php-webdriver · mpierzchalski · Jul 16, 2018 · Sep 3, 2018 · Sep 3, 2018 · Sep 3, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -13,14 +13,21 @@ env:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
     - CHROMEDRIVER_VERSION="2.38"
+    - GECKODRIVER_VERSION="0.22.0"
 
 matrix:
   include:
     # Add build to run tests against Firefox inside Travis environment
     - php: 7.2
-      env: BROWSER_NAME="firefox"
+      env: BROWSER_NAME="firefox" MOZ_HEADLESS="1"
       addons:
-        firefox: "45.8.0esr"
+        firefox: "latest"
+
+    # Add build to run tests against Firefox inside Travis environment with native geckodriver
+    - php: 7.2
+      env: BROWSER_NAME="firefox" GECKODRIVER="1" MOZ_HEADLESS="1"
+      addons:
+        firefox: "latest"
 
     # Add build to run tests against Chrome inside Travis environment
     - php: 7.2
@@ -40,7 +47,7 @@ matrix:
 
     # Saucelabs builds
     - php: 7.2
-      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
+      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="61.0" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
@@ -58,7 +65,7 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.2
-      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="15.15063" PLATFORM="Windows 10"
+      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="latest" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
         - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
@@ -92,9 +99,17 @@ install:
 before_script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; wget -q -t 3 https://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip; unzip chromedriver_linux64 -d chromedriver; fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
+  - if [ "$BROWSER_NAME" = "firefox" ]; then mkdir geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz; tar -xvzf geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz -C geckodriver; chmod +x geckodriver; fi
+  - if [ "$BROWSER_NAME" = "firefox" ]; then export GECKODRIVER_PATH=$PWD/geckodriver/geckodriver; fi
   - sh -e /etc/init.d/xvfb start
-  - if [ ! -f jar/selenium-server-standalone-3.8.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.8/selenium-server-standalone-3.8.1.jar; fi
-  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.8.1.jar -enablePassThrough false -log ./logs/selenium.log &
+  - |
+    if [ "$GECKODRIVER" = "1" ]
+    then
+      geckodriver/geckodriver &> ./logs/geckodriver.log &
+    else
+      if [ ! -f jar/selenium-server-standalone-3.14.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar; fi
+      java -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -Dwebdriver.gecko.driver="$GECKODRIVER_PATH" -jar jar/selenium-server-standalone-3.14.0.jar -log ./logs/selenium.log &
+    fi
   - until $(echo | nc localhost 4444); do sleep 1; echo Waiting for Selenium server on port 4444...; done; echo "Selenium server started"
   - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
   - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"

diff --git a/composer.json b/composer.json
@@ -10,17 +10,18 @@
     "forum": "https://www.facebook.com/groups/phpwebdriver/",
     "source": "https://github.com/facebook/php-webdriver"
   },
-  "minimum-stability": "beta",
+  "minimum-stability": "stable",
   "require": {
     "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1 || ^4.0",
     "ext-curl": "*",
     "ext-zip": "*",
     "ext-mbstring": "*",
-    "ext-json": "*"
+    "ext-json": "*",
+    "psr/log": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7",
+    "phpunit/phpunit": "^5.7.27",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
@@ -56,10 +57,5 @@
       "vendor/bin/parallel-lint -j 10 ./lib ./tests",
       "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-community": "1.5-dev"
-    }
   }
 }
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
@@ -18,9 +18,13 @@
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecutableWebDriverCommand;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
+use Facebook\WebDriver\Remote\WebDriverDialect;
+use Facebook\WebDriver\Remote\WebDriverResponseFactory;
+use Psr\Log\LoggerInterface;
 
 class ChromeDriver extends RemoteWebDriver
 {
@@ -36,12 +40,16 @@ public static function start(DesiredCapabilities $desired_capabilities = null, C
             $service = ChromeDriverService::createDefaultService();
         }
         $executor = new DriverCommandExecutor($service);
-        $driver = new static($executor, null, $desired_capabilities);
+        $driver = new static($executor, WebDriverDialect::createJsonWireProtocol(), null, $desired_capabilities);
         $driver->startSession($desired_capabilities);
 
         return $driver;
     }
 
