Merge remote-tracking branch 'upstream/master'

pstuart2 · pstuart2 · commit a22bbbb25cb5 · 2013-09-13T21:13:14.000-05:00
Conflicts:
	lib/WebDriver.php
	lib/__init__.php
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 /**
  * The interface for WebDriver.
  */
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 /**
  * Interface representing a single user-interaction action.
  */
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
@@ -15,12 +15,17 @@
 
 namespace facebook\Selenium\phpWebDriver;
 
+use facebook\Selenium\phpWebDriver\WebDriverCommandExecutor;
+
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
 class WebDriverAlert {
 
-  protected $executor;
+	/**
+	 * @var WebDriverCommandExecutor
+	 */
+	protected $executor;
 
   public function __construct($executor) {
     $this->executor = $executor;
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
@@ -13,11 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 /**
  * Interface for all command executor.
  */
 interface WebDriverCommandExecutor {
 
   // $command and $params will be merged to an command object in the future.
-  public function execute($command, array $params);
+  public function execute($command, array $params = null);
 }
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
+use facebook\Selenium\phpWebDriver\support\events\EventFiringWebDriver;
+
 class WebDriverDispatcher {
 
   /**
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
@@ -12,8 +12,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
+use facebook\Selenium\phpWebDriver\WebDriverSearchContext;
+use facebook\Selenium\phpWebDriver\WebDriverPoint as WebDriverLocation;
+
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
+use facebook\Selenium\phpWebDriver\support\events\EventFiringWebDriver;
+use facebook\Selenium\phpWebDriver\support\events\EventFiringWebElement;
+
 interface WebDriverEventListener {
 
   /**
diff --git a/lib/WebDriverExceptions.php b/lib/WebDriverExceptions.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 use \Exception;
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 /**
  * Interface implemented by each driver that allows access to the input devices.
  */
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 interface WebDriverKeyboard {
 
   /**
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverCoordinates;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
@@ -12,8 +12,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
+use \InvalidArgumentException;
+
 /**
  * Managing stuff you would do in a browser.
  */
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver;
+
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for
  * WebDriverElement inside.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
@@ -12,6 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 namespace facebook\Selenium\phpWebDriver;
 
 /**
diff --git a/lib/interactions/WebDriverActions.php b/lib/interactions/WebDriverActions.php
@@ -13,6 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions;
+
+use facebook\Selenium\phpWebDriver\WebDriver;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverClickAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverContextClickAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverClickAndHoldAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverDoubleClickAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseMoveAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverButtonReleaseAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMoveToOffsetAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverKeyDownAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverKeyUpAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverSendKeysAction;
+use facebook\Selenium\phpWebDriver\WebDriverElement;
+
 /**
  * WebDriver action builder. It implements the builder pattern.
  */
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/interactions/WebDriverCompositeAction.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+
 /**
  * An action for aggregating actions and triggering all of them afterwards.
  */
diff --git a/lib/interactions/internal/WebDriverButtonReleaseAction.php b/lib/interactions/internal/WebDriverButtonReleaseAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseAction;
+
 /**
  * Move to the location and then release the mouse key.
  */
diff --git a/lib/interactions/internal/WebDriverClickAction.php b/lib/interactions/internal/WebDriverClickAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseAction;
+
 class WebDriverClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverClickAndHoldAction.php b/lib/interactions/internal/WebDriverClickAndHoldAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseAction;
+
 /**
  * Move the the location, click and hold.
  */
diff --git a/lib/interactions/internal/WebDriverContextClickAction.php b/lib/interactions/internal/WebDriverContextClickAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseAction;
+
 /**
  * You can call it 'Right Click' if you like.
  */
diff --git a/lib/interactions/internal/WebDriverCoordinates.php b/lib/interactions/internal/WebDriverCoordinates.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\UnsupportedOperationException;
+use facebook\Selenium\phpWebDriver\WebDriverPoint as WebDriverLocation;
+
 /**
  * Interface representing basic mouse operations.
  */
@@ -37,7 +42,7 @@ public function __construct(
   }
 
   /**
-   * @return WebDriverPoint
+   * @return WebDriverLocation
    */
   public function onScreen() {
     throw new UnsupportedOperationException(
@@ -46,14 +51,14 @@ public function onScreen() {
   }
 
   /**
-   * @return WebDriverPoint
+   * @return WebDriverLocation
    */
   public function inViewPort() {
     return call_user_func($this->inViewPort);
   }
 
   /**
-   * @return WebDriverPoint
+   * @return WebDriverLocation
    */
   public function onPage() {
     return call_user_func($this->onPage);
diff --git a/lib/interactions/internal/WebDriverDoubleClickAction.php b/lib/interactions/internal/WebDriverDoubleClickAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverMouseAction;
+
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyDownAction.php b/lib/interactions/internal/WebDriverKeyDownAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverSingleKeyAction;
+
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyUpAction.php b/lib/interactions/internal/WebDriverKeyUpAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverAction;
+use facebook\Selenium\phpWebDriver\interactions\internal\WebDriverSingleKeyAction;
+
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/interactions/internal/WebDriverKeysRelatedAction.php
@@ -13,6 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverKeyboard;
+use facebook\Selenium\phpWebDriver\WebDriverMouse;
+use facebook\Selenium\phpWebDriver\internal\WebDriverLocatable;
+
 /**
  * Base class for all keyboard-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/interactions/internal/WebDriverMouseAction.php
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace facebook\Selenium\phpWebDriver\interactions\internal;
+
+use facebook\Selenium\phpWebDriver\WebDriverMouse;
+use facebook\Selenium\phpWebDriver\internal\WebDriverLocatable;
+
 /**
  * Base class for all mouse-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseMoveAction.php b/lib/interactions/internal/WebDriverMouseMoveAction.php
diff --git a/lib/interactions/internal/WebDriverMoveToOffsetAction.php b/lib/interactions/internal/WebDriverMoveToOffsetAction.php
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/interactions/internal/WebDriverSendKeysAction.php
diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/interactions/internal/WebDriverSingleKeyAction.php
diff --git a/lib/internal/WebDriverLocatable.php b/lib/internal/WebDriverLocatable.php
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
diff --git a/lib/remote/WebDriverBrowserType.php b/lib/remote/WebDriverBrowserType.php
diff --git a/lib/remote/WebDriverCapabilityType.php b/lib/remote/WebDriverCapabilityType.php
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
diff --git a/lib/support/events/EventFiringWebDriverNavigation.php b/lib/support/events/EventFiringWebDriverNavigation.php
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/support/events/EventFiringWebElement.php