+    /**
+     * @param DesiredCapabilities $desired_capabilities
+     * @throws WebDriverException
+     */
     public function startSession(DesiredCapabilities $desired_capabilities)
     {
         $command = new WebDriverCommand(
@@ -51,7 +59,9 @@ public function startSession(DesiredCapabilities $desired_capabilities)
                 'desiredCapabilities' => $desired_capabilities->toArray(),
             ]
         );
-        $response = $this->executor->execute($command);
+        $result = $this->executor->execute(ExecutableWebDriverCommand::getNewSessionCommand($command));
+        $response = WebDriverResponseFactory::create($result);
+
         $this->sessionID = $response->getSessionID();
     }
 
@@ -65,8 +75,8 @@ public function startSession(DesiredCapabilities $desired_capabilities)
      * @param string|null $http_proxy
      * @param int|null $http_proxy_port
      * @param DesiredCapabilities $required_capabilities
+     * @param LoggerInterface|null $logger
      * @throws WebDriverException
-     * @return RemoteWebDriver
      */
     public static function create(
         $selenium_server_url = 'http://localhost:4444/wd/hub',
@@ -75,7 +85,8 @@ public static function create(
         $request_timeout_in_ms = null,
         $http_proxy = null,
         $http_proxy_port = null,
-        DesiredCapabilities $required_capabilities = null
+        DesiredCapabilities $required_capabilities = null,
+        LoggerInterface $logger = null
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }
@@ -84,6 +95,7 @@ public static function create(
      * Always throws an exception. Use ChromeDriver::start() instead.
      *
      * @param string $session_id The existing session id
+     * @param WebDriverDialect $dialect
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param int|null $connection_timeout_in_ms Set timeout for the connect phase to remote Selenium WebDriver server
      * @param int|null $request_timeout_in_ms Set the maximum time of a request to remote Selenium WebDriver server
@@ -92,6 +104,7 @@ public static function create(
      */
     public static function createBySessionID(
         $session_id,
+        WebDriverDialect $dialect,
         $selenium_server_url = 'http://localhost:4444/wd/hub',
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null

diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
@@ -46,42 +46,7 @@ public function getResults()
      * @param string $message
      * @param mixed $results
      *
-     * @throws ElementNotSelectableException
-     * @throws ElementNotVisibleException
-     * @throws ExpectedException
-     * @throws IMEEngineActivationFailedException
-     * @throws IMENotAvailableException
-     * @throws IndexOutOfBoundsException
-     * @throws InvalidCookieDomainException
-     * @throws InvalidCoordinatesException
-     * @throws InvalidElementStateException
-     * @throws InvalidSelectorException
-     * @throws MoveTargetOutOfBoundsException
-     * @throws NoAlertOpenException
-     * @throws NoCollectionException
-     * @throws NoScriptResultException
-     * @throws NoStringException
-     * @throws NoStringLengthException
-     * @throws NoStringWrapperException
-     * @throws NoSuchCollectionException
-     * @throws NoSuchDocumentException
-     * @throws NoSuchDriverException
-     * @throws NoSuchElementException
-     * @throws NoSuchFrameException
-     * @throws NoSuchWindowException
-     * @throws NullPointerException
-     * @throws ScriptTimeoutException
-     * @throws SessionNotCreatedException
-     * @throws StaleElementReferenceException
-     * @throws TimeOutException
-     * @throws UnableToSetCookieException
-     * @throws UnexpectedAlertOpenException
-     * @throws UnexpectedJavascriptException
-     * @throws UnknownCommandException
-     * @throws UnknownServerException
-     * @throws UnrecognizedExceptionException
-     * @throws WebDriverCurlException
-     * @throws XPathLookupException
+     * @throws WebDriverException
      */
     public static function throwException($status_code, $message, $results)
     {
@@ -158,4 +123,49 @@ public static function throwException($status_code, $message, $results)
                 throw new UnrecognizedExceptionException($message, $results);
         }
     }
+
+    /**
+     * Throw WebDriverExceptions based on WebDriver status code.
+     *
+     * @param string $error
+     * @param mixed $results
+     *
+     * @throws WebDriverException
+     */
+    public static function throwExceptionForW3c($error, $results)
+    {
+        switch ($error) {
+            case 'element click intercepted':
+            case 'invalid element state':
+                throw new InvalidElementStateException($error, $results);
+            case 'element not interactable':
+                throw new ElementNotSelectableException($error, $results);
+            case 'no such element':
+                throw new NoSuchElementException($error, $results);
+            case 'timeout':
+                throw new TimeOutException($error, $results);
+            case 'script timeout':
+                throw new ScriptTimeoutException($error, $results);
+            case 'no such window':
+                throw new NoSuchWindowException($error, $results);
+            case 'invalid cookie domain':
+                throw new InvalidCookieDomainException($error, $results);
+            case 'unable to set cookie':
+                throw new UnableToSetCookieException($error, $results);
+            case 'unknown command':
+                throw new UnknownCommandException($error, $results);
+            case 'unknown error':
+                throw new UnknownServerException($error, $results);
+            case 'invalid selector':
+                throw new InvalidSelectorException($error, $results);
+            case 'move target out of bounds':
+                throw new MoveTargetOutOfBoundsException($error, $results);
+            case 'stale element reference':
+                throw new StaleElementReferenceException($error, $results);
+            case 'no such alert':
+                throw new NoAlertOpenException($error, $results);
+            default:
+                throw new self($error, $results);
+        }
+    }
 }
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
@@ -25,7 +25,7 @@
 use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
-use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\Remote\Action\WebDriverActionPerformer;
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverHasInputDevices;
 
@@ -34,20 +34,20 @@
  */
 class WebDriverActions
 {
-    protected $driver;
     protected $keyboard;
     protected $mouse;
     protected $action;
 
     /**
+     * WebDriverActions constructor.
      * @param WebDriverHasInputDevices $driver
+     * @param WebDriverActionPerformer $performer
      */
-    public function __construct(WebDriverHasInputDevices $driver)
+    public function __construct(WebDriverHasInputDevices $driver, WebDriverActionPerformer $performer)
     {
-        $this->driver = $driver;
-        $this->keyboard = $driver->getKeyboard();
         $this->mouse = $driver->getMouse();
-        $this->action = new WebDriverCompositeAction();
+        $this->keyboard = $driver->getKeyboard();
+        $this->action = new WebDriverCompositeAction($performer);
     }
 
     /**

diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
@@ -15,18 +15,33 @@
 
 namespace Facebook\WebDriver\Interactions;
 
+use Facebook\WebDriver\Remote\Action\WebDriverActionPerformer;
 use Facebook\WebDriver\WebDriverAction;
 
 /**
  * An action for aggregating actions and triggering all of them afterwards.
  */
 class WebDriverCompositeAction implements WebDriverAction
 {
+    /**
+     * @var WebDriverActionPerformer
+     */
+    private $performer;
+
     /**
      * @var WebDriverAction[]
      */
     private $actions = [];
 
+    /**
+     * WebDriverCompositeAction constructor.
+     * @param WebDriverActionPerformer $performer
+     */
+    public function __construct(WebDriverActionPerformer $performer)
+    {
+        $this->performer = $performer;
+    }
+
     /**
      * Add an WebDriverAction to the sequence.
      *
@@ -55,8 +70,6 @@ public function getNumberOfActions()
      */
     public function perform()
     {
-        foreach ($this->actions as $action) {
-            $action->perform();
-        }
+        $this->performer->perform($this->actions);
     }
 }
diff --git a/lib/Interactions/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
@@ -25,8 +25,10 @@
 use Facebook\WebDriver\Interactions\Touch\WebDriverScrollFromElementAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverTapAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\Remote\Action\WebDriverActionPerformer;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverHasInputDevices;
 use Facebook\WebDriver\WebDriverUpAction;
 
 /**
@@ -39,9 +41,9 @@ class WebDriverTouchActions extends WebDriverActions
      */
     protected $touchScreen;
 
-    public function __construct(WebDriver $driver)
+    public function __construct(WebDriverHasInputDevices $driver, WebDriverActionPerformer $performer)
     {
-        parent::__construct($driver);
+        parent::__construct($driver, $performer);
         $this->touchScreen = $driver->getTouch();
     }