From add8a5c91e4a276926d17857f9acbf3ceccfd759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <DaphDaOne@users.noreply.github.com>
Date: Mon, 20 Jan 2014 15:47:23 +0100
Subject: [PATCH 001/784] Remove typehint string in
 `frameToBeAvailableAndSwitchToIt`

Type hints can not be used with scalar types such as int or string.

[See PHP documentation](http://www.php.net/manual/en/language.oop5.typehinting.php)
---
 lib/WebDriverExpectedCondition.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index e00f5382e..5d9a6529b 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -192,8 +192,7 @@ function ($driver) use ($by, $text) {
    * @return WebDriverExpectedCondition<WebDriver> object focused on new frame
    *         when frame is found bool false otherwise
    */
-  public static function frameToBeAvailableAndSwitchToIt(
-      string $frame_locator) {
+  public static function frameToBeAvailableAndSwitchToIt($frame_locator) {
     return new WebDriverExpectedCondition(
       function ($driver) use ($frame_locator) {
         try {

From a6ae29aa0239cfd544bd68ba5ac6695d7902163d Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Tue, 21 Jan 2014 11:41:14 -0800
Subject: [PATCH 002/784] replace filesystem by tempnam

---
 lib/remote/RemoteWebElement.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index bb8864728..c7cfee7fa 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -281,9 +281,10 @@ private function upload($local_file) {
       throw new WebDriverException("You may only upload files: " . $local_file);
     }
 
-    $temp_zip = Filesystem::createTemporaryFile('WebDriverZip', 'true');
+    // Create a temperary file in the system temp directory.
+    $temp_zip = tempnam('', 'WebDriverZip');
     $zip = new ZipArchive();
-    if ($zip->open($temp_zip, ZIPARCHIVE::CREATE) !== true) {
+    if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
       return false;
     }
     $file_name = pathinfo($local_file)['basename'];

From 7aeec8b593cc66a130fda44dca339d2a686a8d0f Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Tue, 21 Jan 2014 16:18:10 -0800
Subject: [PATCH 003/784] clean up temp file

---
 lib/remote/RemoteWebElement.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index c7cfee7fa..151c0f416 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -291,9 +291,11 @@ private function upload($local_file) {
     $zip->addFile($local_file, $file_name);
     $zip->close();
     $params = array(
-      'file' => base64_encode(Filesystem::readFile($temp_zip)),
+      'file' => base64_encode(file_get_contents($temp_zip)),
     );
-    return $this->executor->execute('sendFile', $params);
+    $remote_path = $this->executor->execute('sendFile', $params);
+    unlink($temp_zip);
+    return $remote_path;
   }
 
   /**

From 2b9a7eba4c337989ef8f384dc94f25ac13ede3f5 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Wed, 22 Jan 2014 16:55:23 -0800
Subject: [PATCH 004/784] resolve php 5.3 pathinfo() issue

---
 lib/remote/RemoteWebElement.php        |  3 +-
 tests/BasePHPWebDriverTestCase.php     |  1 +
 tests/FileUploadTestCase.php           | 44 ++++++++++++++++++++++++++
 tests/files/FileUploadTestCaseFile.txt |  1 +
 tests/html/upload.html                 | 10 ++++++
 5 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 tests/FileUploadTestCase.php
 create mode 100644 tests/files/FileUploadTestCaseFile.txt
 create mode 100644 tests/html/upload.html

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index 151c0f416..b394d5590 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -287,7 +287,8 @@ private function upload($local_file) {
     if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
       return false;
     }
-    $file_name = pathinfo($local_file)['basename'];
+    $info = pathinfo($local_file);
+    $file_name = $info['basename'];
     $zip->addFile($local_file, $file_name);
     $zip->close();
     $params = array(
diff --git a/tests/BasePHPWebDriverTestCase.php b/tests/BasePHPWebDriverTestCase.php
index 6b49db2bb..1951651bb 100644
--- a/tests/BasePHPWebDriverTestCase.php
+++ b/tests/BasePHPWebDriverTestCase.php
@@ -25,6 +25,7 @@ protected function setUp() {
       'http://localhost:4444/wd/hub',
       array(
         WebDriverCapabilityType::BROWSER_NAME
+          //=> WebDriverBrowserType::FIREFOX,
           => WebDriverBrowserType::HTMLUNIT,
       )
     );
diff --git a/tests/FileUploadTestCase.php b/tests/FileUploadTestCase.php
new file mode 100644
index 000000000..f88697dd9
--- /dev/null
+++ b/tests/FileUploadTestCase.php
@@ -0,0 +1,44 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+require_once('__init__.php');
+
+/**
+ * An example test case for php-webdriver.
+ * 
+ * Try running it by 
+ *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
+ */
+class ExampleTestCase extends BasePHPWebDriverTestCase {
+  
+  public function testFileUploading() {
+    $this->driver->get($this->getTestPath('upload.html'));
+    $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
+    $file_input->setFileDetector(new LocalFileDetector())
+               ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
+    self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+  }
+
+  public function testUselessFileDetectorSendKeys() {
+    $this->driver->get($this->getTestPath('upload.html'));
+    $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
+    $file_input->sendKeys($this->getFilePath());
+    self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+  }
+  
+  private function getFilePath() {
+    return __DIR__ . '/files/FileUploadTestCaseFile.txt';
+  }
+}
diff --git a/tests/files/FileUploadTestCaseFile.txt b/tests/files/FileUploadTestCaseFile.txt
new file mode 100644
index 000000000..0ca232e37
--- /dev/null
+++ b/tests/files/FileUploadTestCaseFile.txt
@@ -0,0 +1 @@
+text file
diff --git a/tests/html/upload.html b/tests/html/upload.html
new file mode 100644
index 000000000..957514f3f
--- /dev/null
+++ b/tests/html/upload.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+  <title>Upload a file</title>
+</head>
+<body>
+  <form method="post" enctype="mutipart/form-data">
+    <input type="file" id="upload"></input>
+  </form>
+</body>
+</html>

From cb57c13a5cbe88b5040fd5ad00a06eab87c89219 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 17:53:11 +0100
Subject: [PATCH 005/784] First unit test.

---
 README.md                                     |  6 ++++
 .../WebDriverButtonReleaseActionTest.php      | 32 +++++++++++++++++++
 tests/phpunit.xml                             | 21 ++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 tests/interactions/internal/WebDriverButtonReleaseActionTest.php
 create mode 100644 tests/phpunit.xml

diff --git a/README.md b/README.md
index f279f1f18..90c1597d7 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,12 @@ Install the library.
 
 *   The $capabilities array lets you specify (among other things) which browser to use. See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
 
+## RUN UNIT TESTS
+
+To run unit tests simply run:
+
+./vendor/bin/phpunit  -c ./tests
+
 ## MORE INFORMATION
 
 Check out the Selenium docs and wiki at http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki
diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
new file mode 100644
index 000000000..383e3a2d1
--- /dev/null
+++ b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once __DIR__ . '/../../../lib/__init__.php';
+
+class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @type WebDriverButtonReleaseAction
+     */
+    private $webDriverButtonReleaseAction;
+
+    private $webDriverMouse;
+    private $locationProvider;
+
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMock('WebDriverMouse');
+        $this->locationProvider = $this->getMock('WebDriverLocatable');
+        $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
+
+    public function testPerformSendsMouseUpCommand()
+    {
+        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseUp');
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverButtonReleaseAction->perform();
+    }
+}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 000000000..ceb0ce206
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit
+        backupGlobals               = "false"
+        backupStaticAttributes      = "false"
+        colors                      = "true"
+        convertErrorsToExceptions   = "true"
+        convertNoticesToExceptions  = "true"
+        convertWarningsToExceptions = "true"
+        processIsolation            = "false"
+        stopOnFailure               = "false"
+        syntaxCheck                 = "false" >
+
+    <testsuites>
+        <testsuite name="Facebook PHP-Webdriver Testsuite">
+            <directory>./</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>

From d7105521abb5ca4b051eca6ab99fa228713c2ef8 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 17:55:22 +0100
Subject: [PATCH 006/784] Markdown fix for running unit tests

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 90c1597d7..fe517a0d2 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Install the library.
 
 To run unit tests simply run:
 
-./vendor/bin/phpunit  -c ./tests
+    ./vendor/bin/phpunit  -c ./tests
 
 ## MORE INFORMATION
 

From c27197e5246a6e3ea34cbd64a73f33d79461a7b8 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 18:19:38 +0100
Subject: [PATCH 007/784] Add unit test for WebDriverClickAction

---
 .../internal/WebDriverClickActionTest.php     | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/interactions/internal/WebDriverClickActionTest.php

diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/interactions/internal/WebDriverClickActionTest.php
new file mode 100644
index 000000000..ca1ecb036
--- /dev/null
+++ b/tests/interactions/internal/WebDriverClickActionTest.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once __DIR__ . '/../../../lib/__init__.php';
+
+class WebDriverClickActionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @type WebDriverButtonReleaseAction
+     */
+    private $webDriverClickAction;
+
+    private $webDriverMouse;
+    private $locationProvider;
+
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMock('WebDriverMouse');
+        $this->locationProvider = $this->getMock('WebDriverLocatable');
+        $this->webDriverClickAction = new WebDriverClickAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
+
+    public function testPerformSendsClickCommand()
+    {
+        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('click');
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverClickAction->perform();
+    }
+}

From 4fa42cc045075295016dc98ad4c2388aa9df8165 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 18:29:38 +0100
Subject: [PATCH 008/784] Markdown fix for running unit tests

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe517a0d2..6b4e15ea9 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Install the library.
 
 To run unit tests simply run:
 
-    ./vendor/bin/phpunit  -c ./tests
+    ./vendor/bin/phpunit -c ./tests
 
 ## MORE INFORMATION
 

From 38ca99a5a7119600fb07c0d4c9e03f6e8b05b3c8 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 18:34:37 +0100
Subject: [PATCH 009/784] Add unit test for WebDriverClickAndHoldAction

---
 .../WebDriverClickAndHoldActionTest.php       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/interactions/internal/WebDriverClickAndHoldActionTest.php

diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
new file mode 100644
index 000000000..3bd805ed5
--- /dev/null
+++ b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once __DIR__ . '/../../../lib/__init__.php';
+
+class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @type WebDriverClickAndHoldAction
+     */
+    private $webDriverClickAction;
+
+    private $webDriverMouse;
+    private $locationProvider;
+
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMock('WebDriverMouse');
+        $this->locationProvider = $this->getMock('WebDriverLocatable');
+        $this->webDriverClickAction = new WebDriverClickAndHoldAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
+
+    public function testPerformSendsMouseDownCommand()
+    {
+        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseDown');
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverClickAction->perform();
+    }
+}

From fbd824de9e9c9bb828122756a49a8ea4b306d2d1 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 18:54:56 +0100
Subject: [PATCH 010/784] Add a bootstrap.php for phpunit.

---
 tests/bootstrap.php                                            | 3 +++
 .../interactions/internal/WebDriverButtonReleaseActionTest.php | 2 --
 tests/interactions/internal/WebDriverClickActionTest.php       | 2 --
 .../interactions/internal/WebDriverClickAndHoldActionTest.php  | 2 --
 tests/phpunit.xml                                              | 3 ++-
 5 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 tests/bootstrap.php

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..e98637e69
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../lib/__init__.php';
diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
index 383e3a2d1..a2966ca87 100644
--- a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../lib/__init__.php';
-
 class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/interactions/internal/WebDriverClickActionTest.php
index ca1ecb036..58f99fea8 100644
--- a/tests/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/interactions/internal/WebDriverClickActionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../lib/__init__.php';
-
 class WebDriverClickActionTest extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
index 3bd805ed5..11867f480 100644
--- a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../../../lib/__init__.php';
-
 class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index ceb0ce206..4b07ba9b6 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -10,7 +10,8 @@
         convertWarningsToExceptions = "true"
         processIsolation            = "false"
         stopOnFailure               = "false"
-        syntaxCheck                 = "false" >
+        syntaxCheck                 = "false"
+        bootstrap                   = "bootstrap.php" >
 
     <testsuites>
         <testsuite name="Facebook PHP-Webdriver Testsuite">

From bd65ff6666c229bea930b3cde3019352f948339d Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 19:37:36 +0100
Subject: [PATCH 011/784] Add unit test for WebDriverContextClickAction

---
 .../WebDriverContextClickActionTest.php       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 tests/interactions/internal/WebDriverContextClickActionTest.php

diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/interactions/internal/WebDriverContextClickActionTest.php
new file mode 100644
index 000000000..21a91468b
--- /dev/null
+++ b/tests/interactions/internal/WebDriverContextClickActionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @type WebDriverContextClickAction
+     */
+    private $webDriverContextClickAction;
+
+    private $webDriverMouse;
+    private $locationProvider;
+
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMock('WebDriverMouse');
+        $this->locationProvider = $this->getMock('WebDriverLocatable');
+        $this->webDriverContextClickAction = new WebDriverContextClickAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
+
+    public function testPerformSendsMouseDownCommand()
+    {
+        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('contextClick');
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverContextClickAction->perform();
+    }
+}

From 18e912aec09efb2e5c232cf5539f45c17b68ec66 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 25 Jan 2014 19:44:07 +0100
Subject: [PATCH 012/784] Fixed test method name

---
 tests/interactions/internal/WebDriverContextClickActionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/interactions/internal/WebDriverContextClickActionTest.php
index 21a91468b..1b8f2fb54 100644
--- a/tests/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/interactions/internal/WebDriverContextClickActionTest.php
@@ -20,7 +20,7 @@ public function setUp()
         );
     }
 
-    public function testPerformSendsMouseDownCommand()
+    public function testPerformSendsContextClickCommand()
     {
         $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('contextClick');

From abc1bbae4ca9ce94ef0be7cc4b645c9b8294c074 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Tue, 28 Jan 2014 17:41:06 +0100
Subject: [PATCH 013/784] Fixed code style

---
 .../WebDriverButtonReleaseActionTest.php      | 42 +++++++++----------
 .../internal/WebDriverClickActionTest.php     | 42 +++++++++----------
 .../WebDriverClickAndHoldActionTest.php       | 42 +++++++++----------
 .../WebDriverContextClickActionTest.php       | 42 +++++++++----------
 4 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
index a2966ca87..656a6a727 100644
--- a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -2,29 +2,27 @@
 
 class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @type WebDriverButtonReleaseAction
-     */
-    private $webDriverButtonReleaseAction;
+  /**
+   * @type WebDriverButtonReleaseAction
+   */
+  private $webDriverButtonReleaseAction;
 
-    private $webDriverMouse;
-    private $locationProvider;
+  private $webDriverMouse;
+  private $locationProvider;
 
-    public function setUp()
-    {
-        $this->webDriverMouse = $this->getMock('WebDriverMouse');
-        $this->locationProvider = $this->getMock('WebDriverLocatable');
-        $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
-            $this->webDriverMouse,
-            $this->locationProvider
-        );
-    }
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
 
-    public function testPerformSendsMouseUpCommand()
-    {
-        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-        $this->webDriverMouse->expects($this->once())->method('mouseUp');
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-        $this->webDriverButtonReleaseAction->perform();
-    }
+  public function testPerformSendsMouseUpCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('mouseUp');
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverButtonReleaseAction->perform();
+  }
 }
diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/interactions/internal/WebDriverClickActionTest.php
index 58f99fea8..b46d93713 100644
--- a/tests/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/interactions/internal/WebDriverClickActionTest.php
@@ -2,29 +2,27 @@
 
 class WebDriverClickActionTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @type WebDriverButtonReleaseAction
-     */
-    private $webDriverClickAction;
+  /**
+   * @type WebDriverButtonReleaseAction
+   */
+  private $webDriverClickAction;
 
-    private $webDriverMouse;
-    private $locationProvider;
+  private $webDriverMouse;
+  private $locationProvider;
 
-    public function setUp()
-    {
-        $this->webDriverMouse = $this->getMock('WebDriverMouse');
-        $this->locationProvider = $this->getMock('WebDriverLocatable');
-        $this->webDriverClickAction = new WebDriverClickAction(
-            $this->webDriverMouse,
-            $this->locationProvider
-        );
-    }
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverClickAction = new WebDriverClickAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
 
-    public function testPerformSendsClickCommand()
-    {
-        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-        $this->webDriverMouse->expects($this->once())->method('click');
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-        $this->webDriverClickAction->perform();
-    }
+  public function testPerformSendsClickCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('click');
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverClickAction->perform();
+  }
 }
diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
index 11867f480..414d4483e 100644
--- a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -2,29 +2,27 @@
 
 class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @type WebDriverClickAndHoldAction
-     */
-    private $webDriverClickAction;
+  /**
+   * @type WebDriverClickAndHoldAction
+   */
+  private $webDriverClickAction;
 
-    private $webDriverMouse;
-    private $locationProvider;
+  private $webDriverMouse;
+  private $locationProvider;
 
-    public function setUp()
-    {
-        $this->webDriverMouse = $this->getMock('WebDriverMouse');
-        $this->locationProvider = $this->getMock('WebDriverLocatable');
-        $this->webDriverClickAction = new WebDriverClickAndHoldAction(
-            $this->webDriverMouse,
-            $this->locationProvider
-        );
-    }
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverClickAction = new WebDriverClickAndHoldAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
 
-    public function testPerformSendsMouseDownCommand()
-    {
-        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-        $this->webDriverMouse->expects($this->once())->method('mouseDown');
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-        $this->webDriverClickAction->perform();
-    }
+  public function testPerformSendsMouseDownCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('mouseDown');
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverClickAction->perform();
+  }
 }
diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/interactions/internal/WebDriverContextClickActionTest.php
index 1b8f2fb54..f63c144c6 100644
--- a/tests/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/interactions/internal/WebDriverContextClickActionTest.php
@@ -2,29 +2,27 @@
 
 class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * @type WebDriverContextClickAction
-     */
-    private $webDriverContextClickAction;
+  /**
+   * @type WebDriverContextClickAction
+   */
+  private $webDriverContextClickAction;
 
-    private $webDriverMouse;
-    private $locationProvider;
+  private $webDriverMouse;
+  private $locationProvider;
 
-    public function setUp()
-    {
-        $this->webDriverMouse = $this->getMock('WebDriverMouse');
-        $this->locationProvider = $this->getMock('WebDriverLocatable');
-        $this->webDriverContextClickAction = new WebDriverContextClickAction(
-            $this->webDriverMouse,
-            $this->locationProvider
-        );
-    }
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverContextClickAction = new WebDriverContextClickAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
 
-    public function testPerformSendsContextClickCommand()
-    {
-        $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-        $this->webDriverMouse->expects($this->once())->method('contextClick');
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-        $this->webDriverContextClickAction->perform();
-    }
+  public function testPerformSendsContextClickCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('contextClick');
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverContextClickAction->perform();
+  }
 }

From d275ee1db6eceb3a0c9c5228cae72eb12867090d Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Tue, 28 Jan 2014 20:04:06 +0100
Subject: [PATCH 014/784] Add tests for internal interactions

---
 .../WebDriverButtonReleaseActionTest.php      |  2 +-
 .../internal/WebDriverClickActionTest.php     |  4 +--
 .../WebDriverClickAndHoldActionTest.php       |  8 ++---
 .../WebDriverContextClickActionTest.php       |  2 +-
 .../internal/WebDriverCoordinatesTest.php     | 26 ++++++++++++++
 .../WebDriverDoubleClickActionTest.php        | 28 +++++++++++++++
 .../internal/WebDriverKeyDownActionTest.php   | 32 +++++++++++++++++
 .../internal/WebDriverKeyUpActionTest.php     | 33 +++++++++++++++++
 .../internal/WebDriverMouseMoveActionTest.php | 28 +++++++++++++++
 .../WebDriverMouseToOffsetActionTest.php      | 30 ++++++++++++++++
 .../internal/WebDriverSendKeysActionTest.php  | 35 +++++++++++++++++++
 11 files changed, 220 insertions(+), 8 deletions(-)
 create mode 100644 tests/interactions/internal/WebDriverCoordinatesTest.php
 create mode 100644 tests/interactions/internal/WebDriverDoubleClickActionTest.php
 create mode 100644 tests/interactions/internal/WebDriverKeyDownActionTest.php
 create mode 100644 tests/interactions/internal/WebDriverKeyUpActionTest.php
 create mode 100644 tests/interactions/internal/WebDriverMouseMoveActionTest.php
 create mode 100644 tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
 create mode 100644 tests/interactions/internal/WebDriverSendKeysActionTest.php

diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
index 656a6a727..d6b6c0ba4 100644
--- a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -21,7 +21,7 @@ public function setUp() {
 
   public function testPerformSendsMouseUpCommand() {
     $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseUp');
+    $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
   }
diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/interactions/internal/WebDriverClickActionTest.php
index b46d93713..5ab22ebf6 100644
--- a/tests/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/interactions/internal/WebDriverClickActionTest.php
@@ -3,7 +3,7 @@
 class WebDriverClickActionTest extends PHPUnit_Framework_TestCase
 {
   /**
-   * @type WebDriverButtonReleaseAction
+   * @type WebDriverClickAction
    */
   private $webDriverClickAction;
 
@@ -21,7 +21,7 @@ public function setUp() {
 
   public function testPerformSendsClickCommand() {
     $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('click');
+    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
   }
diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
index 414d4483e..685198432 100644
--- a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -5,7 +5,7 @@ class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
   /**
    * @type WebDriverClickAndHoldAction
    */
-  private $webDriverClickAction;
+  private $webDriverClickAndHoldAction;
 
   private $webDriverMouse;
   private $locationProvider;
@@ -13,7 +13,7 @@ class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
   public function setUp() {
     $this->webDriverMouse = $this->getMock('WebDriverMouse');
     $this->locationProvider = $this->getMock('WebDriverLocatable');
-    $this->webDriverClickAction = new WebDriverClickAndHoldAction(
+    $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
     );
@@ -21,8 +21,8 @@ public function setUp() {
 
   public function testPerformSendsMouseDownCommand() {
     $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseDown');
+    $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverClickAction->perform();
+    $this->webDriverClickAndHoldAction->perform();
   }
 }
diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/interactions/internal/WebDriverContextClickActionTest.php
index f63c144c6..e4b323644 100644
--- a/tests/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/interactions/internal/WebDriverContextClickActionTest.php
@@ -21,7 +21,7 @@ public function setUp() {
 
   public function testPerformSendsContextClickCommand() {
     $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('contextClick');
+    $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
   }
diff --git a/tests/interactions/internal/WebDriverCoordinatesTest.php b/tests/interactions/internal/WebDriverCoordinatesTest.php
new file mode 100644
index 000000000..1bc2133c6
--- /dev/null
+++ b/tests/interactions/internal/WebDriverCoordinatesTest.php
@@ -0,0 +1,26 @@
+<?php
+
+class WebDriverCoordinatesTest extends PHPUnit_Framework_TestCase
+{
+  public function testConstruct() {
+    $in_view_port = function() { };
+    $on_page = function() { };
+
+    $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
+
+    $this->assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
+    $this->assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
+    $this->assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
+    $this->assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
+  }
+
+  public function testGetAuxiliary()
+  {
+    $in_view_port = function() { };
+    $on_page = function() { };
+
+    $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
+
+    $this->assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
+  }
+}
diff --git a/tests/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/interactions/internal/WebDriverDoubleClickActionTest.php
new file mode 100644
index 000000000..51961d640
--- /dev/null
+++ b/tests/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -0,0 +1,28 @@
+<?php
+
+class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverDoubleClickAction
+   */
+  private $webDriverDoubleClickAction;
+
+  private $webDriverMouse;
+  private $locationProvider;
+
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
+
+  public function testPerformSendsDoubleClickCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverDoubleClickAction->perform();
+  }
+}
diff --git a/tests/interactions/internal/WebDriverKeyDownActionTest.php b/tests/interactions/internal/WebDriverKeyDownActionTest.php
new file mode 100644
index 000000000..e5bcc9ba1
--- /dev/null
+++ b/tests/interactions/internal/WebDriverKeyDownActionTest.php
@@ -0,0 +1,32 @@
+<?php
+
+class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverKeyDownAction
+   */
+  private $webDriverKeyDownAction;
+
+  private $webDriverKeyboard;
+  private $webDriverMouse;
+  private $locationProvider;
+
+  public function setUp() {
+    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
+      $this->webDriverKeyboard,
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
+
+  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverKeyboard->expects($this->once())->method('pressKey');
+    $this->webDriverKeyDownAction->perform();
+  }
+}
diff --git a/tests/interactions/internal/WebDriverKeyUpActionTest.php b/tests/interactions/internal/WebDriverKeyUpActionTest.php
new file mode 100644
index 000000000..90494867a
--- /dev/null
+++ b/tests/interactions/internal/WebDriverKeyUpActionTest.php
@@ -0,0 +1,33 @@
+<?php
+
+class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverKeyUpAction
+   */
+  private $webDriverKeyUpAction;
+
+  private $webDriverKeyboard;
+  private $webDriverMouse;
+  private $locationProvider;
+
+  public function setUp() {
+    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
+      $this->webDriverKeyboard,
+      $this->webDriverMouse,
+      $this->locationProvider,
+      'a'
+    );
+  }
+
+  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
+    $this->webDriverKeyUpAction->perform();
+  }
+}
diff --git a/tests/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/interactions/internal/WebDriverMouseMoveActionTest.php
new file mode 100644
index 000000000..98cd80060
--- /dev/null
+++ b/tests/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -0,0 +1,28 @@
+<?php
+
+class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverMouseMoveAction
+   */
+  private $webDriverMouseMoveAction;
+
+  private $webDriverMouse;
+  private $locationProvider;
+
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
+      $this->webDriverMouse,
+      $this->locationProvider
+    );
+  }
+
+  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverMouseMoveAction->perform();
+  }
+}
diff --git a/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
new file mode 100644
index 000000000..278972c19
--- /dev/null
+++ b/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverMoveToOffsetAction
+   */
+  private $webDriverMoveToOffsetAction;
+
+  private $webDriverMouse;
+  private $locationProvider;
+
+  public function setUp() {
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
+      $this->webDriverMouse,
+      $this->locationProvider,
+      150,
+      200
+    );
+  }
+
+  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverMoveToOffsetAction->perform();
+  }
+}
diff --git a/tests/interactions/internal/WebDriverSendKeysActionTest.php b/tests/interactions/internal/WebDriverSendKeysActionTest.php
new file mode 100644
index 000000000..47cd81a4e
--- /dev/null
+++ b/tests/interactions/internal/WebDriverSendKeysActionTest.php
@@ -0,0 +1,35 @@
+<?php
+
+class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase
+{
+  /**
+   * @type WebDriverSendKeysAction
+   */
+  private $webDriverSendKeysAction;
+
+  private $webDriverKeyboard;
+  private $webDriverMouse;
+  private $locationProvider;
+  private $keys;
+
+  public function setUp() {
+    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('WebDriverMouse');
+    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->keys = array('t', 'e', 's', 't');
+    $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
+      $this->webDriverKeyboard,
+      $this->webDriverMouse,
+      $this->locationProvider,
+      $this->keys
+    );
+  }
+
+  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
+    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
+    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+    $this->webDriverSendKeysAction->perform();
+  }
+}

From 6b724d99f76df47d48a17b34cdd51ddded1a6a45 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 28 Jan 2014 17:54:25 -0800
Subject: [PATCH 015/784] add license header

---
 .../WebDriverButtonReleaseActionTest.php         | 16 ++++++++++++++--
 .../internal/WebDriverClickActionTest.php        | 16 ++++++++++++++--
 .../internal/WebDriverClickAndHoldActionTest.php | 16 ++++++++++++++--
 .../internal/WebDriverContextClickActionTest.php | 16 ++++++++++++++--
 .../internal/WebDriverCoordinatesTest.php        | 16 ++++++++++++++--
 .../internal/WebDriverDoubleClickActionTest.php  | 16 ++++++++++++++--
 .../internal/WebDriverKeyDownActionTest.php      | 16 ++++++++++++++--
 .../internal/WebDriverKeyUpActionTest.php        | 16 ++++++++++++++--
 .../internal/WebDriverMouseMoveActionTest.php    | 16 ++++++++++++++--
 .../WebDriverMouseToOffsetActionTest.php         | 16 ++++++++++++++--
 .../internal/WebDriverSendKeysActionTest.php     | 16 ++++++++++++++--
 11 files changed, 154 insertions(+), 22 deletions(-)

diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
index d6b6c0ba4..609415846 100644
--- a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverButtonReleaseAction
    */
diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/interactions/internal/WebDriverClickActionTest.php
index 5ab22ebf6..98fd39197 100644
--- a/tests/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/interactions/internal/WebDriverClickActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverClickActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverClickActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAction
    */
diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
index 685198432..fe1826ee0 100644
--- a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAndHoldAction
    */
diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/interactions/internal/WebDriverContextClickActionTest.php
index e4b323644..7ac3162cc 100644
--- a/tests/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/interactions/internal/WebDriverContextClickActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverContextClickAction
    */
diff --git a/tests/interactions/internal/WebDriverCoordinatesTest.php b/tests/interactions/internal/WebDriverCoordinatesTest.php
index 1bc2133c6..5991c2157 100644
--- a/tests/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/interactions/internal/WebDriverCoordinatesTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverCoordinatesTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverCoordinatesTest extends PHPUnit_Framework_TestCase {
   public function testConstruct() {
     $in_view_port = function() { };
     $on_page = function() { };
diff --git a/tests/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/interactions/internal/WebDriverDoubleClickActionTest.php
index 51961d640..a0c85ac0d 100644
--- a/tests/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverDoubleClickAction
    */
diff --git a/tests/interactions/internal/WebDriverKeyDownActionTest.php b/tests/interactions/internal/WebDriverKeyDownActionTest.php
index e5bcc9ba1..f82b25cb1 100644
--- a/tests/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/interactions/internal/WebDriverKeyDownActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyDownAction
    */
diff --git a/tests/interactions/internal/WebDriverKeyUpActionTest.php b/tests/interactions/internal/WebDriverKeyUpActionTest.php
index 90494867a..e35277bd7 100644
--- a/tests/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/interactions/internal/WebDriverKeyUpActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyUpAction
    */
diff --git a/tests/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/interactions/internal/WebDriverMouseMoveActionTest.php
index 98cd80060..aec3444d3 100644
--- a/tests/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMouseMoveAction
    */
diff --git a/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
index 278972c19..2cd2bc75d 100644
--- a/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
    */
diff --git a/tests/interactions/internal/WebDriverSendKeysActionTest.php b/tests/interactions/internal/WebDriverSendKeysActionTest.php
index 47cd81a4e..9f9cad84b 100644
--- a/tests/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/interactions/internal/WebDriverSendKeysActionTest.php
@@ -1,7 +1,19 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
-class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase
-{
+class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverSendKeysAction
    */

From 3e41d878f709cd76d998d97202b838260294f363 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Wed, 29 Jan 2014 20:26:57 -0800
Subject: [PATCH 016/784] [standardize exception]

The name of the exceptions in php-webdriver is not quite good because of
a legacy reason.

The new php-webdriver was rewritten but it reused the WebDriverException
from the old version. This is bad to have non-standard exception names
in many
senses.

Here is a common situation, when the test throws an exception, we might
find
that it is very hard to search for the solution via search engines
because of the
odd exceptions name. However, if we search it again using the standard
name,
we get more solutions and probably fix the bug immediately and easily.

Try to google:
1) webdriver unknownserverexception
2) webdriver unhandledwebdrivererror

The first one gives 10,800 results and it is the standard name.
The second one gives 362 results and it is our bad name.

again 1:
1) StaleElementReferenceException <-- 6900 results
2) ObsoleteElementWebDriverError <-- 196 results

again 2
1) NoSuchElementWebDriverError <-- 194 results
2) NoSuchElementException <-- 324,000 results

There are many solutions or blog posts talking about different tricky or
common errors.
We could reuse those resource by just renaming the exceptions.
This will very beneficial in long term in terms of maintaining,
debugging php-webdriver issue,
for us and people using it outside facebook.
---
 lib/WebDriver.php                  |   2 +-
 lib/WebDriverElement.php           |   2 +-
 lib/WebDriverExceptions.php        | 140 ++++++++++++++---------------
 lib/WebDriverExpectedCondition.php |  28 +++---
 lib/WebDriverSearchContext.php     |   2 +-
 lib/WebDriverSelect.php            |   8 +-
 lib/WebDriverWait.php              |   4 +-
 lib/WebDriverWindow.php            |   4 +-
 lib/remote/RemoteWebDriver.php     |   2 +-
 lib/remote/RemoteWebElement.php    |   2 +-
 10 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index d82911fc8..23e68d78e 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -29,7 +29,7 @@ public function close();
    * Find the first WebDriverElement using the given mechanism.
    *
    * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   * @return WebDriverElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index c530123f8..c3677b7a1 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -38,7 +38,7 @@ public function click();
    * mechanism.
    *
    * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   * @return WebDriverElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
diff --git a/lib/WebDriverExceptions.php b/lib/WebDriverExceptions.php
index 923cae256..b0d1f47a1 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/WebDriverExceptions.php
@@ -41,116 +41,116 @@ public static function throwException($status_code, $message, $results) {
         // Success
         break;
       case 1:
-        throw new IndexOutOfBoundsWebDriverError($message, $results);
+        throw new IndexOutOfBoundsException($message, $results);
       case 2:
-        throw new NoCollectionWebDriverError($message, $results);
+        throw new NoCollectionException($message, $results);
       case 3:
-        throw new NoStringWebDriverError($message, $results);
+        throw new NoStringException($message, $results);
       case 4:
-        throw new NoStringLengthWebDriverError($message, $results);
+        throw new NoStringLengthException($message, $results);
       case 5:
-        throw new NoStringWrapperWebDriverError($message, $results);
+        throw new NoStringWrapperException($message, $results);
       case 6:
-        throw new NoSuchDriverWebDriverError($message, $results);
+        throw new NoSuchDriverException($message, $results);
       case 7:
-        throw new NoSuchElementWebDriverError($message, $results);
+        throw new NoSuchElementException($message, $results);
       case 8:
-        throw new NoSuchFrameWebDriverError($message, $results);
+        throw new NoSuchFrameException($message, $results);
       case 9:
-        throw new UnknownCommandWebDriverError($message, $results);
+        throw new UnknownCommandException($message, $results);
       case 10:
-        throw new ObsoleteElementWebDriverError($message, $results);
+        throw new StaleElementReferenceException($message, $results);
       case 11:
-        throw new ElementNotDisplayedWebDriverError($message, $results);
+        throw new ElementNotVisibleException($message, $results);
       case 12:
-        throw new InvalidElementStateWebDriverError($message, $results);
+        throw new InvalidElementStateException($message, $results);
       case 13:
-        throw new UnhandledWebDriverError($message, $results);
+        throw new UnknownServerException($message, $results);
       case 14:
-        throw new ExpectedWebDriverError($message, $results);
+        throw new ExpectedException($message, $results);
       case 15:
-        throw new ElementNotSelectableWebDriverError($message, $results);
+        throw new ElementNotSelectableException($message, $results);
       case 16:
-        throw new NoSuchDocumentWebDriverError($message, $results);
+        throw new NoSuchDocumentException($message, $results);
       case 17:
-        throw new UnexpectedJavascriptWebDriverError($message, $results);
+        throw new UnexpectedJavascriptException($message, $results);
       case 18:
-        throw new NoScriptResultWebDriverError($message, $results);
+        throw new NoScriptResultException($message, $results);
       case 19:
-        throw new XPathLookupWebDriverError($message, $results);
+        throw new XPathLookupException($message, $results);
       case 20:
-        throw new NoSuchCollectionWebDriverError($message, $results);
+        throw new NoSuchCollectionException($message, $results);
       case 21:
-        throw new TimeOutWebDriverError($message, $results);
+        throw new TimeOutException($message, $results);
       case 22:
-        throw new NullPointerWebDriverError($message, $results);
+        throw new NullPointerException($message, $results);
       case 23:
-        throw new NoSuchWindowWebDriverError($message, $results);
+        throw new NoSuchWindowException($message, $results);
       case 24:
-        throw new InvalidCookieDomainWebDriverError($message, $results);
+        throw new InvalidCookieDomainException($message, $results);
       case 25:
-        throw new UnableToSetCookieWebDriverError($message, $results);
+        throw new UnableToSetCookieException($message, $results);
       case 26:
-        throw new UnexpectedAlertOpenWebDriverError($message, $results);
+        throw new UnexpectedAlertOpenException($message, $results);
       case 27:
-        throw new NoAlertOpenWebDriverError($message, $results);
+        throw new NoAlertOpenException($message, $results);
       case 28:
-        throw new ScriptTimeoutWebDriverError($message, $results);
+        throw new ScriptTimeoutException($message, $results);
       case 29:
-        throw new InvalidElementCoordinatesWebDriverError($message, $results);
+        throw new InvalidCoordinatesException($message, $results);
       case 30:
-        throw new IMENotAvailableWebDriverError($message, $results);
+        throw new IMENotAvailableException($message, $results);
       case 31:
-        throw new IMEEngineActivationFailedWebDriverError($message, $results);
+        throw new IMEEngineActivationFailedException($message, $results);
       case 32:
-        throw new InvalidSelectorWebDriverError($message, $results);
+        throw new InvalidSelectorException($message, $results);
       case 33:
-        throw new SessionNotCreatedWebDriverError($message, $results);
+        throw new SessionNotCreatedException($message, $results);
       case 34:
-        throw new MoveTargetOutOfBoundsWebDriverError($message, $results);
+        throw new MoveTargetOutOfBoundsException($message, $results);
       default:
-        throw new UnrecognizedWebDriverErrorWebDriverError($message, $results);
+        throw new UnrecognizedExceptionException($message, $results);
     }
   }
 }
 
-class IndexOutOfBoundsWebDriverError extends WebDriverException {} // 1
-class NoCollectionWebDriverError extends WebDriverException {} // 2
-class NoStringWebDriverError extends WebDriverException {} // 3
-class NoStringLengthWebDriverError extends WebDriverException {} // 4
-class NoStringWrapperWebDriverError extends WebDriverException {} // 5
-class NoSuchDriverWebDriverError extends WebDriverException {} // 6
-class NoSuchElementWebDriverError extends WebDriverException {} // 7
-class NoSuchFrameWebDriverError extends WebDriverException {} // 8
-class UnknownCommandWebDriverError extends WebDriverException {} // 9
-class ObsoleteElementWebDriverError extends WebDriverException {} // 10
-class ElementNotDisplayedWebDriverError extends WebDriverException {} // 11
-class InvalidElementStateWebDriverError extends WebDriverException {} // 12
-class UnhandledWebDriverError extends WebDriverException {} // 13
-class ExpectedWebDriverError extends WebDriverException {} // 14
-class ElementNotSelectableWebDriverError extends WebDriverException {} // 15
-class NoSuchDocumentWebDriverError extends WebDriverException {} // 16
-class UnexpectedJavascriptWebDriverError extends WebDriverException {} // 17
-class NoScriptResultWebDriverError extends WebDriverException {} // 18
-class XPathLookupWebDriverError extends WebDriverException {} // 19
-class NoSuchCollectionWebDriverError extends WebDriverException {} // 20
-class TimeOutWebDriverError extends WebDriverException {} // 21
-class NullPointerWebDriverError extends WebDriverException {} // 22
-class NoSuchWindowWebDriverError extends WebDriverException {} // 23
-class InvalidCookieDomainWebDriverError extends WebDriverException {} // 24
-class UnableToSetCookieWebDriverError extends WebDriverException {} // 25
-class UnexpectedAlertOpenWebDriverError extends WebDriverException {} // 26
-class NoAlertOpenWebDriverError extends WebDriverException {} // 27
-class ScriptTimeoutWebDriverError extends WebDriverException {} // 28
-class InvalidElementCoordinatesWebDriverError extends WebDriverException {}// 29
-class IMENotAvailableWebDriverError extends WebDriverException {} // 30
-class IMEEngineActivationFailedWebDriverError extends WebDriverException {}// 31
-class InvalidSelectorWebDriverError extends WebDriverException {} // 32
-class SessionNotCreatedWebDriverError extends WebDriverException {} // 33
-class MoveTargetOutOfBoundsWebDriverError extends WebDriverException {} // 34
+class IndexOutOfBoundsException extends WebDriverException {} // 1
+class NoCollectionException extends WebDriverException {} // 2
+class NoStringException extends WebDriverException {} // 3
+class NoStringLengthException extends WebDriverException {} // 4
+class NoStringWrapperException extends WebDriverException {} // 5
+class NoSuchDriverException extends WebDriverException {} // 6
+class NoSuchElementException extends WebDriverException {} // 7
+class NoSuchFrameException extends WebDriverException {} // 8
+class UnknownCommandException extends WebDriverException {} // 9
+class StaleElementReferenceException extends WebDriverException {} // 10
+class ElementNotVisibleException extends WebDriverException {} // 11
+class InvalidElementStateException extends WebDriverException {} // 12
+class UnknownServerException extends WebDriverException {} // 13
+class ExpectedException extends WebDriverException {} // 14
+class ElementNotSelectableException extends WebDriverException {} // 15
+class NoSuchDocumentException extends WebDriverException {} // 16
+class UnexpectedJavascriptException extends WebDriverException {} // 17
+class NoScriptResultException extends WebDriverException {} // 18
+class XPathLookupException extends WebDriverException {} // 19
+class NoSuchCollectionException extends WebDriverException {} // 20
+class TimeOutException extends WebDriverException {} // 21
+class NullPointerException extends WebDriverException {} // 22
+class NoSuchWindowException extends WebDriverException {} // 23
+class InvalidCookieDomainException extends WebDriverException {} // 24
+class UnableToSetCookieException extends WebDriverException {} // 25
+class UnexpectedAlertOpenException extends WebDriverException {} // 26
+class NoAlertOpenException extends WebDriverException {} // 27
+class ScriptTimeoutException extends WebDriverException {} // 28
+class InvalidCoordinatesException extends WebDriverException {}// 29
+class IMENotAvailableException extends WebDriverException {} // 30
+class IMEEngineActivationFailedException extends WebDriverException {}// 31
+class InvalidSelectorException extends WebDriverException {} // 32
+class SessionNotCreatedException extends WebDriverException {} // 33
+class MoveTargetOutOfBoundsException extends WebDriverException {} // 34
 
 // Fallback
-class UnrecognizedWebDriverErrorWebDriverError extends WebDriverException {}
+class UnrecognizedExceptionException extends WebDriverException {}
 
 class UnexpectedTagNameException extends WebDriverException {
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 5d9a6529b..945522c24 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -98,7 +98,7 @@ function ($driver) use ($by) {
         try {
           $element = $driver->findElement($by);
           return $element->isDisplayed() ? $element : null;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return null;
         }
       }
@@ -154,7 +154,7 @@ function ($driver) use ($by, $text) {
         try {
           $element_text = $driver->findElement($by)->getText();
           return strpos($element_text, $text) !== false;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return null;
         }
       }
@@ -176,7 +176,7 @@ function ($driver) use ($by, $text) {
         try {
           $element_text = $driver->findElement($by)->getAttribute('value');
           return strpos($element_text, $text) !== false;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return null;
         }
       }
@@ -197,7 +197,7 @@ public static function frameToBeAvailableAndSwitchToIt($frame_locator) {
       function ($driver) use ($frame_locator) {
         try {
           return $driver->switchTo()->frame($frame_locator);
-        } catch (NoSuchFrameWebDriverError $e) {
+        } catch (NoSuchFrameException $e) {
           return false;
         }
       }
@@ -217,9 +217,9 @@ public static function invisibilityOfElementLocated(WebDriverBy $by) {
       function ($driver) use ($by) {
         try {
           return !($driver->findElement($by)->isDisplayed());
-        } catch (NoSuchElementWebDriverError $e) {
+        } catch (NoSuchElementException $e) {
           return true;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return true;
         }
       }
@@ -241,9 +241,9 @@ public static function invisibilityOfElementWithText(
       function ($driver) use ($by, $text) {
         try {
           return !($driver->findElement($by)->getText() === $text);
-        } catch (NoSuchElementWebDriverError $e) {
+        } catch (NoSuchElementException $e) {
           return true;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return true;
         }
       }
@@ -273,7 +273,7 @@ function ($driver) use ($visibility_of_element_located) {
           } else {
             return null;
           }
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return null;
         }
       }
@@ -293,7 +293,7 @@ function ($driver) use ($element) {
         try {
           $element->isEnabled();
           return false;
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return true;
         }
       }
@@ -306,7 +306,7 @@ function ($driver) use ($element) {
    * This works around the problem of conditions which have two parts: find an
    * element and then check for some condition on it. For these conditions it is
    * possible that an element is located and then subsequently it is redrawn on
-   * the client. When this happens a ObsoleteElementWebDriverError is thrown
+   * the client. When this happens a StaleElementReferenceException is thrown
    * when the second part of the condition is checked.
    *
    * @param WebDriverExpectedCondition $condition The condition wrapped.
@@ -318,7 +318,7 @@ public static function refreshed(WebDriverExpectedCondition $condition) {
       function ($driver) use ($condition) {
         try {
           return call_user_func($condition->getApply(), $driver);
-        } catch (ObsoleteElementWebDriverError $e) {
+        } catch (StaleElementReferenceException $e) {
           return null;
         }
       }
@@ -361,7 +361,7 @@ function ($driver) use ($element_or_by, $selected) {
           try {
             $element = $driver->findElement($element_or_by);
             return $element->isSelected === $selected;
-          } catch (ObsoleteElementWebDriverError $e) {
+          } catch (StaleElementReferenceException $e) {
             return null;
           }
         }
@@ -385,7 +385,7 @@ function ($driver) {
           $alert = $driver->switchTo()->alert();
           $alert->getText();
           return $alert;
-        } catch (NoAlertOpenWebDriverError $e) {
+        } catch (NoAlertOpenException $e) {
           return null;
         }
       }
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 2bcd7660e..dacea3f33 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -24,7 +24,7 @@ interface WebDriverSearchContext {
    * mechanism.
    *
    * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   * @return WebDriverElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 0468675c6..09d15a56a 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -72,7 +72,7 @@ public function getFirstSelectedOption() {
       }
     }
 
-    throw new NoSuchElementWebDriverError('No options are selected');
+    throw new NoSuchElementException('No options are selected');
   }
 
   /**
@@ -114,7 +114,7 @@ public function selectByIndex($index) {
       }
     }
     if (!$matched) {
-      throw new NoSuchElementWebDriverError(
+      throw new NoSuchElementException(
         sprintf('Cannot locate option with index: %d', $index)
       );
     }
@@ -145,7 +145,7 @@ public function selectByValue($value) {
     }
 
     if (!$matched) {
-      throw new NoSuchElementWebDriverError(
+      throw new NoSuchElementException(
         sprintf('Cannot locate option with value: %s', $value)
       );
     }
@@ -192,7 +192,7 @@ public function selectByVisibleText($text) {
     }
 
     if (!$matched) {
-      throw new NoSuchElementWebDriverError(
+      throw new NoSuchElementException(
         sprintf('Cannot locate option with text: %s', $text)
       );
     }
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 219cdc08e..c5f304e42 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -56,7 +56,7 @@ public function until($func_or_ec, $message = "") {
         if ($ret_val) {
           return $ret_val;
         }
-      } catch (NoSuchElementWebDriverError $e) {
+      } catch (NoSuchElementException $e) {
         $last_exception = $e;
       }
       usleep($this->interval * 1000);
@@ -65,6 +65,6 @@ public function until($func_or_ec, $message = "") {
     if ($last_exception) {
       throw $last_exception;
     }
-    throw new TimeOutWebDriverError($message);
+    throw new TimeOutException($message);
   }
 }
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 83571f52c..2cdca091e 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -123,12 +123,12 @@ public function getScreenOrientation() {
    *
    * @param string $orientation
    * @return WebDriverWindow The instance.
-   * @throws IndexOutOfBoundsWebDriverError
+   * @throws IndexOutOfBoundsException
    */
   public function setScreenOrientation($orientation) {
     $orientation = strtoupper($orientation);
     if (!in_array($orientation, array('PORTRAIT', 'LANDSCAPE'))) {
-      throw new IndexOutOfBoundsWebDriverError(
+      throw new IndexOutOfBoundsException(
         "Orientation must be either PORTRAIT, or LANDSCAPE"
       );
     }
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index b00dbd32c..c199155e0 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -91,7 +91,7 @@ public function close() {
    * Find the first WebDriverElement using the given mechanism.
    *
    * @param WebDriverBy $by
-   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   * @return WebDriverElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index b394d5590..f7998f280 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -54,7 +54,7 @@ public function click() {
    * mechanism.
    *
    * @param WebDriverBy $by
-   * @return WebDriverElement NoSuchElementWebDriverError is thrown in
+   * @return WebDriverElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */

From 45ad3a3fb6f18bc9219c344bbfe77530224e42e8 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 1 Feb 2014 16:44:27 +0100
Subject: [PATCH 017/784] Add a second test suite for functional tests.
 Refactor (move method) RemoteWebDriver to provide testability. Add first unit
 test to RemoteWebDriver. Update README.md unit test section.

---
 README.md                                     |  2 +
 lib/remote/RemoteWebDriver.php                | 41 ++++++++++++----
 tests/__init__.php                            | 16 -------
 tests/bootstrap.php                           |  1 +
 .../BaseTest.php}                             | 18 ++-----
 .../FileUploadTest.php}                       |  8 ++--
 .../WebDriverTestCase.php}                    |  3 +-
 .../files/FileUploadTestCaseFile.txt          |  0
 tests/{ => functional}/html/index.html        |  0
 tests/{ => functional}/html/upload.html       |  0
 tests/phpunit.xml                             |  7 ++-
 .../WebDriverButtonReleaseActionTest.php      |  0
 .../internal/WebDriverClickActionTest.php     |  0
 .../WebDriverClickAndHoldActionTest.php       |  0
 .../WebDriverContextClickActionTest.php       |  0
 .../internal/WebDriverCoordinatesTest.php     |  0
 .../WebDriverDoubleClickActionTest.php        |  0
 .../internal/WebDriverKeyDownActionTest.php   |  0
 .../internal/WebDriverKeyUpActionTest.php     |  0
 .../internal/WebDriverMouseMoveActionTest.php |  0
 .../WebDriverMouseToOffsetActionTest.php      |  0
 .../internal/WebDriverSendKeysActionTest.php  |  0
 tests/unit/remote/RemoteWebDriverTest.php     | 47 +++++++++++++++++++
 23 files changed, 96 insertions(+), 47 deletions(-)
 delete mode 100644 tests/__init__.php
 rename tests/{ExampleTestCase.php => functional/BaseTest.php} (72%)
 rename tests/{FileUploadTestCase.php => functional/FileUploadTest.php} (84%)
 rename tests/{BasePHPWebDriverTestCase.php => functional/WebDriverTestCase.php} (92%)
 rename tests/{ => functional}/files/FileUploadTestCaseFile.txt (100%)
 rename tests/{ => functional}/html/index.html (100%)
 rename tests/{ => functional}/html/upload.html (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverButtonReleaseActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverClickActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverClickAndHoldActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverContextClickActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverCoordinatesTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverDoubleClickActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverKeyDownActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverKeyUpActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverMouseMoveActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverMouseToOffsetActionTest.php (100%)
 rename tests/{ => unit}/interactions/internal/WebDriverSendKeysActionTest.php (100%)
 create mode 100644 tests/unit/remote/RemoteWebDriverTest.php

diff --git a/README.md b/README.md
index 6b4e15ea9..26f7717fa 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,8 @@ To run unit tests simply run:
 
     ./vendor/bin/phpunit -c ./tests
 
+Note: For the functional test suite, a running selenium server is required.
+
 ## MORE INFORMATION
 
 Check out the Selenium docs and wiki at http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index c199155e0..d78b4ef8f 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -41,18 +41,11 @@ public static function create(
       'name' => 'newSession',
       'parameters' => array('desiredCapabilities' => $desired_capabilities),
     );
-    $response = HttpCommandExecutor::remoteExecute(
-      $command,
-      array(
-        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
-      )
-    );
 
+    $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
     $driver = new static();
-    $executor = new HttpCommandExecutor(
-      $url,
-      $response['sessionId']
-    );
+    $executor = static::createHttpCommandExecutor($url, $response);
+
     return $driver->setCommandExecutor($executor);
   }
 
@@ -76,6 +69,34 @@ public static function createBySessionID(
     return $driver;
   }
 
+  /**
+   * @param string $url
+   * @param array  $response
+   * @return HttpCommandExecutor
+   */
+  public static function createHttpCommandExecutor($url, $response) {
+    $executor = new HttpCommandExecutor(
+      $url,
+      $response['sessionId']
+    );
+    return $executor;
+  }
+
+  /**
+   * @param int   $timeout_in_ms
+   * @param array $command
+   * @return array
+   */
+  public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
+    $response = HttpCommandExecutor::remoteExecute(
+      $command,
+      array(
+        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
+      )
+    );
+    return $response;
+  }
+
   /**
    * Close the current window.
    *
diff --git a/tests/__init__.php b/tests/__init__.php
deleted file mode 100644
index d90f7b531..000000000
--- a/tests/__init__.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-require_once('BasePHPWebDriverTestCase.php');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index e98637e69..46df8183e 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,3 +1,4 @@
 <?php
 
 require_once __DIR__ . '/../lib/__init__.php';
+require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/ExampleTestCase.php b/tests/functional/BaseTest.php
similarity index 72%
rename from tests/ExampleTestCase.php
rename to tests/functional/BaseTest.php
index 982e7e6ad..df9af06e5 100644
--- a/tests/ExampleTestCase.php
+++ b/tests/functional/BaseTest.php
@@ -13,27 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-require_once('__init__.php');
-
-/**
- * An example test case for php-webdriver.
- * 
- * Try running it by 
- *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
- */
-class ExampleTestCase extends BasePHPWebDriverTestCase {
+class BaseTest extends WebDriverTestCase {
   
-  public function testTestPageTitle() {
+  public function testGetTitle() {
     $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
+    $this->assertEquals(
       'php-webdriver test page',
       $this->driver->getTitle()
     );
   }
   
-  public function testTestPageWelcome() {
+  public function testGetText() {
     $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
+    $this->assertEquals(
       'Welcome to the facebook/php-webdriver testing page.',
       $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
     );
diff --git a/tests/FileUploadTestCase.php b/tests/functional/FileUploadTest.php
similarity index 84%
rename from tests/FileUploadTestCase.php
rename to tests/functional/FileUploadTest.php
index f88697dd9..21b046037 100644
--- a/tests/FileUploadTestCase.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,29 +13,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-require_once('__init__.php');
-
 /**
  * An example test case for php-webdriver.
  * 
  * Try running it by 
  *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
  */
-class ExampleTestCase extends BasePHPWebDriverTestCase {
+class FileUploadTest extends WebDriverTestCase {
   
   public function testFileUploading() {
     $this->driver->get($this->getTestPath('upload.html'));
     $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
     $file_input->setFileDetector(new LocalFileDetector())
                ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
-    self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    $this->assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
   }
 
   public function testUselessFileDetectorSendKeys() {
     $this->driver->get($this->getTestPath('upload.html'));
     $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
     $file_input->sendKeys($this->getFilePath());
-    self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    $this->assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
   }
   
   private function getFilePath() {
diff --git a/tests/BasePHPWebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
similarity index 92%
rename from tests/BasePHPWebDriverTestCase.php
rename to tests/functional/WebDriverTestCase.php
index 1951651bb..92b017b34 100644
--- a/tests/BasePHPWebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -16,8 +16,9 @@
 /**
  * The base class for test cases.
  */
-class BasePHPWebDriverTestCase extends PHPUnit_Framework_TestCase {
+class WebDriverTestCase extends PHPUnit_Framework_TestCase {
 
+  /** @var RemoteWebDriver $driver */
   protected $driver;
 
   protected function setUp() {
diff --git a/tests/files/FileUploadTestCaseFile.txt b/tests/functional/files/FileUploadTestCaseFile.txt
similarity index 100%
rename from tests/files/FileUploadTestCaseFile.txt
rename to tests/functional/files/FileUploadTestCaseFile.txt
diff --git a/tests/html/index.html b/tests/functional/html/index.html
similarity index 100%
rename from tests/html/index.html
rename to tests/functional/html/index.html
diff --git a/tests/html/upload.html b/tests/functional/html/upload.html
similarity index 100%
rename from tests/html/upload.html
rename to tests/functional/html/upload.html
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 4b07ba9b6..88bf4dbde 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -14,8 +14,11 @@
         bootstrap                   = "bootstrap.php" >
 
     <testsuites>
-        <testsuite name="Facebook PHP-Webdriver Testsuite">
-            <directory>./</directory>
+        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
+            <directory>./unit</directory>
+        </testsuite>
+        <testsuite name="Facebook PHP-Webdriver Functional Testsuite">
+            <directory>./functional</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverButtonReleaseActionTest.php
rename to tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
diff --git a/tests/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverClickActionTest.php
rename to tests/unit/interactions/internal/WebDriverClickActionTest.php
diff --git a/tests/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverClickAndHoldActionTest.php
rename to tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
diff --git a/tests/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverContextClickActionTest.php
rename to tests/unit/interactions/internal/WebDriverContextClickActionTest.php
diff --git a/tests/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverCoordinatesTest.php
rename to tests/unit/interactions/internal/WebDriverCoordinatesTest.php
diff --git a/tests/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverDoubleClickActionTest.php
rename to tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
diff --git a/tests/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverKeyDownActionTest.php
rename to tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
diff --git a/tests/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverKeyUpActionTest.php
rename to tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
diff --git a/tests/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverMouseMoveActionTest.php
rename to tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
diff --git a/tests/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverMouseToOffsetActionTest.php
rename to tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
diff --git a/tests/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
similarity index 100%
rename from tests/interactions/internal/WebDriverSendKeysActionTest.php
rename to tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
diff --git a/tests/unit/remote/RemoteWebDriverTest.php b/tests/unit/remote/RemoteWebDriverTest.php
new file mode 100644
index 000000000..e56a3178d
--- /dev/null
+++ b/tests/unit/remote/RemoteWebDriverTest.php
@@ -0,0 +1,47 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class RemoteWebDriverTest extends PHPUnit_Framework_TestCase {
+  public function testCreate() {
+    $remoteWebDriver = $this
+      ->getMockBuilder('RemoteWebDriver')
+      ->disableOriginalConstructor()
+      ->setMethods(array('remoteExecuteHttpCommand', 'createHttpCommandExecutor'))
+      ->getMock()
+    ;
+
+    $timeout = 1000;
+    $url = 'http://localhost:4444/wd/hub';
+    $response = array('value' => 'someValue', 'info' => 'someInfo', 'sessionId' => 'someSessionId');
+    $executor = $this->getMockBuilder('HttpCommandExecutor')->disableOriginalConstructor()->getMock();
+
+    $remoteWebDriver
+      ->staticExpects($this->once())
+      ->method('remoteExecuteHttpCommand')
+      ->with($timeout, array('url' => $url, 'name' => 'newSession', 'parameters' => array('desiredCapabilities' => array())))
+      ->will($this->returnValue($response))
+    ;
+
+    $remoteWebDriver
+      ->staticExpects($this->once())
+      ->method('createHttpCommandExecutor')
+      ->with($url, $response)
+      ->will($this->returnValue($executor))
+    ;
+
+    $remoteWebDriver->create($url, array(), $timeout);
+  }
+}
+ 
\ No newline at end of file

From f9263790699265d380035fc46a09692e12cc2dc2 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 1 Feb 2014 21:04:25 +0100
Subject: [PATCH 018/784] Add functional test for WebDriverBy::id

---
 tests/functional/BaseTest.php    | 8 ++++++++
 tests/functional/html/index.html | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index df9af06e5..fec069e4f 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -30,4 +30,12 @@ public function testGetText() {
       $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
     );
   }
+
+  public function testGetById() {
+    $this->driver->get($this->getTestPath('index.html'));
+    $this->assertEquals(
+      'Test by ID',
+      $this->driver->findElement(WebDriverBy::id('css_selector_test'))->getText()
+    );
+  }
 }
\ No newline at end of file
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index c8739903a..89bb12346 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -4,5 +4,6 @@
 </head>
 <body>
   <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
+  <p id="css_selector_test">Test by ID</p>
 </body>
 </html>
\ No newline at end of file

From 0059566aa5254acb6f8df8138db28e1087cce273 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Sat, 1 Feb 2014 21:14:46 +0100
Subject: [PATCH 019/784] Add functional test for WebDriverBy::id - Rename id

---
 tests/functional/BaseTest.php    | 2 +-
 tests/functional/html/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index fec069e4f..e999f11a2 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -35,7 +35,7 @@ public function testGetById() {
     $this->driver->get($this->getTestPath('index.html'));
     $this->assertEquals(
       'Test by ID',
-      $this->driver->findElement(WebDriverBy::id('css_selector_test'))->getText()
+      $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
     );
   }
 }
\ No newline at end of file
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index 89bb12346..17a5e9cc6 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -4,6 +4,6 @@
 </head>
 <body>
   <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
-  <p id="css_selector_test">Test by ID</p>
+  <p id="id_test">Test by ID</p>
 </body>
 </html>
\ No newline at end of file

From ffa428aca9878a1fd0bb7f382c962711830e5152 Mon Sep 17 00:00:00 2001
From: christian <cbergau86@gmail.com>
Date: Wed, 5 Feb 2014 18:20:04 +0100
Subject: [PATCH 020/784] Use static::assert* instead of $this->assert*

---
 tests/functional/BaseTest.php                          |  6 +++---
 tests/functional/FileUploadTest.php                    |  4 ++--
 .../interactions/internal/WebDriverCoordinatesTest.php | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index e999f11a2..c73c9e6e2 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -17,7 +17,7 @@ class BaseTest extends WebDriverTestCase {
   
   public function testGetTitle() {
     $this->driver->get($this->getTestPath('index.html'));
-    $this->assertEquals(
+    self::assertEquals(
       'php-webdriver test page',
       $this->driver->getTitle()
     );
@@ -25,7 +25,7 @@ public function testGetTitle() {
   
   public function testGetText() {
     $this->driver->get($this->getTestPath('index.html'));
-    $this->assertEquals(
+    self::assertEquals(
       'Welcome to the facebook/php-webdriver testing page.',
       $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
     );
@@ -33,7 +33,7 @@ public function testGetText() {
 
   public function testGetById() {
     $this->driver->get($this->getTestPath('index.html'));
-    $this->assertEquals(
+    self::assertEquals(
       'Test by ID',
       $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
     );
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 21b046037..84ec454e8 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -26,14 +26,14 @@ public function testFileUploading() {
     $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
     $file_input->setFileDetector(new LocalFileDetector())
                ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
-    $this->assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
   }
 
   public function testUselessFileDetectorSendKeys() {
     $this->driver->get($this->getTestPath('upload.html'));
     $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
     $file_input->sendKeys($this->getFilePath());
-    $this->assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
   }
   
   private function getFilePath() {
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index 5991c2157..cf4cc0d12 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -20,10 +20,10 @@ public function testConstruct() {
 
     $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-    $this->assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
-    $this->assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
-    $this->assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
-    $this->assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
+    self::assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
+    self::assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
+    self::assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
+    self::assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
   }
 
   public function testGetAuxiliary()
@@ -33,6 +33,6 @@ public function testGetAuxiliary()
 
     $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-    $this->assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
+    self::assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
   }
 }

From df9a00e9af80f64b0ed5742d3c95505c0fd5927c Mon Sep 17 00:00:00 2001
From: okrad <enrico.triolo@gmail.com>
Date: Mon, 17 Feb 2014 17:05:21 +0100
Subject: [PATCH 021/784] isSelected is a method and not a class property

---
 lib/WebDriverExpectedCondition.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 945522c24..a08a37a58 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -352,7 +352,7 @@ public static function elementSelectionStateToBe(
     if ($element_or_by instanceof WebDriverElement) {
       return new WebDriverExpectedCondition(
         function ($driver) use ($element_or_by, $selected) {
-          return $element_or_by->isSelected === $selected;
+          return $element_or_by->isSelected() === $selected;
         }
       );
     } else if ($element_or_by instanceof WebDriverBy) {
@@ -360,7 +360,7 @@ function ($driver) use ($element_or_by, $selected) {
         function ($driver) use ($element_or_by, $selected) {
           try {
             $element = $driver->findElement($element_or_by);
-            return $element->isSelected === $selected;
+            return $element->isSelected() === $selected;
           } catch (StaleElementReferenceException $e) {
             return null;
           }

From 5d65696ac64d4842bf015b95819e4ff374a6ddcc Mon Sep 17 00:00:00 2001
From: okrad <enrico.triolo@gmail.com>
Date: Mon, 17 Feb 2014 17:05:54 +0100
Subject: [PATCH 022/784] Splitted string into char array

---
 lib/WebDriverKeys.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index db043f81e..a4bf94063 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -90,8 +90,12 @@ class WebDriverKeys {
    * @return array
    */
   public static function encode($keys) {
+
+    if(is_numeric($keys))
+      $keys = '' . $keys;
+
     if (is_string($keys)) {
-      $keys = array($keys);
+      $keys = str_split($keys);
     }
 
     $encoded = array();

From c60fc3d5a3c2a3b3439d2987739697ecca7beb18 Mon Sep 17 00:00:00 2001
From: okrad <enrico.triolo@gmail.com>
Date: Mon, 17 Feb 2014 17:20:21 +0100
Subject: [PATCH 023/784] Bugfix for last commit

---
 lib/WebDriverKeys.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index a4bf94063..11712a8a7 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -95,7 +95,7 @@ public static function encode($keys) {
       $keys = '' . $keys;
 
     if (is_string($keys)) {
-      $keys = str_split($keys);
+      $keys = array($keys);
     }
 
     $encoded = array();
@@ -104,7 +104,8 @@ public static function encode($keys) {
         // handle modified keys
         $key = implode('', $key).self::NULL;
       }
-      $encoded[] = (string)$key;
+      //$encoded[] = (string)$key;
+      $encoded = array_merge($encoded, str_split((string)$key));
     }
 
     return $encoded;

From 8bde8d59e2aa50e81008efe0d34b5c8038cb4583 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Mon, 17 Feb 2014 20:30:26 -0800
Subject: [PATCH 024/784] move phpunit from require to require-dev in
 composer.json

---
 composer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 108f2898f..3af7435c8 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,9 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.19",
+    "php": ">=5.3.19"
+  },
+  "require-dev": {
     "phpunit/phpunit": "3.7.*"
   },
   "autoload": {

From d9ba70407a1a11f2124232452e533e2182a75721 Mon Sep 17 00:00:00 2001
From: okrad <enrico.triolo@gmail.com>
Date: Tue, 18 Feb 2014 08:29:41 +0100
Subject: [PATCH 025/784] Removed comment

---
 lib/WebDriverKeys.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 11712a8a7..1e7f7e5e1 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -104,7 +104,6 @@ public static function encode($keys) {
         // handle modified keys
         $key = implode('', $key).self::NULL;
       }
-      //$encoded[] = (string)$key;
       $encoded = array_merge($encoded, str_split((string)$key));
     }
 

From 9ab1af478d6bcc35e05ee1e9139493def2ff88ce Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:37:02 +0100
Subject: [PATCH 026/784] Add functional test for WebDriverBy::className

---
 tests/functional/BaseTest.php    | 8 ++++++++
 tests/functional/html/index.html | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index c73c9e6e2..f94662dee 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -38,4 +38,12 @@ public function testGetById() {
       $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
     );
   }
+
+  public function testGetByClassName() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Test by Class',
+      $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
+    );
+  }
 }
\ No newline at end of file
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index 17a5e9cc6..876336ea1 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -5,5 +5,6 @@
 <body>
   <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
   <p id="id_test">Test by ID</p>
+  <p class="test_class">Test by Class</p>
 </body>
 </html>
\ No newline at end of file

From 2d7596fb3b3c8149fb6a6fdf105c53b38aa07f13 Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:38:34 +0100
Subject: [PATCH 027/784] Add functional test for WebDriverBy::cssSelector

---
 tests/functional/BaseTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index f94662dee..54fc79026 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -46,4 +46,12 @@ public function testGetByClassName() {
       $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
     );
   }
+
+  public function testGetByCssSelector() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+     'Test by Class',
+     $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
+    );
+  }
 }
\ No newline at end of file

From 33ccaab9e898a6ac7133ed2a7bf9baff6488b067 Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:40:53 +0100
Subject: [PATCH 028/784] Add functional test for WebDriverBy::linkText

---
 tests/functional/BaseTest.php    | 8 ++++++++
 tests/functional/html/index.html | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 54fc79026..83ac327f1 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -54,4 +54,12 @@ public function testGetByCssSelector() {
      $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
     );
   }
+
+  public function testGetByLinkText() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Click here',
+      $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
+    );
+  }
 }
\ No newline at end of file
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index 876336ea1..de143e6c3 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -6,5 +6,6 @@
   <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
   <p id="id_test">Test by ID</p>
   <p class="test_class">Test by Class</p>
+  <a href="#">Click here</a>
 </body>
 </html>
\ No newline at end of file

From ecd04521939e6b38e1f84c717e545bac4c91aede Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:44:12 +0100
Subject: [PATCH 029/784] Add functional test for WebDriverBy::name

---
 tests/functional/BaseTest.php    | 8 ++++++++
 tests/functional/html/index.html | 1 +
 2 files changed, 9 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 83ac327f1..bf5edbcf6 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -62,4 +62,12 @@ public function testGetByLinkText() {
       $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
     );
   }
+
+  public function testGetByName() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Test Value',
+      $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
+    );
+  }
 }
\ No newline at end of file
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index de143e6c3..6bafefdc9 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -7,5 +7,6 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
   <p id="id_test">Test by ID</p>
   <p class="test_class">Test by Class</p>
   <a href="#">Click here</a>
+  <input type="text" name="test_name" value="Test Value" />
 </body>
 </html>
\ No newline at end of file

From ac45e67cc2e08481a0154fbdbcbb6db0abf5aaea Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:48:35 +0100
Subject: [PATCH 030/784] Add functional test for WebDriverBy::xpath

---
 tests/functional/BaseTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index bf5edbcf6..dfe8fe26d 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -70,4 +70,12 @@ public function testGetByName() {
       $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
     );
   }
+
+  public function testGetByXpath() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Test Value',
+      $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
+    );
+  }
 }
\ No newline at end of file

From c9d526520e47747c950b535e40da1e145047c84a Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:50:18 +0100
Subject: [PATCH 031/784] Add functional test for WebDriverBy::partialLinkText

---
 tests/functional/BaseTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index dfe8fe26d..79b8f0141 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -78,4 +78,12 @@ public function testGetByXpath() {
       $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
     );
   }
+
+  public function testGetByPartialLinkText() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Click here',
+      $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
+    );
+  }
 }
\ No newline at end of file

From 7fb2ed90fd687157c8d76a5d5dddcabb3058faa8 Mon Sep 17 00:00:00 2001
From: christianbergau <cbergau86@gmail.com>
Date: Thu, 20 Feb 2014 17:52:31 +0100
Subject: [PATCH 032/784] Add functional test for WebDriverBy::tagName

---
 tests/functional/BaseTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 79b8f0141..69c076cbb 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -86,4 +86,12 @@ public function testGetByPartialLinkText() {
       $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
     );
   }
+
+  public function testGetByTagName() {
+    $this->driver->get($this->getTestPath('index.html'));
+    self::assertEquals(
+      'Test Value',
+      $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
+    );
+  }
 }
\ No newline at end of file

From 342df507312ea5ae5337be47e16e4268d7ed661f Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Fri, 21 Feb 2014 10:22:11 -0800
Subject: [PATCH 033/784] fix non-ascii keys

---
 lib/WebDriverKeys.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 1e7f7e5e1..ae2b0875e 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -91,8 +91,9 @@ class WebDriverKeys {
    */
   public static function encode($keys) {
 
-    if(is_numeric($keys))
+    if (is_numeric($keys)) {
       $keys = '' . $keys;
+    }
 
     if (is_string($keys)) {
       $keys = array($keys);
@@ -104,7 +105,7 @@ public static function encode($keys) {
         // handle modified keys
         $key = implode('', $key).self::NULL;
       }
-      $encoded = array_merge($encoded, str_split((string)$key));
+      $encoded[] = (string)$key;
     }
 
     return $encoded;

From 588a5fa7df3c99172428a3ee6dee1de2690a1e58 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 25 Feb 2014 20:08:43 -0800
Subject: [PATCH 034/784] add 2 methods

---
 lib/remote/HttpCommandExecutor.php        |  7 +++++++
 lib/remote/RemoteWebDriver.php            | 25 +++++++++++++++++++----
 tests/unit/remote/RemoteWebDriverTest.php |  4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 8c6f237cc..53d0e670a 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -255,6 +255,13 @@ protected static function curl(
     return array('value' => $value, 'info' => $info, 'sessionId' => $sessionId);
   }
 
+  /**
+   * @return string
+   */
+  public function getAddressOfRemoteServer() {
+    return $this->url;
+  }
+
   /**
    * @return string
    */
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index d78b4ef8f..b21bea183 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -44,7 +44,7 @@ public static function create(
 
     $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
     $driver = new static();
-    $executor = static::createHttpCommandExecutor($url, $response);
+    $executor = static::createHttpCommandExecutor($url, $response['sessionId']);
 
     return $driver->setCommandExecutor($executor);
   }
@@ -71,13 +71,13 @@ public static function createBySessionID(
 
   /**
    * @param string $url
-   * @param array  $response
+   * @param string $session_id
    * @return HttpCommandExecutor
    */
-  public static function createHttpCommandExecutor($url, $response) {
+  public static function createHttpCommandExecutor($url, $session_id) {
     $executor = new HttpCommandExecutor(
       $url,
-      $response['sessionId']
+      $session_id
     );
     return $executor;
   }
@@ -394,8 +394,25 @@ public function getCommandExecutor() {
     return $this->executor;
   }
 
+  /**
+   * Set the session id of the RemoteWebDriver.
+   *
+   * @param string $session_id
+   * @return WebDriver
+   */
+  public function setSessionID($session_id) {
+    $this->setCommandExecutor(
+      new HttpCommandExecutor(
+        $this->executor->getAddressOfRemoteServer(),
+        $session_id
+      )
+    );
+    return $this;
+  }
+
   /**
    * Get current selenium sessionID
+   *
    * @return sessionID
    */
   public function getSessionID() {
diff --git a/tests/unit/remote/RemoteWebDriverTest.php b/tests/unit/remote/RemoteWebDriverTest.php
index e56a3178d..3da28ae07 100644
--- a/tests/unit/remote/RemoteWebDriverTest.php
+++ b/tests/unit/remote/RemoteWebDriverTest.php
@@ -37,11 +37,11 @@ public function testCreate() {
     $remoteWebDriver
       ->staticExpects($this->once())
       ->method('createHttpCommandExecutor')
-      ->with($url, $response)
+      ->with($url, $response['sessionId'])
       ->will($this->returnValue($executor))
     ;
 
     $remoteWebDriver->create($url, array(), $timeout);
   }
 }
- 
\ No newline at end of file
+ 

From 8a360e5a26cc1618c3ec086ac04f297bcb4f5c1c Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Fri, 28 Feb 2014 09:14:34 -0800
Subject: [PATCH 035/784] [executeAsyncScript]

Implement executeAsyncScript in RemoteWebDriver.
Add interface JavaScriptExecutor.

This is done by our bootcamper, glh@fb!
---
 lib/JavaScriptExecutor.php                  | 47 +++++++++++++++++++++
 lib/WebDriver.php                           | 11 -----
 lib/__init__.php                            |  1 +
 lib/remote/HttpCommandExecutor.php          |  1 +
 lib/remote/RemoteWebDriver.php              | 26 ++++++++++--
 lib/support/events/EventFiringWebDriver.php | 31 +++++++++++++-
 6 files changed, 102 insertions(+), 15 deletions(-)
 create mode 100644 lib/JavaScriptExecutor.php

diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
new file mode 100644
index 000000000..783f0baa7
--- /dev/null
+++ b/lib/JavaScriptExecutor.php
@@ -0,0 +1,47 @@
+<?hh
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * WebDriver interface implemented by drivers that support JavaScript.
+ */
+interface JavaScriptExecutor {
+
+  /**
+   * Inject a snippet of JavaScript into the page for execution in the context
+   * of the currently selected frame. The executed script is assumed to be
+   * synchronous and the result of evaluating the script will be returned.
+   *
+   * @param string $script The script to inject.
+   * @param array $arguments The arguments of the script.
+   * @return mixed The return value of the script.
+   */
+  public function executeScript($script, array $arguments = array());
+
+  /**
+   * Inject a snippet of JavaScript into the page for asynchronous execution in
+   * the context of the currently selected frame.
+   *
+   * The driver will pass a callback as the last argument to the snippet, and
+   * block until the callback is invoked.
+   *
+   * @see WebDriverExecuteAsyncScriptTestCase
+   *
+   * @param string $script The script to inject.
+   * @param array $arguments The arguments of the script.
+   * @return mixed The value passed by the script to the callback.
+   */
+  public function executeAsyncScript($script, array $arguments = array());
+
+}
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 23e68d78e..b49c71cec 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -96,17 +96,6 @@ public function getWindowHandles();
    */
   public function quit();
 
-  /**
-   * Inject a snippet of JavaScript into the page for execution in the context
-   * of the currently selected frame. The executed script is assumed to be
-   * synchronous and the result of evaluating the script will be returned.
-   *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The return value of the script.
-   */
-  public function executeScript($script, array $arguments = array());
-
   /**
    * Take a screenshot of the current page.
    *
diff --git a/lib/__init__.php b/lib/__init__.php
index 23c696023..02142696c 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -15,6 +15,7 @@
 
 // interface
 require_once('WebDriverSearchContext.php');
+require_once('JavaScriptExecutor.php');
 require_once('WebDriver.php');
 require_once('WebDriverElement.php');
 require_once('WebDriverCommandExecutor.php');
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 53d0e670a..93f916fd5 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -35,6 +35,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
     'elementFindElement' =>     array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/element'),
     'elementFindElements' =>    array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/elements'),
     'executeScript' =>          array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
+    'executeAsyncScript' =>     array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
     'findElement' =>            array('method' => 'POST', 'url' => '/session/:sessionId/element'),
     'findElements' =>           array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
     'focusFrame' =>             array('method' => 'POST',  'url' => '/session/:sessionId/frame'),
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index b21bea183..3ec129ad7 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class RemoteWebDriver implements WebDriver {
+class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
 
   protected $executor;
   protected $mouse;
@@ -246,8 +246,28 @@ public function executeScript($script, array $arguments = array()) {
       'script' => $script,
       'args' => $this->prepareScriptArguments($arguments),
     );
-    $response = $this->executor->execute('executeScript', $params);
-    return $response;
+    return $this->executor->execute('executeScript', $params);
+  }
+
+  /**
+   * Inject a snippet of JavaScript into the page for asynchronous execution in
+   * the context of the currently selected frame.
+   *
+   * The driver will pass a callback as the last argument to the snippet, and
+   * block until the callback is invoked.
+   *
+   * @see WebDriverExecuteAsyncScriptTestCase
+   *
+   * @param string $script The script to inject.
+   * @param array $arguments The arguments of the script.
+   * @return mixed The value passed by the script to the callback.
+   */
+  public function executeAsyncScript($script, array $arguments = array()) {
+    $params = array(
+      'script' => $script,
+      'args' => $this->prepareScriptArguments($arguments),
+    );
+    return $this->executor->execute('executeAsyncScript', $params);
   }
 
   /**
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index f86a6c4d2..0ac1695e1 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class EventFiringWebDriver implements WebDriver {
+class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
   /**
    * @var WebDriver
@@ -134,6 +134,12 @@ public function findElement(WebDriverBy $by) {
    * @throws WebDriverException
    */
   public function executeScript($script, array $arguments = array()) {
+    if (!$this->driver instanceof JavaScriptExecutor) {
+      throw new UnsupportedOperationException(
+        'driver does not implement JavaScriptExecutor',
+      );
+    }
+
     $this->dispatch('beforeScript', $script, $this);
     try {
       $result = $this->driver->executeScript($script, $arguments);
@@ -144,6 +150,29 @@ public function executeScript($script, array $arguments = array()) {
     return $result;
   }
 
+  /**
+   * @param       $script
+   * @param array $arguments
+   * @return mixed
+   * @throws WebDriverException
+   */
+  public function executeAsyncScript($script, array $arguments = array()) {
+    if (!$this->driver instanceof JavaScriptExecutor) {
+      throw new UnsupportedOperationException(
+        'driver does not implement JavaScriptExecutor',
+      );
+    }
+
+    $this->dispatch('beforeScript', $script, $this);
+    try {
+      $result = $this->driver->executeAsyncScript($script, $arguments);
+    } catch (WebDriverException $exception) {
+      $this->dispatchOnException($exception);
+    }
+    $this->dispatch('afterScript', $script, $this);
+    return $result;
+  }
+
   /**
    * @return $this
    * @throws WebDriverException

From e2d73c813c4e3d76a11793bad158a8a0ec26e8ea Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 28 Feb 2014 09:33:47 -0800
Subject: [PATCH 036/784] fix

---
 lib/JavaScriptExecutor.php                  | 2 +-
 lib/support/events/EventFiringWebDriver.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 783f0baa7..131a7fef1 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -1,4 +1,4 @@
-<?hh
+<?php
 // Copyright 2004-present Facebook. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index 0ac1695e1..b2a9b8b8e 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -136,7 +136,7 @@ public function findElement(WebDriverBy $by) {
   public function executeScript($script, array $arguments = array()) {
     if (!$this->driver instanceof JavaScriptExecutor) {
       throw new UnsupportedOperationException(
-        'driver does not implement JavaScriptExecutor',
+        'driver does not implement JavaScriptExecutor'
       );
     }
 
@@ -159,7 +159,7 @@ public function executeScript($script, array $arguments = array()) {
   public function executeAsyncScript($script, array $arguments = array()) {
     if (!$this->driver instanceof JavaScriptExecutor) {
       throw new UnsupportedOperationException(
-        'driver does not implement JavaScriptExecutor',
+        'driver does not implement JavaScriptExecutor'
       );
     }
 

From aeaab8a2228d55cec796b5fc66e9e9254537d152 Mon Sep 17 00:00:00 2001
From: Ling-Yi Kung <lkung@tagged.com>
Date: Tue, 11 Mar 2014 22:49:01 -0700
Subject: [PATCH 037/784] Check whether an array is associative for script
 arguments.

---
 lib/remote/RemoteWebDriver.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 3ec129ad7..88c682d20 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -218,6 +218,11 @@ public function quit() {
    * @return array
    */
   private function prepareScriptArguments(array $arguments) {
+    // If arguments is an associative array, don't do anything.
+    if ((bool)count(array_filter(array_keys($arguments), 'is_string'))) {
+      return $arguments;
+    }
+
     $args = array();
     foreach ($arguments as $arg) {
       if ($arg instanceof WebDriverElement) {

From da65338d24a345cde741ebedf8c1a34981ba0b39 Mon Sep 17 00:00:00 2001
From: Ling-Yi Kung <lkung@tagged.com>
Date: Wed, 12 Mar 2014 11:48:05 -0700
Subject: [PATCH 038/784] Use foreach to check associative arrays.

---
 lib/remote/RemoteWebDriver.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 88c682d20..9bb9f2c15 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -218,20 +218,15 @@ public function quit() {
    * @return array
    */
   private function prepareScriptArguments(array $arguments) {
-    // If arguments is an associative array, don't do anything.
-    if ((bool)count(array_filter(array_keys($arguments), 'is_string'))) {
-      return $arguments;
-    }
-
     $args = array();
-    foreach ($arguments as $arg) {
-      if ($arg instanceof WebDriverElement) {
-        $args[] = array('ELEMENT'=>$arg->getID());
+    foreach ($arguments as $key => $value) {
+      if ($value instanceof WebDriverElement) {
+        $args[$key] = array('ELEMENT'=>$value->getID());
       } else {
-        if (is_array($arg)) {
-          $arg = $this->prepareScriptArguments($arg);
+        if (is_array($value)) {
+          $value = $this->prepareScriptArguments($value);
         }
-        $args[] = $arg;
+        $args[$key] = $value;
       }
     }
     return $args;

From 2695367437710de164ed2ed6f17d29de2d1be438 Mon Sep 17 00:00:00 2001
From: Jordan Pickwell <jpickwell@linux2>
Date: Fri, 18 Apr 2014 10:40:46 -0500
Subject: [PATCH 039/784] Fix #141.

Removed the redefined methods.
---
 lib/WebDriver.php        | 21 ---------------------
 lib/WebDriverElement.php | 21 ---------------------
 2 files changed, 42 deletions(-)

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index b49c71cec..6a87cbbcd 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -25,27 +25,6 @@ interface WebDriver extends WebDriverSearchContext {
    */
   public function close();
 
-  /**
-   * Find the first WebDriverElement using the given mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementException is thrown in
-   *    HttpCommandExecutor if no element is found.
-   * @see WebDriverBy
-   */
-  public function findElement(WebDriverBy $locator);
-
-  /**
-   * Find all WebDriverElements within the current page using the given
-   * mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return array<WebDriverElement> A list of all WebDriverElements,
-   *    or an empty array if nothing matches
-   * @see WebDriverBy
-   */
-  public function findElements(WebDriverBy $locator);
-
   /**
    * Load a new web page in the current browser window.
    *
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index c3677b7a1..81bbbd5f6 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -33,27 +33,6 @@ public function clear();
    */
   public function click();
 
-  /**
-   * Find the first WebDriverElement within this element using the given
-   * mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementException is thrown in
-   *    HttpCommandExecutor if no element is found.
-   * @see WebDriverBy
-   */
-  public function findElement(WebDriverBy $locator);
-
-  /**
-   * Find all WebDriverElements within this element using the given mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return array A list of all WebDriverElements, or an empty array if
-   *    nothing matches
-   * @see WebDriverBy
-   */
-  public function findElements(WebDriverBy $locator);
-
   /**
    * Get the value of a the given attribute of the element.
    *

From ac4c46c9fc35bc9de49ec0a47ec6cdb747197811 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Tue, 20 May 2014 08:59:24 -0700
Subject: [PATCH 040/784] DesiredCapabilities + WebDriverPlatform

Make desired capabilities object-oriented. To start a RemoteWebDriver
instance, we can use pre-defineded DesiredCapabilities instead of
constructing an array everytime.

For example, to start Chrome.
```
$driver = RemoteWebDriver::create($url, DesiredCapabilities::chrome());
```
---
 example.php                        |   2 +-
 lib/WebDriverCapabilities.php      |  47 ++++++++
 lib/WebDriverPlatform.php          |  29 +++++
 lib/__init__.php                   |   3 +
 lib/remote/DesiredCapabilities.php | 184 +++++++++++++++++++++++++++++
 lib/remote/RemoteWebDriver.php     |  11 +-
 6 files changed, 273 insertions(+), 3 deletions(-)
 create mode 100644 lib/WebDriverCapabilities.php
 create mode 100644 lib/WebDriverPlatform.php
 create mode 100644 lib/remote/DesiredCapabilities.php

diff --git a/example.php b/example.php
index 39ffb5a96..a1e133b91 100644
--- a/example.php
+++ b/example.php
@@ -5,7 +5,7 @@
 
 // start Firefox with 5 second timeout
 $host = 'http://localhost:4444/wd/hub'; // this is the default
-$capabilities = array(WebDriverCapabilityType::BROWSER_NAME => 'firefox');
+$capabilities = DesiredCapabilities::firefox();
 $driver = RemoteWebDriver::create($host, $capabilities, 5000);
 
 // navigate to 'http://docs.seleniumhq.org/'
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
new file mode 100644
index 000000000..3eb65f474
--- /dev/null
+++ b/lib/WebDriverCapabilities.php
@@ -0,0 +1,47 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+interface WebDriverCapabilities {
+
+  /**
+   * @return string The name of the browser.
+   */
+  public function getBrowserName();
+
+  /**
+   * @return mixed The value of a capability.
+   */
+  public function getCapability($name);
+
+  /**
+   * @return string The name of the platform.
+   */
+  public function getPlatform();
+
+  /**
+   * @return string The version of the browser.
+   */
+  public function getVersion();
+
+  /**
+   * @return bool Whether the value is not null and not false.
+   */
+  public function is($capability_name);
+
+  /**
+   * @return bool Whether javascript is enabled.
+   */
+  public function isJavascriptEnabled();
+}
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
new file mode 100644
index 000000000..9d0e413fc
--- /dev/null
+++ b/lib/WebDriverPlatform.php
@@ -0,0 +1,29 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * The platforms supported by WebDriver.
+ */
+class WebDriverPlatform {
+
+  const ANDROID = 'ANDROID';
+  const ANY = 'ANY';
+  const LINUX = 'LINUX';
+  const MAC = 'MAC';
+  const UNIX = 'UNIX';
+  const VISTA = 'VISTA';
+  const WINDOWS = 'WINDOWS';
+  const XP = 'XP';
+}
diff --git a/lib/__init__.php b/lib/__init__.php
index 02142696c..41a32bb4c 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -22,6 +22,7 @@
 require_once('WebDriverAction.php');
 require_once('WebDriverEventListener.php');
 require_once('remote/FileDetector.php');
+require_once('WebDriverCapabilities.php');
 
 // abstract class
 require_once('interactions/internal/WebDriverKeysRelatedAction.php');
@@ -39,6 +40,7 @@
 require_once('WebDriverMouse.php');
 require_once('WebDriverKeyboard.php');
 require_once('WebDriverOptions.php');
+require_once('WebDriverPlatform.php');
 require_once('WebDriverPoint.php');
 require_once('WebDriverSelect.php');
 require_once('WebDriverTargetLocator.php');
@@ -65,6 +67,7 @@
 require_once('remote/RemoteWebElement.php');
 require_once('remote/WebDriverBrowserType.php');
 require_once('remote/WebDriverCapabilityType.php');
+require_once('remote/DesiredCapabilities.php');
 require_once('remote/HttpCommandExecutor.php');
 require_once('interactions/internal/WebDriverSendKeysAction.php');
 require_once('interactions/internal/WebDriverKeyDownAction.php');
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
new file mode 100644
index 000000000..08035c3b5
--- /dev/null
+++ b/lib/remote/DesiredCapabilities.php
@@ -0,0 +1,184 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class DesiredCapabilities implements WebDriverCapabilities {
+
+  private $capabilities;
+
+  public function __construct(array $capabilities = array()) {
+    $this->capabilities = $capabilities;
+  }
+
+  /**
+   * @return string The name of the browser.
+   */
+  public function getBrowserName() {
+    return $this->get(WebDriverCapabilityType::BROWSER_NAME, '');
+  }
+
+  public function setBrowserName($browser_name) {
+    $this->set(WebDriverCapabilityType::BROWSER_NAME, $browser_name);
+    return $this;
+  }
+
+  /**
+   * @return string The version of the browser.
+   */
+  public function getVersion() {
+    return $this->get(WebDriverCapabilityType::VERSION, '');
+  }
+
+  public function setVersion($version) {
+    $this->set(WebDriverCapabilityType::VERSION, $version);
+    return $this;
+  }
+
+  /**
+   * @return mixed The value of a capability.
+   */
+  public function getCapability($name) {
+    $this->get($name);
+  }
+
+  public function setCapability($name, $value) {
+    $this->set($name, $value);
+    return $this;
+  }
+
+  /**
+   * @return string The name of the platform.
+   */
+  public function getPlatform() {
+    return $this->get(WebDriverCapabilityType::PLATFORM, '');
+  }
+
+  public function setPlatform($platform) {
+    $this->set(WebDriverCapabilityType::PLATFORM, $platform);
+    return $this;
+  }
+
+
+  /**
+   * @return bool Whether the value is not null and not false.
+   */
+  public function is($capability_name) {
+    return (bool)$this->get($capability_name);
+  }
+
+  /**
+   * @return bool Whether javascript is enabled.
+   */
+  public function isJavascriptEnabled() {
+    return $this->get(WebDriverCapabilityType::JAVASCRIPT_ENABLED, false);
+  }
+
+  public function setJavascriptEnabled($enabled) {
+    $this->set(WebDriverCapabilityType::JAVASCRIPT_ENABLED, $enabled);
+    return $this;
+  }
+
+  public function toArray() {
+    return $this->capabilities;
+  }
+
+  private function set($key, $value) {
+    $this->capabilities[$key] = $value;
+    return $this;
+  }
+
+  private function get($key, $default = null) {
+    return isset($this->capabilities[$key])
+           ? $this->capabilities[$key]
+           : $default;
+  }
+
+  public static function android() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANDROID,
+    ));
+  }
+
+  public static function chrome() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+
+  public static function firefox() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+
+  public static function htmlUnit() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+
+  public static function htmlUnitWithJS() {
+    $caps = new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+    return $caps->setJavascriptEnabled(true);
+  }
+
+  public static function internetExplorer() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
+    ));
+  }
+
+  public static function iphone() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
+    ));
+  }
+
+  public static function ipad() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
+    ));
+  }
+
+  public static function opera() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+
+  public static function safari() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+
+  public static function phantomjs() {
+    return new DesiredCapabilities(array(
+      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
+      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+    ));
+  }
+}
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 9bb9f2c15..a04908f30 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -26,16 +26,23 @@ protected function __construct() {}
    * Construct the RemoteWebDriver by a desired capabilities.
    *
    * @param string $url The url of the remote server
-   * @param array $desired_capabilities The webdriver desired capabilities
+   * @param DesiredCapabilities $desired_capabilities The desired capabilities
    * @param int $timeout_in_ms
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
-    $desired_capabilities = array(),
+    $desired_capabilities = null,
     $timeout_in_ms = 300000
   ) {
     $url = preg_replace('#/+$#', '', $url);
+
+    // Passing DesiredCapabilities as $desired_capabilities is encourged but
+    // array is also accepted for legacy reason.
+    if ($desired_capabilities instanceof DesiredCapabilities) {
+      $desired_capabilities = $desired_capabilities->toArray();
+    }
+
     $command = array(
       'url' => $url,
       'name' => 'newSession',

From 80bb705533a760e5afc914374bbfbf1fd40e53c0 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 20 May 2014 09:51:58 -0700
Subject: [PATCH 041/784] Update README.md

Migrate to DesiredCapabilities.
---
 README.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 26f7717fa..7b278f8fe 100644
--- a/README.md
+++ b/README.md
@@ -47,10 +47,22 @@ Install the library.
 
         // This would be the url of the host running the server-standalone.jar
         $host = 'http://localhost:4444/wd/hub'; // this is the default
-        $capabilities = array(WebDriverCapabilityType::BROWSER_NAME => 'firefox');
-        $driver = RemoteWebDriver::create($host, $capabilities);
 
-*   The $capabilities array lets you specify (among other things) which browser to use. See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
+*   Launch Firefox
+
+        $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
+        
+*   Launch Chrome
+
+        $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+
+*   You can also customize the desired capabilities. 
+
+        $desired_capabilities = DesiredCapabilities::firefox();
+        $desired_capabilities->setJavascriptEnabled(false);
+        RemoteWebDriver::create($host, $desired_capabilities);
+
+*   See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
 
 ## RUN UNIT TESTS
 

From cf29441ba713e249f49e58390b0608b360932180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:00:03 +0400
Subject: [PATCH 042/784] Fix phpdoc comments for FileDetector.

---
 lib/remote/FileDetector.php        | 14 ++++++++------
 lib/remote/LocalFileDetector.php   |  8 ++++++--
 lib/remote/UselessFileDetector.php |  8 ++++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/remote/FileDetector.php b/lib/remote/FileDetector.php
index c452058c0..dc79cff1e 100644
--- a/lib/remote/FileDetector.php
+++ b/lib/remote/FileDetector.php
@@ -15,11 +15,13 @@
 
 interface FileDetector {
 
-  /**
-   * Try to detect whether the given $file is a file or not. Return the path
-   * of the file. Otherwise, return null.
-   *
-   * @return ?string The path of the file.
-   */
+    /**
+     * Try to detect whether the given $file is a file or not. Return the path
+     * of the file. Otherwise, return null.
+     *
+     * @param string $file
+     *
+     * @return string The path of the file.
+     */
   public function getLocalFile($file);
 }
diff --git a/lib/remote/LocalFileDetector.php b/lib/remote/LocalFileDetector.php
index cf118b5ec..f0107b0ba 100644
--- a/lib/remote/LocalFileDetector.php
+++ b/lib/remote/LocalFileDetector.php
@@ -14,8 +14,12 @@
 // limitations under the License.
 
 class LocalFileDetector implements FileDetector {
-
-  public function getLocalFile($file) {
+    /**
+     * @param string $file
+     *
+     * @return null|string
+     */
+    public function getLocalFile($file) {
     if (is_file($file)) {
       return $file;
     }
diff --git a/lib/remote/UselessFileDetector.php b/lib/remote/UselessFileDetector.php
index 8923c7694..f200990c6 100644
--- a/lib/remote/UselessFileDetector.php
+++ b/lib/remote/UselessFileDetector.php
@@ -14,8 +14,12 @@
 // limitations under the License.
 
 class UselessFileDetector implements FileDetector {
-
-  public function getLocalFile($file) {
+    /**
+     * @param string $file
+     *
+     * @return null
+     */
+    public function getLocalFile($file) {
     return null;
   }
 }

From 9c5944426b6dec10f4c009b8f2ca2ba68b6c1f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:09:44 +0400
Subject: [PATCH 043/784] Fix phpdoc comments for RemoteWebDriver.

---
 .gitignore                     |  1 +
 lib/remote/RemoteWebDriver.php | 56 ++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e4c563c5..88ca8c5ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ vendor
 *.DS_Store
 *~
 *.swp
+.idea
\ No newline at end of file
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 9bb9f2c15..e29772ae9 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -14,10 +14,21 @@
 // limitations under the License.
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
-
+  /**
+  * @var HttpCommandExecutor
+  */
   protected $executor;
+  /**
+   * @var RemoteMouse
+   */
   protected $mouse;
+  /**
+   * @var RemoteKeyboard
+   */
   protected $keyboard;
+  /**
+   * @var RemoteTouchScreen
+   */
   protected $touch;
 
   protected function __construct() {}
@@ -43,7 +54,7 @@ public static function create(
     );
 
     $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
-    $driver = new static();
+    $driver = new self();
     $executor = static::createHttpCommandExecutor($url, $response['sessionId']);
 
     return $driver->setCommandExecutor($executor);
@@ -64,7 +75,7 @@ public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub'
   ) {
-    $driver = new static();
+    $driver = new self();
     $driver->setCommandExecutor(new HttpCommandExecutor($url, $session_id));
     return $driver;
   }
@@ -100,7 +111,7 @@ public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
   /**
    * Close the current window.
    *
-   * @return WebDriver The current instance.
+   * @return RemoteWebDriver The current instance.
    */
   public function close() {
     $this->executor->execute('closeCurrentWindow', array());
@@ -112,7 +123,7 @@ public function close() {
    * Find the first WebDriverElement using the given mechanism.
    *
    * @param WebDriverBy $by
-   * @return WebDriverElement NoSuchElementException is thrown in
+   * @return RemoteWebElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
@@ -128,7 +139,7 @@ public function findElement(WebDriverBy $by) {
    * mechanism.
    *
    * @param WebDriverBy $by
-   * @return array A list of all WebDriverElements, or an empty array if
+   * @return RemoteWebElement[] A list of all WebDriverElements, or an empty array if
    *    nothing matches
    * @see WebDriverBy
    */
@@ -143,11 +154,13 @@ public function findElements(WebDriverBy $by) {
     return $elements;
   }
 
-  /**
-   * Load a new web page in the current browser window.
-   *
-   * @return WebDriver The current instance.
-   */
+    /**
+     * Load a new web page in the current browser window.
+     *
+     * @param string $url
+     *
+     * @return RemoteWebDriver The current instance.
+     */
   public function get($url) {
     $params = array('url' => (string)$url);
     $this->executor->execute('get', $params);
@@ -294,6 +307,9 @@ public function takeScreenshot($save_as = null) {
    *     WebDriverExpectedCondition::titleIs('WebDriver Page')
    *   );
    *
+   * @param int $timeout_in_second
+   * @param int $interval_in_millisecond
+   *
    * @return WebDriverWait
    */
   public function wait(
@@ -336,7 +352,7 @@ public function switchTo() {
   }
 
   /**
-   * @return WebDriverMouse
+   * @return RemoteMouse
    */
   public function getMouse() {
     if (!$this->mouse) {
@@ -346,7 +362,7 @@ public function getMouse() {
   }
 
   /**
-   * @return WebDriverKeyboard
+   * @return RemoteKeyboard
    */
   public function getKeyboard() {
     if (!$this->keyboard) {
@@ -356,7 +372,7 @@ public function getKeyboard() {
   }
 
   /**
-   * @return WebDriverTouchScreen
+   * @return RemoteTouchScreen
    */
   public function getTouch() {
     if (!$this->touch) {
@@ -377,7 +393,7 @@ public function action() {
   /**
    * Get the element on the page that currently has focus.
    *
-   * @return WebDriverElement
+   * @return RemoteWebElement
    */
   public function getActiveElement() {
     $response = $this->executor->execute('getActiveElement');
@@ -388,7 +404,7 @@ public function getActiveElement() {
    * Return the WebDriverElement with the given id.
    *
    * @param string $id The id of the element to be created.
-   * @return WebDriverElement
+   * @return RemoteWebElement
    */
   private function newElement($id) {
     return new RemoteWebElement($this->executor, $id);
@@ -398,7 +414,7 @@ private function newElement($id) {
    * Set the command executor of this RemoteWebdrver
    *
    * @param WebDriverCommandExecutor $executor
-   * @return WebDriver
+   * @return RemoteWebDriver
    */
   public function setCommandExecutor(WebDriverCommandExecutor $executor) {
     $this->executor = $executor;
@@ -408,7 +424,7 @@ public function setCommandExecutor(WebDriverCommandExecutor $executor) {
   /**
    * Set the command executor of this RemoteWebdriver
    *
-   * @return WebDriverCommandExecutor
+   * @return HttpCommandExecutor
    */
   public function getCommandExecutor() {
     return $this->executor;
@@ -418,7 +434,7 @@ public function getCommandExecutor() {
    * Set the session id of the RemoteWebDriver.
    *
    * @param string $session_id
-   * @return WebDriver
+   * @return RemoteWebDriver
    */
   public function setSessionID($session_id) {
     $this->setCommandExecutor(
@@ -433,7 +449,7 @@ public function setSessionID($session_id) {
   /**
    * Get current selenium sessionID
    *
-   * @return sessionID
+   * @return string sessionID
    */
   public function getSessionID() {
     return $this->executor->getSessionID();

From 77bd9cee95b7b9885fa1f1ff3ea829b07ea56c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:15:41 +0400
Subject: [PATCH 044/784] Fix phpdoc comments for HttpCommandExecutor.

---
 lib/remote/HttpCommandExecutor.php | 39 +++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 93f916fd5..5d4325e75 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -98,16 +98,35 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
     'touchUp' =>                array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
   );
 
+  /**
+   * @var string
+   */
   protected $url;
+  /**
+   * @var string
+   */
   protected $sessionID;
+  /**
+   * @var array
+   */
   protected $capabilities;
 
+  /**
+   * @param string $url
+   * @param string $session_id
+   */
   public function __construct($url, $session_id) {
     $this->url = $url;
     $this->sessionID = $session_id;
     $this->capabilities = $this->execute('getSession', array());
   }
 
+  /**
+   * @param string $name
+   * @param array $params
+   *
+   * @return mixed
+   */
   public function execute($name, array $params = array()) {
     $command = array(
       'url' => $this->url,
@@ -127,16 +146,17 @@ public function execute($name, array $params = array()) {
    *   name       : the name of the command
    *   parameters : the parameters of the command required
    *
-   * @param command An array that contains
+   * @param array $command An array that contains
    *                  url        : the url of the remote server
    *                  sessionId  : the session id if needed
    *                  name       : the name of the command
    *                  parameters : the parameters of the command required
-   * @param curl_opts An array of curl options.
+   * @param array $curl_opts An array of curl options.
    *
    * @return array The response of the command.
+   * @throws Exception
    */
-  public static function remoteExecute($command, $curl_opts = array()) {
+  public static function remoteExecute(array $command, array $curl_opts = array()) {
     if (!isset(self::$commands[$command['name']])) {
       throw new Exception($command['name']." is not a valid command.");
     }
@@ -157,17 +177,18 @@ public static function remoteExecute($command, $curl_opts = array()) {
   /**
    * Curl request to webdriver server.
    *
-   * @param http_method 'GET', 'POST', or 'DELETE'
-   * @param suffix       What to append to the base URL.
-   * @param command      The Command object, modelled as a hash.
-   * @param extra_opts   key => value pairs of curl options for curl_setopt()
+   * @param string $http_method 'GET', 'POST', or 'DELETE'
+   * @param string $url
+   * @param array $command      The Command object, modelled as a hash.
+   * @param array $extra_opts   key => value pairs of curl options for curl_setopt()
    * @return array
+   * @throws Exception
    */
   protected static function curl(
     $http_method,
     $url,
-    $command,
-    $extra_opts = array()) {
+    array $command,
+    array $extra_opts = array()) {
 
     $params = $command['parameters'];
 

From d9c5dbf3637524de574b424b529a986d19f91f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:17:39 +0400
Subject: [PATCH 045/784] Fix phpdoc comments for RemoteKeyboard.

---
 lib/remote/RemoteKeyboard.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
index 27708163c..9aa204c27 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/remote/RemoteKeyboard.php
@@ -18,9 +18,15 @@
  */
 class RemoteKeyboard implements WebDriverKeyboard {
 
+  /**
+   * @var WebDriverCommandExecutor
+   */
   private $executor;
 
-  public function __construct($executor) {
+  /**
+   * @param WebDriverCommandExecutor $executor
+   */
+  public function __construct(WebDriverCommandExecutor $executor) {
     $this->executor = $executor;
   }
 

From e9f34e350fecb33a397a5f9dd8f95463915a7a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:21:04 +0400
Subject: [PATCH 046/784] Fix phpdoc comments for RemoteMouse.

---
 lib/remote/RemoteMouse.php | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index 38d6ee695..faa560a5f 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -18,14 +18,22 @@
  */
 class RemoteMouse implements WebDriverMouse {
 
+  /**
+   * @var WebDriverCommandExecutor
+   */
   private $executor;
 
-  public function __construct($executor) {
-    $this->executor = $executor;
+  /**
+   * @param WebDriverCommandExecutor $executor
+   */
+  public function __construct(WebDriverCommandExecutor $executor) {
+      $this->executor = $executor;
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   *
+   * @return RemoteMouse
    */
   public function click(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
@@ -36,7 +44,9 @@ public function click(WebDriverCoordinates $where = null) {
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   *
+   * @return RemoteMouse
    */
   public function contextClick(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
@@ -47,7 +57,9 @@ public function contextClick(WebDriverCoordinates $where = null) {
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   *
+   * @return RemoteMouse
    */
   public function doubleClick(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
@@ -56,7 +68,9 @@ public function doubleClick(WebDriverCoordinates $where = null) {
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   *
+   * @return RemoteMouse
    */
   public function mouseDown(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
@@ -65,7 +79,11 @@ public function mouseDown(WebDriverCoordinates $where = null) {
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   * @param int|null $x_offset
+   * @param int|null $y_offset
+   *
+   * @return RemoteMouse
    */
   public function mouseMove(WebDriverCoordinates $where = null,
                             $x_offset = null,
@@ -85,7 +103,9 @@ public function mouseMove(WebDriverCoordinates $where = null,
   }
 
   /**
-   * @return WebDriverMouse
+   * @param WebDriverCoordinates $where
+   *
+   * @return RemoteMouse
    */
   public function mouseUp(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
@@ -94,7 +114,7 @@ public function mouseUp(WebDriverCoordinates $where = null) {
   }
 
   /**
-   * @return void
+   * @param WebDriverCoordinates $where
    */
   protected function moveIfNeeded(WebDriverCoordinates $where = null) {
     if ($where) {

From 9d2ad574a4999e8a38d845ea9f24443627443261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:23:39 +0400
Subject: [PATCH 047/784] Fix phpdoc comments for RemoteTouchScreen.

---
 lib/remote/RemoteTouchScreen.php | 40 ++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/lib/remote/RemoteTouchScreen.php b/lib/remote/RemoteTouchScreen.php
index fb99f01c8..382d5a383 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/remote/RemoteTouchScreen.php
@@ -18,13 +18,21 @@
  */
 class RemoteTouchScreen implements WebDriverTouchScreen {
 
+  /**
+   * @var WebDriverCommandExecutor
+   */
   private $executor;
 
-  public function __construct($executor) {
-    $this->executor = $executor;
+  /**
+   * @param WebDriverCommandExecutor $executor
+   */
+  public function __construct(WebDriverCommandExecutor $executor) {
+      $this->executor = $executor;
   }
 
   /**
+   * @param WebDriverElement $element
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function tap(WebDriverElement $element) {
@@ -34,6 +42,8 @@ public function tap(WebDriverElement $element) {
   }
 
   /**
+   * @param WebDriverElement $element
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function doubleTap(WebDriverElement $element) {
@@ -46,6 +56,9 @@ public function doubleTap(WebDriverElement $element) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function down($x, $y) {
@@ -59,6 +72,9 @@ public function down($x, $y) {
 
 
   /**
+   * @param int $xspeed
+   * @param int $yspeed
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function flick($xspeed, $yspeed) {
@@ -71,6 +87,11 @@ public function flick($xspeed, $yspeed) {
   }
 
   /**
+   * @param WebDriverElement $element
+   * @param int $xoffset
+   * @param int $yoffset
+   * @param int $speed
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function flickFromElement(
@@ -87,6 +108,8 @@ public function flickFromElement(
   }
 
   /**
+   * @param WebDriverElement $element
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function longPress(WebDriverElement $element) {
@@ -99,6 +122,9 @@ public function longPress(WebDriverElement $element) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function move($x, $y) {
@@ -111,6 +137,9 @@ public function move($x, $y) {
   }
 
   /**
+   * @param int $xoffset
+   * @param int $yoffset
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function scroll($xoffset, $yoffset) {
@@ -123,6 +152,10 @@ public function scroll($xoffset, $yoffset) {
   }
 
   /**
+   * @param WebDriverElement $element
+   * @param int $xoffset
+   * @param int $yoffset
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function scrollFromElement(
@@ -139,6 +172,9 @@ public function scrollFromElement(
 
 
   /**
+   * @param int $x
+   * @param int $y
+   *
    * @return RemoteTouchScreen The instance.
    */
   public function up($x, $y) {

From d67051bee3fbb36e407d5177c1014153635cef83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 21 May 2014 11:28:57 +0400
Subject: [PATCH 048/784] Fix phpdoc comments for RemoteWebElement.

---
 lib/remote/RemoteWebElement.php | 38 +++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index f7998f280..d39cfc509 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -18,10 +18,23 @@
  */
 class RemoteWebElement implements WebDriverElement, WebDriverLocatable {
 
+  /**
+   * @var HttpCommandExecutor
+   */
   protected $executor;
+  /**
+   * @var string
+   */
   protected $id;
+  /**
+   * @var UselessFileDetector
+   */
   protected $fileDetector;
 
+  /**
+   * @param HttpCommandExecutor $executor
+   * @param string $id
+   */
   public function __construct(HttpCommandExecutor $executor, $id) {
     $this->executor = $executor;
     $this->id = $id;
@@ -32,7 +45,7 @@ public function __construct(HttpCommandExecutor $executor, $id) {
    * If this element is a TEXTAREA or text INPUT element, this will clear the
    * value.
    *
-   * @return WebDriverElement The current instance.
+   * @return RemoteWebElement The current instance.
    */
   public function clear() {
     $this->executor->execute('clear', array(':id' => $this->id));
@@ -42,7 +55,7 @@ public function clear() {
   /**
    * Click this element.
    *
-   * @return WebDriverElement The current instance.
+   * @return RemoteWebElement The current instance.
    */
   public function click() {
     $this->executor->execute('clickElement', array(':id' => $this->id));
@@ -54,7 +67,7 @@ public function click() {
    * mechanism.
    *
    * @param WebDriverBy $by
-   * @return WebDriverElement NoSuchElementException is thrown in
+   * @return RemoteWebElement NoSuchElementException is thrown in
    *    HttpCommandExecutor if no element is found.
    * @see WebDriverBy
    */
@@ -73,7 +86,7 @@ public function findElement(WebDriverBy $by) {
    * Find all WebDriverElements within this element using the given mechanism.
    *
    * @param WebDriverBy $by
-   * @return array A list of all WebDriverElements, or an empty array if
+   * @return RemoteWebElement[] A list of all WebDriverElements, or an empty array if
    *    nothing matches
    * @see WebDriverBy
    */
@@ -123,7 +136,7 @@ public function getCSSValue($css_property_name) {
   /**
    * Get the location of element relative to the top-left corner of the page.
    *
-   * @return WebDriverLocation The location of the element.
+   * @return WebDriverPoint The location of the element.
    */
   public function getLocation() {
     $location = $this->executor->execute(
@@ -137,7 +150,7 @@ public function getLocation() {
    * Try scrolling the element into the view port and return the location of
    * element relative to the top-left corner of the page afterwards.
    *
-   * @return WebDriverLocation The location of the element.
+   * @return WebDriverPoint The location of the element.
    */
   public function getLocationOnScreenOnceScrolledIntoView() {
     $location = $this->executor->execute(
@@ -250,7 +263,7 @@ public function isSelected() {
    * Simulate typing into an element, which may set its value.
    *
    * @param mixed $value The data to be typed.
-   * @return WebDriverElement The current instance.
+   * @return RemoteWebElement The current instance.
    */
   public function sendKeys($value) {
     $local_file = $this->fileDetector->getLocalFile($value);
@@ -274,6 +287,9 @@ public function sendKeys($value) {
   /**
    * Upload a local file to the server
    *
+   * @param string $local_file
+   *
+   * @throws WebDriverException
    * @return string The remote path of the file.
    */
   private function upload($local_file) {
@@ -308,6 +324,8 @@ private function upload($local_file) {
    *
    *   eg. $element->setFileDetector(new LocalFileDetector);
    *
+   * @param FileDetector $detector
+   * @return RemoteWebElement
    * @see FileDetector
    * @see LocalFileDetector
    * @see UselessFileDetector
@@ -321,7 +339,7 @@ public function setFileDetector(FileDetector $detector) {
    * If this current element is a form, or an element within a form, then this
    * will be submitted to the remote server.
    *
-   * @return WebDriverElement The current instance.
+   * @return RemoteWebElement The current instance.
    */
   public function submit() {
     $this->executor->execute('submitElement', array(':id' => $this->id));
@@ -354,7 +372,9 @@ public function equals(WebDriverElement $other) {
   /**
    * Return the WebDriverElement with $id
    *
-   * @return WebDriverElement
+   * @param string $id
+   *
+   * @return RemoteWebElement
    */
   private function newElement($id) {
     return new RemoteWebElement($this->executor, $id);

From 2fddfd9cc7c27130686eb1fb1d325e00447920c8 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Tue, 20 May 2014 12:38:55 -0700
Subject: [PATCH 049/784] ChromeOptions - setBinary, addExtensions

---
 lib/__init__.php                   |   1 +
 lib/chrome/ChromeOptions.php       | 102 +++++++++++++++++++++++++++++
 lib/remote/DesiredCapabilities.php |   7 +-
 3 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 lib/chrome/ChromeOptions.php

diff --git a/lib/__init__.php b/lib/__init__.php
index 41a32bb4c..d11df33a7 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -59,6 +59,7 @@
 require_once('interactions/internal/WebDriverMouseMoveAction.php');
 require_once('interactions/internal/WebDriverMoveToOffsetAction.php');
 require_once('internal/WebDriverLocatable.php');
+require_once('chrome/ChromeOptions.php');
 require_once('remote/LocalFileDetector.php');
 require_once('remote/UselessFileDetector.php');
 require_once('remote/RemoteMouse.php');
diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
new file mode 100644
index 000000000..e17eeca58
--- /dev/null
+++ b/lib/chrome/ChromeOptions.php
@@ -0,0 +1,102 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * The class manages the capabilities in ChromeDriver.
+ *
+ * @see https://sites.google.com/a/chromium.org/chromedriver/capabilities
+ */
+class ChromeOptions {
+
+  /**
+   * The key of chrome options in desired capabilities.
+   */
+  const CAPABILITY = "chromeOptions";
+
+  private $binary = null;
+  private $extensions = array();
+
+  /**
+   * Sets the path of the Chrome executable. The path should be either absolute
+   * or relative to the location running ChromeDriver server.
+   */
+  public function setBinary($path) {
+    $this->binary = $path;
+    return $this;
+  }
+
+  /**
+   * Add a Chrome extension to install on browser startup. Each path should be a
+   * packed Chrome extension.
+   */
+  public function addExtensions(array $paths) {
+    foreach ($paths as $path) {
+      $this->addExtension($path);
+    }
+    return $this;
+  }
+
+  /**
+   * @param array encoded_extensions An array of base64 encoded of the
+   *                                 extensions.
+   */
+  public function addEncodedExtensions(array $encoded_extensions) {
+    foreach ($encoded_extensions as $encoded_extension) {
+      $this->addEncodedExtension($encoded_extension);
+    }
+    return $this;
+  }
+
+  /**
+   * @return DesiredCapabilities The DesiredCapabilities for Chrome with this
+   *                             options.
+   */
+  public function toCapabilities() {
+    $capabilities = DesiredCapabilities::chrome();
+    $capabilities->setCapability(self::CAPABILITY, $this);
+    return $capabilities;
+  }
+
+  public function toArray() {
+    $options = array();
+
+    if ($this->binary) {
+      $options['binary'] = $this->binary;
+    }
+
+    if ($this->extensions) {
+      $options['extensions'] = $this->extensions;
+    }
+
+    return $options;
+  }
+
+  /**
+   * Add a Chrome extension to install on browser startup. Each path should be a
+   * packed Chrome extension.
+   */
+  private function addExtension($path) {
+    $this->addEncodedExtension(base64_encode(file_get_contents($path)));
+    return $this;
+  }
+
+  /**
+   * @param string encoded_extension Base64 encoded of the extension.
+   */
+  private function addEncodedExtension($encoded_extension) {
+    $this->extension[] = $encoded_extension;
+    return $this;
+  }
+}
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index 08035c3b5..acdc683e6 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -69,7 +69,6 @@ public function setPlatform($platform) {
     return $this;
   }
 
-
   /**
    * @return bool Whether the value is not null and not false.
    */
@@ -90,6 +89,12 @@ public function setJavascriptEnabled($enabled) {
   }
 
   public function toArray() {
+    if (isset($this->capabilities[ChromeOptions::CAPABILITY]) &&
+      $this->capabilities[ChromeOptions::CAPABILITY] instanceof ChromeOptions) {
+      $this->capabilities[ChromeOptions::CAPABILITY] =
+        $this->capabilities[ChromeOptions::CAPABILITY]->toArray();
+    }
+
     return $this->capabilities;
   }
 

From f2f93d16802c884a673db4a41aa5fc5dc012f1d3 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Wed, 21 May 2014 15:24:37 -0700
Subject: [PATCH 050/784] typo extension vs extensions

---
 lib/chrome/ChromeOptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index e17eeca58..e453a75f0 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -96,7 +96,7 @@ private function addExtension($path) {
    * @param string encoded_extension Base64 encoded of the extension.
    */
   private function addEncodedExtension($encoded_extension) {
-    $this->extension[] = $encoded_extension;
+    $this->extensions[] = $encoded_extension;
     return $this;
   }
 }

From 8ea8fc69380093faa1db1283244f49a546409e52 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Wed, 21 May 2014 15:32:55 -0700
Subject: [PATCH 051/784] phpdoc for ChromeOptions

---
 lib/chrome/ChromeOptions.php | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index e453a75f0..73ef5fca8 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -25,12 +25,22 @@ class ChromeOptions {
    */
   const CAPABILITY = "chromeOptions";
 
-  private $binary = null;
+  /**
+   * @var string
+   */
+  private $binary = '';
+
+  /**
+   * @var array
+   */
   private $extensions = array();
 
   /**
    * Sets the path of the Chrome executable. The path should be either absolute
    * or relative to the location running ChromeDriver server.
+   *
+   * @param string $path
+   * @return ChromeOptions
    */
   public function setBinary($path) {
     $this->binary = $path;
@@ -38,8 +48,11 @@ public function setBinary($path) {
   }
 
   /**
-   * Add a Chrome extension to install on browser startup. Each path should be a
-   * packed Chrome extension.
+   * Add a Chrome extension to install on browser startup. Each path should be
+   * a packed Chrome extension.
+   *
+   * @param array $paths
+   * @return ChromeOptions
    */
   public function addExtensions(array $paths) {
     foreach ($paths as $path) {
@@ -49,8 +62,8 @@ public function addExtensions(array $paths) {
   }
 
   /**
-   * @param array encoded_extensions An array of base64 encoded of the
-   *                                 extensions.
+   * @param array $encoded_extensions An array of base64 encoded of the
+   *                                  extensions.
    */
   public function addEncodedExtensions(array $encoded_extensions) {
     foreach ($encoded_extensions as $encoded_extension) {
@@ -69,6 +82,9 @@ public function toCapabilities() {
     return $capabilities;
   }
 
+  /**
+   * @return array
+   */
   public function toArray() {
     $options = array();
 
@@ -86,6 +102,9 @@ public function toArray() {
   /**
    * Add a Chrome extension to install on browser startup. Each path should be a
    * packed Chrome extension.
+   *
+   * @param string $path
+   * @return ChromeOptions
    */
   private function addExtension($path) {
     $this->addEncodedExtension(base64_encode(file_get_contents($path)));
@@ -93,7 +112,8 @@ private function addExtension($path) {
   }
 
   /**
-   * @param string encoded_extension Base64 encoded of the extension.
+   * @param string $encoded_extension Base64 encoded of the extension.
+   * @return ChromeOptions
    */
   private function addEncodedExtension($encoded_extension) {
     $this->extensions[] = $encoded_extension;

From ff9269eab1a878e4deefdfcab67aa1447d4659e1 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Wed, 21 May 2014 15:38:25 -0700
Subject: [PATCH 052/784] allow empty chrome options

---
 lib/chrome/ChromeOptions.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index 73ef5fca8..5c1788ef3 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -88,9 +88,7 @@ public function toCapabilities() {
   public function toArray() {
     $options = array();
 
-    if ($this->binary) {
-      $options['binary'] = $this->binary;
-    }
+    $options['binary'] = $this->binary;
 
     if ($this->extensions) {
       $options['extensions'] = $this->extensions;

From 27be74080b07712c4f3a9e2840cfabf3be2beaec Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Thu, 22 May 2014 19:15:25 -0700
Subject: [PATCH 053/784] ChromeOptions: setExperimentalOptions, addArguments

Start Chrome with arguments.

Example,
```
$options = new ChromeOptions();
$options->addArguments(array('--window-size=300,900'));
$caps = DesiredCapabilities::chrome();
$caps->setCapability(ChromeOptions::CAPABILITY, $options);
$driver = RemoteWebDriver::create($url, $caps);
```
---
 lib/chrome/ChromeOptions.php       | 38 +++++++++++++++++++-
 lib/remote/DesiredCapabilities.php | 57 ++++++++++++++++++++++++++++++
 lib/remote/RemoteMouse.php         |  1 +
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index 5c1788ef3..89939b1e2 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -25,6 +25,11 @@ class ChromeOptions {
    */
   const CAPABILITY = "chromeOptions";
 
+  /**
+   * @var array
+   */
+  private $arguments = array();
+
   /**
    * @var string
    */
@@ -35,6 +40,11 @@ class ChromeOptions {
    */
   private $extensions = array();
 
+  /**
+   * @var array
+   */
+  private $experimentalOptions = array();
+
   /**
    * Sets the path of the Chrome executable. The path should be either absolute
    * or relative to the location running ChromeDriver server.
@@ -47,6 +57,15 @@ public function setBinary($path) {
     return $this;
   }
 
+  /**
+   * @param array $args
+   * @return ChromeOptions
+   */
+  public function addArguments(array $arguments) {
+    $this->arguments = array_merge($this->arguments, $arguments);
+    return $this;
+  }
+
   /**
    * Add a Chrome extension to install on browser startup. Each path should be
    * a packed Chrome extension.
@@ -64,6 +83,7 @@ public function addExtensions(array $paths) {
   /**
    * @param array $encoded_extensions An array of base64 encoded of the
    *                                  extensions.
+   * @return ChromeOptions
    */
   public function addEncodedExtensions(array $encoded_extensions) {
     foreach ($encoded_extensions as $encoded_extension) {
@@ -72,6 +92,18 @@ public function addEncodedExtensions(array $encoded_extensions) {
     return $this;
   }
 
+  /**
+   * Sets an experimental option which has not exposed officially.
+   *
+   * @param string $name
+   * @parma mixed $value
+   * @return ChromeOptions
+   */
+  public function setExperimentalOption($name, $value) {
+    $this->experimentalOptions[$name] = $value;
+    return $this;
+  }
+
   /**
    * @return DesiredCapabilities The DesiredCapabilities for Chrome with this
    *                             options.
@@ -86,10 +118,14 @@ public function toCapabilities() {
    * @return array
    */
   public function toArray() {
-    $options = array();
+    $options = $this->experimentOptions;
 
     $options['binary'] = $this->binary;
 
+    if ($this->arguments) {
+      $options['args'] = $this->arguments;
+    }
+
     if ($this->extensions) {
       $options['extensions'] = $this->extensions;
     }
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index acdc683e6..844deb1d5 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -28,6 +28,9 @@ public function getBrowserName() {
     return $this->get(WebDriverCapabilityType::BROWSER_NAME, '');
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public function setBrowserName($browser_name) {
     $this->set(WebDriverCapabilityType::BROWSER_NAME, $browser_name);
     return $this;
@@ -40,6 +43,9 @@ public function getVersion() {
     return $this->get(WebDriverCapabilityType::VERSION, '');
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public function setVersion($version) {
     $this->set(WebDriverCapabilityType::VERSION, $version);
     return $this;
@@ -52,6 +58,9 @@ public function getCapability($name) {
     $this->get($name);
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public function setCapability($name, $value) {
     $this->set($name, $value);
     return $this;
@@ -64,6 +73,9 @@ public function getPlatform() {
     return $this->get(WebDriverCapabilityType::PLATFORM, '');
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public function setPlatform($platform) {
     $this->set(WebDriverCapabilityType::PLATFORM, $platform);
     return $this;
@@ -83,11 +95,17 @@ public function isJavascriptEnabled() {
     return $this->get(WebDriverCapabilityType::JAVASCRIPT_ENABLED, false);
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public function setJavascriptEnabled($enabled) {
     $this->set(WebDriverCapabilityType::JAVASCRIPT_ENABLED, $enabled);
     return $this;
   }
 
+  /**
+   * @return array
+   */
   public function toArray() {
     if (isset($this->capabilities[ChromeOptions::CAPABILITY]) &&
       $this->capabilities[ChromeOptions::CAPABILITY] instanceof ChromeOptions) {
@@ -98,17 +116,26 @@ public function toArray() {
     return $this->capabilities;
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   private function set($key, $value) {
     $this->capabilities[$key] = $value;
     return $this;
   }
 
+  /**
+   * @return mixed
+   */
   private function get($key, $default = null) {
     return isset($this->capabilities[$key])
            ? $this->capabilities[$key]
            : $default;
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function android() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
@@ -116,6 +143,9 @@ public static function android() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function chrome() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
@@ -123,6 +153,9 @@ public static function chrome() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function firefox() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
@@ -130,6 +163,9 @@ public static function firefox() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function htmlUnit() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
@@ -137,6 +173,9 @@ public static function htmlUnit() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function htmlUnitWithJS() {
     $caps = new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
@@ -145,6 +184,9 @@ public static function htmlUnitWithJS() {
     return $caps->setJavascriptEnabled(true);
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function internetExplorer() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
@@ -152,6 +194,9 @@ public static function internetExplorer() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function iphone() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
@@ -159,6 +204,9 @@ public static function iphone() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function ipad() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
@@ -166,6 +214,9 @@ public static function ipad() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function opera() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
@@ -173,6 +224,9 @@ public static function opera() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function safari() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
@@ -180,6 +234,9 @@ public static function safari() {
     ));
   }
 
+  /**
+   * @return DesiredCapabilities
+   */
   public static function phantomjs() {
     return new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index 099b71f89..00ead06fa 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -115,6 +115,7 @@ public function mouseUp(WebDriverCoordinates $where = null) {
 
   /**
    * @param WebDriverCoordinates $where
+   * @return void
    */
   protected function moveIfNeeded(WebDriverCoordinates $where = null) {
     if ($where) {

From 773333dd1f4a6afd025ae86fa0d030a2e4f56fc5 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Fri, 23 May 2014 11:01:07 -0700
Subject: [PATCH 054/784] DriverCommand

---
 lib/WebDriverAlert.php             |  11 +-
 lib/WebDriverNavigation.php        |   8 +-
 lib/WebDriverOptions.php           |  18 ++-
 lib/WebDriverTargetLocator.php     |   6 +-
 lib/WebDriverTimeouts.php          |   6 +-
 lib/WebDriverWindow.php            |  14 +--
 lib/__init__.php                   |   1 +
 lib/remote/DriverCommand.php       | 169 +++++++++++++++++++++++++++++
 lib/remote/HttpCommandExecutor.php | 151 +++++++++++++-------------
 lib/remote/RemoteKeyboard.php      |   6 +-
 lib/remote/RemoteMouse.php         |  12 +-
 lib/remote/RemoteTouchScreen.php   |  23 ++--
 lib/remote/RemoteWebDriver.php     |  42 ++++---
 lib/remote/RemoteWebElement.php    |  62 +++++++----
 14 files changed, 373 insertions(+), 156 deletions(-)
 create mode 100644 lib/remote/DriverCommand.php

diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 23b1285a8..aa731402d 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -30,7 +30,7 @@ public function __construct($executor) {
    * @return WebDriverAlert The instance.
    */
   public function accept() {
-    $this->executor->execute('acceptAlert');
+    $this->executor->execute(DriverCommand::ACCEPT_ALERT);
     return $this;
   }
 
@@ -40,7 +40,7 @@ public function accept() {
    * @return WebDriverAlert The instance.
    */
   public function dismiss() {
-    $this->executor->execute('dismissAlert');
+    $this->executor->execute(DriverCommand::DISMISS_ALERT);
     return $this;
   }
 
@@ -50,7 +50,7 @@ public function dismiss() {
    * @return string
    */
   public function getText() {
-    return $this->executor->execute('getAlertText');
+    return $this->executor->execute(DriverCommand::GET_ALERT_TEXT);
   }
 
   /**
@@ -59,7 +59,10 @@ public function getText() {
    * @return WebDriverAlert
    */
   public function sendKeys($value) {
-    $this->executor->execute('sendKeysToAlert', array('text' => $value));
+    $this->executor->execute(
+      DriverCommand::SET_ALERT_VALUE,
+      array('text' => $value)
+    );
     return $this;
   }
 
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 551a49bed..6f3a2bb31 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -36,7 +36,7 @@ public function __construct(WebDriverCommandExecutor $executor) {
    * @return WebDriverNavigation The instance.
    */
   public function back() {
-    $this->executor->execute('goBack');
+    $this->executor->execute(DriverCommand::GO_BACK);
     return $this;
   }
 
@@ -46,7 +46,7 @@ public function back() {
    * @return WebDriverNavigation The instance.
    */
   public function forward() {
-    $this->executor->execute('goForward');
+    $this->executor->execute(DriverCommand::GO_FORWARD);
     return $this;
   }
 
@@ -56,7 +56,7 @@ public function forward() {
    * @return WebDriverNavigation The instance.
    */
   public function refresh() {
-    $this->executor->execute('refreshPage');
+    $this->executor->execute(DriverCommand::REFRESH);
     return $this;
   }
 
@@ -67,7 +67,7 @@ public function refresh() {
    */
   public function to($url) {
     $params = array('url' => (string)$url);
-    $this->executor->execute('get', $params);
+    $this->executor->execute(DriverCommand::GET, $params);
     return $this;
   }
 }
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index f6838897f..98dcb0a63 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -45,7 +45,10 @@ public function __construct(WebDriverCommandExecutor $executor) {
    */
   public function addCookie(array $cookie) {
     $this->validate($cookie);
-    $this->executor->execute('addCookie', array('cookie' => $cookie));
+    $this->executor->execute(
+      DriverCommand::ADD_COOKIE,
+      array('cookie' => $cookie)
+    );
     return $this;
   }
 
@@ -55,7 +58,7 @@ public function addCookie(array $cookie) {
    * @return WebDriverOptions The current instance.
    */
   public function deleteAllCookies() {
-    $this->executor->execute('deleteAllCookies');
+    $this->executor->execute(DriverCommand::DELETE_ALL_COOKIES);
     return $this;
   }
 
@@ -65,7 +68,10 @@ public function deleteAllCookies() {
    * @return WebDriverOptions The current instance.
    */
   public function deleteCookieNamed($name) {
-    $this->executor->execute('deleteCookie', array(':name' => $name));
+    $this->executor->execute(
+      DriverCommand::DELETE_COOKIE,
+      array(':name' => $name)
+    );
     return $this;
   }
 
@@ -91,7 +97,7 @@ public function getCookieNamed($name) {
    * @return array The array of cookies presented.
    */
   public function getCookies() {
-    return $this->executor->execute('getAllCookies');
+    return $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
   }
 
   private function validate(array $cookie) {
@@ -141,7 +147,7 @@ public function window() {
    */
   public function getLog($log_type) {
     return $this->executor->execute(
-      'getLog',
+      DriverCommand::GET_LOG,
       array('type' => $log_type)
     );
   }
@@ -153,7 +159,7 @@ public function getLog($log_type) {
    * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
    */
   public function getAvailableLogTypes() {
-    return $this->executor->execute('getAvailableLogTypes');
+    return $this->executor->execute(DriverCommand::GET_AVAILABLE_LOG_TYPES);
   }
 
 }
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 2e937991c..e330b151d 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -33,7 +33,7 @@ public function __construct($executor, $driver) {
    * @return WebDriver The driver focused on the top window or the first frame.
    */
   public function defaultContent() {
-    $this->executor->execute('focusFrame', array());
+    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, array());
 
     return $this->driver;
   }
@@ -53,7 +53,7 @@ public function frame($frame) {
     }
 
     $params = array('id' => $id);
-    $this->executor->execute('focusFrame', $params);
+    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
     return $this->driver;
   }
@@ -67,7 +67,7 @@ public function frame($frame) {
    */
   public function window($handle) {
     $params = array('name' => (string)$handle);
-    $this->executor->execute('focusWindow', $params);
+    $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
 
     return $this->driver;
   }
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index b86c5f4d5..885c5f190 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -33,7 +33,7 @@ public function __construct($executor) {
    */
   public function implicitlyWait($seconds) {
     $this->executor->execute(
-      'setImplicitWaitTimeout',
+      DriverCommand::IMPLICITLY_WAIT,
       array('ms' => $seconds * 1000)
     );
     return $this;
@@ -48,7 +48,7 @@ public function implicitlyWait($seconds) {
    */
   public function setScriptTimeout($seconds) {
     $this->executor->execute(
-      'setScriptTimeout',
+      DriverCommand::SET_SCRIPT_TIMEOUT,
       array('ms' => $seconds * 1000)
     );
     return $this;
@@ -62,7 +62,7 @@ public function setScriptTimeout($seconds) {
    * @return WebDriverTimeouts The current instance.
    */
   public function pageLoadTimeout($seconds) {
-    $this->executor->execute('setPageLoadTimeout', array(
+    $this->executor->execute(DriverCommand::SET_TIMEOUT, array(
       'type' => 'page load',
       'ms' => $seconds * 1000,
     ));
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 2cdca091e..e0b940042 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -32,7 +32,7 @@ public function __construct($executor) {
    */
   public function getPosition() {
     $position = $this->executor->execute(
-      'getWindowPosition',
+      DriverCommand::GET_WINDOW_POSITION,
       array(':windowHandle' => 'current')
     );
     return new WebDriverPoint(
@@ -49,7 +49,7 @@ public function getPosition() {
    */
   public function getSize() {
     $size = $this->executor->execute(
-      'getWindowSize',
+      DriverCommand::GET_WINDOW_SIZE,
       array(':windowHandle' => 'current')
     );
     return new WebDriverDimension(
@@ -65,7 +65,7 @@ public function getSize() {
    */
   public function maximize() {
     $this->executor->execute(
-      'maximizeWindow',
+      DriverCommand::MAXIMIZE_WINDOW,
       array(':windowHandle' => 'current')
     );
     return $this;
@@ -85,7 +85,7 @@ public function setSize(WebDriverDimension $size) {
       'height' => $size->getHeight(),
       ':windowHandle' => 'current',
     );
-    $this->executor->execute('setWindowSize', $params);
+    $this->executor->execute(DriverCommand::SET_WINDOW_SIZE, $params);
     return $this;
   }
 
@@ -103,7 +103,7 @@ public function setPosition(WebDriverPoint $position) {
       'y' => $position->getY(),
       ':windowHandle' => 'current',
     );
-    $this->executor->execute('setWindowPosition', $params);
+    $this->executor->execute(DriverCommand::SET_WINDOW_POSITION, $params);
     return $this;
   }
 
@@ -113,7 +113,7 @@ public function setPosition(WebDriverPoint $position) {
    * @return string Either LANDSCAPE|PORTRAIT
    */
   public function getScreenOrientation() {
-    return $this->executor->execute('getScreenOrientation');
+    return $this->executor->execute(DriverCommand::GET_SCREEN_ORIENTATION);
   }
 
 
@@ -134,7 +134,7 @@ public function setScreenOrientation($orientation) {
     }
 
     $this->executor->execute(
-      'setScreenOrientation',
+      DriverCommand::SET_SCREEN_ORIENTATION,
       array('orientation' => $orientation)
     );
 
diff --git a/lib/__init__.php b/lib/__init__.php
index d11df33a7..517aec324 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -60,6 +60,7 @@
 require_once('interactions/internal/WebDriverMoveToOffsetAction.php');
 require_once('internal/WebDriverLocatable.php');
 require_once('chrome/ChromeOptions.php');
+require_once('remote/DriverCommand.php');
 require_once('remote/LocalFileDetector.php');
 require_once('remote/UselessFileDetector.php');
 require_once('remote/RemoteMouse.php');
diff --git a/lib/remote/DriverCommand.php b/lib/remote/DriverCommand.php
new file mode 100644
index 000000000..837e5e9de
--- /dev/null
+++ b/lib/remote/DriverCommand.php
@@ -0,0 +1,169 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * This list of command defined in the WebDriver json wire protocol.
+ */
+class DriverCommand {
+
+  const GET_ALL_SESSIONS = "getAllSessions";
+  const GET_CAPABILITIES = "getCapabilities";
+  const NEW_SESSION = "newSession";
+
+  const STATUS = "status";
+
+  const CLOSE = "close";
+  const QUIT = "quit";
+
+  const GET = "get";
+  const GO_BACK = "goBack";
+  const GO_FORWARD = "goForward";
+  const REFRESH = "refresh";
+
+  const ADD_COOKIE = "addCookie";
+  const GET_ALL_COOKIES = "getCookies";
+  const DELETE_COOKIE = "deleteCookie";
+  const DELETE_ALL_COOKIES = "deleteAllCookies";
+
+  const FIND_ELEMENT = "findElement";
+  const FIND_ELEMENTS = "findElements";
+  const FIND_CHILD_ELEMENT = "findChildElement";
+  const FIND_CHILD_ELEMENTS = "findChildElements";
+
+  const CLEAR_ELEMENT = "clearElement";
+  const CLICK_ELEMENT = "clickElement";
+  const SEND_KEYS_TO_ELEMENT = "sendKeysToElement";
+  const SEND_KEYS_TO_ACTIVE_ELEMENT = "sendKeysToActiveElement";
+  const SUBMIT_ELEMENT = "submitElement";
+  const UPLOAD_FILE = "uploadFile";
+
+  const GET_CURRENT_WINDOW_HANDLE = "getCurrentWindowHandle";
+  const GET_WINDOW_HANDLES = "getWindowHandles";
+
+  const GET_CURRENT_CONTEXT_HANDLE = "getCurrentContextHandle";
+  const GET_CONTEXT_HANDLES = "getContextHandles";
+
+  // Switching between to window/frame/iframe
+  const SWITCH_TO_WINDOW = "switchToWindow";
+  const SWITCH_TO_CONTEXT = "switchToContext";
+  const SWITCH_TO_FRAME = "switchToFrame";
+  const SWITCH_TO_PARENT_FRAME = "switchToParentFrame";
+  const GET_ACTIVE_ELEMENT = "getActiveElement";
+
+  // Information of the page
+  const GET_CURRENT_URL = "getCurrentUrl";
+  const GET_PAGE_SOURCE = "getPageSource";
+  const GET_TITLE = "getTitle";
+
+  // Javascript API
+  const EXECUTE_SCRIPT = "executeScript";
+  const EXECUTE_ASYNC_SCRIPT = "executeAsyncScript";
+
+  // API getting information from an element.
+  const GET_ELEMENT_TEXT = "getElementText";
+  const GET_ELEMENT_TAG_NAME = "getElementTagName";
+  const IS_ELEMENT_SELECTED = "isElementSelected";
+  const IS_ELEMENT_ENABLED = "isElementEnabled";
+  const IS_ELEMENT_DISPLAYED = "isElementDisplayed";
+  const GET_ELEMENT_LOCATION = "getElementLocation";
+  const GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW =
+    "getElementLocationOnceScrolledIntoView";
+  const GET_ELEMENT_SIZE = "getElementSize";
+  const GET_ELEMENT_ATTRIBUTE = "getElementAttribute";
+  const GET_ELEMENT_VALUE_OF_CSS_PROPERTY = "getElementValueOfCssProperty";
+  const ELEMENT_EQUALS = "elementEquals";
+
+  const SCREENSHOT = "screenshot";
+
+  // Alert API
+  const ACCEPT_ALERT = "acceptAlert";
+  const DISMISS_ALERT = "dismissAlert";
+  const GET_ALERT_TEXT = "getAlertText";
+  const SET_ALERT_VALUE = "setAlertValue";
+
+  // Timeout API
+  const SET_TIMEOUT = "setTimeout";
+  const IMPLICITLY_WAIT = "implicitlyWait";
+  const SET_SCRIPT_TIMEOUT = "setScriptTimeout";
+
+  const EXECUTE_SQL = "executeSQL";
+  const GET_LOCATION = "getLocation";
+  const SET_LOCATION = "setLocation";
+  const GET_APP_CACHE = "getAppCache";
+  const GET_APP_CACHE_STATUS = "getStatus";
+  const CLEAR_APP_CACHE = "clearAppCache";
+  const IS_BROWSER_ONLINE = "isBrowserOnline";
+  const SET_BROWSER_ONLINE = "setBrowserOnline";
+
+  const GET_LOCAL_STORAGE_ITEM = "getLocalStorageItem";
+  const GET_LOCAL_STORAGE_KEYS = "getLocalStorageKeys";
+  const SET_LOCAL_STORAGE_ITEM = "setLocalStorageItem";
+  const REMOVE_LOCAL_STORAGE_ITEM = "removeLocalStorageItem";
+  const CLEAR_LOCAL_STORAGE = "clearLocalStorage";
+  const GET_LOCAL_STORAGE_SIZE = "getLocalStorageSize";
+
+  const GET_SESSION_STORAGE_ITEM = "getSessionStorageItem";
+  const GET_SESSION_STORAGE_KEYS = "getSessionStorageKey";
+  const SET_SESSION_STORAGE_ITEM = "setSessionStorageItem";
+  const REMOVE_SESSION_STORAGE_ITEM = "removeSessionStorageItem";
+  const CLEAR_SESSION_STORAGE = "clearSessionStorage";
+  const GET_SESSION_STORAGE_SIZE = "getSessionStorageSize";
+
+  const SET_SCREEN_ORIENTATION = "setScreenOrientation";
+  const GET_SCREEN_ORIENTATION = "getScreenOrientation";
+
+  // These belong to the Advanced user interactions - an element is
+  // optional for these commands.
+  const CLICK = "mouseClick";
+  const DOUBLE_CLICK = "mouseDoubleClick";
+  const MOUSE_DOWN = "mouseButtonDown";
+  const MOUSE_UP = "mouseButtonUp";
+  const MOVE_TO = "mouseMoveTo";
+
+  // Those allow interactions with the Input Methods installed on
+  // the system.
+  const IME_GET_AVAILABLE_ENGINES = "imeGetAvailableEngines";
+  const IME_GET_ACTIVE_ENGINE = "imeGetActiveEngine";
+  const IME_IS_ACTIVATED = "imeIsActivated";
+  const IME_DEACTIVATE = "imeDeactivate";
+  const IME_ACTIVATE_ENGINE = "imeActivateEngine";
+
+  // These belong to the Advanced Touch API
+  const TOUCH_SINGLE_TAP = "touchSingleTap";
+  const TOUCH_DOWN = "touchDown";
+  const TOUCH_UP = "touchUp";
+  const TOUCH_MOVE = "touchMove";
+  const TOUCH_SCROLL = "touchScroll";
+  const TOUCH_DOUBLE_TAP = "touchDoubleTap";
+  const TOUCH_LONG_PRESS = "touchLongPress";
+  const TOUCH_FLICK = "touchFlick";
+
+  // Window API (beta)
+  const SET_WINDOW_SIZE = "setWindowSize";
+  const SET_WINDOW_POSITION = "setWindowPosition";
+  const GET_WINDOW_SIZE = "getWindowSize";
+  const GET_WINDOW_POSITION = "getWindowPosition";
+  const MAXIMIZE_WINDOW = "maximizeWindow";
+
+  // Logging API
+  const GET_AVAILABLE_LOG_TYPES = "getAvailableLogTypes";
+  const GET_LOG = "getLog";
+  const GET_SESSION_LOGS = "getSessionLogs";
+
+  // Mobile API
+  const GET_NETWORK_CONNECTION = "getNetworkConnection";
+  const SET_NETWORK_CONNECTION = "setNetworkConnection";
+
+}
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 9c6e2f49e..c42c53b0b 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -23,79 +23,79 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
    */
   private static $commands = array(
-    'acceptAlert' =>            array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
-    'addCookie' =>              array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
-    'clear' =>                  array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
-    'clickElement' =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'),
-    'closeCurrentWindow' =>     array('method' => 'DELETE', 'url' => '/session/:sessionId/window'),
-    'deleteAllCookies' =>       array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie'),
-    'deleteCookie' =>           array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie/:name'),
-    'dismissAlert' =>           array('method' => 'POST',   'url' => '/session/:sessionId/dismiss_alert'),
-    'elementEquals' =>          array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/equals/:other'),
-    'elementFindElement' =>     array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/element'),
-    'elementFindElements' =>    array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/elements'),
-    'executeScript' =>          array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
-    'executeAsyncScript' =>     array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
-    'findElement' =>            array('method' => 'POST', 'url' => '/session/:sessionId/element'),
-    'findElements' =>           array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
-    'focusFrame' =>             array('method' => 'POST',  'url' => '/session/:sessionId/frame'),
-    'focusWindow' =>            array('method' => 'POST',  'url' => '/session/:sessionId/window'),
-    'get' =>                    array('method' => 'POST', 'url' => '/session/:sessionId/url'),
-    'getActiveElement' =>       array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
-    'getAlertText' =>           array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
-    'getAllCookies' =>          array('method' => 'GET',  'url' => '/session/:sessionId/cookie'),
-    'getAvailableLogTypes' =>   array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
-    'getCurrentURL' =>          array('method' => 'GET',  'url' => '/session/:sessionId/url'),
-    'getCurrentWindowHandle' => array('method' => 'GET',  'url' => '/session/:sessionId/window_handle'),
-    'getElementAttribute' =>    array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/attribute/:name'),
-    'getElementCSSValue' =>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/css/:propertyName'),
-    'getElementLocation' =>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location'),
-    'getElementLocationOnceScrolledIntoView' => array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location_in_view'),
-    'getElementSize' =>         array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/size'),
-    'getElementTagName' =>      array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/name'),
-    'getElementText' =>         array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/text'),
-    'getLog' =>      array('method' => 'POST', 'url' => '/session/:sessionId/log'),
-    'getPageSource' =>          array('method' => 'GET',  'url' => '/session/:sessionId/source'),
-    'getScreenOrientation' =>   array('method' => 'GET',  'url' => '/session/:sessionId/orientation'),
-    'getSession' =>             array('method' => 'GET',  'url' => '/session/:sessionId'),
-    'getTitle' =>               array('method' => 'GET',  'url' => '/session/:sessionId/title'),
-    'getWindowHandles' =>       array('method' => 'GET',  'url' => '/session/:sessionId/window_handles'),
-    'getWindowPosition' =>      array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/position'),
-    'getWindowSize' =>          array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/size'),
-    'goBack' =>                 array('method' => 'POST',  'url' => '/session/:sessionId/back'),
-    'goForward' =>              array('method' => 'POST',  'url' => '/session/:sessionId/forward'),
-    'isElementDisplayed'=>      array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/displayed'),
-    'isElementEnabled'=>        array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/enabled'),
-    'isElementSelected'=>       array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/selected'),
-    'maximizeWindow' =>         array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/maximize'),
-    'mouseButtonDown' =>        array('method' => 'POST', 'url' => '/session/:sessionId/buttondown'),
-    'mouseButtonUp' =>          array('method' => 'POST', 'url' => '/session/:sessionId/buttonup'),
-    'mouseClick' =>             array('method' => 'POST', 'url' => '/session/:sessionId/click'),
-    'mouseDoubleClick' =>       array('method' => 'POST', 'url' => '/session/:sessionId/doubleclick'),
-    'mouseMoveTo' =>            array('method' => 'POST', 'url' => '/session/:sessionId/moveto'),
-    'newSession' =>             array('method' => 'POST', 'url' => '/session'),
-    'quit' =>                   array('method' => 'DELETE', 'url' => '/session/:sessionId'),
-    'refreshPage' =>            array('method' => 'POST', 'url' => '/session/:sessionId/refresh'),
-    'sendFile' =>               array('method' => 'POST', 'url' => '/session/:sessionId/file'), // undocumented
-    'sendKeys' =>               array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
-    'sendKeysToAlert' =>        array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
-    'sendKeysToElement' =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/value'),
-    'setImplicitWaitTimeout' => array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/implicit_wait'),
-    'setScreenOrientation' =>   array('method' => 'POST', 'url' => '/session/:sessionId/orientation'),
-    'setPageLoadTimeout' =>     array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
-    'setScriptTimeout' =>       array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/async_script'),
-    'setWindowPosition' =>      array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/position'),
-    'setWindowSize' =>          array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/size'),
-    'submitElement' =>          array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'),
-    'takeScreenshot' =>         array('method' => 'GET',  'url' => '/session/:sessionId/screenshot'),
-    'touchTap' =>               array('method' => 'POST', 'url' => '/session/:sessionId/touch/click'),
-    'touchDown' =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/down'),
-    'touchDoubleTap' =>         array('method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'),
-    'touchFlick' =>             array('method' => 'POST', 'url' => '/session/:sessionId/touch/flick'),
-    'touchLongPress' =>         array('method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'),
-    'touchMove' =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/move'),
-    'touchScroll' =>            array('method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'),
-    'touchUp' =>                array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
+    DriverCommand::ACCEPT_ALERT =>            array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
+    DriverCommand::ADD_COOKIE =>              array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
+    DriverCommand::CLEAR_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
+    DriverCommand::CLICK_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'),
+    DriverCommand::CLOSE =>                   array('method' => 'DELETE', 'url' => '/session/:sessionId/window'),
+    DriverCommand::DELETE_ALL_COOKIES =>      array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie'),
+    DriverCommand::DELETE_COOKIE =>           array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie/:name'),
+    DriverCommand::DISMISS_ALERT =>           array('method' => 'POST',   'url' => '/session/:sessionId/dismiss_alert'),
+    DriverCommand::ELEMENT_EQUALS =>          array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/equals/:other'),
+    DriverCommand::FIND_CHILD_ELEMENT =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/element'),
+    DriverCommand::FIND_CHILD_ELEMENTS =>     array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/elements'),
+    DriverCommand::EXECUTE_SCRIPT =>          array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
+    DriverCommand::EXECUTE_ASYNC_SCRIPT =>    array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
+    DriverCommand::FIND_ELEMENT =>            array('method' => 'POST', 'url' => '/session/:sessionId/element'),
+    DriverCommand::FIND_ELEMENTS =>           array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
+    DriverCommand::SWITCH_TO_FRAME =>         array('method' => 'POST',  'url' => '/session/:sessionId/frame'),
+    DriverCommand::SWITCH_TO_WINDOW =>        array('method' => 'POST',  'url' => '/session/:sessionId/window'),
+    DriverCommand::GET =>                     array('method' => 'POST', 'url' => '/session/:sessionId/url'),
+    DriverCommand::GET_ACTIVE_ELEMENT =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
+    DriverCommand::GET_ALERT_TEXT =>          array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
+    DriverCommand::GET_ALL_COOKIES =>         array('method' => 'GET',  'url' => '/session/:sessionId/cookie'),
+    DriverCommand::GET_AVAILABLE_LOG_TYPES => array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
+    DriverCommand::GET_CURRENT_URL =>         array('method' => 'GET',  'url' => '/session/:sessionId/url'),
+    DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('method' => 'GET',  'url' => '/session/:sessionId/window_handle'),
+    DriverCommand::GET_ELEMENT_ATTRIBUTE =>   array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/attribute/:name'),
+    DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY =>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/css/:propertyName'),
+    DriverCommand::GET_ELEMENT_LOCATION =>    array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location'),
+    DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location_in_view'),
+    DriverCommand::GET_ELEMENT_SIZE =>        array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/size'),
+    DriverCommand::GET_ELEMENT_TAG_NAME =>    array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/name'),
+    DriverCommand::GET_ELEMENT_TEXT =>        array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/text'),
+    DriverCommand::GET_LOG =>                 array('method' => 'POST', 'url' => '/session/:sessionId/log'),
+    DriverCommand::GET_PAGE_SOURCE =>         array('method' => 'GET',  'url' => '/session/:sessionId/source'),
+    DriverCommand::GET_SCREEN_ORIENTATION =>  array('method' => 'GET',  'url' => '/session/:sessionId/orientation'),
+    DriverCommand::GET_CAPABILITIES =>        array('method' => 'GET',  'url' => '/session/:sessionId'),
+    DriverCommand::GET_TITLE =>               array('method' => 'GET',  'url' => '/session/:sessionId/title'),
+    DriverCommand::GET_WINDOW_HANDLES =>      array('method' => 'GET',  'url' => '/session/:sessionId/window_handles'),
+    DriverCommand::GET_WINDOW_POSITION =>     array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/position'),
+    DriverCommand::GET_WINDOW_SIZE =>         array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/size'),
+    DriverCommand::GO_BACK =>                 array('method' => 'POST',  'url' => '/session/:sessionId/back'),
+    DriverCommand::GO_FORWARD =>              array('method' => 'POST',  'url' => '/session/:sessionId/forward'),
+    DriverCommand::IS_ELEMENT_DISPLAYED=>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/displayed'),
+    DriverCommand::IS_ELEMENT_ENABLED=>       array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/enabled'),
+    DriverCommand::IS_ELEMENT_SELECTED=>      array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/selected'),
+    DriverCommand::MAXIMIZE_WINDOW =>         array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/maximize'),
+    DriverCommand::MOUSE_DOWN =>              array('method' => 'POST', 'url' => '/session/:sessionId/buttondown'),
+    DriverCommand::MOUSE_UP =>                array('method' => 'POST', 'url' => '/session/:sessionId/buttonup'),
+    DriverCommand::CLICK =>                   array('method' => 'POST', 'url' => '/session/:sessionId/click'),
+    DriverCommand::DOUBLE_CLICK =>            array('method' => 'POST', 'url' => '/session/:sessionId/doubleclick'),
+    DriverCommand::MOVE_TO =>                 array('method' => 'POST', 'url' => '/session/:sessionId/moveto'),
+    DriverCommand::NEW_SESSION =>             array('method' => 'POST', 'url' => '/session'),
+    DriverCommand::QUIT =>                    array('method' => 'DELETE', 'url' => '/session/:sessionId'),
+    DriverCommand::REFRESH =>                 array('method' => 'POST', 'url' => '/session/:sessionId/refresh'),
+    DriverCommand::UPLOAD_FILE =>             array('method' => 'POST', 'url' => '/session/:sessionId/file'), // undocumented
+    DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
+    DriverCommand::SET_ALERT_VALUE =>         array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
+    DriverCommand::SEND_KEYS_TO_ELEMENT =>    array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/value'),
+    DriverCommand::IMPLICITLY_WAIT =>         array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/implicit_wait'),
+    DriverCommand::SET_SCREEN_ORIENTATION =>  array('method' => 'POST', 'url' => '/session/:sessionId/orientation'),
+    DriverCommand::SET_TIMEOUT =>             array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
+    DriverCommand::SET_SCRIPT_TIMEOUT =>      array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/async_script'),
+    DriverCommand::SET_WINDOW_POSITION =>     array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/position'),
+    DriverCommand::SET_WINDOW_SIZE =>         array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/size'),
+    DriverCommand::SUBMIT_ELEMENT =>          array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'),
+    DriverCommand::SCREENSHOT =>              array('method' => 'GET',  'url' => '/session/:sessionId/screenshot'),
+    DriverCommand::TOUCH_SINGLE_TAP =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/click'),
+    DriverCommand::TOUCH_DOWN =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/down'),
+    DriverCommand::TOUCH_DOUBLE_TAP =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'),
+    DriverCommand::TOUCH_FLICK =>             array('method' => 'POST', 'url' => '/session/:sessionId/touch/flick'),
+    DriverCommand::TOUCH_LONG_PRESS =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'),
+    DriverCommand::TOUCH_MOVE =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/move'),
+    DriverCommand::TOUCH_SCROLL =>            array('method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'),
+    DriverCommand::TOUCH_UP =>                array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
   );
 
   /**
@@ -118,7 +118,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
   public function __construct($url, $session_id) {
     $this->url = $url;
     $this->sessionID = $session_id;
-    $this->capabilities = $this->execute('getSession', array());
+    $this->capabilities = $this->execute(DriverCommand::GET_CAPABILITIES);
   }
 
   /**
@@ -165,7 +165,7 @@ public static function remoteExecute(
     }
     $raw = self::$commands[$command['name']];
 
-    if ($command['name'] == 'newSession') {
+    if ($command['name'] == DriverCommand::NEW_SESSION) {
       $curl_opts[CURLOPT_FOLLOWLOCATION] = true;
     }
 
@@ -294,5 +294,4 @@ public function getAddressOfRemoteServer() {
   public function getSessionID() {
     return $this->sessionID;
   }
-
 }
diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
index 9aa204c27..116020545 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/remote/RemoteKeyboard.php
@@ -36,7 +36,7 @@ public function __construct(WebDriverCommandExecutor $executor) {
    * @return $this
    */
   public function sendKeys($keys) {
-    $this->executor->execute('sendKeys', array(
+    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
       'value' => WebDriverKeys::encode($keys),
     ));
     return $this;
@@ -50,7 +50,7 @@ public function sendKeys($keys) {
    * @return $this
    */
   public function pressKey($key) {
-    $this->executor->execute('sendKeys', array(
+    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
       'value' => array((string)$key),
     ));
     return $this;
@@ -64,7 +64,7 @@ public function pressKey($key) {
    * @return $this
    */
   public function releaseKey($key) {
-    $this->executor->execute('sendKeys', array(
+    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
       'value' => array((string)$key),
     ));
     return $this;
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index 00ead06fa..cb0613e1e 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -37,7 +37,7 @@ public function __construct(WebDriverCommandExecutor $executor) {
    */
   public function click(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
-    $this->executor->execute('mouseClick', array(
+    $this->executor->execute(DriverCommand::CLICK, array(
       'button' => 0,
     ));
     return $this;
@@ -50,7 +50,7 @@ public function click(WebDriverCoordinates $where = null) {
    */
   public function contextClick(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
-    $this->executor->execute('mouseClick', array(
+    $this->executor->execute(DriverCommand::CLICK, array(
       'button' => 2,
     ));
     return $this;
@@ -63,7 +63,7 @@ public function contextClick(WebDriverCoordinates $where = null) {
    */
   public function doubleClick(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
-    $this->executor->execute('mouseDoubleClick');
+    $this->executor->execute(DriverCommand::DOUBLE_CLICK);
     return $this;
   }
 
@@ -74,7 +74,7 @@ public function doubleClick(WebDriverCoordinates $where = null) {
    */
   public function mouseDown(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
-    $this->executor->execute('mouseButtonDown');
+    $this->executor->execute(DriverCommand::MOUSE_DOWN);
     return $this;
   }
 
@@ -98,7 +98,7 @@ public function mouseMove(WebDriverCoordinates $where = null,
     if ($y_offset !== null) {
       $params['yoffset'] = $y_offset;
     }
-    $this->executor->execute('mouseMoveTo', $params);
+    $this->executor->execute(DriverCommand::MOVE_TO, $params);
     return $this;
   }
 
@@ -109,7 +109,7 @@ public function mouseMove(WebDriverCoordinates $where = null,
    */
   public function mouseUp(WebDriverCoordinates $where = null) {
     $this->moveIfNeeded($where);
-    $this->executor->execute('mouseButtonUp');
+    $this->executor->execute(DriverCommand::MOUSE_UP);
     return $this;
   }
 
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/remote/RemoteTouchScreen.php
index 382d5a383..de8dc539d 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/remote/RemoteTouchScreen.php
@@ -36,7 +36,10 @@ public function __construct(WebDriverCommandExecutor $executor) {
    * @return RemoteTouchScreen The instance.
    */
   public function tap(WebDriverElement $element) {
-    $this->executor->execute('touchTap', array('element' => $element->getID()));
+    $this->executor->execute(
+      DriverCommand::TOUCH_SINGLE_TAP,
+      array('element' => $element->getID())
+    );
 
     return $this;
   }
@@ -48,7 +51,7 @@ public function tap(WebDriverElement $element) {
    */
   public function doubleTap(WebDriverElement $element) {
     $this->executor->execute(
-      'touchDoubleTap',
+      DriverCommand::TOUCH_DOUBLE_TAP,
       array('element' => $element->getID())
     );
 
@@ -62,7 +65,7 @@ public function doubleTap(WebDriverElement $element) {
    * @return RemoteTouchScreen The instance.
    */
   public function down($x, $y) {
-    $this->executor->execute('touchDown', array(
+    $this->executor->execute(DriverCommand::TOUCH_DOWN, array(
       'x' => $x,
       'y' => $y,
     ));
@@ -78,7 +81,7 @@ public function down($x, $y) {
    * @return RemoteTouchScreen The instance.
    */
   public function flick($xspeed, $yspeed) {
-    $this->executor->execute('touchFlick', array(
+    $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
       'xspeed' => $xspeed,
       'yspeed' => $yspeed,
     ));
@@ -97,7 +100,7 @@ public function flick($xspeed, $yspeed) {
   public function flickFromElement(
     WebDriverElement $element, $xoffset, $yoffset, $speed
   ) {
-    $this->executor->execute('touchFlick', array(
+    $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
       'xoffset' => $xoffset,
       'yoffset' => $yoffset,
       'element' => $element->getID(),
@@ -114,7 +117,7 @@ public function flickFromElement(
    */
   public function longPress(WebDriverElement $element) {
     $this->executor->execute(
-      'touchLongPress',
+      DriverCommand::TOUCH_LONG_PRESS,
       array('element' => $element->getID())
     );
 
@@ -128,7 +131,7 @@ public function longPress(WebDriverElement $element) {
    * @return RemoteTouchScreen The instance.
    */
   public function move($x, $y) {
-    $this->executor->execute('touchMove', array(
+    $this->executor->execute(DriverCommand::TOUCH_MOVE, array(
       'x' => $x,
       'y' => $y,
     ));
@@ -143,7 +146,7 @@ public function move($x, $y) {
    * @return RemoteTouchScreen The instance.
    */
   public function scroll($xoffset, $yoffset) {
-    $this->executor->execute('touchScroll', array(
+    $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
       'xoffset' => $xoffset,
       'yoffset' => $yoffset,
     ));
@@ -161,7 +164,7 @@ public function scroll($xoffset, $yoffset) {
   public function scrollFromElement(
     WebDriverElement $element, $xoffset, $yoffset
   ) {
-    $this->executor->execute('touchScroll', array(
+    $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
       'element' => $element->getID(),
       'xoffset' => $xoffset,
       'yoffset' => $yoffset,
@@ -178,7 +181,7 @@ public function scrollFromElement(
    * @return RemoteTouchScreen The instance.
    */
   public function up($x, $y) {
-    $this->executor->execute('touchUp', array(
+    $this->executor->execute(DriverCommand::TOUCH_UP, array(
       'x' => $x,
       'y' => $y,
     ));
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 4fd773fd6..7bec1da87 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -56,7 +56,7 @@ public static function create(
 
     $command = array(
       'url' => $url,
-      'name' => 'newSession',
+      'name' => DriverCommand::NEW_SESSION,
       'parameters' => array('desiredCapabilities' => $desired_capabilities),
     );
 
@@ -121,7 +121,7 @@ public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
    * @return RemoteWebDriver The current instance.
    */
   public function close() {
-    $this->executor->execute('closeCurrentWindow', array());
+    $this->executor->execute(DriverCommand::CLOSE, array());
 
     return $this;
   }
@@ -136,7 +136,10 @@ public function close() {
    */
   public function findElement(WebDriverBy $by) {
     $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_element = $this->executor->execute('findElement', $params);
+    $raw_element = $this->executor->execute(
+      DriverCommand::FIND_ELEMENT,
+      $params
+    );
 
     return $this->newElement($raw_element['ELEMENT']);
   }
@@ -152,7 +155,10 @@ public function findElement(WebDriverBy $by) {
    */
   public function findElements(WebDriverBy $by) {
     $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_elements = $this->executor->execute('findElements', $params);
+    $raw_elements = $this->executor->execute(
+      DriverCommand::FIND_ELEMENTS,
+      $params
+    );
 
     $elements = array();
     foreach ($raw_elements as $raw_element) {
@@ -170,7 +176,7 @@ public function findElements(WebDriverBy $by) {
      */
   public function get($url) {
     $params = array('url' => (string)$url);
-    $this->executor->execute('get', $params);
+    $this->executor->execute(DriverCommand::GET, $params);
 
     return $this;
   }
@@ -181,7 +187,7 @@ public function get($url) {
    * @return string The current URL.
    */
   public function getCurrentURL() {
-    return $this->executor->execute('getCurrentURL');
+    return $this->executor->execute(DriverCommand::GET_CURRENT_URL);
   }
 
   /**
@@ -190,7 +196,7 @@ public function getCurrentURL() {
    * @return string The current page source.
    */
   public function getPageSource() {
-    return $this->executor->execute('getPageSource');
+    return $this->executor->execute(DriverCommand::GET_PAGE_SOURCE);
   }
 
   /**
@@ -199,7 +205,7 @@ public function getPageSource() {
    * @return string The title of the current page.
    */
   public function getTitle() {
-    return $this->executor->execute('getTitle');
+    return $this->executor->execute(DriverCommand::GET_TITLE);
   }
 
   /**
@@ -209,7 +215,10 @@ public function getTitle() {
    * @return string The current window handle.
    */
   public function getWindowHandle() {
-    return $this->executor->execute('getCurrentWindowHandle', array());
+    return $this->executor->execute(
+      DriverCommand::GET_CURRENT_WINDOW_HANDLE,
+      array()
+    );
   }
 
   /**
@@ -218,7 +227,7 @@ public function getWindowHandle() {
    * @return array An array of string containing all available window handles.
    */
   public function getWindowHandles() {
-    return $this->executor->execute('getWindowHandles', array());
+    return $this->executor->execute(DriverCommand::GET_WINDOW_HANDLES, array());
   }
 
   /**
@@ -227,7 +236,7 @@ public function getWindowHandles() {
    * @return void
    */
   public function quit() {
-    $this->executor->execute('quit');
+    $this->executor->execute(DriverCommand::QUIT);
     $this->executor = null;
   }
 
@@ -266,7 +275,7 @@ public function executeScript($script, array $arguments = array()) {
       'script' => $script,
       'args' => $this->prepareScriptArguments($arguments),
     );
-    return $this->executor->execute('executeScript', $params);
+    return $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, $params);
   }
 
   /**
@@ -287,7 +296,10 @@ public function executeAsyncScript($script, array $arguments = array()) {
       'script' => $script,
       'args' => $this->prepareScriptArguments($arguments),
     );
-    return $this->executor->execute('executeAsyncScript', $params);
+    return $this->executor->execute(
+      DriverCommand::EXECUTE_ASYNC_SCRIPT,
+      $params
+    );
   }
 
   /**
@@ -298,7 +310,7 @@ public function executeAsyncScript($script, array $arguments = array()) {
    */
   public function takeScreenshot($save_as = null) {
     $screenshot = base64_decode(
-      $this->executor->execute('takeScreenshot')
+      $this->executor->execute(DriverCommand::SCREENSHOT)
     );
     if ($save_as) {
       file_put_contents($save_as, $screenshot);
@@ -403,7 +415,7 @@ public function action() {
    * @return RemoteWebElement
    */
   public function getActiveElement() {
-    $response = $this->executor->execute('getActiveElement');
+    $response = $this->executor->execute(DriverCommand::GET_ACTIVE_ELEMENT);
     return $this->newElement($response['ELEMENT']);
   }
 
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index ba15f8835..cc5549228 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -48,7 +48,10 @@ public function __construct(HttpCommandExecutor $executor, $id) {
    * @return RemoteWebElement The current instance.
    */
   public function clear() {
-    $this->executor->execute('clear', array(':id' => $this->id));
+    $this->executor->execute(
+      DriverCommand::CLEAR_ELEMENT,
+      array(':id' => $this->id)
+    );
     return $this;
   }
 
@@ -58,7 +61,10 @@ public function clear() {
    * @return RemoteWebElement The current instance.
    */
   public function click() {
-    $this->executor->execute('clickElement', array(':id' => $this->id));
+    $this->executor->execute(
+      DriverCommand::CLICK_ELEMENT,
+      array(':id' => $this->id)
+    );
     return $this;
   }
 
@@ -77,7 +83,10 @@ public function findElement(WebDriverBy $by) {
       'value' => $by->getValue(),
       ':id'   => $this->id,
     );
-    $raw_element = $this->executor->execute('elementFindElement', $params);
+    $raw_element = $this->executor->execute(
+      DriverCommand::FIND_CHILD_ELEMENT,
+      $params
+    );
 
     return $this->newElement($raw_element['ELEMENT']);
   }
@@ -96,7 +105,10 @@ public function findElements(WebDriverBy $by) {
       'value' => $by->getValue(),
       ':id'   => $this->id,
     );
-    $raw_elements = $this->executor->execute('elementFindElements', $params);
+    $raw_elements = $this->executor->execute(
+      DriverCommand::FIND_CHILD_ELEMENTS,
+      $params
+    );
 
     $elements = array();
     foreach ($raw_elements as $raw_element) {
@@ -116,7 +128,10 @@ public function getAttribute($attribute_name) {
       ':name' => $attribute_name,
       ':id'   => $this->id,
     );
-    return $this->executor->execute('getElementAttribute', $params);
+    return $this->executor->execute(
+      DriverCommand::GET_ELEMENT_ATTRIBUTE,
+      $params
+    );
   }
 
   /**
@@ -130,7 +145,10 @@ public function getCSSValue($css_property_name) {
       ':propertyName' => $css_property_name,
       ':id'           => $this->id,
     );
-    return $this->executor->execute('getElementCSSValue', $params);
+    return $this->executor->execute(
+      DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
+      $params
+    );
   }
 
   /**
@@ -140,7 +158,7 @@ public function getCSSValue($css_property_name) {
    */
   public function getLocation() {
     $location = $this->executor->execute(
-      'getElementLocation',
+      DriverCommand::GET_ELEMENT_LOCATION,
       array(':id' => $this->id)
     );
     return new WebDriverPoint($location['x'], $location['y']);
@@ -154,7 +172,7 @@ public function getLocation() {
    */
   public function getLocationOnScreenOnceScrolledIntoView() {
     $location = $this->executor->execute(
-      'getElementLocationOnceScrolledIntoView',
+      DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
       array(':id' => $this->id)
     );
     return new WebDriverPoint($location['x'], $location['y']);
@@ -190,7 +208,7 @@ public function getCoordinates() {
    */
   public function getSize() {
     $size = $this->executor->execute(
-      'getElementSize',
+      DriverCommand::GET_ELEMENT_SIZE,
       array(':id' => $this->id)
     );
     return new WebDriverDimension($size['width'], $size['height']);
@@ -203,7 +221,7 @@ public function getSize() {
    */
   public function getTagName() {
     return $this->executor->execute(
-      'getElementTagName',
+      DriverCommand::GET_ELEMENT_TAG_NAME,
       array(':id' => $this->id)
     );
   }
@@ -216,7 +234,7 @@ public function getTagName() {
    */
   public function getText() {
     return $this->executor->execute(
-      'getElementText',
+      DriverCommand::GET_ELEMENT_TEXT,
       array(':id' => $this->id)
     );
   }
@@ -229,7 +247,7 @@ public function getText() {
    */
   public function isDisplayed() {
     return $this->executor->execute(
-      'isElementDisplayed',
+      DriverCommand::IS_ELEMENT_DISPLAYED,
       array(':id' => $this->id)
     );
   }
@@ -242,7 +260,7 @@ public function isDisplayed() {
    */
   public function isEnabled() {
     return $this->executor->execute(
-      'isElementEnabled',
+      DriverCommand::IS_ELEMENT_ENABLED,
       array(':id' => $this->id)
     );
   }
@@ -254,7 +272,7 @@ public function isEnabled() {
    */
   public function isSelected() {
     return $this->executor->execute(
-      'isElementSelected',
+      DriverCommand::IS_ELEMENT_SELECTED,
       array(':id' => $this->id)
     );
   }
@@ -272,14 +290,14 @@ public function sendKeys($value) {
         'value' => WebDriverKeys::encode($value),
         ':id'   => $this->id,
       );
-      $this->executor->execute('sendKeysToElement', $params);
+      $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
     } else {
       $remote_path = $this->upload($local_file);
       $params = array(
         'value' => WebDriverKeys::encode($remote_path),
         ':id'   => $this->id,
       );
-      $this->executor->execute('sendKeysToElement', $params);
+      $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
     }
     return $this;
   }
@@ -310,7 +328,10 @@ private function upload($local_file) {
     $params = array(
       'file' => base64_encode(file_get_contents($temp_zip)),
     );
-    $remote_path = $this->executor->execute('sendFile', $params);
+    $remote_path = $this->executor->execute(
+      DriverCommand::UPLOAD_FILE,
+      $params
+    );
     unlink($temp_zip);
     return $remote_path;
   }
@@ -342,7 +363,10 @@ public function setFileDetector(FileDetector $detector) {
    * @return RemoteWebElement The current instance.
    */
   public function submit() {
-    $this->executor->execute('submitElement', array(':id' => $this->id));
+    $this->executor->execute(
+      DriverCommand::SUBMIT_ELEMENT,
+      array(':id' => $this->id)
+    );
 
     return $this;
   }
@@ -363,7 +387,7 @@ public function getID() {
    * @return bool
    */
   public function equals(WebDriverElement $other) {
-    return $this->executor->execute('elementEquals', array(
+    return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, array(
       ':id'    => $this->id,
       ':other' => $other->getID(),
     ));

From 0f210ae8c826d134c65d726e02587b8b03513401 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 27 May 2014 14:31:19 -0700
Subject: [PATCH 055/784] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b278f8fe..897a2df48 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Install the library.
 
 ##  GETTING STARTED
 
-*   All you need as the server for this client is the selenium-server-standalone-#.jar file provided here:  http://code.google.com/p/selenium/downloads/list
+*   All you need as the server for this client is the selenium-server-standalone-#.jar file provided here: http://selenium-release.storage.googleapis.com/index.html
 
 *   Download and run that file, replacing # with the current server version.
 

From d63006322379e55e4223d6fbf2486d22780ac7a4 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Tue, 27 May 2014 16:43:08 -0700
Subject: [PATCH 056/784] Standardize WebDriver Response

---
 lib/__init__.php                   |  1 +
 lib/remote/HttpCommandExecutor.php |  9 ++--
 lib/remote/WebDriverResponse.php   | 87 ++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 lib/remote/WebDriverResponse.php

diff --git a/lib/__init__.php b/lib/__init__.php
index 517aec324..d041cc4f2 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -70,6 +70,7 @@
 require_once('remote/WebDriverBrowserType.php');
 require_once('remote/WebDriverCapabilityType.php');
 require_once('remote/DesiredCapabilities.php');
+require_once('remote/WebDriverResponse.php');
 require_once('remote/HttpCommandExecutor.php');
 require_once('interactions/internal/WebDriverSendKeysAction.php');
 require_once('interactions/internal/WebDriverKeyDownAction.php');
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index c42c53b0b..b869d868d 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -134,8 +134,8 @@ public function execute($name, array $params = array()) {
       'name' => $name,
       'parameters' => $params,
     );
-    $raw = self::remoteExecute($command);
-    return $raw['value'];
+    $response = self::remoteExecute($command);
+    return $response->getValue();
   }
 
   /**
@@ -244,7 +244,6 @@ protected static function curl(
     }
 
     $raw_results = trim(curl_exec($curl));
-    $info = curl_getinfo($curl);
 
     if ($error = curl_error($curl)) {
       $msg = sprintf(
@@ -278,7 +277,9 @@ protected static function curl(
     $status = isset($results['status']) ? $results['status'] : 0;
     WebDriverException::throwException($status, $message, $results);
 
-    return array('value' => $value, 'info' => $info, 'sessionId' => $sessionId);
+    return (new WebDriverResponse($sessionId))
+      ->setStatus($status)
+      ->setValue($value);
   }
 
   /**
diff --git a/lib/remote/WebDriverResponse.php b/lib/remote/WebDriverResponse.php
new file mode 100644
index 000000000..a42e3067c
--- /dev/null
+++ b/lib/remote/WebDriverResponse.php
@@ -0,0 +1,87 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class WebDriverResponse {
+
+  /**
+   * @var int
+   */
+  private $status;
+
+  /**
+   * @var mixed
+   */
+  private $value;
+
+  /**
+   * @var string
+   */
+  private $sessionID;
+
+  /**
+   * @param null|string $session_id
+   */
+  public function __construct($session_id = null) {
+    $this->sessionID = $session_id;
+  }
+
+  /**
+   * @return null|int
+   */
+  public function getStatus() {
+    return $this->status;
+  }
+
+  /**
+   * @param int $status
+   * @return WebDriverResponse
+   */
+  public function setStatus($status) {
+    $this->status = $status;
+    return $this;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function getValue() {
+    return $this->value;
+  }
+
+  /**
+   * @param mixed $value
+   * @return WebDriverResponse
+   */
+  public function setValue($value) {
+    $this->value = $value;
+    return $this;
+  }
+
+  /**
+   * @return null|string
+   */
+  public function getSessionID() {
+    return $this->sessionID;
+  }
+
+  /**
+   * @param mixed $session_id
+   * @return WebDriverResponse
+   */
+  public function setSessionID($session_id) {
+    $this->sessionID = $session_id;
+    return $this;
+  }
+}

From 8667599b19e992cf14b904d8c743bc2e86334768 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 27 May 2014 16:46:24 -0700
Subject: [PATCH 057/784] fix

---
 lib/remote/RemoteWebDriver.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 7bec1da87..de461e2af 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -62,7 +62,10 @@ public static function create(
 
     $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
     $driver = new static();
-    $executor = static::createHttpCommandExecutor($url, $response['sessionId']);
+    $executor = static::createHttpCommandExecutor(
+      $url,
+      $response->getSessionID()
+    );
 
     return $driver->setCommandExecutor($executor);
   }

From 5b1e3302f32352c52ebdd7dc23d9aa90f94170b1 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 27 May 2014 16:58:57 -0700
Subject: [PATCH 058/784] update test

---
 tests/unit/remote/RemoteWebDriverTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/unit/remote/RemoteWebDriverTest.php b/tests/unit/remote/RemoteWebDriverTest.php
index 3da28ae07..c53b4fcbe 100644
--- a/tests/unit/remote/RemoteWebDriverTest.php
+++ b/tests/unit/remote/RemoteWebDriverTest.php
@@ -25,6 +25,10 @@ public function testCreate() {
     $timeout = 1000;
     $url = 'http://localhost:4444/wd/hub';
     $response = array('value' => 'someValue', 'info' => 'someInfo', 'sessionId' => 'someSessionId');
+    $response = (new WebDriverResponse('someSessionId'))
+                  ->setStatus(0)
+                  ->setValue('someValue');
+
     $executor = $this->getMockBuilder('HttpCommandExecutor')->disableOriginalConstructor()->getMock();
 
     $remoteWebDriver
@@ -37,7 +41,7 @@ public function testCreate() {
     $remoteWebDriver
       ->staticExpects($this->once())
       ->method('createHttpCommandExecutor')
-      ->with($url, $response['sessionId'])
+      ->with($url, $response->getSessionID())
       ->will($this->returnValue($executor))
     ;
 

From c58a324cf2683601885b430663a821ad34dd6709 Mon Sep 17 00:00:00 2001
From: TobiasLang <tobias.lang@evoscout.com>
Date: Wed, 28 May 2014 16:22:37 +0200
Subject: [PATCH 059/784] Update HttpCommandExecutor.php

Bugfix, as current code breaks execution with PHP 5.3 (unsupported language feature).
---
 lib/remote/HttpCommandExecutor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index b869d868d..bea23059c 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -277,7 +277,8 @@ protected static function curl(
     $status = isset($results['status']) ? $results['status'] : 0;
     WebDriverException::throwException($status, $message, $results);
 
-    return (new WebDriverResponse($sessionId))
+    $response = new WebDriverResponse($sessionId);
+    return $response
       ->setStatus($status)
       ->setValue($value);
   }

From f7175ff60768345c742e49e7cd13c3b25b76b3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Thu, 29 May 2014 13:14:30 +0400
Subject: [PATCH 060/784] Does not close connection manually. Update phpdoc.
 Init curl from RemoteWebDriver.

---
 lib/remote/HttpCommandExecutor.php | 42 +++++++++++++++++++-----------
 lib/remote/RemoteWebDriver.php     |  5 +++-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index bea23059c..a11161b75 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -110,6 +110,10 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    * @var array
    */
   protected $capabilities;
+  /**
+   * @var resource
+   */
+  protected static $curl;
 
   /**
    * @param string $url
@@ -121,6 +125,15 @@ public function __construct($url, $session_id) {
     $this->capabilities = $this->execute(DriverCommand::GET_CAPABILITIES);
   }
 
+  /**
+   * Init curl.
+   */
+  public static function initCurl() {
+    if (self::$curl === null) {
+      self::$curl = curl_init();
+    }
+  }
+
   /**
    * @param string $name
    * @param array $params
@@ -153,7 +166,7 @@ public function execute($name, array $params = array()) {
    *                  parameters : the parameters of the command required
    * @param array $curl_opts An array of curl options.
    *
-   * @return array The response of the command.
+   * @return WebDriverResponse The response of the command.
    * @throws Exception
    */
   public static function remoteExecute(
@@ -185,7 +198,7 @@ public static function remoteExecute(
    * @param array $command      The Command object, modelled as a hash.
    * @param array $extra_opts   key => value pairs of curl options for
    *                            curl_setopt()
-   * @return array
+   * @return WebDriverResponse
    * @throws Exception
    */
   protected static function curl(
@@ -218,34 +231,33 @@ protected static function curl(
         json_encode($params)));
     }
 
-    $curl = curl_init($url);
-
-    curl_setopt($curl, CURLOPT_TIMEOUT, 300);
-    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+    curl_setopt(self::$curl, CURLOPT_URL, $url);
+    curl_setopt(self::$curl, CURLOPT_TIMEOUT, 300);
+    curl_setopt(self::$curl, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt(self::$curl, CURLOPT_FOLLOWLOCATION, true);
     curl_setopt(
-      $curl,
+      self::$curl,
       CURLOPT_HTTPHEADER,
       array(
         'Content-Type: application/json;charset=UTF-8',
         'Accept: application/json'));
 
     if ($http_method === 'POST') {
-      curl_setopt($curl, CURLOPT_POST, true);
+      curl_setopt(self::$curl, CURLOPT_POST, true);
       if ($params && is_array($params)) {
-        curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($params));
+        curl_setopt(self::$curl, CURLOPT_POSTFIELDS, json_encode($params));
       }
     } else if ($http_method == 'DELETE') {
-      curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
+      curl_setopt(self::$curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
     }
 
     foreach ($extra_opts as $option => $value) {
-      curl_setopt($curl, $option, $value);
+      curl_setopt(self::$curl, $option, $value);
     }
 
-    $raw_results = trim(curl_exec($curl));
+    $raw_results = trim(curl_exec(self::$curl));
 
-    if ($error = curl_error($curl)) {
+    if ($error = curl_error(self::$curl)) {
       $msg = sprintf(
         'Curl error thrown for http %s to %s',
         $http_method,
@@ -255,7 +267,7 @@ protected static function curl(
       }
       WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
     }
-    curl_close($curl);
+    curl_reset(self::$curl);
 
     $results = json_decode($raw_results, true);
 
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index de461e2af..d0fb8c550 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -61,6 +61,7 @@ public static function create(
     );
 
     $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
+    /** @var RemoteWebDriver $driver */
     $driver = new static();
     $executor = static::createHttpCommandExecutor(
       $url,
@@ -85,6 +86,7 @@ public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub'
   ) {
+    /** @var RemoteWebDriver $driver */
     $driver = new static();
     $driver->setCommandExecutor(new HttpCommandExecutor($url, $session_id));
     return $driver;
@@ -106,9 +108,10 @@ public static function createHttpCommandExecutor($url, $session_id) {
   /**
    * @param int   $timeout_in_ms
    * @param array $command
-   * @return array
+   * @return WebDriverResponse
    */
   public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
+    HttpCommandExecutor::initCurl();
     $response = HttpCommandExecutor::remoteExecute(
       $command,
       array(

From fe0a427fafa6e6a1c960f82b7fc5b7814947b9ad Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Thu, 29 May 2014 17:10:17 -0700
Subject: [PATCH 061/784] FirefoxProfile

see https://github.com/facebook/php-webdriver/wiki/FirefoxProfile
---
 lib/__init__.php                   |   2 +
 lib/firefox/FirefoxDriver.php      |  19 +++++
 lib/firefox/FirefoxProfile.php     | 123 +++++++++++++++++++++++++++++
 lib/remote/DesiredCapabilities.php |   6 ++
 4 files changed, 150 insertions(+)
 create mode 100644 lib/firefox/FirefoxDriver.php
 create mode 100644 lib/firefox/FirefoxProfile.php

diff --git a/lib/__init__.php b/lib/__init__.php
index d041cc4f2..8235f973f 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -60,6 +60,8 @@
 require_once('interactions/internal/WebDriverMoveToOffsetAction.php');
 require_once('internal/WebDriverLocatable.php');
 require_once('chrome/ChromeOptions.php');
+require_once('firefox/FirefoxDriver.php');
+require_once('firefox/FirefoxProfile.php');
 require_once('remote/DriverCommand.php');
 require_once('remote/LocalFileDetector.php');
 require_once('remote/UselessFileDetector.php');
diff --git a/lib/firefox/FirefoxDriver.php b/lib/firefox/FirefoxDriver.php
new file mode 100644
index 000000000..b1580baa6
--- /dev/null
+++ b/lib/firefox/FirefoxDriver.php
@@ -0,0 +1,19 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class FirefoxDriver {
+
+  const PROFILE = 'firefox_profile';
+}
diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
new file mode 100644
index 000000000..84e2de947
--- /dev/null
+++ b/lib/firefox/FirefoxProfile.php
@@ -0,0 +1,123 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class FirefoxProfile {
+
+  /**
+   * @var array
+   */
+  private $preferences = array();
+
+  /**
+   * @var array
+   */
+  private $extensions = array();
+
+  /**
+   * @param string $extension The path to the xpi extension.
+   */
+  public function addExtension($extension) {
+    $this->extensions[] = $extension;
+    return $this;
+  }
+
+  /**
+   * @param string $key
+   * @param string|bool|int $value
+   * @return FirefoxProfile
+   */
+  public function setPreference($key, $value) {
+    if (is_string($value)) {
+      $value = sprintf('"%s"', $value);
+    } else if (is_int($value)) {
+      $value = sprintf('%d', $value);
+    } else if (is_bool($value)) {
+      $value = $value ? 'true' : 'false';
+    } else {
+      throw new WebDriverException(
+        'The value of the preference should be either a string, int or bool.');
+    }
+    $this->preferences[$key] = $value;
+    return $this;
+  }
+
+  /**
+   * @return string
+   */
+  public function encode() {
+    $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
+
+    foreach ($this->extensions as $extension) {
+      $this->installExtension($extension, $temp_dir);
+    }
+
+    $content = "";
+    foreach ($this->preferences as $key => $value) {
+      $content .= sprintf("user_pref(\"%s\", %s);\n", $key, $value);
+    }
+    file_put_contents($temp_dir.'/user.js', $content);
+
+    $zip = new ZipArchive();
+    $temp_zip = tempnam('', 'WebDriverFirefoxProfileZip');
+    $zip->open($temp_zip, ZipArchive::CREATE);
+
+    $dir = new RecursiveDirectoryIterator($temp_dir);
+    $files = new RecursiveIteratorIterator($dir);
+    foreach ($files as $name => $object) {
+      $path = preg_replace("#^{$temp_dir}/#", "", $name);
+      $zip->addFile($name, $path);
+    }
+    $zip->close();
+
+    $profile = base64_encode(file_get_contents($temp_zip));
+    return $profile;
+  }
+
+  private function installExtension($extension, $profile_dir) {
+    $temp_dir = $this->createTempDirectory();
+
+    $this->extractTo($extension, $temp_dir);
+
+    $install_rdf_path = $temp_dir.'/install.rdf';
+    $xml = simplexml_load_string(file_get_contents($install_rdf_path));
+    $ext_dir = $profile_dir.'/extensions/'.((string)($xml->Description->id));
+    mkdir($ext_dir, 0777, true);
+
+    $this->extractTo($extension, $ext_dir);
+    return $ext_dir;
+  }
+
+  private function createTempDirectory($prefix = '') {
+    $temp_dir = tempnam('', $prefix);
+    if (file_exists($temp_dir)) {
+      unlink($temp_dir);
+      mkdir($temp_dir);
+      if (!is_dir($temp_dir)) {
+        throw new WebDriverException('Cannot create firefox profile.');
+      }
+    }
+    return $temp_dir;
+  }
+
+  private function extractTo($xpi, $target_dir) {
+    $zip = new ZipArchive();
+    if ($zip->open($xpi)) {
+      $zip->extractTo($target_dir);
+      $zip->close();
+    } else {
+      throw new Exception("Failed to open the firefox extension. '$xpi'");
+    }
+  }
+}
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index 844deb1d5..72e984317 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -113,6 +113,12 @@ public function toArray() {
         $this->capabilities[ChromeOptions::CAPABILITY]->toArray();
     }
 
+    if (isset($this->capabilities[FirefoxDriver::PROFILE]) &&
+      $this->capabilities[FirefoxDriver::PROFILE] instanceof FirefoxProfile) {
+      $this->capabilities[FirefoxDriver::PROFILE] =
+        $this->capabilities[FirefoxDriver::PROFILE]->encode();
+    }
+
     return $this->capabilities;
   }
 

From fc3fb7762a15d9d6051a34a535e7da4da8dc3e1a Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Thu, 29 May 2014 17:12:23 -0700
Subject: [PATCH 062/784] FirefoxProfile

see https://github.com/facebook/php-webdriver/wiki/FirefoxProfile
---
 lib/firefox/FirefoxProfile.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index 84e2de947..148a07fa1 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -76,6 +76,9 @@ public function encode() {
     $dir = new RecursiveDirectoryIterator($temp_dir);
     $files = new RecursiveIteratorIterator($dir);
     foreach ($files as $name => $object) {
+      if (is_dir($name)) {
+        continue;
+      }
       $path = preg_replace("#^{$temp_dir}/#", "", $name);
       $zip->addFile($name, $path);
     }
@@ -91,8 +94,12 @@ private function installExtension($extension, $profile_dir) {
     $this->extractTo($extension, $temp_dir);
 
     $install_rdf_path = $temp_dir.'/install.rdf';
-    $xml = simplexml_load_string(file_get_contents($install_rdf_path));
-    $ext_dir = $profile_dir.'/extensions/'.((string)($xml->Description->id));
+    // This is a hacky way to parse the id since there is no offical
+    // RDF parser library.
+    $xml = file_get_contents($install_rdf_path);
+    preg_match('#<em:id>([^<]+)</em:id>#', $xml, $matches);
+    $ext_dir = $profile_dir.'/extensions/'.$matches[1];
+
     mkdir($ext_dir, 0777, true);
 
     $this->extractTo($extension, $ext_dir);
@@ -121,3 +128,4 @@ private function extractTo($xpi, $target_dir) {
     }
   }
 }
+

From 66fd950c5717f98fc14c2bb48d66b3b32adb3b96 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Thu, 29 May 2014 17:25:54 -0700
Subject: [PATCH 063/784] phpdoc for firefox profile

---
 lib/firefox/FirefoxProfile.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index 148a07fa1..af2184464 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -27,6 +27,7 @@ class FirefoxProfile {
 
   /**
    * @param string $extension The path to the xpi extension.
+   * @return FirefoxProfile
    */
   public function addExtension($extension) {
     $this->extensions[] = $extension;
@@ -88,6 +89,11 @@ public function encode() {
     return $profile;
   }
 
+  /**
+   * @param string $extension The path to the extension.
+   * @param string $profile_dir The path to the profile directory.
+   * @return string The path to the directory of this extension.
+   */
   private function installExtension($extension, $profile_dir) {
     $temp_dir = $this->createTempDirectory();
 
@@ -96,6 +102,7 @@ private function installExtension($extension, $profile_dir) {
     $install_rdf_path = $temp_dir.'/install.rdf';
     // This is a hacky way to parse the id since there is no offical
     // RDF parser library.
+    $matches = array();
     $xml = file_get_contents($install_rdf_path);
     preg_match('#<em:id>([^<]+)</em:id>#', $xml, $matches);
     $ext_dir = $profile_dir.'/extensions/'.$matches[1];
@@ -106,6 +113,10 @@ private function installExtension($extension, $profile_dir) {
     return $ext_dir;
   }
 
+  /**
+   * @param string $prefix Prefix of the temp directory.
+   * @return string The path to the temp directory created.
+   */
   private function createTempDirectory($prefix = '') {
     $temp_dir = tempnam('', $prefix);
     if (file_exists($temp_dir)) {
@@ -118,6 +129,11 @@ private function createTempDirectory($prefix = '') {
     return $temp_dir;
   }
 
+  /**
+   * @param string $xpi The path to the .xpi extension.
+   * @param string The path to the unzip directory.
+   * @return FirefoxProfile
+   */
   private function extractTo($xpi, $target_dir) {
     $zip = new ZipArchive();
     if ($zip->open($xpi)) {
@@ -126,6 +142,6 @@ private function extractTo($xpi, $target_dir) {
     } else {
       throw new Exception("Failed to open the firefox extension. '$xpi'");
     }
+    return $this;
   }
 }
-

From 336853bc6d124af386526aa877114a2bf38a3730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Fri, 30 May 2014 10:59:01 +0400
Subject: [PATCH 064/784] Reset curl without curl_reset().

---
 lib/remote/HttpCommandExecutor.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a11161b75..9947f774c 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -131,6 +131,15 @@ public function __construct($url, $session_id) {
   public static function initCurl() {
     if (self::$curl === null) {
       self::$curl = curl_init();
+      curl_setopt(self::$curl, CURLOPT_TIMEOUT, 300);
+      curl_setopt(self::$curl, CURLOPT_RETURNTRANSFER, true);
+      curl_setopt(self::$curl, CURLOPT_FOLLOWLOCATION, true);
+      curl_setopt(
+        self::$curl,
+        CURLOPT_HTTPHEADER,
+        array(
+          'Content-Type: application/json;charset=UTF-8',
+          'Accept: application/json'));
     }
   }
 
@@ -232,17 +241,10 @@ protected static function curl(
     }
 
     curl_setopt(self::$curl, CURLOPT_URL, $url);
-    curl_setopt(self::$curl, CURLOPT_TIMEOUT, 300);
-    curl_setopt(self::$curl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt(self::$curl, CURLOPT_FOLLOWLOCATION, true);
-    curl_setopt(
-      self::$curl,
-      CURLOPT_HTTPHEADER,
-      array(
-        'Content-Type: application/json;charset=UTF-8',
-        'Accept: application/json'));
 
-    if ($http_method === 'POST') {
+    if ($http_method === 'GET') {
+        curl_setopt(self::$curl, CURLOPT_HTTPGET, true);
+    } else if ($http_method === 'POST') {
       curl_setopt(self::$curl, CURLOPT_POST, true);
       if ($params && is_array($params)) {
         curl_setopt(self::$curl, CURLOPT_POSTFIELDS, json_encode($params));
@@ -267,7 +269,9 @@ protected static function curl(
       }
       WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
     }
-    curl_reset(self::$curl);
+
+    curl_setopt(self::$curl, CURLOPT_POSTFIELDS, null);
+    curl_setopt(self::$curl, CURLOPT_CUSTOMREQUEST, null);
 
     $results = json_decode($raw_results, true);
 

From 37dc83f740b2c4758c995bc166b6a7bdeb085b6a Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Fri, 30 May 2014 17:37:27 -0700
Subject: [PATCH 065/784] fix bug in WebDriverWait

---
 lib/WebDriverWait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index c5f304e42..23f20a033 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -43,10 +43,10 @@ public function __construct(
    * return mixed The return value of $func_or_ec
    */
   public function until($func_or_ec, $message = "") {
-    $end = time() + $this->timeout;
+    $end = microtime(true) + $this->timeout;
     $last_exception = null;
 
-    while ($end > time()) {
+    while ($end > microtime(time)) {
       try {
         if ($func_or_ec instanceof WebDriverExpectedCondition) {
           $ret_val = call_user_func($func_or_ec->getApply(), $this->driver);

From d4fb7cdc79c39972f4b494cd1a3822c4aad9526c Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Fri, 30 May 2014 17:38:56 -0700
Subject: [PATCH 066/784] typo

---
 lib/WebDriverWait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 23f20a033..2ab2aad5a 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -46,7 +46,7 @@ public function until($func_or_ec, $message = "") {
     $end = microtime(true) + $this->timeout;
     $last_exception = null;
 
-    while ($end > microtime(time)) {
+    while ($end > microtime(true)) {
       try {
         if ($func_or_ec instanceof WebDriverExpectedCondition) {
           $ret_val = call_user_func($func_or_ec->getApply(), $this->driver);

From 0b7141daf1dcad189b2de61ca2489e4b29e8b1ad Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Mon, 2 Jun 2014 12:52:59 -0700
Subject: [PATCH 067/784] refactor WebDriverCommand

CommandExecutor should not hold the session id.
Instead, the session id should be passed inside the command to the
executor.
---
 lib/WebDriver.php                           |   7 ++
 lib/WebDriverCommandExecutor.php            |   3 +-
 lib/WebDriverNavigation.php                 |   2 +-
 lib/WebDriverOptions.php                    |   2 +-
 lib/__init__.php                            |   4 +
 lib/remote/ExecuteMethod.php                |  24 ++++
 lib/remote/HttpCommandExecutor.php          |  70 +++--------
 lib/remote/RemoteExecuteMethod.php          |  36 ++++++
 lib/remote/RemoteKeyboard.php               |   6 +-
 lib/remote/RemoteMouse.php                  |   6 +-
 lib/remote/RemoteTouchScreen.php            |   6 +-
 lib/remote/RemoteWebDriver.php              | 121 +++++++++++---------
 lib/remote/RemoteWebElement.php             |   6 +-
 lib/remote/WebDriverCommand.php             |  39 +++++++
 lib/support/events/EventFiringWebDriver.php |   8 ++
 15 files changed, 220 insertions(+), 120 deletions(-)
 create mode 100644 lib/remote/ExecuteMethod.php
 create mode 100644 lib/remote/RemoteExecuteMethod.php
 create mode 100644 lib/remote/WebDriverCommand.php

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 6a87cbbcd..2f4515774 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -121,4 +121,11 @@ public function navigate();
    * @see WebDriverTargetLocator
    */
   public function switchTo();
+
+  /**
+   * @param string $name
+   * @param array $params
+   * @return mixed
+   */
+  public function execute($name, $params);
 }
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index b74bc4f67..481a9336a 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -18,9 +18,8 @@
  */
 interface WebDriverCommandExecutor {
 
-  // $command and $params will be merged to an command object in the future.
   /**
    * @return mixed
    */
-  public function execute($command, array $params =  array());
+  public function execute(WebDriverCommand $command);
 }
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 6f3a2bb31..13c662ad0 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -26,7 +26,7 @@ class WebDriverNavigation {
 
   protected $executor;
 
-  public function __construct(WebDriverCommandExecutor $executor) {
+  public function __construct(ExecuteMethod $executor) {
     $this->executor = $executor;
   }
 
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 98dcb0a63..98a6d07c2 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -20,7 +20,7 @@ class WebDriverOptions {
 
   protected $executor;
 
-  public function __construct(WebDriverCommandExecutor $executor) {
+  public function __construct(ExecuteMethod $executor) {
     $this->executor = $executor;
   }
 
diff --git a/lib/__init__.php b/lib/__init__.php
index 8235f973f..f6843eefa 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -23,11 +23,14 @@
 require_once('WebDriverEventListener.php');
 require_once('remote/FileDetector.php');
 require_once('WebDriverCapabilities.php');
+require_once('remote/ExecuteMethod.php');
 
 // abstract class
 require_once('interactions/internal/WebDriverKeysRelatedAction.php');
 require_once('interactions/internal/WebDriverSingleKeyAction.php');
 
+require_once('remote/WebDriverCommand.php');
+
 // class
 require_once('WebDriverAlert.php');
 require_once('WebDriverBy.php');
@@ -69,6 +72,7 @@
 require_once('remote/RemoteKeyboard.php');
 require_once('remote/RemoteWebDriver.php');
 require_once('remote/RemoteWebElement.php');
+require_once('remote/RemoteExecuteMethod.php');
 require_once('remote/WebDriverBrowserType.php');
 require_once('remote/WebDriverCapabilityType.php');
 require_once('remote/DesiredCapabilities.php');
diff --git a/lib/remote/ExecuteMethod.php b/lib/remote/ExecuteMethod.php
new file mode 100644
index 000000000..8d934bd32
--- /dev/null
+++ b/lib/remote/ExecuteMethod.php
@@ -0,0 +1,24 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+interface ExecuteMethod {
+
+  /**
+   * @param string $command_name
+   * @param array $parameters
+   * @return WebDriverResponse
+   */
+  public function execute($command_name, array $parameters = array());
+}
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index bea23059c..0f8dc85ce 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -102,76 +102,52 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    * @var string
    */
   protected $url;
-  /**
-   * @var string
-   */
-  protected $sessionID;
-  /**
-   * @var array
-   */
-  protected $capabilities;
 
   /**
    * @param string $url
    * @param string $session_id
    */
-  public function __construct($url, $session_id) {
+  public function __construct($url) {
     $this->url = $url;
-    $this->sessionID = $session_id;
-    $this->capabilities = $this->execute(DriverCommand::GET_CAPABILITIES);
   }
 
   /**
-   * @param string $name
-   * @param array $params
+   * @param WebDriverCommand $command
    *
    * @return mixed
    */
-  public function execute($name, array $params = array()) {
-    $command = array(
-      'url' => $this->url,
-      'sessionId' => $this->sessionID,
-      'name' => $name,
-      'parameters' => $params,
-    );
-    $response = self::remoteExecute($command);
-    return $response->getValue();
+  public function execute(WebDriverCommand $command) {
+    $response = self::remoteExecute($command, $this->url);
+    return $response;
   }
 
   /**
-   * Execute a command on a remote server. The command should be an array
-   * contains
-   *   url        : the url of the remote server
-   *   sessionId  : the session id if needed
-   *   name       : the name of the command
-   *   parameters : the parameters of the command required
+   * This method is deprecated.
+   * Execute a command on a remote server.
    *
-   * @param array $command An array that contains
-   *                  url        : the url of the remote server
-   *                  sessionId  : the session id if needed
-   *                  name       : the name of the command
-   *                  parameters : the parameters of the command required
+   * @param WebDriverCommand
    * @param array $curl_opts An array of curl options.
    *
    * @return array The response of the command.
    * @throws Exception
    */
   public static function remoteExecute(
-    array $command,
+    WebDriverCommand $command,
+    string $url,
     array $curl_opts = array()
   ) {
-    if (!isset(self::$commands[$command['name']])) {
-      throw new Exception($command['name']." is not a valid command.");
+    if (!isset(self::$commands[$command->getName()])) {
+      throw new Exception($command->getName()." is not a valid command.");
     }
-    $raw = self::$commands[$command['name']];
+    $raw = self::$commands[$command->getName()];
 
-    if ($command['name'] == DriverCommand::NEW_SESSION) {
+    if ($command->getName() == DriverCommand::NEW_SESSION) {
       $curl_opts[CURLOPT_FOLLOWLOCATION] = true;
     }
 
     return self::curl(
       $raw['method'],
-      sprintf("%s%s", $command['url'], $raw['url']),
+      sprintf("%s%s", $url, $raw['url']),
       $command,
       $curl_opts
     );
@@ -191,10 +167,9 @@ public static function remoteExecute(
   protected static function curl(
     $http_method,
     $url,
-    array $command,
+    WebDriverCommand $command,
     array $extra_opts = array()) {
-
-    $params = $command['parameters'];
+    $params = $command->getParameters();
 
     foreach ($params as $name => $value) {
       if ($name[0] === ':') {
@@ -205,8 +180,8 @@ protected static function curl(
       }
     }
 
-    if (isset($command['sessionId'])) {
-      $url = str_replace(':sessionId', $command['sessionId'], $url);
+    if ($command->getSessionID()) {
+      $url = str_replace(':sessionId', $command->getSessionID(), $url);
     }
 
     if ($params && is_array($params) && $http_method !== 'POST') {
@@ -289,11 +264,4 @@ protected static function curl(
   public function getAddressOfRemoteServer() {
     return $this->url;
   }
-
-  /**
-   * @return string
-   */
-  public function getSessionID() {
-    return $this->sessionID;
-  }
 }
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/remote/RemoteExecuteMethod.php
new file mode 100644
index 000000000..cc97f19b3
--- /dev/null
+++ b/lib/remote/RemoteExecuteMethod.php
@@ -0,0 +1,36 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class RemoteExecuteMethod implements ExecuteMethod {
+
+  private RemoteWebDriver $driver;
+
+  /**
+   * @param RemoteWebDriver $driver
+   */
+  public function __construct(RemoteWebDriver $driver) {
+    $this->driver = $driver;
+  }
+
+  /**
+   * @return mixed
+   */
+  public function execute(
+    $command_name,
+    array $parameters = array()
+  ) {
+    return $this->driver->execute($command_name, $parameters);
+  }
+}
diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
index 116020545..2a3cc5477 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/remote/RemoteKeyboard.php
@@ -19,14 +19,14 @@
 class RemoteKeyboard implements WebDriverKeyboard {
 
   /**
-   * @var WebDriverCommandExecutor
+   * @var RemoteExecuteMethod
    */
   private $executor;
 
   /**
-   * @param WebDriverCommandExecutor $executor
+   * @param RemoteExecuteMethod $executor
    */
-  public function __construct(WebDriverCommandExecutor $executor) {
+  public function __construct(RemoteExecuteMethod $executor) {
     $this->executor = $executor;
   }
 
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index cb0613e1e..66d010252 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -19,14 +19,14 @@
 class RemoteMouse implements WebDriverMouse {
 
   /**
-   * @var WebDriverCommandExecutor
+   * @var RemoteExecuteMethod
    */
   private $executor;
 
   /**
-   * @param WebDriverCommandExecutor $executor
+   * @param RemoteExecuteMethod $executor
    */
-  public function __construct(WebDriverCommandExecutor $executor) {
+  public function __construct(RemoteExecuteMethod $executor) {
       $this->executor = $executor;
   }
 
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/remote/RemoteTouchScreen.php
index de8dc539d..652020dea 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/remote/RemoteTouchScreen.php
@@ -19,14 +19,14 @@
 class RemoteTouchScreen implements WebDriverTouchScreen {
 
   /**
-   * @var WebDriverCommandExecutor
+   * @var RemoteExecuteMethod
    */
   private $executor;
 
   /**
-   * @param WebDriverCommandExecutor $executor
+   * @param RemoteExecuteMethod $executor
    */
-  public function __construct(WebDriverCommandExecutor $executor) {
+  public function __construct(RemoteExecuteMethod $executor) {
       $this->executor = $executor;
   }
 
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index de461e2af..daf0bdfbf 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -15,9 +15,13 @@
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
-  * @var HttpCommandExecutor
-  */
+   * @var HttpCommandExecutor
+   */
   protected $executor;
+  /**
+   * @var string
+   */
+  protected $sessionID;
   /**
    * @var RemoteMouse
    */
@@ -30,6 +34,10 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
    * @var RemoteTouchScreen
    */
   protected $touch;
+  /**
+   * @var RemoteExecuteMethod
+   */
+  protected $executeMethod;
 
   protected function __construct() {}
 
@@ -54,19 +62,22 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
-    $command = array(
-      'url' => $url,
-      'name' => DriverCommand::NEW_SESSION,
-      'parameters' => array('desiredCapabilities' => $desired_capabilities),
+    $command = new WebDriverCommand(
+      null,
+      DriverCommand::NEW_SESSION,
+      array('desiredCapabilities' => $desired_capabilities)
     );
 
-    $response = static::remoteExecuteHttpCommand($timeout_in_ms, $command);
-    $driver = new static();
-    $executor = static::createHttpCommandExecutor(
-      $url,
-      $response->getSessionID()
+    $response = static::remoteExecuteHttpCommand(
+      $timeout_in_ms,
+      $command,
+      $url
     );
 
+    $driver = new static();
+    $driver->setSessionID($response->getSessionID());
+    $executor = new HttpCommandExecutor($url);
+
     return $driver->setCommandExecutor($executor);
   }
 
@@ -86,31 +97,22 @@ public static function createBySessionID(
     $url = 'http://localhost:4444/wd/hub'
   ) {
     $driver = new static();
-    $driver->setCommandExecutor(new HttpCommandExecutor($url, $session_id));
+    $driver->setSessionID($session_id)
+           ->setCommandExecutor(new HttpCommandExecutor($url));
     return $driver;
   }
 
-  /**
-   * @param string $url
-   * @param string $session_id
-   * @return HttpCommandExecutor
-   */
-  public static function createHttpCommandExecutor($url, $session_id) {
-    $executor = new HttpCommandExecutor(
-      $url,
-      $session_id
-    );
-    return $executor;
-  }
-
   /**
    * @param int   $timeout_in_ms
    * @param array $command
    * @return array
    */
-  public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
+  public static function remoteExecuteHttpCommand(
+    $timeout_in_ms, $command, $url
+  ) {
     $response = HttpCommandExecutor::remoteExecute(
       $command,
+      $url,
       array(
         CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
       )
@@ -124,7 +126,7 @@ public static function remoteExecuteHttpCommand($timeout_in_ms, $command) {
    * @return RemoteWebDriver The current instance.
    */
   public function close() {
-    $this->executor->execute(DriverCommand::CLOSE, array());
+    $this->execute(DriverCommand::CLOSE, array());
 
     return $this;
   }
@@ -139,7 +141,7 @@ public function close() {
    */
   public function findElement(WebDriverBy $by) {
     $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_element = $this->executor->execute(
+    $raw_element = $this->execute(
       DriverCommand::FIND_ELEMENT,
       $params
     );
@@ -158,7 +160,7 @@ public function findElement(WebDriverBy $by) {
    */
   public function findElements(WebDriverBy $by) {
     $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_elements = $this->executor->execute(
+    $raw_elements = $this->execute(
       DriverCommand::FIND_ELEMENTS,
       $params
     );
@@ -179,7 +181,7 @@ public function findElements(WebDriverBy $by) {
      */
   public function get($url) {
     $params = array('url' => (string)$url);
-    $this->executor->execute(DriverCommand::GET, $params);
+    $this->execute(DriverCommand::GET, $params);
 
     return $this;
   }
@@ -190,7 +192,7 @@ public function get($url) {
    * @return string The current URL.
    */
   public function getCurrentURL() {
-    return $this->executor->execute(DriverCommand::GET_CURRENT_URL);
+    return $this->execute(DriverCommand::GET_CURRENT_URL);
   }
 
   /**
@@ -199,7 +201,7 @@ public function getCurrentURL() {
    * @return string The current page source.
    */
   public function getPageSource() {
-    return $this->executor->execute(DriverCommand::GET_PAGE_SOURCE);
+    return $this->execute(DriverCommand::GET_PAGE_SOURCE);
   }
 
   /**
@@ -208,7 +210,7 @@ public function getPageSource() {
    * @return string The title of the current page.
    */
   public function getTitle() {
-    return $this->executor->execute(DriverCommand::GET_TITLE);
+    return $this->execute(DriverCommand::GET_TITLE);
   }
 
   /**
@@ -218,7 +220,7 @@ public function getTitle() {
    * @return string The current window handle.
    */
   public function getWindowHandle() {
-    return $this->executor->execute(
+    return $this->execute(
       DriverCommand::GET_CURRENT_WINDOW_HANDLE,
       array()
     );
@@ -230,7 +232,7 @@ public function getWindowHandle() {
    * @return array An array of string containing all available window handles.
    */
   public function getWindowHandles() {
-    return $this->executor->execute(DriverCommand::GET_WINDOW_HANDLES, array());
+    return $this->execute(DriverCommand::GET_WINDOW_HANDLES, array());
   }
 
   /**
@@ -239,7 +241,7 @@ public function getWindowHandles() {
    * @return void
    */
   public function quit() {
-    $this->executor->execute(DriverCommand::QUIT);
+    $this->execute(DriverCommand::QUIT);
     $this->executor = null;
   }
 
@@ -278,7 +280,7 @@ public function executeScript($script, array $arguments = array()) {
       'script' => $script,
       'args' => $this->prepareScriptArguments($arguments),
     );
-    return $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, $params);
+    return $this->execute(DriverCommand::EXECUTE_SCRIPT, $params);
   }
 
   /**
@@ -299,7 +301,7 @@ public function executeAsyncScript($script, array $arguments = array()) {
       'script' => $script,
       'args' => $this->prepareScriptArguments($arguments),
     );
-    return $this->executor->execute(
+    return $this->execute(
       DriverCommand::EXECUTE_ASYNC_SCRIPT,
       $params
     );
@@ -313,7 +315,7 @@ public function executeAsyncScript($script, array $arguments = array()) {
    */
   public function takeScreenshot($save_as = null) {
     $screenshot = base64_decode(
-      $this->executor->execute(DriverCommand::SCREENSHOT)
+      $this->execute(DriverCommand::SCREENSHOT)
     );
     if ($save_as) {
       file_put_contents($save_as, $screenshot);
@@ -349,7 +351,7 @@ public function wait(
    * @return WebDriverOptions
    */
   public function manage() {
-    return new WebDriverOptions($this->executor);
+    return new WebDriverOptions($this->getExecuteMethod());
   }
 
   /**
@@ -360,7 +362,7 @@ public function manage() {
    * @see WebDriverNavigation
    */
   public function navigate() {
-    return new WebDriverNavigation($this->executor);
+    return new WebDriverNavigation($this->getExecuteMethod());
   }
 
   /**
@@ -378,7 +380,7 @@ public function switchTo() {
    */
   public function getMouse() {
     if (!$this->mouse) {
-      $this->mouse = new RemoteMouse($this->executor);
+      $this->mouse = new RemoteMouse($this->getExecuteMethod());
     }
     return $this->mouse;
   }
@@ -388,7 +390,7 @@ public function getMouse() {
    */
   public function getKeyboard() {
     if (!$this->keyboard) {
-      $this->keyboard = new RemoteKeyboard($this->executor);
+      $this->keyboard = new RemoteKeyboard($this->getExecuteMethod());
     }
     return $this->keyboard;
   }
@@ -398,11 +400,18 @@ public function getKeyboard() {
    */
   public function getTouch() {
     if (!$this->touch) {
-      $this->touch = new RemoteTouchScreen($this->executor);
+      $this->touch = new RemoteTouchScreen($this->getExecuteMethod());
     }
     return $this->touch;
   }
 
+  protected function getExecuteMethod() {
+    if (!$this->executeMethod) {
+      $this->executeMethod = new RemoteExecuteMethod($this);
+    }
+    return $this->executeMethod;
+  }
+
   /**
    * Construct a new action builder.
    *
@@ -418,7 +427,7 @@ public function action() {
    * @return RemoteWebElement
    */
   public function getActiveElement() {
-    $response = $this->executor->execute(DriverCommand::GET_ACTIVE_ELEMENT);
+    $response = $this->execute(DriverCommand::GET_ACTIVE_ELEMENT);
     return $this->newElement($response['ELEMENT']);
   }
 
@@ -429,7 +438,7 @@ public function getActiveElement() {
    * @return RemoteWebElement
    */
   private function newElement($id) {
-    return new RemoteWebElement($this->executor, $id);
+    return new RemoteWebElement($this->getExecuteMethod(), $id);
   }
 
   /**
@@ -459,12 +468,7 @@ public function getCommandExecutor() {
    * @return RemoteWebDriver
    */
   public function setSessionID($session_id) {
-    $this->setCommandExecutor(
-      new HttpCommandExecutor(
-        $this->executor->getAddressOfRemoteServer(),
-        $session_id
-      )
-    );
+    $this->sessionID = $session_id;
     return $this;
   }
 
@@ -474,6 +478,17 @@ public function setSessionID($session_id) {
    * @return string sessionID
    */
   public function getSessionID() {
-    return $this->executor->getSessionID();
+    return $this->sessionID;
+  }
+
+  public function execute($command_name, $params = array()) {
+    $command = new WebDriverCommand(
+      $this->sessionID,
+      $command_name,
+      $params
+    );
+
+    $response = $this->executor->execute($command);
+    return $response->getValue();
   }
 }
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index cc5549228..19d0f377a 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -19,7 +19,7 @@
 class RemoteWebElement implements WebDriverElement, WebDriverLocatable {
 
   /**
-   * @var HttpCommandExecutor
+   * @var RemoteExecuteMethod
    */
   protected $executor;
   /**
@@ -32,10 +32,10 @@ class RemoteWebElement implements WebDriverElement, WebDriverLocatable {
   protected $fileDetector;
 
   /**
-   * @param HttpCommandExecutor $executor
+   * @param RemoteExecuteMethod $executor
    * @param string $id
    */
-  public function __construct(HttpCommandExecutor $executor, $id) {
+  public function __construct(RemoteExecuteMethod $executor, $id) {
     $this->executor = $executor;
     $this->id = $id;
     $this->fileDetector = new UselessFileDetector();
diff --git a/lib/remote/WebDriverCommand.php b/lib/remote/WebDriverCommand.php
new file mode 100644
index 000000000..d9d94c909
--- /dev/null
+++ b/lib/remote/WebDriverCommand.php
@@ -0,0 +1,39 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class WebDriverCommand {
+
+  private $sessionID;
+  private $name;
+  private $parameters;
+
+  public function __construct($session_id, $name, $parameters) {
+    $this->sessionID = $session_id;
+    $this->name = $name;
+    $this->parameters = $parameters;
+  }
+
+  public function getName() {
+    return $this->name;
+  }
+
+  public function getSessionID() {
+    return $this->sessionID;
+  }
+
+  public function getParameters() {
+    return $this->parameters;
+  }
+}
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index b2a9b8b8e..07d0990b1 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -353,4 +353,12 @@ private function dispatchOnException($exception) {
     $this->dispatch('onException', $exception, $this);
     throw $exception;
   }
+
+  public function execute($name, $params) {
+    try {
+      return $this->driver->execute($name, $params);
+    } catch (WebDriverException $exception) {
+      $this->dispatchOnException($exception);
+    }
+  }
 }

From 586bf32884c1a975b6cad64bf02bade98da914e8 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Mon, 2 Jun 2014 12:57:35 -0700
Subject: [PATCH 068/784] compatibility issue

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 lib/remote/RemoteExecuteMethod.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 0f8dc85ce..5d0249897 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -133,7 +133,7 @@ public function execute(WebDriverCommand $command) {
    */
   public static function remoteExecute(
     WebDriverCommand $command,
-    string $url,
+    $url,
     array $curl_opts = array()
   ) {
     if (!isset(self::$commands[$command->getName()])) {
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/remote/RemoteExecuteMethod.php
index cc97f19b3..248627e81 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/remote/RemoteExecuteMethod.php
@@ -15,7 +15,7 @@
 
 class RemoteExecuteMethod implements ExecuteMethod {
 
-  private RemoteWebDriver $driver;
+  private $driver;
 
   /**
    * @param RemoteWebDriver $driver

From bb9c3903c508df7cf920bed85fd8934ec71fecf5 Mon Sep 17 00:00:00 2001
From: whhone <whhone@fb.com>
Date: Mon, 2 Jun 2014 15:25:06 -0700
Subject: [PATCH 069/784] wrong parameter when constructing TargetLocator

---
 lib/remote/RemoteWebDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index daf0bdfbf..c2959a09a 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -372,7 +372,7 @@ public function navigate() {
    * @see WebDriverTargetLocator
    */
   public function switchTo() {
-    return new WebDriverTargetLocator($this->executor, $this);
+    return new WebDriverTargetLocator($this->getExecuteMethod(), $this);
   }
 
   /**

From ca96c06ea8ea47fe951cb84a92424dccb4f1a755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Tue, 3 Jun 2014 18:12:02 +0400
Subject: [PATCH 070/784] Alternative implementation of
 WebDriverCommandExecutor.

---
 lib/remote/CurlCommandExecutor.php | 237 +++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 lib/remote/CurlCommandExecutor.php

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
new file mode 100644
index 000000000..d7e354bfd
--- /dev/null
+++ b/lib/remote/CurlCommandExecutor.php
@@ -0,0 +1,237 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * Command executor talking to the standalone server via HTTP (curl).
+ */
+class CurlCommandExecutor implements WebDriverCommandExecutor
+{
+    /**
+     * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
+     */
+    protected $commands = array(
+        DriverCommand::ACCEPT_ALERT => array('POST' => '/session/:sessionId/accept_alert'),
+        DriverCommand::ADD_COOKIE => array('POST' => '/session/:sessionId/cookie'),
+        DriverCommand::CLEAR_ELEMENT => array('POST' => '/session/:sessionId/element/:id/clear'),
+        DriverCommand::CLICK_ELEMENT => array('POST' => '/session/:sessionId/element/:id/click'),
+        DriverCommand::CLOSE => array('DELETE' => '/session/:sessionId/window'),
+        DriverCommand::DELETE_ALL_COOKIES => array('DELETE' => '/session/:sessionId/cookie'),
+        DriverCommand::DELETE_COOKIE => array('DELETE' => '/session/:sessionId/cookie/:name'),
+        DriverCommand::DISMISS_ALERT => array('POST' => '/session/:sessionId/dismiss_alert'),
+        DriverCommand::ELEMENT_EQUALS => array('GET' => '/session/:sessionId/element/:id/equals/:other'),
+        DriverCommand::FIND_CHILD_ELEMENT => array('POST' => '/session/:sessionId/element/:id/element'),
+        DriverCommand::FIND_CHILD_ELEMENTS => array('POST' => '/session/:sessionId/element/:id/elements'),
+        DriverCommand::EXECUTE_SCRIPT => array('POST' => '/session/:sessionId/execute'),
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('POST' => '/session/:sessionId/execute_async'),
+        DriverCommand::FIND_ELEMENT => array('POST' => '/session/:sessionId/element'),
+        DriverCommand::FIND_ELEMENTS => array('POST' => '/session/:sessionId/elements'),
+        DriverCommand::SWITCH_TO_FRAME => array('POST' => '/session/:sessionId/frame'),
+        DriverCommand::SWITCH_TO_WINDOW => array('POST' => '/session/:sessionId/window'),
+        DriverCommand::GET => array('POST' => '/session/:sessionId/url'),
+        DriverCommand::GET_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/element/active'),
+        DriverCommand::GET_ALERT_TEXT => array('GET' => '/session/:sessionId/alert_text'),
+        DriverCommand::GET_ALL_COOKIES => array('GET' => '/session/:sessionId/cookie'),
+        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('GET' => '/session/:sessionId/log/types'),
+        DriverCommand::GET_CURRENT_URL => array('GET' => '/session/:sessionId/url'),
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('GET' => '/session/:sessionId/window_handle'),
+        DriverCommand::GET_ELEMENT_ATTRIBUTE => array('GET' => '/session/:sessionId/element/:id/attribute/:name'),
+        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array('GET' => '/session/:sessionId/element/:id/css/:propertyName'),
+        DriverCommand::GET_ELEMENT_LOCATION => array('GET' => '/session/:sessionId/element/:id/location'),
+        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('GET' => '/session/:sessionId/element/:id/location_in_view'),
+        DriverCommand::GET_ELEMENT_SIZE => array('GET' => '/session/:sessionId/element/:id/size'),
+        DriverCommand::GET_ELEMENT_TAG_NAME => array('GET' => '/session/:sessionId/element/:id/name'),
+        DriverCommand::GET_ELEMENT_TEXT => array('GET' => '/session/:sessionId/element/:id/text'),
+        DriverCommand::GET_LOG => array('POST' => '/session/:sessionId/log'),
+        DriverCommand::GET_PAGE_SOURCE => array('GET' => '/session/:sessionId/source'),
+        DriverCommand::GET_SCREEN_ORIENTATION => array('GET' => '/session/:sessionId/orientation'),
+        DriverCommand::GET_CAPABILITIES => array('GET' => '/session/:sessionId'),
+        DriverCommand::GET_TITLE => array('GET' => '/session/:sessionId/title'),
+        DriverCommand::GET_WINDOW_HANDLES => array('GET' => '/session/:sessionId/window_handles'),
+        DriverCommand::GET_WINDOW_POSITION => array('GET' => '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::GET_WINDOW_SIZE => array('GET' => '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::GO_BACK => array('POST' => '/session/:sessionId/back'),
+        DriverCommand::GO_FORWARD => array('POST' => '/session/:sessionId/forward'),
+        DriverCommand::IS_ELEMENT_DISPLAYED => array('GET' => '/session/:sessionId/element/:id/displayed'),
+        DriverCommand::IS_ELEMENT_ENABLED => array('GET' => '/session/:sessionId/element/:id/enabled'),
+        DriverCommand::IS_ELEMENT_SELECTED => array('GET' => '/session/:sessionId/element/:id/selected'),
+        DriverCommand::MAXIMIZE_WINDOW => array('POST' => '/session/:sessionId/window/:windowHandle/maximize'),
+        DriverCommand::MOUSE_DOWN => array('POST' => '/session/:sessionId/buttondown'),
+        DriverCommand::MOUSE_UP => array('POST' => '/session/:sessionId/buttonup'),
+        DriverCommand::CLICK => array('POST' => '/session/:sessionId/click'),
+        DriverCommand::DOUBLE_CLICK => array('POST' => '/session/:sessionId/doubleclick'),
+        DriverCommand::MOVE_TO => array('POST' => '/session/:sessionId/moveto'),
+        DriverCommand::NEW_SESSION => array('POST' => '/session'),
+        DriverCommand::QUIT => array('DELETE' => '/session/:sessionId'),
+        DriverCommand::REFRESH => array('POST' => '/session/:sessionId/refresh'),
+        DriverCommand::UPLOAD_FILE => array('POST' => '/session/:sessionId/file'), // undocumented
+        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/keys'),
+        DriverCommand::SET_ALERT_VALUE => array('POST' => '/session/:sessionId/alert_text'),
+        DriverCommand::SEND_KEYS_TO_ELEMENT => array('POST' => '/session/:sessionId/element/:id/value'),
+        DriverCommand::IMPLICITLY_WAIT => array('POST' => '/session/:sessionId/timeouts/implicit_wait'),
+        DriverCommand::SET_SCREEN_ORIENTATION => array('POST' => '/session/:sessionId/orientation'),
+        DriverCommand::SET_TIMEOUT => array('POST' => '/session/:sessionId/timeouts'),
+        DriverCommand::SET_SCRIPT_TIMEOUT => array('POST' => '/session/:sessionId/timeouts/async_script'),
+        DriverCommand::SET_WINDOW_POSITION => array('POST' => '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::SET_WINDOW_SIZE => array('POST' => '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::SUBMIT_ELEMENT => array('POST' => '/session/:sessionId/element/:id/submit'),
+        DriverCommand::SCREENSHOT => array('GET' => '/session/:sessionId/screenshot'),
+        DriverCommand::TOUCH_SINGLE_TAP => array('POST' => '/session/:sessionId/touch/click'),
+        DriverCommand::TOUCH_DOWN => array('POST' => '/session/:sessionId/touch/down'),
+        DriverCommand::TOUCH_DOUBLE_TAP => array('POST' => '/session/:sessionId/touch/doubleclick'),
+        DriverCommand::TOUCH_FLICK => array('POST' => '/session/:sessionId/touch/flick'),
+        DriverCommand::TOUCH_LONG_PRESS => array('POST' => '/session/:sessionId/touch/longclick'),
+        DriverCommand::TOUCH_MOVE => array('POST' => '/session/:sessionId/touch/move'),
+        DriverCommand::TOUCH_SCROLL => array('POST' => '/session/:sessionId/touch/scroll'),
+        DriverCommand::TOUCH_UP => array('POST' => '/session/:sessionId/touch/up'),
+    );
+
+    /**
+     * @var string
+     */
+    protected $url;
+    /**
+     * @var string
+     */
+    protected $sessionID;
+    /**
+     * @var resource
+     */
+    protected $curl;
+
+    /**
+     * @param string $url
+     */
+    public function __construct($url = 'http://localhost:4444/wd/hub')
+    {
+        $this->url = $url;
+        $this->curl = curl_init();
+        curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, 300000);
+        curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt(
+            $this->curl,
+            CURLOPT_HTTPHEADER,
+            array('Content-Type: application/json;charset=UTF-8', 'Accept: application/json')
+        );
+    }
+
+    /**
+     * Set connection timeout in ms.
+     *
+     * @param int $timeout
+     */
+    public function setTimeout($timeout)
+    {
+        curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $timeout);
+    }
+
+    /**
+     * @param string $sessionID
+     */
+    public function setSessionID($sessionID)
+    {
+        $this->sessionID = $sessionID;
+    }
+
+    /**
+     * @param $command
+     * @param array $params
+     *
+     * @throws InvalidArgumentException
+     * @throws BadMethodCallException
+     * @return mixed
+     */
+    public function execute($command, array $params = array())
+    {
+        if (empty($this->commands[$command])) {
+            throw new InvalidArgumentException(sprintf('Command %s is unknown.', $command));
+        }
+        reset($this->commands[$command]);
+        list($method, $url) = each($this->commands[$command]);
+        $url = str_replace(':sessionId', $this->sessionID, $url);
+        foreach ($params as $name => $value) {
+            if ($name[0] === ':') {
+                $url = str_replace($name, $value, $url);
+                if ($method !== 'POST') {
+                    unset($params[$name]);
+                }
+            }
+        }
+        if (!empty($params) && $method !== 'POST') {
+            throw new BadMethodCallException(sprintf(
+                'The http method called for %s is %s but it has to be POST' .
+                ' if you want to pass the JSON params %s',
+                $url,
+                $method,
+                json_encode($params)
+            ));
+        }
+        curl_setopt($this->curl, CURLOPT_URL, $url);
+
+        if ($method === 'GET') {
+            curl_setopt($this->curl, CURLOPT_HTTPGET, true);
+        } elseif ($method === 'POST') {
+            curl_setopt($this->curl, CURLOPT_POST, true);
+            if ($params && is_array($params)) {
+                curl_setopt($this->curl, CURLOPT_POSTFIELDS, json_encode($params));
+            }
+        } elseif ($method == 'DELETE') {
+            curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        }
+
+        $raw_results = trim(curl_exec($this->curl));
+
+        if ($error = curl_error($this->curl)) {
+            $msg = sprintf(
+                'Curl error thrown for http %s to %s',
+                $method,
+                $url
+            );
+            if ($params && is_array($params)) {
+                $msg .= sprintf(' with params: %s', json_encode($params));
+            }
+            WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
+        }
+
+        curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
+        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, null);
+
+        $results = json_decode($raw_results, true);
+
+        $value = null;
+        if (is_array($results) && array_key_exists('value', $results)) {
+            $value = $results['value'];
+        }
+
+        $message = null;
+        if (is_array($value) && array_key_exists('message', $value)) {
+            $message = $value['message'];
+        }
+
+        $sessionId = null;
+        if (is_array($results) && array_key_exists('sessionId', $results)) {
+            $sessionId = $results['sessionId'];
+        }
+
+        $status = isset($results['status']) ? $results['status'] : 0;
+        WebDriverException::throwException($status, $message, $results);
+
+        $response = new WebDriverResponse($sessionId);
+
+        return $response
+            ->setStatus($status)
+            ->setValue($value);
+    }
+}

From 94e58fec69aa9291ddba528c8e3ab18bd0e06e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Tue, 3 Jun 2014 18:18:15 +0400
Subject: [PATCH 071/784] Update phpdoc.

---
 lib/remote/CurlCommandExecutor.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index d7e354bfd..c755adafa 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -151,7 +151,7 @@ public function setSessionID($sessionID)
      *
      * @throws InvalidArgumentException
      * @throws BadMethodCallException
-     * @return mixed
+     * @return WebDriverResponse
      */
     public function execute($command, array $params = array())
     {
@@ -230,8 +230,6 @@ public function execute($command, array $params = array())
 
         $response = new WebDriverResponse($sessionId);
 
-        return $response
-            ->setStatus($status)
-            ->setValue($value);
+        return $response->setStatus($status)->setValue($value);
     }
 }

From 83f61b29bb858649094ec1ecbed43444086db558 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 10 Jun 2014 11:44:40 -0700
Subject: [PATCH 072/784] kill static method HttpCommandExecutor::remoteExcute

---
 lib/remote/HttpCommandExecutor.php | 28 +++++-------------------
 lib/remote/RemoteWebDriver.php     | 34 ++++++++----------------------
 2 files changed, 14 insertions(+), 48 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 5d0249897..08a6c685b 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -113,41 +113,23 @@ public function __construct($url) {
 
   /**
    * @param WebDriverCommand $command
-   *
-   * @return mixed
-   */
-  public function execute(WebDriverCommand $command) {
-    $response = self::remoteExecute($command, $this->url);
-    return $response;
-  }
-
-  /**
-   * This method is deprecated.
-   * Execute a command on a remote server.
-   *
-   * @param WebDriverCommand
    * @param array $curl_opts An array of curl options.
    *
-   * @return array The response of the command.
-   * @throws Exception
+   * @return mixed
    */
-  public static function remoteExecute(
-    WebDriverCommand $command,
-    $url,
-    array $curl_opts = array()
-  ) {
+  public function execute(WebDriverCommand $command, $curl_opts = array()) {
     if (!isset(self::$commands[$command->getName()])) {
       throw new Exception($command->getName()." is not a valid command.");
     }
     $raw = self::$commands[$command->getName()];
 
-    if ($command->getName() == DriverCommand::NEW_SESSION) {
+    if ($command->getName() === DriverCommand::NEW_SESSION) {
       $curl_opts[CURLOPT_FOLLOWLOCATION] = true;
     }
 
     return self::curl(
       $raw['method'],
-      sprintf("%s%s", $url, $raw['url']),
+      sprintf("%s%s", $this->url, $raw['url']),
       $command,
       $curl_opts
     );
@@ -210,7 +192,7 @@ protected static function curl(
       if ($params && is_array($params)) {
         curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($params));
       }
-    } else if ($http_method == 'DELETE') {
+    } else if ($http_method === 'DELETE') {
       curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
     }
 
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index c2959a09a..9d476cc64 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -62,23 +62,25 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
+    $executor = new HttpCommandExecutor($url);
+
     $command = new WebDriverCommand(
       null,
       DriverCommand::NEW_SESSION,
       array('desiredCapabilities' => $desired_capabilities)
     );
 
-    $response = static::remoteExecuteHttpCommand(
-      $timeout_in_ms,
+    $response = $executor->execute(
       $command,
-      $url
+      array(
+        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
+      )
     );
 
     $driver = new static();
-    $driver->setSessionID($response->getSessionID());
-    $executor = new HttpCommandExecutor($url);
-
-    return $driver->setCommandExecutor($executor);
+    $driver->setSessionID($response->getSessionID())
+           ->setCommandExecutor($executor);
+    return $driver;
   }
 
   /**
@@ -102,24 +104,6 @@ public static function createBySessionID(
     return $driver;
   }
 
-  /**
-   * @param int   $timeout_in_ms
-   * @param array $command
-   * @return array
-   */
-  public static function remoteExecuteHttpCommand(
-    $timeout_in_ms, $command, $url
-  ) {
-    $response = HttpCommandExecutor::remoteExecute(
-      $command,
-      $url,
-      array(
-        CURLOPT_CONNECTTIMEOUT_MS => $timeout_in_ms,
-      )
-    );
-    return $response;
-  }
-
   /**
    * Close the current window.
    *

From d626d8bd5460c07e4716972756876ba6bccf04f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 11 Jun 2014 17:32:55 +0400
Subject: [PATCH 073/784] Fix URL.

---
 lib/remote/CurlCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index c755adafa..073ffd471 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -178,7 +178,7 @@ public function execute($command, array $params = array())
                 json_encode($params)
             ));
         }
-        curl_setopt($this->curl, CURLOPT_URL, $url);
+        curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
 
         if ($method === 'GET') {
             curl_setopt($this->curl, CURLOPT_HTTPGET, true);

From a7250a37c0953ccabd521f8cb914eb793524fa26 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Wed, 11 Jun 2014 15:36:50 -0700
Subject: [PATCH 074/784] remove redundent curl options

Thanks komex@github for pointing it out in pull request 150.
---
 lib/remote/HttpCommandExecutor.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 08a6c685b..9b19f4948 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -123,10 +123,6 @@ public function execute(WebDriverCommand $command, $curl_opts = array()) {
     }
     $raw = self::$commands[$command->getName()];
 
-    if ($command->getName() === DriverCommand::NEW_SESSION) {
-      $curl_opts[CURLOPT_FOLLOWLOCATION] = true;
-    }
-
     return self::curl(
       $raw['method'],
       sprintf("%s%s", $this->url, $raw['url']),

From 41d5e9f2f9c6c8f8efc2d146a9bde8809342a6f1 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Mon, 16 Jun 2014 11:29:11 -0700
Subject: [PATCH 075/784] ChromeDriver

putenv("webdriver.chrome.driver=/path/to/the/chrome_driver");
$driver = new ChromeDriver();
---
 lib/__init__.php                             |  11 ++
 lib/chrome/ChromeDriver.php                  |  43 ++++++
 lib/chrome/ChromeDriverService.php           |  29 ++++
 lib/net/URLChecker.php                       |  72 ++++++++++
 lib/remote/HttpCommandExecutor.php           |   1 -
 lib/remote/service/DriverCommandExecutor.php |  57 ++++++++
 lib/remote/service/DriverService.php         | 144 +++++++++++++++++++
 7 files changed, 356 insertions(+), 1 deletion(-)
 create mode 100644 lib/chrome/ChromeDriver.php
 create mode 100644 lib/chrome/ChromeDriverService.php
 create mode 100644 lib/net/URLChecker.php
 create mode 100644 lib/remote/service/DriverCommandExecutor.php
 create mode 100644 lib/remote/service/DriverService.php

diff --git a/lib/__init__.php b/lib/__init__.php
index f6843eefa..d10dd12ca 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -31,6 +31,8 @@
 
 require_once('remote/WebDriverCommand.php');
 
+require_once('net/URLChecker.php');
+
 // class
 require_once('WebDriverAlert.php');
 require_once('WebDriverBy.php');
@@ -70,14 +72,23 @@
 require_once('remote/UselessFileDetector.php');
 require_once('remote/RemoteMouse.php');
 require_once('remote/RemoteKeyboard.php');
+
+require_once('remote/service/DriverService.php');
+require_once('chrome/ChromeDriverService.php');
+
 require_once('remote/RemoteWebDriver.php');
+require_once('chrome/ChromeDriver.php');
+
 require_once('remote/RemoteWebElement.php');
 require_once('remote/RemoteExecuteMethod.php');
 require_once('remote/WebDriverBrowserType.php');
 require_once('remote/WebDriverCapabilityType.php');
 require_once('remote/DesiredCapabilities.php');
 require_once('remote/WebDriverResponse.php');
+
 require_once('remote/HttpCommandExecutor.php');
+require_once('remote/service/DriverCommandExecutor.php');
+
 require_once('interactions/internal/WebDriverSendKeysAction.php');
 require_once('interactions/internal/WebDriverKeyDownAction.php');
 require_once('interactions/internal/WebDriverKeyUpAction.php');
diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
new file mode 100644
index 000000000..fa7927f5b
--- /dev/null
+++ b/lib/chrome/ChromeDriver.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class ChromeDriver extends RemoteWebDriver {
+
+  public static function create(
+    DesiredCapabilities $desired_capabilities = null
+  ) {
+    if ($desired_capabilities === null) {
+      $desired_capabilities = DesiredCapabilities::chrome();
+    }
+    $service = ChromeDriverService::createDefaultService();
+    $executor = new DriverCommandExecutor($service);
+    $driver = new static();
+    $driver->setCommandExecutor($executor)
+           ->startSession($desired_capabilities);
+    return $driver;
+  }
+
+  public function startSession($desired_capabilities) {
+    $command = new WebDriverCommand(
+      null,
+      DriverCommand::NEW_SESSION,
+      array(
+        'desiredCapabilities' => $desired_capabilities->toArray(),
+      )
+    );
+    $response = $this->executor->execute($command);
+    $this->setSessionID($response->getSessionID());
+  }
+}
diff --git a/lib/chrome/ChromeDriverService.php b/lib/chrome/ChromeDriverService.php
new file mode 100644
index 000000000..c4de774e7
--- /dev/null
+++ b/lib/chrome/ChromeDriverService.php
@@ -0,0 +1,29 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class ChromeDriverService extends DriverService {
+
+  // The environment variable storing the path to the chrome driver executable.
+  const CHROME_DRIVER_EXE_PROPERTY = "webdriver.chrome.driver";
+
+  public static function createDefaultService() {
+    $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+    $port = 9515; // TODO: Get another port if the default port is used.
+    $args = array("--port=$port");
+    $service = new ChromeDriverService($exe, $port, $args);
+    return $service;
+  }
+
+}
diff --git a/lib/net/URLChecker.php b/lib/net/URLChecker.php
new file mode 100644
index 000000000..6223dfc28
--- /dev/null
+++ b/lib/net/URLChecker.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class URLChecker {
+
+  const POLL_INTERVAL_MS = 500;
+  const CONNECT_TIMEOUT_MS = 500;
+
+  public function waitUntilAvailable($timeout_in_ms, $url) {
+    $end = microtime(true) + $timeout_in_ms / 1000;
+
+    while ($end > microtime(true)) {
+      if ($this->getHTTPResponseCode($timeout_in_ms, $url) === 200) {
+        return $this;
+      }
+      usleep(self::POLL_INTERVAL_MS);
+    }
+
+    throw new TimeOutException(sprintf(
+      "Timed out waiting for %s to become available after %d ms.",
+      $url,
+      $timeout_in_ms
+    ));
+
+    return $this;
+  }
+
+  public function waitUntilUnavailable($timeout_in_ms, $url) {
+    $end = microtime(true) + $timeout_in_ms / 1000;
+
+    while ($end > microtime(true)) {
+      if ($this->getHTTPResponseCode($timeout_in_ms, $url) !== 200) {
+        return $this;
+      }
+      usleep(self::POLL_INTERVAL_MS);
+    }
+
+    throw new TimeOutException(sprintf(
+      "Timed out waiting for %s to become unavailable after %d ms.",
+      $url,
+      $timeout_in_ms
+    ));
+  }
+
+  private function getHTTPResponseCode($timeout_in_ms, $url) {
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
+    $code = null;
+    try {
+      curl_exec($ch);
+      $info = curl_getinfo($ch);
+      $code = $info['http_code'];
+    } catch (Exception $e) {
+    }
+    curl_close($ch);
+    return $code;
+  }
+}
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 9b19f4948..05335600a 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -105,7 +105,6 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
 
   /**
    * @param string $url
-   * @param string $session_id
    */
   public function __construct($url) {
     $this->url = $url;
diff --git a/lib/remote/service/DriverCommandExecutor.php b/lib/remote/service/DriverCommandExecutor.php
new file mode 100644
index 000000000..51cdda466
--- /dev/null
+++ b/lib/remote/service/DriverCommandExecutor.php
@@ -0,0 +1,57 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * A HttpCommandExecutor that talks to a local driver service instead of
+ * a remote server.
+ */
+class DriverCommandExecutor extends HttpCommandExecutor {
+
+  /**
+   * @var DriverService
+   */
+  private $service;
+
+  public function __construct(DriverService $service) {
+    parent::__construct($service->getURL());
+    $this->service = $service;
+  }
+
+  /**
+   * @param WebDriverCommand $command
+   * @param array $curl_opts
+   *
+   * @return mixed
+   */
+  public function execute(WebDriverCommand $command, $curl_opts = array()) {
+    if ($command->getName() === DriverCommand::NEW_SESSION) {
+      $this->service->start();
+    }
+
+    try {
+      $value = parent::execute($command, $curl_opts);
+      if ($command->getName() === DriverCommand::QUIT) {
+        $this->service->stop();
+      }
+      return $value;
+    } catch (Exception $e) {
+      if (!$this->service->isRunning()) {
+        throw new WebDriverException('The driver server has died.');
+      }
+      throw $e;
+    }
+  }
+
+}
diff --git a/lib/remote/service/DriverService.php b/lib/remote/service/DriverService.php
new file mode 100644
index 000000000..b8ba78831
--- /dev/null
+++ b/lib/remote/service/DriverService.php
@@ -0,0 +1,144 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+class DriverService {
+
+  /**
+   * @var string
+   */
+  private $executable;
+
+  /**
+   * @var string
+   */
+  private $url;
+
+  /**
+   * @var array
+   */
+  private $args;
+
+  /**
+   * @var array
+   */
+  private $environment;
+
+  /**
+   * @var resource
+   */
+  private $process;
+
+  /**
+   * @param string $executable
+   * @param int $port The given port the service should use.
+   * @param array $args
+   * @param array|null $environment Use the system environment if it is null
+   */
+  public function __construct(
+    $executable,
+    $port,
+    $args = array(),
+    $environment = null
+  ) {
+    $this->executable = self::checkExecutable($executable);
+    $this->url = sprintf('http://localhost:%d', $port);
+    $this->args = $args;
+
+    if ($environment === null) {
+      $this->environment = $_ENV;
+    } else {
+      $this->environment = $environment;
+    }
+  }
+
+  /**
+   * @return string
+   */
+  public function getURL() {
+    return $this->url;
+  }
+
+  /**
+   * @return DriverService
+   */
+  public function start() {
+    if ($this->process !== null) {
+      return $this;
+    }
+
+    $pipes = array();
+    $this->process = proc_open(
+      sprintf("%s %s", $this->executable, implode(' ', $this->args)),
+      $descriptorspec = array(
+        0 => array('pipe', 'r'), // stdin
+        1 => array('pipe', 'w'), // stdout
+        2 => array('pipe', 'a'), // stderr
+      ),
+      $pipes,
+      null,
+      $this->environment
+    );
+
+    $checker = new URLChecker();
+    $checker->waitUntilAvailable(20 * 1000, $this->url.'/status');
+
+    return $this;
+  }
+
+  /**
+   * @return DriverService
+   */
+  public function stop() {
+    if ($this->process === null) {
+      return $this;
+    }
+
+    proc_terminate($this->process);
+    $this->process = null;
+
+    $checker = new URLChecker();
+    $checker->waitUntilUnAvailable(3 * 1000, $this->url.'/shutdown');
+
+    return $this;
+  }
+
+  /**
+   * @return bool
+   */
+  public function isRunning() {
+    if ($this->process === null) {
+      return false;
+    }
+
+    $status = proc_get_status($this->process);
+    return $status['running'];
+  }
+
+  /**
+   * Check if the executable is executable.
+   *
+   * @param string $executable
+   * @return string
+   * @throws Exception
+   */
+  protected static function checkExecutable($executable) {
+    if (!is_file($executable)) {
+      throw new Exception("'$executable' is not a file.");
+    } else if (!is_executable($executable)) {
+      throw new Exception("'$executable' is not executable.");
+    }
+    return $executable;
+  }
+}

From 6e3a5b632b208da4c0c484d3fe885496b8d80a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Wollse=CC=81n?= <fredrik@neam.se>
Date: Wed, 2 Jul 2014 16:12:36 +0300
Subject: [PATCH 076/784] Throw exception when json_decode() of remote response
 fails

---
 lib/remote/HttpCommandExecutor.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 05335600a..8a68c99dd 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -211,6 +211,10 @@ protected static function curl(
 
     $results = json_decode($raw_results, true);
 
+    if ($results === null && json_last_error() !== JSON_ERROR_NONE) {
+        throw new WebDriverException('JSON decoding of remote response failed. The response: \'' . $raw_results . '\'');
+    }
+
     $value = null;
     if (is_array($results) && array_key_exists('value', $results)) {
       $value = $results['value'];

From 3e08f353b8cef15f23591bb50cf788514eaf34bd Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Mon, 7 Jul 2014 14:25:13 -0700
Subject: [PATCH 077/784] RemoteWebDriverTest with php 5.3

---
 tests/unit/remote/RemoteWebDriverTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/remote/RemoteWebDriverTest.php b/tests/unit/remote/RemoteWebDriverTest.php
index c53b4fcbe..5221b7079 100644
--- a/tests/unit/remote/RemoteWebDriverTest.php
+++ b/tests/unit/remote/RemoteWebDriverTest.php
@@ -25,9 +25,9 @@ public function testCreate() {
     $timeout = 1000;
     $url = 'http://localhost:4444/wd/hub';
     $response = array('value' => 'someValue', 'info' => 'someInfo', 'sessionId' => 'someSessionId');
-    $response = (new WebDriverResponse('someSessionId'))
-                  ->setStatus(0)
-                  ->setValue('someValue');
+    $response = new WebDriverResponse('someSessionId');
+    $response->setStatus(0)
+             ->setValue('someValue');
 
     $executor = $this->getMockBuilder('HttpCommandExecutor')->disableOriginalConstructor()->getMock();
 

From c3ccf9dc288851a5016d0a4b05541356609cc112 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 8 Jul 2014 09:48:16 -0700
Subject: [PATCH 078/784] php strict standards error in ChromeDriver

ChromeDriver extends RemoteWebDriver. However, the create method is not compatible because
ChromeDriver does not require the address of a remote server.

phpfail....

In addition, throw exception when calling invalid parent method.
---
 lib/chrome/ChromeDriver.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index fa7927f5b..7f85d8a81 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -15,7 +15,7 @@
 
 class ChromeDriver extends RemoteWebDriver {
 
-  public static function create(
+  public static function start(
     DesiredCapabilities $desired_capabilities = null
   ) {
     if ($desired_capabilities === null) {
@@ -40,4 +40,12 @@ public function startSession($desired_capabilities) {
     $response = $this->executor->execute($command);
     $this->setSessionID($response->getSessionID());
   }
+
+  public static function create() {
+    throw new WebDriverException('Please use ChromeDriver::start() instead.');
+  }
+
+  public static function createBySessionID() {
+    throw new WebDriverException('Please use ChromeDriver::start() instead.');
+  }
 }

From d3a3544fc7f7419e4a02aa0507e154cb63cfb6e4 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 8 Jul 2014 09:50:26 -0700
Subject: [PATCH 079/784] removing unnecessary abstract method

---
 lib/interactions/internal/WebDriverSingleKeyAction.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/interactions/internal/WebDriverSingleKeyAction.php
index f8c96bb81..aa450e0d8 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/interactions/internal/WebDriverSingleKeyAction.php
@@ -27,9 +27,4 @@ public function __construct(
     parent::__construct($keyboard, $mouse, $location_provider);
     $this->key = $key;
   }
-
-  /**
-   * @return void
-   */
-  abstract public function perform();
 }

From 1c1d056c49fcabbeb6afc6e66621983470ca42f1 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 8 Jul 2014 10:26:16 -0700
Subject: [PATCH 080/784] remove legacy test

The methods to be tested are removed for a while.
---
 tests/unit/remote/RemoteWebDriverTest.php | 51 -----------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 tests/unit/remote/RemoteWebDriverTest.php

diff --git a/tests/unit/remote/RemoteWebDriverTest.php b/tests/unit/remote/RemoteWebDriverTest.php
deleted file mode 100644
index 5221b7079..000000000
--- a/tests/unit/remote/RemoteWebDriverTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-class RemoteWebDriverTest extends PHPUnit_Framework_TestCase {
-  public function testCreate() {
-    $remoteWebDriver = $this
-      ->getMockBuilder('RemoteWebDriver')
-      ->disableOriginalConstructor()
-      ->setMethods(array('remoteExecuteHttpCommand', 'createHttpCommandExecutor'))
-      ->getMock()
-    ;
-
-    $timeout = 1000;
-    $url = 'http://localhost:4444/wd/hub';
-    $response = array('value' => 'someValue', 'info' => 'someInfo', 'sessionId' => 'someSessionId');
-    $response = new WebDriverResponse('someSessionId');
-    $response->setStatus(0)
-             ->setValue('someValue');
-
-    $executor = $this->getMockBuilder('HttpCommandExecutor')->disableOriginalConstructor()->getMock();
-
-    $remoteWebDriver
-      ->staticExpects($this->once())
-      ->method('remoteExecuteHttpCommand')
-      ->with($timeout, array('url' => $url, 'name' => 'newSession', 'parameters' => array('desiredCapabilities' => array())))
-      ->will($this->returnValue($response))
-    ;
-
-    $remoteWebDriver
-      ->staticExpects($this->once())
-      ->method('createHttpCommandExecutor')
-      ->with($url, $response->getSessionID())
-      ->will($this->returnValue($executor))
-    ;
-
-    $remoteWebDriver->create($url, array(), $timeout);
-  }
-}
- 

From 9533d8048d07bd4a881fc5d4c51f4d5fe1786585 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 11 Jul 2014 21:04:06 -0700
Subject: [PATCH 081/784] use phpdoc to generate docs

The documentation is hosted on facebook.github.io/php-webdriver
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3af7435c8..6a22de87b 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
     "php": ">=5.3.19"
   },
   "require-dev": {
-    "phpunit/phpunit": "3.7.*"
+    "phpunit/phpunit": "3.7.*",
+    ""phpdocumentor/phpdocumentor": "2.*""
   },
   "autoload": {
     "classmap": ["lib/"]

From 1c36faa2823ddb8dab81d380032d7ead12c600e8 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 11 Jul 2014 21:08:38 -0700
Subject: [PATCH 082/784] Update README.md

Link to documentation.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 897a2df48..d5272c4f4 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ php-webdriver -- WebDriver bindings for PHP
 
 This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
 
-Looking for documentation about Selenium WebDriver? See http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki
+Looking for documentation about php-webdriver? See http://facebook.github.io/php-webdriver/
 
 The PHP client was rewritten from scratch. Using the old version? Check out Adam Goucher's fork of it at https://github.com/Element-34/php-webdriver
 

From f117bbee7176ebb3552fffcd1c5a50430d28a12d Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 11 Jul 2014 22:21:40 -0700
Subject: [PATCH 083/784] fix

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6a22de87b..00faaa7bf 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",
-    ""phpdocumentor/phpdocumentor": "2.*""
+    "phpdocumentor/phpdocumentor": "2.*"
   },
   "autoload": {
     "classmap": ["lib/"]

From 1096e1786b2733069c220ff9c7a7ebebe64afdc2 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Thu, 17 Jul 2014 16:24:21 -0700
Subject: [PATCH 084/784] use travis-ci

---
 .travis.yml              |  8 ++++++++
 tests/unit/bootstrap.php |  3 +++
 tests/unit/phpunit.xml   | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 tests/unit/bootstrap.php
 create mode 100644 tests/unit/phpunit.xml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..1342b9d4b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,8 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - hhvm
+
+script: phpunit -c ./tests/unit
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
new file mode 100644
index 000000000..562467964
--- /dev/null
+++ b/tests/unit/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+
+require_once __DIR__ . '/../../lib/__init__.php';
diff --git a/tests/unit/phpunit.xml b/tests/unit/phpunit.xml
new file mode 100644
index 000000000..0338c9327
--- /dev/null
+++ b/tests/unit/phpunit.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit
+        backupGlobals               = "false"
+        backupStaticAttributes      = "false"
+        colors                      = "true"
+        convertErrorsToExceptions   = "true"
+        convertNoticesToExceptions  = "true"
+        convertWarningsToExceptions = "true"
+        processIsolation            = "false"
+        stopOnFailure               = "false"
+        syntaxCheck                 = "false"
+        bootstrap                   = "bootstrap.php" >
+
+    <testsuites>
+        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
+            <directory>../unit</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>

From 47ae4ab1e1ec1d301c1ab1a244b60cfcb6053e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Tue, 3 Jun 2014 18:12:02 +0400
Subject: [PATCH 085/784] Alternative implementation of
 WebDriverCommandExecutor.

---
 lib/remote/CurlCommandExecutor.php | 237 +++++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 lib/remote/CurlCommandExecutor.php

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
new file mode 100644
index 000000000..d7e354bfd
--- /dev/null
+++ b/lib/remote/CurlCommandExecutor.php
@@ -0,0 +1,237 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * Command executor talking to the standalone server via HTTP (curl).
+ */
+class CurlCommandExecutor implements WebDriverCommandExecutor
+{
+    /**
+     * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
+     */
+    protected $commands = array(
+        DriverCommand::ACCEPT_ALERT => array('POST' => '/session/:sessionId/accept_alert'),
+        DriverCommand::ADD_COOKIE => array('POST' => '/session/:sessionId/cookie'),
+        DriverCommand::CLEAR_ELEMENT => array('POST' => '/session/:sessionId/element/:id/clear'),
+        DriverCommand::CLICK_ELEMENT => array('POST' => '/session/:sessionId/element/:id/click'),
+        DriverCommand::CLOSE => array('DELETE' => '/session/:sessionId/window'),
+        DriverCommand::DELETE_ALL_COOKIES => array('DELETE' => '/session/:sessionId/cookie'),
+        DriverCommand::DELETE_COOKIE => array('DELETE' => '/session/:sessionId/cookie/:name'),
+        DriverCommand::DISMISS_ALERT => array('POST' => '/session/:sessionId/dismiss_alert'),
+        DriverCommand::ELEMENT_EQUALS => array('GET' => '/session/:sessionId/element/:id/equals/:other'),
+        DriverCommand::FIND_CHILD_ELEMENT => array('POST' => '/session/:sessionId/element/:id/element'),
+        DriverCommand::FIND_CHILD_ELEMENTS => array('POST' => '/session/:sessionId/element/:id/elements'),
+        DriverCommand::EXECUTE_SCRIPT => array('POST' => '/session/:sessionId/execute'),
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('POST' => '/session/:sessionId/execute_async'),
+        DriverCommand::FIND_ELEMENT => array('POST' => '/session/:sessionId/element'),
+        DriverCommand::FIND_ELEMENTS => array('POST' => '/session/:sessionId/elements'),
+        DriverCommand::SWITCH_TO_FRAME => array('POST' => '/session/:sessionId/frame'),
+        DriverCommand::SWITCH_TO_WINDOW => array('POST' => '/session/:sessionId/window'),
+        DriverCommand::GET => array('POST' => '/session/:sessionId/url'),
+        DriverCommand::GET_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/element/active'),
+        DriverCommand::GET_ALERT_TEXT => array('GET' => '/session/:sessionId/alert_text'),
+        DriverCommand::GET_ALL_COOKIES => array('GET' => '/session/:sessionId/cookie'),
+        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('GET' => '/session/:sessionId/log/types'),
+        DriverCommand::GET_CURRENT_URL => array('GET' => '/session/:sessionId/url'),
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('GET' => '/session/:sessionId/window_handle'),
+        DriverCommand::GET_ELEMENT_ATTRIBUTE => array('GET' => '/session/:sessionId/element/:id/attribute/:name'),
+        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array('GET' => '/session/:sessionId/element/:id/css/:propertyName'),
+        DriverCommand::GET_ELEMENT_LOCATION => array('GET' => '/session/:sessionId/element/:id/location'),
+        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('GET' => '/session/:sessionId/element/:id/location_in_view'),
+        DriverCommand::GET_ELEMENT_SIZE => array('GET' => '/session/:sessionId/element/:id/size'),
+        DriverCommand::GET_ELEMENT_TAG_NAME => array('GET' => '/session/:sessionId/element/:id/name'),
+        DriverCommand::GET_ELEMENT_TEXT => array('GET' => '/session/:sessionId/element/:id/text'),
+        DriverCommand::GET_LOG => array('POST' => '/session/:sessionId/log'),
+        DriverCommand::GET_PAGE_SOURCE => array('GET' => '/session/:sessionId/source'),
+        DriverCommand::GET_SCREEN_ORIENTATION => array('GET' => '/session/:sessionId/orientation'),
+        DriverCommand::GET_CAPABILITIES => array('GET' => '/session/:sessionId'),
+        DriverCommand::GET_TITLE => array('GET' => '/session/:sessionId/title'),
+        DriverCommand::GET_WINDOW_HANDLES => array('GET' => '/session/:sessionId/window_handles'),
+        DriverCommand::GET_WINDOW_POSITION => array('GET' => '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::GET_WINDOW_SIZE => array('GET' => '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::GO_BACK => array('POST' => '/session/:sessionId/back'),
+        DriverCommand::GO_FORWARD => array('POST' => '/session/:sessionId/forward'),
+        DriverCommand::IS_ELEMENT_DISPLAYED => array('GET' => '/session/:sessionId/element/:id/displayed'),
+        DriverCommand::IS_ELEMENT_ENABLED => array('GET' => '/session/:sessionId/element/:id/enabled'),
+        DriverCommand::IS_ELEMENT_SELECTED => array('GET' => '/session/:sessionId/element/:id/selected'),
+        DriverCommand::MAXIMIZE_WINDOW => array('POST' => '/session/:sessionId/window/:windowHandle/maximize'),
+        DriverCommand::MOUSE_DOWN => array('POST' => '/session/:sessionId/buttondown'),
+        DriverCommand::MOUSE_UP => array('POST' => '/session/:sessionId/buttonup'),
+        DriverCommand::CLICK => array('POST' => '/session/:sessionId/click'),
+        DriverCommand::DOUBLE_CLICK => array('POST' => '/session/:sessionId/doubleclick'),
+        DriverCommand::MOVE_TO => array('POST' => '/session/:sessionId/moveto'),
+        DriverCommand::NEW_SESSION => array('POST' => '/session'),
+        DriverCommand::QUIT => array('DELETE' => '/session/:sessionId'),
+        DriverCommand::REFRESH => array('POST' => '/session/:sessionId/refresh'),
+        DriverCommand::UPLOAD_FILE => array('POST' => '/session/:sessionId/file'), // undocumented
+        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/keys'),
+        DriverCommand::SET_ALERT_VALUE => array('POST' => '/session/:sessionId/alert_text'),
+        DriverCommand::SEND_KEYS_TO_ELEMENT => array('POST' => '/session/:sessionId/element/:id/value'),
+        DriverCommand::IMPLICITLY_WAIT => array('POST' => '/session/:sessionId/timeouts/implicit_wait'),
+        DriverCommand::SET_SCREEN_ORIENTATION => array('POST' => '/session/:sessionId/orientation'),
+        DriverCommand::SET_TIMEOUT => array('POST' => '/session/:sessionId/timeouts'),
+        DriverCommand::SET_SCRIPT_TIMEOUT => array('POST' => '/session/:sessionId/timeouts/async_script'),
+        DriverCommand::SET_WINDOW_POSITION => array('POST' => '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::SET_WINDOW_SIZE => array('POST' => '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::SUBMIT_ELEMENT => array('POST' => '/session/:sessionId/element/:id/submit'),
+        DriverCommand::SCREENSHOT => array('GET' => '/session/:sessionId/screenshot'),
+        DriverCommand::TOUCH_SINGLE_TAP => array('POST' => '/session/:sessionId/touch/click'),
+        DriverCommand::TOUCH_DOWN => array('POST' => '/session/:sessionId/touch/down'),
+        DriverCommand::TOUCH_DOUBLE_TAP => array('POST' => '/session/:sessionId/touch/doubleclick'),
+        DriverCommand::TOUCH_FLICK => array('POST' => '/session/:sessionId/touch/flick'),
+        DriverCommand::TOUCH_LONG_PRESS => array('POST' => '/session/:sessionId/touch/longclick'),
+        DriverCommand::TOUCH_MOVE => array('POST' => '/session/:sessionId/touch/move'),
+        DriverCommand::TOUCH_SCROLL => array('POST' => '/session/:sessionId/touch/scroll'),
+        DriverCommand::TOUCH_UP => array('POST' => '/session/:sessionId/touch/up'),
+    );
+
+    /**
+     * @var string
+     */
+    protected $url;
+    /**
+     * @var string
+     */
+    protected $sessionID;
+    /**
+     * @var resource
+     */
+    protected $curl;
+
+    /**
+     * @param string $url
+     */
+    public function __construct($url = 'http://localhost:4444/wd/hub')
+    {
+        $this->url = $url;
+        $this->curl = curl_init();
+        curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, 300000);
+        curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt(
+            $this->curl,
+            CURLOPT_HTTPHEADER,
+            array('Content-Type: application/json;charset=UTF-8', 'Accept: application/json')
+        );
+    }
+
+    /**
+     * Set connection timeout in ms.
+     *
+     * @param int $timeout
+     */
+    public function setTimeout($timeout)
+    {
+        curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $timeout);
+    }
+
+    /**
+     * @param string $sessionID
+     */
+    public function setSessionID($sessionID)
+    {
+        $this->sessionID = $sessionID;
+    }
+
+    /**
+     * @param $command
+     * @param array $params
+     *
+     * @throws InvalidArgumentException
+     * @throws BadMethodCallException
+     * @return mixed
+     */
+    public function execute($command, array $params = array())
+    {
+        if (empty($this->commands[$command])) {
+            throw new InvalidArgumentException(sprintf('Command %s is unknown.', $command));
+        }
+        reset($this->commands[$command]);
+        list($method, $url) = each($this->commands[$command]);
+        $url = str_replace(':sessionId', $this->sessionID, $url);
+        foreach ($params as $name => $value) {
+            if ($name[0] === ':') {
+                $url = str_replace($name, $value, $url);
+                if ($method !== 'POST') {
+                    unset($params[$name]);
+                }
+            }
+        }
+        if (!empty($params) && $method !== 'POST') {
+            throw new BadMethodCallException(sprintf(
+                'The http method called for %s is %s but it has to be POST' .
+                ' if you want to pass the JSON params %s',
+                $url,
+                $method,
+                json_encode($params)
+            ));
+        }
+        curl_setopt($this->curl, CURLOPT_URL, $url);
+
+        if ($method === 'GET') {
+            curl_setopt($this->curl, CURLOPT_HTTPGET, true);
+        } elseif ($method === 'POST') {
+            curl_setopt($this->curl, CURLOPT_POST, true);
+            if ($params && is_array($params)) {
+                curl_setopt($this->curl, CURLOPT_POSTFIELDS, json_encode($params));
+            }
+        } elseif ($method == 'DELETE') {
+            curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        }
+
+        $raw_results = trim(curl_exec($this->curl));
+
+        if ($error = curl_error($this->curl)) {
+            $msg = sprintf(
+                'Curl error thrown for http %s to %s',
+                $method,
+                $url
+            );
+            if ($params && is_array($params)) {
+                $msg .= sprintf(' with params: %s', json_encode($params));
+            }
+            WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
+        }
+
+        curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
+        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, null);
+
+        $results = json_decode($raw_results, true);
+
+        $value = null;
+        if (is_array($results) && array_key_exists('value', $results)) {
+            $value = $results['value'];
+        }
+
+        $message = null;
+        if (is_array($value) && array_key_exists('message', $value)) {
+            $message = $value['message'];
+        }
+
+        $sessionId = null;
+        if (is_array($results) && array_key_exists('sessionId', $results)) {
+            $sessionId = $results['sessionId'];
+        }
+
+        $status = isset($results['status']) ? $results['status'] : 0;
+        WebDriverException::throwException($status, $message, $results);
+
+        $response = new WebDriverResponse($sessionId);
+
+        return $response
+            ->setStatus($status)
+            ->setValue($value);
+    }
+}

From 0e5db656518d98e574d914d5a2c44562872255d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Tue, 3 Jun 2014 18:18:15 +0400
Subject: [PATCH 086/784] Update phpdoc.

---
 lib/remote/CurlCommandExecutor.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index d7e354bfd..c755adafa 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -151,7 +151,7 @@ public function setSessionID($sessionID)
      *
      * @throws InvalidArgumentException
      * @throws BadMethodCallException
-     * @return mixed
+     * @return WebDriverResponse
      */
     public function execute($command, array $params = array())
     {
@@ -230,8 +230,6 @@ public function execute($command, array $params = array())
 
         $response = new WebDriverResponse($sessionId);
 
-        return $response
-            ->setStatus($status)
-            ->setValue($value);
+        return $response->setStatus($status)->setValue($value);
     }
 }

From 36f84ba0fed44a437b88dd88fec775e7bf3e229d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9A=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=BA=D0=BE?=
 <a.j.kolchenko@baltsoftservice.ru>
Date: Wed, 11 Jun 2014 17:32:55 +0400
Subject: [PATCH 087/784] Fix URL.

---
 lib/remote/CurlCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index c755adafa..073ffd471 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -178,7 +178,7 @@ public function execute($command, array $params = array())
                 json_encode($params)
             ));
         }
-        curl_setopt($this->curl, CURLOPT_URL, $url);
+        curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
 
         if ($method === 'GET') {
             curl_setopt($this->curl, CURLOPT_HTTPGET, true);

From 5aac4dcaf5aa377b74ee4c4c4864e2f1031b5b91 Mon Sep 17 00:00:00 2001
From: Andrey Kolchenko <komexx@gmail.com>
Date: Mon, 21 Jul 2014 17:25:27 +0400
Subject: [PATCH 088/784] Fix bug with curl (PHP < 5.5)

---
 lib/remote/CurlCommandExecutor.php | 162 ++++++++++++++---------------
 1 file changed, 79 insertions(+), 83 deletions(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index 073ffd471..5a0734f3c 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -22,79 +22,79 @@ class CurlCommandExecutor implements WebDriverCommandExecutor
      * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
      */
     protected $commands = array(
-        DriverCommand::ACCEPT_ALERT => array('POST' => '/session/:sessionId/accept_alert'),
-        DriverCommand::ADD_COOKIE => array('POST' => '/session/:sessionId/cookie'),
-        DriverCommand::CLEAR_ELEMENT => array('POST' => '/session/:sessionId/element/:id/clear'),
-        DriverCommand::CLICK_ELEMENT => array('POST' => '/session/:sessionId/element/:id/click'),
-        DriverCommand::CLOSE => array('DELETE' => '/session/:sessionId/window'),
-        DriverCommand::DELETE_ALL_COOKIES => array('DELETE' => '/session/:sessionId/cookie'),
-        DriverCommand::DELETE_COOKIE => array('DELETE' => '/session/:sessionId/cookie/:name'),
-        DriverCommand::DISMISS_ALERT => array('POST' => '/session/:sessionId/dismiss_alert'),
-        DriverCommand::ELEMENT_EQUALS => array('GET' => '/session/:sessionId/element/:id/equals/:other'),
-        DriverCommand::FIND_CHILD_ELEMENT => array('POST' => '/session/:sessionId/element/:id/element'),
-        DriverCommand::FIND_CHILD_ELEMENTS => array('POST' => '/session/:sessionId/element/:id/elements'),
-        DriverCommand::EXECUTE_SCRIPT => array('POST' => '/session/:sessionId/execute'),
-        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('POST' => '/session/:sessionId/execute_async'),
-        DriverCommand::FIND_ELEMENT => array('POST' => '/session/:sessionId/element'),
-        DriverCommand::FIND_ELEMENTS => array('POST' => '/session/:sessionId/elements'),
-        DriverCommand::SWITCH_TO_FRAME => array('POST' => '/session/:sessionId/frame'),
-        DriverCommand::SWITCH_TO_WINDOW => array('POST' => '/session/:sessionId/window'),
-        DriverCommand::GET => array('POST' => '/session/:sessionId/url'),
-        DriverCommand::GET_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/element/active'),
-        DriverCommand::GET_ALERT_TEXT => array('GET' => '/session/:sessionId/alert_text'),
-        DriverCommand::GET_ALL_COOKIES => array('GET' => '/session/:sessionId/cookie'),
-        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('GET' => '/session/:sessionId/log/types'),
-        DriverCommand::GET_CURRENT_URL => array('GET' => '/session/:sessionId/url'),
-        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('GET' => '/session/:sessionId/window_handle'),
-        DriverCommand::GET_ELEMENT_ATTRIBUTE => array('GET' => '/session/:sessionId/element/:id/attribute/:name'),
-        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array('GET' => '/session/:sessionId/element/:id/css/:propertyName'),
-        DriverCommand::GET_ELEMENT_LOCATION => array('GET' => '/session/:sessionId/element/:id/location'),
-        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('GET' => '/session/:sessionId/element/:id/location_in_view'),
-        DriverCommand::GET_ELEMENT_SIZE => array('GET' => '/session/:sessionId/element/:id/size'),
-        DriverCommand::GET_ELEMENT_TAG_NAME => array('GET' => '/session/:sessionId/element/:id/name'),
-        DriverCommand::GET_ELEMENT_TEXT => array('GET' => '/session/:sessionId/element/:id/text'),
-        DriverCommand::GET_LOG => array('POST' => '/session/:sessionId/log'),
-        DriverCommand::GET_PAGE_SOURCE => array('GET' => '/session/:sessionId/source'),
-        DriverCommand::GET_SCREEN_ORIENTATION => array('GET' => '/session/:sessionId/orientation'),
-        DriverCommand::GET_CAPABILITIES => array('GET' => '/session/:sessionId'),
-        DriverCommand::GET_TITLE => array('GET' => '/session/:sessionId/title'),
-        DriverCommand::GET_WINDOW_HANDLES => array('GET' => '/session/:sessionId/window_handles'),
-        DriverCommand::GET_WINDOW_POSITION => array('GET' => '/session/:sessionId/window/:windowHandle/position'),
-        DriverCommand::GET_WINDOW_SIZE => array('GET' => '/session/:sessionId/window/:windowHandle/size'),
-        DriverCommand::GO_BACK => array('POST' => '/session/:sessionId/back'),
-        DriverCommand::GO_FORWARD => array('POST' => '/session/:sessionId/forward'),
-        DriverCommand::IS_ELEMENT_DISPLAYED => array('GET' => '/session/:sessionId/element/:id/displayed'),
-        DriverCommand::IS_ELEMENT_ENABLED => array('GET' => '/session/:sessionId/element/:id/enabled'),
-        DriverCommand::IS_ELEMENT_SELECTED => array('GET' => '/session/:sessionId/element/:id/selected'),
-        DriverCommand::MAXIMIZE_WINDOW => array('POST' => '/session/:sessionId/window/:windowHandle/maximize'),
-        DriverCommand::MOUSE_DOWN => array('POST' => '/session/:sessionId/buttondown'),
-        DriverCommand::MOUSE_UP => array('POST' => '/session/:sessionId/buttonup'),
-        DriverCommand::CLICK => array('POST' => '/session/:sessionId/click'),
-        DriverCommand::DOUBLE_CLICK => array('POST' => '/session/:sessionId/doubleclick'),
-        DriverCommand::MOVE_TO => array('POST' => '/session/:sessionId/moveto'),
-        DriverCommand::NEW_SESSION => array('POST' => '/session'),
-        DriverCommand::QUIT => array('DELETE' => '/session/:sessionId'),
-        DriverCommand::REFRESH => array('POST' => '/session/:sessionId/refresh'),
-        DriverCommand::UPLOAD_FILE => array('POST' => '/session/:sessionId/file'), // undocumented
-        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('POST' => '/session/:sessionId/keys'),
-        DriverCommand::SET_ALERT_VALUE => array('POST' => '/session/:sessionId/alert_text'),
-        DriverCommand::SEND_KEYS_TO_ELEMENT => array('POST' => '/session/:sessionId/element/:id/value'),
-        DriverCommand::IMPLICITLY_WAIT => array('POST' => '/session/:sessionId/timeouts/implicit_wait'),
-        DriverCommand::SET_SCREEN_ORIENTATION => array('POST' => '/session/:sessionId/orientation'),
-        DriverCommand::SET_TIMEOUT => array('POST' => '/session/:sessionId/timeouts'),
-        DriverCommand::SET_SCRIPT_TIMEOUT => array('POST' => '/session/:sessionId/timeouts/async_script'),
-        DriverCommand::SET_WINDOW_POSITION => array('POST' => '/session/:sessionId/window/:windowHandle/position'),
-        DriverCommand::SET_WINDOW_SIZE => array('POST' => '/session/:sessionId/window/:windowHandle/size'),
-        DriverCommand::SUBMIT_ELEMENT => array('POST' => '/session/:sessionId/element/:id/submit'),
-        DriverCommand::SCREENSHOT => array('GET' => '/session/:sessionId/screenshot'),
-        DriverCommand::TOUCH_SINGLE_TAP => array('POST' => '/session/:sessionId/touch/click'),
-        DriverCommand::TOUCH_DOWN => array('POST' => '/session/:sessionId/touch/down'),
-        DriverCommand::TOUCH_DOUBLE_TAP => array('POST' => '/session/:sessionId/touch/doubleclick'),
-        DriverCommand::TOUCH_FLICK => array('POST' => '/session/:sessionId/touch/flick'),
-        DriverCommand::TOUCH_LONG_PRESS => array('POST' => '/session/:sessionId/touch/longclick'),
-        DriverCommand::TOUCH_MOVE => array('POST' => '/session/:sessionId/touch/move'),
-        DriverCommand::TOUCH_SCROLL => array('POST' => '/session/:sessionId/touch/scroll'),
-        DriverCommand::TOUCH_UP => array('POST' => '/session/:sessionId/touch/up'),
+        DriverCommand::ACCEPT_ALERT => array('POST', '/session/:sessionId/accept_alert'),
+        DriverCommand::ADD_COOKIE => array('POST', '/session/:sessionId/cookie'),
+        DriverCommand::CLEAR_ELEMENT => array('POST', '/session/:sessionId/element/:id/clear'),
+        DriverCommand::CLICK_ELEMENT => array('POST', '/session/:sessionId/element/:id/click'),
+        DriverCommand::CLOSE => array('DELETE', '/session/:sessionId/window'),
+        DriverCommand::DELETE_ALL_COOKIES => array('DELETE', '/session/:sessionId/cookie'),
+        DriverCommand::DELETE_COOKIE => array('DELETE', '/session/:sessionId/cookie/:name'),
+        DriverCommand::DISMISS_ALERT => array('POST', '/session/:sessionId/dismiss_alert'),
+        DriverCommand::ELEMENT_EQUALS => array('GET', '/session/:sessionId/element/:id/equals/:other'),
+        DriverCommand::FIND_CHILD_ELEMENT => array('POST', '/session/:sessionId/element/:id/element'),
+        DriverCommand::FIND_CHILD_ELEMENTS => array('POST', '/session/:sessionId/element/:id/elements'),
+        DriverCommand::EXECUTE_SCRIPT => array('POST', '/session/:sessionId/execute'),
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('POST', '/session/:sessionId/execute_async'),
+        DriverCommand::FIND_ELEMENT => array('POST', '/session/:sessionId/element'),
+        DriverCommand::FIND_ELEMENTS => array('POST', '/session/:sessionId/elements'),
+        DriverCommand::SWITCH_TO_FRAME => array('POST', '/session/:sessionId/frame'),
+        DriverCommand::SWITCH_TO_WINDOW => array('POST', '/session/:sessionId/window'),
+        DriverCommand::GET => array('POST', '/session/:sessionId/url'),
+        DriverCommand::GET_ACTIVE_ELEMENT => array('POST', '/session/:sessionId/element/active'),
+        DriverCommand::GET_ALERT_TEXT => array('GET', '/session/:sessionId/alert_text'),
+        DriverCommand::GET_ALL_COOKIES => array('GET', '/session/:sessionId/cookie'),
+        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('GET', '/session/:sessionId/log/types'),
+        DriverCommand::GET_CURRENT_URL => array('GET', '/session/:sessionId/url'),
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('GET', '/session/:sessionId/window_handle'),
+        DriverCommand::GET_ELEMENT_ATTRIBUTE => array('GET', '/session/:sessionId/element/:id/attribute/:name'),
+        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array('GET', '/session/:sessionId/element/:id/css/:propertyName'),
+        DriverCommand::GET_ELEMENT_LOCATION => array('GET', '/session/:sessionId/element/:id/location'),
+        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('GET', '/session/:sessionId/element/:id/location_in_view'),
+        DriverCommand::GET_ELEMENT_SIZE => array('GET', '/session/:sessionId/element/:id/size'),
+        DriverCommand::GET_ELEMENT_TAG_NAME => array('GET', '/session/:sessionId/element/:id/name'),
+        DriverCommand::GET_ELEMENT_TEXT => array('GET', '/session/:sessionId/element/:id/text'),
+        DriverCommand::GET_LOG => array('POST', '/session/:sessionId/log'),
+        DriverCommand::GET_PAGE_SOURCE => array('GET', '/session/:sessionId/source'),
+        DriverCommand::GET_SCREEN_ORIENTATION => array('GET', '/session/:sessionId/orientation'),
+        DriverCommand::GET_CAPABILITIES => array('GET', '/session/:sessionId'),
+        DriverCommand::GET_TITLE => array('GET', '/session/:sessionId/title'),
+        DriverCommand::GET_WINDOW_HANDLES => array('GET', '/session/:sessionId/window_handles'),
+        DriverCommand::GET_WINDOW_POSITION => array('GET', '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::GET_WINDOW_SIZE => array('GET', '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::GO_BACK => array('POST', '/session/:sessionId/back'),
+        DriverCommand::GO_FORWARD => array('POST', '/session/:sessionId/forward'),
+        DriverCommand::IS_ELEMENT_DISPLAYED => array('GET', '/session/:sessionId/element/:id/displayed'),
+        DriverCommand::IS_ELEMENT_ENABLED => array('GET', '/session/:sessionId/element/:id/enabled'),
+        DriverCommand::IS_ELEMENT_SELECTED => array('GET', '/session/:sessionId/element/:id/selected'),
+        DriverCommand::MAXIMIZE_WINDOW => array('POST', '/session/:sessionId/window/:windowHandle/maximize'),
+        DriverCommand::MOUSE_DOWN => array('POST', '/session/:sessionId/buttondown'),
+        DriverCommand::MOUSE_UP => array('POST', '/session/:sessionId/buttonup'),
+        DriverCommand::CLICK => array('POST', '/session/:sessionId/click'),
+        DriverCommand::DOUBLE_CLICK => array('POST', '/session/:sessionId/doubleclick'),
+        DriverCommand::MOVE_TO => array('POST', '/session/:sessionId/moveto'),
+        DriverCommand::NEW_SESSION => array('POST', '/session'),
+        DriverCommand::QUIT => array('DELETE', '/session/:sessionId'),
+        DriverCommand::REFRESH => array('POST', '/session/:sessionId/refresh'),
+        DriverCommand::UPLOAD_FILE => array('POST', '/session/:sessionId/file'), // undocumented
+        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('POST', '/session/:sessionId/keys'),
+        DriverCommand::SET_ALERT_VALUE => array('POST', '/session/:sessionId/alert_text'),
+        DriverCommand::SEND_KEYS_TO_ELEMENT => array('POST', '/session/:sessionId/element/:id/value'),
+        DriverCommand::IMPLICITLY_WAIT => array('POST', '/session/:sessionId/timeouts/implicit_wait'),
+        DriverCommand::SET_SCREEN_ORIENTATION => array('POST', '/session/:sessionId/orientation'),
+        DriverCommand::SET_TIMEOUT => array('POST', '/session/:sessionId/timeouts'),
+        DriverCommand::SET_SCRIPT_TIMEOUT => array('POST', '/session/:sessionId/timeouts/async_script'),
+        DriverCommand::SET_WINDOW_POSITION => array('POST', '/session/:sessionId/window/:windowHandle/position'),
+        DriverCommand::SET_WINDOW_SIZE => array('POST', '/session/:sessionId/window/:windowHandle/size'),
+        DriverCommand::SUBMIT_ELEMENT => array('POST', '/session/:sessionId/element/:id/submit'),
+        DriverCommand::SCREENSHOT => array('GET', '/session/:sessionId/screenshot'),
+        DriverCommand::TOUCH_SINGLE_TAP => array('POST', '/session/:sessionId/touch/click'),
+        DriverCommand::TOUCH_DOWN => array('POST', '/session/:sessionId/touch/down'),
+        DriverCommand::TOUCH_DOUBLE_TAP => array('POST', '/session/:sessionId/touch/doubleclick'),
+        DriverCommand::TOUCH_FLICK => array('POST', '/session/:sessionId/touch/flick'),
+        DriverCommand::TOUCH_LONG_PRESS => array('POST', '/session/:sessionId/touch/longclick'),
+        DriverCommand::TOUCH_MOVE => array('POST', '/session/:sessionId/touch/move'),
+        DriverCommand::TOUCH_SCROLL => array('POST', '/session/:sessionId/touch/scroll'),
+        DriverCommand::TOUCH_UP => array('POST', '/session/:sessionId/touch/up'),
     );
 
     /**
@@ -146,21 +146,20 @@ public function setSessionID($sessionID)
     }
 
     /**
-     * @param $command
-     * @param array $params
+     * @param WebDriverCommand $command
      *
      * @throws InvalidArgumentException
      * @throws BadMethodCallException
      * @return WebDriverResponse
      */
-    public function execute($command, array $params = array())
+    public function execute(WebDriverCommand $command)
     {
-        if (empty($this->commands[$command])) {
-            throw new InvalidArgumentException(sprintf('Command %s is unknown.', $command));
+        if (empty($this->commands[$command->getName()])) {
+            throw new InvalidArgumentException(sprintf('Command %s is unknown.', $command->getName()));
         }
-        reset($this->commands[$command]);
-        list($method, $url) = each($this->commands[$command]);
+        list($method, $url) = $this->commands[$command->getName()];
         $url = str_replace(':sessionId', $this->sessionID, $url);
+        $params = $command->getParameters();
         foreach ($params as $name => $value) {
             if ($name[0] === ':') {
                 $url = str_replace($name, $value, $url);
@@ -205,9 +204,6 @@ public function execute($command, array $params = array())
             WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
         }
 
-        curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
-        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, null);
-
         $results = json_decode($raw_results, true);
 
         $value = null;

From 985c40cd835a2e1cab7c79f6ae9b244ff4b84462 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Tue, 22 Jul 2014 13:28:36 +0200
Subject: [PATCH 089/784] fix typo error in ChromeOptions

---
 lib/chrome/ChromeOptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index 89939b1e2..cef9b04f8 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -118,7 +118,7 @@ public function toCapabilities() {
    * @return array
    */
   public function toArray() {
-    $options = $this->experimentOptions;
+    $options = $this->experimentalOptions;
 
     $options['binary'] = $this->binary;
 

From fb6c90fd49b262fec690128db3ca8dc9d4a8c456 Mon Sep 17 00:00:00 2001
From: Andrey Kolchenko <komexx@gmail.com>
Date: Sat, 26 Jul 2014 13:14:52 +0400
Subject: [PATCH 090/784] Use CURLOPT_CUSTOMREQUEST option for fixing bug with
 HTTP method.

---
 lib/remote/CurlCommandExecutor.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/remote/CurlCommandExecutor.php b/lib/remote/CurlCommandExecutor.php
index 5a0734f3c..36ac6df10 100644
--- a/lib/remote/CurlCommandExecutor.php
+++ b/lib/remote/CurlCommandExecutor.php
@@ -178,17 +178,13 @@ public function execute(WebDriverCommand $command)
             ));
         }
         curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
-
-        if ($method === 'GET') {
-            curl_setopt($this->curl, CURLOPT_HTTPGET, true);
-        } elseif ($method === 'POST') {
-            curl_setopt($this->curl, CURLOPT_POST, true);
-            if ($params && is_array($params)) {
-                curl_setopt($this->curl, CURLOPT_POSTFIELDS, json_encode($params));
-            }
-        } elseif ($method == 'DELETE') {
-            curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
+        if ($method === 'POST' && $params && is_array($params)) {
+            $encoded_params = json_encode($params);
+        } else {
+            $encoded_params = null;
         }
+        curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
 
         $raw_results = trim(curl_exec($this->curl));
 

From d089ddfbba7968770ac1789f37eff79a37efea17 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Thu, 31 Jul 2014 20:38:58 -0700
Subject: [PATCH 091/784] Throw exception if the browser is not 'htmlunit'.

---
 lib/remote/DesiredCapabilities.php | 11 +++++++++++
 lib/remote/HttpCommandExecutor.php |  1 -
 lib/remote/RemoteWebElement.php    |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index 72e984317..d0942d112 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -96,9 +96,20 @@ public function isJavascriptEnabled() {
   }
 
   /**
+   * This is a htmlUnit-only option.
+   *
    * @return DesiredCapabilities
+   * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
    */
   public function setJavascriptEnabled($enabled) {
+    $browser = $this->getBrowserName();
+    if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
+      throw new Exception(
+        'isJavascriptEnable() is a htmlunit-only option. '.
+        'See https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities.'
+      );
+    }
+
     $this->set(WebDriverCapabilityType::JAVASCRIPT_ENABLED, $enabled);
     return $this;
   }
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index bcc6aa2bf..d7ab430b7 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -237,4 +237,3 @@ public function getAddressOfRemoteServer() {
     return $this->url;
   }
 }
-
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index 19d0f377a..d702cc601 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -121,7 +121,7 @@ public function findElements(WebDriverBy $by) {
    * Get the value of a the given attribute of the element.
    *
    * @param string $attribute_name The name of the attribute.
-   * @return string The value of the attribute.
+   * @return string|null The value of the attribute.
    */
   public function getAttribute($attribute_name) {
     $params = array(

From 39d8be53309457458c4e023a9899a603c9be36d2 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Sat, 2 Aug 2014 13:07:20 +0200
Subject: [PATCH 092/784] fix chrome driver php5.4 interface signatures

---
 lib/chrome/ChromeDriver.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index 7f85d8a81..186e0341e 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -41,11 +41,18 @@ public function startSession($desired_capabilities) {
     $this->setSessionID($response->getSessionID());
   }
 
-  public static function create() {
+  public static function create(
+    $url = 'http://localhost:4444/wd/hub',
+    $desired_capabilities = null,
+    $timeout_in_ms = 300000
+  ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }
 
-  public static function createBySessionID() {
+  public static function createBySessionID(
+    $session_id,
+    $url = 'http://localhost:4444/wd/hub'
+  ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }
 }

From 7483c3524784257769ac25c9b0c3f7dbf9ed8429 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Sun, 21 Sep 2014 21:17:58 +0200
Subject: [PATCH 093/784] temporary fix for opera to force tag name lowercase

---
 lib/remote/RemoteWebElement.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index d702cc601..98b7d5f9c 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -220,10 +220,14 @@ public function getSize() {
    * @return string The tag name.
    */
   public function getTagName() {
-    return $this->executor->execute(
+    // Force tag name to be lowercase as expected by protocol for Opera driver
+    // until this issue is not resolved :
+    // https://github.com/operasoftware/operadriver/issues/102
+    // Remove it when fixed to be consistent with the protocol.
+    return strtolower($this->executor->execute(
       DriverCommand::GET_ELEMENT_TAG_NAME,
       array(':id' => $this->id)
-    );
+    ));
   }
 
   /**

From 81f7716e33d9c9c604f2163daad7ca54a4f5918e Mon Sep 17 00:00:00 2001
From: MartyIX <vseticka.martin@gmail.com>
Date: Wed, 1 Oct 2014 17:25:02 +0200
Subject: [PATCH 094/784] Update WebDriverWait.php

typo
---
 lib/WebDriverWait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 2ab2aad5a..68b7b46f7 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -40,7 +40,7 @@ public function __construct(
    * value is not falsey.
    *
    * @param (closure|WebDriverExpectedCondition)
-   * return mixed The return value of $func_or_ec
+   * @return mixed The return value of $func_or_ec
    */
   public function until($func_or_ec, $message = "") {
     $end = microtime(true) + $this->timeout;

From 0ce0687c627881e663a073582cf974cd769c06bf Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Tue, 14 Oct 2014 22:24:35 +0200
Subject: [PATCH 095/784] Moved the webdriver to a namespace (see issue #169 on
 the original repo)

---
 example.php                                          |  2 ++
 lib/JavaScriptExecutor.php                           |  2 ++
 lib/WebDriver.php                                    |  2 ++
 lib/WebDriverAction.php                              |  2 ++
 lib/WebDriverAlert.php                               |  2 ++
 lib/WebDriverBy.php                                  |  2 ++
 lib/WebDriverCapabilities.php                        |  2 ++
 lib/WebDriverCommandExecutor.php                     |  2 ++
 lib/WebDriverDimension.php                           |  2 ++
 lib/WebDriverDispatcher.php                          |  2 ++
 lib/WebDriverElement.php                             |  2 ++
 lib/WebDriverEventListener.php                       |  2 ++
 lib/WebDriverExceptions.php                          |  4 ++++
 lib/WebDriverExpectedCondition.php                   |  2 ++
 lib/WebDriverHasInputDevices.php                     |  2 ++
 lib/WebDriverKeyboard.php                            |  2 ++
 lib/WebDriverKeys.php                                |  2 ++
 lib/WebDriverMouse.php                               |  2 ++
 lib/WebDriverNavigation.php                          |  2 ++
 lib/WebDriverOptions.php                             |  2 ++
 lib/WebDriverPlatform.php                            |  2 ++
 lib/WebDriverPoint.php                               |  2 ++
 lib/WebDriverSearchContext.php                       |  2 ++
 lib/WebDriverSelect.php                              |  2 ++
 lib/WebDriverTargetLocator.php                       |  2 ++
 lib/WebDriverTimeouts.php                            |  2 ++
 lib/WebDriverWait.php                                |  2 ++
 lib/WebDriverWindow.php                              |  2 ++
 lib/chrome/ChromeDriver.php                          |  2 ++
 lib/chrome/ChromeDriverService.php                   |  2 ++
 lib/chrome/ChromeOptions.php                         |  2 ++
 lib/firefox/FirefoxDriver.php                        |  2 ++
 lib/firefox/FirefoxProfile.php                       |  4 ++++
 lib/interactions/WebDriverActions.php                |  2 ++
 lib/interactions/WebDriverCompositeAction.php        |  2 ++
 lib/interactions/WebDriverTouchActions.php           |  2 ++
 lib/interactions/WebDriverTouchScreen.php            |  2 ++
 .../internal/WebDriverButtonReleaseAction.php        |  2 ++
 lib/interactions/internal/WebDriverClickAction.php   |  2 ++
 .../internal/WebDriverClickAndHoldAction.php         |  2 ++
 .../internal/WebDriverContextClickAction.php         |  2 ++
 lib/interactions/internal/WebDriverCoordinates.php   |  4 ++++
 .../internal/WebDriverDoubleClickAction.php          |  2 ++
 lib/interactions/internal/WebDriverKeyDownAction.php |  2 ++
 lib/interactions/internal/WebDriverKeyUpAction.php   |  2 ++
 .../internal/WebDriverKeysRelatedAction.php          |  2 ++
 lib/interactions/internal/WebDriverMouseAction.php   |  2 ++
 .../internal/WebDriverMouseMoveAction.php            |  2 ++
 .../internal/WebDriverMoveToOffsetAction.php         |  2 ++
 .../internal/WebDriverSendKeysAction.php             |  2 ++
 .../internal/WebDriverSingleKeyAction.php            |  2 ++
 lib/interactions/touch/WebDriverDoubleTapAction.php  |  2 ++
 lib/interactions/touch/WebDriverDownAction.php       |  2 ++
 lib/interactions/touch/WebDriverFlickAction.php      |  2 ++
 .../touch/WebDriverFlickFromElementAction.php        |  2 ++
 lib/interactions/touch/WebDriverLongPressAction.php  |  2 ++
 lib/interactions/touch/WebDriverMoveAction.php       |  2 ++
 lib/interactions/touch/WebDriverScrollAction.php     |  2 ++
 .../touch/WebDriverScrollFromElementAction.php       |  2 ++
 lib/interactions/touch/WebDriverTapAction.php        |  2 ++
 lib/interactions/touch/WebDriverTouchAction.php      |  2 ++
 lib/interactions/touch/WebDriverUpAction.php         |  2 ++
 lib/internal/WebDriverLocatable.php                  |  2 ++
 lib/net/URLChecker.php                               |  2 ++
 lib/remote/DesiredCapabilities.php                   |  2 ++
 lib/remote/DriverCommand.php                         |  2 ++
 lib/remote/ExecuteMethod.php                         |  2 ++
 lib/remote/FileDetector.php                          |  2 ++
 lib/remote/HttpCommandExecutor.php                   |  2 ++
 lib/remote/LocalFileDetector.php                     |  2 ++
 lib/remote/RemoteExecuteMethod.php                   |  2 ++
 lib/remote/RemoteKeyboard.php                        |  2 ++
 lib/remote/RemoteMouse.php                           |  2 ++
 lib/remote/RemoteTouchScreen.php                     |  2 ++
 lib/remote/RemoteWebDriver.php                       |  2 ++
 lib/remote/RemoteWebElement.php                      |  4 ++++
 lib/remote/UselessFileDetector.php                   |  2 ++
 lib/remote/WebDriverBrowserType.php                  |  2 ++
 lib/remote/WebDriverCapabilityType.php               |  2 ++
 lib/remote/WebDriverCommand.php                      |  2 ++
 lib/remote/WebDriverResponse.php                     |  2 ++
 lib/remote/service/DriverCommandExecutor.php         |  2 ++
 lib/remote/service/DriverService.php                 |  2 ++
 lib/support/events/EventFiringWebDriver.php          |  2 ++
 .../events/EventFiringWebDriverNavigation.php        |  2 ++
 lib/support/events/EventFiringWebElement.php         |  2 ++
 tests/bootstrap.php                                  |  2 ++
 tests/functional/BaseTest.php                        |  4 +++-
 tests/functional/FileUploadTest.php                  |  2 ++
 tests/functional/WebDriverTestCase.php               |  4 +++-
 tests/unit/bootstrap.php                             |  2 ++
 .../internal/WebDriverButtonReleaseActionTest.php    | 10 ++++++----
 .../internal/WebDriverClickActionTest.php            | 10 ++++++----
 .../internal/WebDriverClickAndHoldActionTest.php     | 10 ++++++----
 .../internal/WebDriverContextClickActionTest.php     | 10 ++++++----
 .../internal/WebDriverCoordinatesTest.php            |  4 +++-
 .../internal/WebDriverDoubleClickActionTest.php      | 10 ++++++----
 .../internal/WebDriverKeyDownActionTest.php          | 12 +++++++-----
 .../internal/WebDriverKeyUpActionTest.php            | 12 +++++++-----
 .../internal/WebDriverMouseMoveActionTest.php        | 10 ++++++----
 .../internal/WebDriverMouseToOffsetActionTest.php    | 10 ++++++----
 .../internal/WebDriverSendKeysActionTest.php         | 12 +++++++-----
 102 files changed, 258 insertions(+), 46 deletions(-)

diff --git a/example.php b/example.php
index a1e133b91..8cfac7461 100644
--- a/example.php
+++ b/example.php
@@ -1,6 +1,8 @@
 <?php
 // An example of using php-webdriver.
 
+namespace Selenium\WebDriver;
+
 require_once('lib/__init__.php');
 
 // start Firefox with 5 second timeout
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 131a7fef1..18cba7866 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver interface implemented by drivers that support JavaScript.
  */
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 2f4515774..e781d1059 100755
--- 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 Selenium\WebDriver;
+
 /**
  * The interface for WebDriver.
  */
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index 80a310a64..cff1ca9ae 100644
--- 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 Selenium\WebDriver;
+
 /**
  * Interface representing a single user-interaction action.
  */
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index aa731402d..4ec59ea2b 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index 7e0e9cce0..1bfa58c21 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The basic 8 mechanisms supported by webdriver to locate a web element.
  * ie. 'class name', 'css selector', 'id', 'name', 'link text',
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 3eb65f474..8dbbfd45b 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface WebDriverCapabilities {
 
   /**
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 481a9336a..2b7cd6be4 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface for all command executor.
  */
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 545370fac..a2572ecbf 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Represent a dimension.
  */
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index c5c4f191f..693763b70 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDispatcher {
 
   /**
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 81bbbd5f6..1b0670643 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 7c6620649..21c7f9002 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface WebDriverEventListener {
 
   /**
diff --git a/lib/WebDriverExceptions.php b/lib/WebDriverExceptions.php
index b0d1f47a1..a942b626b 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/WebDriverExceptions.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use \Exception;
+
 final class WebDriverCurlException extends Exception {} // When curls fail
 
 class WebDriverException extends Exception {
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index a08a37a58..52ff03579 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Canned ExpectedConditions which are generally useful within webdriver tests.
  *
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 949c26dc8..67fb80947 100644
--- 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 Selenium\WebDriver;
+
 /**
  * Interface implemented by each driver that allows access to the input devices.
  */
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index 1e39000aa..06e6091dd 100644
--- 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 Selenium\WebDriver;
+
 interface WebDriverKeyboard {
 
   /**
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index ae2b0875e..14dfa781b 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Representations of pressable keys that aren't text.
  * These are stored in the Unicode PUA (Private Use Area) code points.
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index fce57601d..f63169ff5 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 13c662ad0..ae5eac36c 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to access the browser's history and to
  * navigate to a given URL.
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 98a6d07c2..a190958ea 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Managing stuff you would do in a browser.
  */
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 9d0e413fc..a16a4cb2a 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The platforms supported by WebDriver.
  */
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 74f78d74f..e058e2673 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Represent a point.
  */
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index dacea3f33..17f3417a4 100644
--- 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 Selenium\WebDriver;
+
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for
  * WebDriverElement inside.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 09d15a56a..5bb3f4d8e 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
  */
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index e330b151d..9da924be3 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Used to locate a given frame or window.
  */
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 885c5f190..f4732f708 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Managing timeout behavior for WebDriver instances.
  */
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 68b7b46f7..a820bed44 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * A utility class, designed to help the user to wait until a condition turns
  * true.
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index e0b940042..d8facb1e9 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to manipulate the browser's window
  */
diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index 186e0341e..fae03000e 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class ChromeDriver extends RemoteWebDriver {
 
   public static function start(
diff --git a/lib/chrome/ChromeDriverService.php b/lib/chrome/ChromeDriverService.php
index c4de774e7..00206c023 100644
--- a/lib/chrome/ChromeDriverService.php
+++ b/lib/chrome/ChromeDriverService.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class ChromeDriverService extends DriverService {
 
   // The environment variable storing the path to the chrome driver executable.
diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index cef9b04f8..720dcedf3 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The class manages the capabilities in ChromeDriver.
  *
diff --git a/lib/firefox/FirefoxDriver.php b/lib/firefox/FirefoxDriver.php
index b1580baa6..7d4852129 100644
--- a/lib/firefox/FirefoxDriver.php
+++ b/lib/firefox/FirefoxDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class FirefoxDriver {
 
   const PROFILE = 'firefox_profile';
diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index af2184464..b4596af53 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use ZipArchive;
+
 class FirefoxProfile {
 
   /**
diff --git a/lib/interactions/WebDriverActions.php b/lib/interactions/WebDriverActions.php
index 301f1821a..fa86b11b8 100644
--- a/lib/interactions/WebDriverActions.php
+++ b/lib/interactions/WebDriverActions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver action builder. It implements the builder pattern.
  */
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/interactions/WebDriverCompositeAction.php
index a8a7c9a34..5660fb330 100644
--- a/lib/interactions/WebDriverCompositeAction.php
+++ b/lib/interactions/WebDriverCompositeAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An action for aggregating actions and triggering all of them afterwards.
  */
diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/interactions/WebDriverTouchActions.php
index 31bfc7dde..070e6d511 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/interactions/WebDriverTouchActions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver action builder for touch events
  */
diff --git a/lib/interactions/WebDriverTouchScreen.php b/lib/interactions/WebDriverTouchScreen.php
index 0b739f13b..00eb4cf95 100644
--- a/lib/interactions/WebDriverTouchScreen.php
+++ b/lib/interactions/WebDriverTouchScreen.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing touch screen operations.
  */
diff --git a/lib/interactions/internal/WebDriverButtonReleaseAction.php b/lib/interactions/internal/WebDriverButtonReleaseAction.php
index 76ebb7092..ea518877a 100644
--- a/lib/interactions/internal/WebDriverButtonReleaseAction.php
+++ b/lib/interactions/internal/WebDriverButtonReleaseAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Move to the location and then release the mouse key.
  */
diff --git a/lib/interactions/internal/WebDriverClickAction.php b/lib/interactions/internal/WebDriverClickAction.php
index 0aba9dc16..54adb4a6f 100644
--- a/lib/interactions/internal/WebDriverClickAction.php
+++ b/lib/interactions/internal/WebDriverClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverClickAndHoldAction.php b/lib/interactions/internal/WebDriverClickAndHoldAction.php
index 80622ed11..30169ff5b 100644
--- a/lib/interactions/internal/WebDriverClickAndHoldAction.php
+++ b/lib/interactions/internal/WebDriverClickAndHoldAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Move the the location, click and hold.
  */
diff --git a/lib/interactions/internal/WebDriverContextClickAction.php b/lib/interactions/internal/WebDriverContextClickAction.php
index 4802fdc3a..e1c3f96ad 100644
--- a/lib/interactions/internal/WebDriverContextClickAction.php
+++ b/lib/interactions/internal/WebDriverContextClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * You can call it 'Right Click' if you like.
  */
diff --git a/lib/interactions/internal/WebDriverCoordinates.php b/lib/interactions/internal/WebDriverCoordinates.php
index 18cc42020..980051bac 100644
--- a/lib/interactions/internal/WebDriverCoordinates.php
+++ b/lib/interactions/internal/WebDriverCoordinates.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use Closure;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/interactions/internal/WebDriverDoubleClickAction.php b/lib/interactions/internal/WebDriverDoubleClickAction.php
index 41fd41716..d720e0d20 100644
--- a/lib/interactions/internal/WebDriverDoubleClickAction.php
+++ b/lib/interactions/internal/WebDriverDoubleClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyDownAction.php b/lib/interactions/internal/WebDriverKeyDownAction.php
index 1de8ae0ed..70f5421eb 100644
--- a/lib/interactions/internal/WebDriverKeyDownAction.php
+++ b/lib/interactions/internal/WebDriverKeyDownAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyUpAction.php b/lib/interactions/internal/WebDriverKeyUpAction.php
index 06e652700..24b5150f3 100644
--- a/lib/interactions/internal/WebDriverKeyUpAction.php
+++ b/lib/interactions/internal/WebDriverKeyUpAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/interactions/internal/WebDriverKeysRelatedAction.php
index 1e334fb22..b5bfa0c21 100644
--- a/lib/interactions/internal/WebDriverKeysRelatedAction.php
+++ b/lib/interactions/internal/WebDriverKeysRelatedAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all keyboard-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/interactions/internal/WebDriverMouseAction.php
index 0bbdf0bf5..0d7b21309 100644
--- a/lib/interactions/internal/WebDriverMouseAction.php
+++ b/lib/interactions/internal/WebDriverMouseAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all mouse-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseMoveAction.php b/lib/interactions/internal/WebDriverMouseMoveAction.php
index ca21d3511..01e5c28bf 100644
--- a/lib/interactions/internal/WebDriverMouseMoveAction.php
+++ b/lib/interactions/internal/WebDriverMouseMoveAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverMoveToOffsetAction.php b/lib/interactions/internal/WebDriverMoveToOffsetAction.php
index d82558b55..bdf41629e 100644
--- a/lib/interactions/internal/WebDriverMoveToOffsetAction.php
+++ b/lib/interactions/internal/WebDriverMoveToOffsetAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/interactions/internal/WebDriverSendKeysAction.php
index a75e2817f..a97f06496 100644
--- a/lib/interactions/internal/WebDriverSendKeysAction.php
+++ b/lib/interactions/internal/WebDriverSendKeysAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/interactions/internal/WebDriverSingleKeyAction.php
index aa450e0d8..35fd3962c 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/interactions/internal/WebDriverSingleKeyAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
     implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverDoubleTapAction.php b/lib/interactions/touch/WebDriverDoubleTapAction.php
index 00b2c28a4..c4bf374d6 100644
--- a/lib/interactions/touch/WebDriverDoubleTapAction.php
+++ b/lib/interactions/touch/WebDriverDoubleTapAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverDownAction.php b/lib/interactions/touch/WebDriverDownAction.php
index b3e5e35fe..95be8a888 100644
--- a/lib/interactions/touch/WebDriverDownAction.php
+++ b/lib/interactions/touch/WebDriverDownAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDownAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverFlickAction.php b/lib/interactions/touch/WebDriverFlickAction.php
index 96333ec38..0b7a0cdd0 100644
--- a/lib/interactions/touch/WebDriverFlickAction.php
+++ b/lib/interactions/touch/WebDriverFlickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverFlickAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverFlickFromElementAction.php b/lib/interactions/touch/WebDriverFlickFromElementAction.php
index 6cb1d6ec9..78c91495d 100644
--- a/lib/interactions/touch/WebDriverFlickFromElementAction.php
+++ b/lib/interactions/touch/WebDriverFlickFromElementAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverLongPressAction.php b/lib/interactions/touch/WebDriverLongPressAction.php
index 556c1d47f..a34de2e10 100644
--- a/lib/interactions/touch/WebDriverLongPressAction.php
+++ b/lib/interactions/touch/WebDriverLongPressAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverLongPressAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverMoveAction.php b/lib/interactions/touch/WebDriverMoveAction.php
index b0237bdab..7cb02ab82 100644
--- a/lib/interactions/touch/WebDriverMoveAction.php
+++ b/lib/interactions/touch/WebDriverMoveAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMoveAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverScrollAction.php b/lib/interactions/touch/WebDriverScrollAction.php
index 9b5eeb583..124d5fae5 100644
--- a/lib/interactions/touch/WebDriverScrollAction.php
+++ b/lib/interactions/touch/WebDriverScrollAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverScrollAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverScrollFromElementAction.php b/lib/interactions/touch/WebDriverScrollFromElementAction.php
index aa6c3da7f..e220465a2 100644
--- a/lib/interactions/touch/WebDriverScrollFromElementAction.php
+++ b/lib/interactions/touch/WebDriverScrollFromElementAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverTapAction.php b/lib/interactions/touch/WebDriverTapAction.php
index fb1a71004..b61056e99 100644
--- a/lib/interactions/touch/WebDriverTapAction.php
+++ b/lib/interactions/touch/WebDriverTapAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverTapAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverTouchAction.php b/lib/interactions/touch/WebDriverTouchAction.php
index 1f1cabe82..3a56f2988 100644
--- a/lib/interactions/touch/WebDriverTouchAction.php
+++ b/lib/interactions/touch/WebDriverTouchAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all touch-related actions.
  */
diff --git a/lib/interactions/touch/WebDriverUpAction.php b/lib/interactions/touch/WebDriverUpAction.php
index b9fa26649..7ae77e03e 100644
--- a/lib/interactions/touch/WebDriverUpAction.php
+++ b/lib/interactions/touch/WebDriverUpAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverUpAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/internal/WebDriverLocatable.php b/lib/internal/WebDriverLocatable.php
index 5250d1347..d315387a1 100644
--- a/lib/internal/WebDriverLocatable.php
+++ b/lib/internal/WebDriverLocatable.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/net/URLChecker.php b/lib/net/URLChecker.php
index 6223dfc28..fb70e905d 100644
--- a/lib/net/URLChecker.php
+++ b/lib/net/URLChecker.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class URLChecker {
 
   const POLL_INTERVAL_MS = 500;
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index d0942d112..9c9b9779d 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class DesiredCapabilities implements WebDriverCapabilities {
 
   private $capabilities;
diff --git a/lib/remote/DriverCommand.php b/lib/remote/DriverCommand.php
index 837e5e9de..c6279dd4b 100644
--- a/lib/remote/DriverCommand.php
+++ b/lib/remote/DriverCommand.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * This list of command defined in the WebDriver json wire protocol.
  */
diff --git a/lib/remote/ExecuteMethod.php b/lib/remote/ExecuteMethod.php
index 8d934bd32..5a06fca0d 100644
--- a/lib/remote/ExecuteMethod.php
+++ b/lib/remote/ExecuteMethod.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface ExecuteMethod {
 
   /**
diff --git a/lib/remote/FileDetector.php b/lib/remote/FileDetector.php
index 134f6b95b..79216095c 100644
--- a/lib/remote/FileDetector.php
+++ b/lib/remote/FileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface FileDetector {
 
   /**
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index d7ab430b7..38076d056 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Command executor talking to the standalone server via HTTP.
  */
diff --git a/lib/remote/LocalFileDetector.php b/lib/remote/LocalFileDetector.php
index f0107b0ba..d8cac906e 100644
--- a/lib/remote/LocalFileDetector.php
+++ b/lib/remote/LocalFileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class LocalFileDetector implements FileDetector {
     /**
      * @param string $file
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/remote/RemoteExecuteMethod.php
index 248627e81..bd0f35cca 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/remote/RemoteExecuteMethod.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class RemoteExecuteMethod implements ExecuteMethod {
 
   private $driver;
diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
index 2a3cc5477..9831b74f4 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/remote/RemoteKeyboard.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute keyboard commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index 66d010252..93168abf8 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute mouse commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/remote/RemoteTouchScreen.php
index 652020dea..6ef5d35d5 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/remote/RemoteTouchScreen.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute touch commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 3675d5953..812c576b3 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
    * @var HttpCommandExecutor
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index 98b7d5f9c..601800bf0 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use ZipArchive;
+
 /**
  * Represents an HTML element.
  */
diff --git a/lib/remote/UselessFileDetector.php b/lib/remote/UselessFileDetector.php
index db4c3f2cd..f21df9e64 100644
--- a/lib/remote/UselessFileDetector.php
+++ b/lib/remote/UselessFileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class UselessFileDetector implements FileDetector {
   /**
    * @param string $file
diff --git a/lib/remote/WebDriverBrowserType.php b/lib/remote/WebDriverBrowserType.php
index b0f7aea1d..8db21c0a5 100644
--- a/lib/remote/WebDriverBrowserType.php
+++ b/lib/remote/WebDriverBrowserType.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * All the browsers supported by selenium
  */
diff --git a/lib/remote/WebDriverCapabilityType.php b/lib/remote/WebDriverCapabilityType.php
index 11fec888a..a7499d9e0 100644
--- a/lib/remote/WebDriverCapabilityType.php
+++ b/lib/remote/WebDriverCapabilityType.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
  * Wire Protocol.
diff --git a/lib/remote/WebDriverCommand.php b/lib/remote/WebDriverCommand.php
index d9d94c909..2300ce373 100644
--- a/lib/remote/WebDriverCommand.php
+++ b/lib/remote/WebDriverCommand.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverCommand {
 
   private $sessionID;
diff --git a/lib/remote/WebDriverResponse.php b/lib/remote/WebDriverResponse.php
index a42e3067c..71b934074 100644
--- a/lib/remote/WebDriverResponse.php
+++ b/lib/remote/WebDriverResponse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverResponse {
 
   /**
diff --git a/lib/remote/service/DriverCommandExecutor.php b/lib/remote/service/DriverCommandExecutor.php
index 51cdda466..3c6e573a1 100644
--- a/lib/remote/service/DriverCommandExecutor.php
+++ b/lib/remote/service/DriverCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
  * a remote server.
diff --git a/lib/remote/service/DriverService.php b/lib/remote/service/DriverService.php
index b8ba78831..0b707403e 100644
--- a/lib/remote/service/DriverService.php
+++ b/lib/remote/service/DriverService.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class DriverService {
 
   /**
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index 07d0990b1..b986c248f 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
   /**
diff --git a/lib/support/events/EventFiringWebDriverNavigation.php b/lib/support/events/EventFiringWebDriverNavigation.php
index 5fb96f929..7f1e71b0a 100644
--- a/lib/support/events/EventFiringWebDriverNavigation.php
+++ b/lib/support/events/EventFiringWebDriverNavigation.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebDriverNavigation {
 
   /**
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/support/events/EventFiringWebElement.php
index 162aeca9c..739aecd90 100644
--- a/lib/support/events/EventFiringWebElement.php
+++ b/lib/support/events/EventFiringWebElement.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
   /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 46df8183e..28437e38b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 
+namespace Selenium\WebDriver;
+
 require_once __DIR__ . '/../lib/__init__.php';
 require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 69c076cbb..b74d27d77 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class BaseTest extends WebDriverTestCase {
   
   public function testGetTitle() {
@@ -94,4 +96,4 @@ public function testGetByTagName() {
       $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
     );
   }
-}
\ No newline at end of file
+}
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 84ec454e8..7f09aa8f0 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An example test case for php-webdriver.
  * 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 92b017b34..53e031ac9 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -13,10 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The base class for test cases.
  */
-class WebDriverTestCase extends PHPUnit_Framework_TestCase {
+class WebDriverTestCase extends \PHPUnit_Framework_TestCase {
 
   /** @var RemoteWebDriver $driver */
   protected $driver;
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 562467964..80da4bb38 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -1,3 +1,5 @@
 <?php
 
+namespace Selenium\WebDriver;
+
 require_once __DIR__ . '/../../lib/__init__.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 609415846..2b489ff8c 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverButtonReleaseAction
    */
@@ -23,8 +25,8 @@ class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index 98fd39197..ca60ae668 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index fe1826ee0..78781fae6 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAndHoldAction
    */
@@ -23,8 +25,8 @@ class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index 7ac3162cc..ece8f3488 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverContextClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index cf4cc0d12..f339e5044 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverCoordinatesTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
     $in_view_port = function() { };
     $on_page = function() { };
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index a0c85ac0d..ae45d169b 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverDoubleClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index f82b25cb1..0cc5cb5cd 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyDownAction
    */
@@ -24,9 +26,9 @@ class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -35,7 +37,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index e35277bd7..daf7bfc06 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyUpAction
    */
@@ -24,9 +26,9 @@ class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -36,7 +38,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index aec3444d3..2c6ee400e 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMouseMoveAction
    */
@@ -23,8 +25,8 @@ class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index 2cd2bc75d..c6066d051 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
    */
@@ -23,8 +25,8 @@ class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -34,7 +36,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 9f9cad84b..6a51f8934 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverSendKeysAction
    */
@@ -25,9 +27,9 @@ class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase {
   private $keys;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -38,7 +40,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From fab0b484142430f4f598baef45680f945a60eb4f Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 28 Oct 2014 13:04:04 -0700
Subject: [PATCH 096/784] CURLOPT_CONNECTTIMEOUT_MS is undefined in some
 versions of PHP

For some reasons, CURLOPT_CONNECTTIMEOUT_MS is undefined and it is
a bug in some versions of php.

Bug reports,
https://www.mail-archive.com/wikibugs-l@lists.wikimedia.org/msg312672.html

Issue on facebook/php-webdriver,
https://github.com/facebook/php-webdriver/issues/154

Issue on Codeception/Codeception,
https://github.com/Codeception/Codeception/issues/1116
---
 lib/net/URLChecker.php             | 6 ++++++
 lib/remote/HttpCommandExecutor.php | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/net/URLChecker.php b/lib/net/URLChecker.php
index 6223dfc28..894c2ca37 100644
--- a/lib/net/URLChecker.php
+++ b/lib/net/URLChecker.php
@@ -59,6 +59,12 @@ private function getHTTPResponseCode($timeout_in_ms, $url) {
     curl_setopt($ch, CURLOPT_URL, $url);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
+    // There is a PHP bug in some versions which didn't define the constant.
+    curl_setopt(
+      $ch,
+      156, // CURLOPT_CONNECTTIMEOUT_MS
+      self::CONNECT_TIMEOUT_MS
+    );
     $code = null;
     try {
       curl_exec($ch);
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index d7ab430b7..f01bec8cb 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -113,7 +113,6 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
   public function __construct($url) {
     $this->url = $url;
     $this->curl = curl_init();
-    curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, 300000);
     curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
     curl_setopt(
@@ -124,6 +123,7 @@ public function __construct($url) {
         'Accept: application/json',
       )
     );
+    $this->setTimeout(300000);
   }
 
   /**
@@ -131,7 +131,8 @@ public function __construct($url) {
    * @return HttpCommandExecutor
    */
   public function setTimeout($timeout) {
-    curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $timeout);
+    // There is a PHP bug in some versions which didn't define the constant.
+    curl_setopt($this->curl, /* CURLOPT_CONNECTTIMEOUT_MS */ 156, $timeout);
     return $this;
   }
 

From bcc76d8166957ce43947324201343571218ad669 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Thu, 30 Oct 2014 10:33:27 +0100
Subject: [PATCH 097/784] merged HTTP auth with latest version

---
 lib/remote/HttpCommandExecutor.php |  4 +++-
 lib/remote/RemoteWebDriver.php     | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index f01bec8cb..c88641981 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -110,11 +110,13 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
   /**
    * @param string $url
    */
-  public function __construct($url) {
+  public function __construct($url, $auth_method, $auth_creds) {
     $this->url = $url;
     $this->curl = curl_init();
     curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
+    curl_setopt($this->curl, CURLOPT_HTTPAUTH, $auth_method);
+    curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
     curl_setopt(
       $this->curl,
       CURLOPT_HTTPHEADER,
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 3675d5953..4896376ac 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -52,7 +52,9 @@ protected function __construct() {}
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = 300000
+    $timeout_in_ms = 300000,
+    $auth_method = null,
+    $auth_creds = null
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -62,7 +64,7 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
-    $executor = new HttpCommandExecutor($url);
+    $executor = new HttpCommandExecutor($url, $auth_method, $auth_creds);
     $executor->setTimeout($timeout_in_ms);
 
     $command = new WebDriverCommand(
@@ -92,11 +94,13 @@ public static function create(
    */
   public static function createBySessionID(
     $session_id,
-    $url = 'http://localhost:4444/wd/hub'
+    $url = 'http://localhost:4444/wd/hub',
+	$auth_method = CURLAUTH_ANY,
+	$auth_creds = null
   ) {
     $driver = new static();
     $driver->setSessionID($session_id)
-           ->setCommandExecutor(new HttpCommandExecutor($url));
+           ->setCommandExecutor(new HttpCommandExecutor($url, $auth_method, $auth_creds));
     return $driver;
   }
 

From 2dad5561e4a6ecc0d220bc739921bab4fbce0a6e Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Thu, 30 Oct 2014 10:37:07 +0100
Subject: [PATCH 098/784] set default auth to none

---
 lib/remote/RemoteWebDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 4896376ac..9bc9769ec 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -95,7 +95,7 @@ public static function create(
   public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub',
-	$auth_method = CURLAUTH_ANY,
+	$auth_method = null,
 	$auth_creds = null
   ) {
     $driver = new static();

From f711b6623043ed2f39713e7211eef9ce288c48d9 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Thu, 30 Oct 2014 10:41:09 +0100
Subject: [PATCH 099/784] space instead of tab indentation

---
 lib/remote/RemoteWebDriver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 9bc9769ec..638c44432 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -95,8 +95,8 @@ public static function create(
   public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub',
-	$auth_method = null,
-	$auth_creds = null
+    $auth_method = null,
+    $auth_creds = null
   ) {
     $driver = new static();
     $driver->setSessionID($session_id)

From 8873e3b4eeb6e1d46a3ffa64ccb3a2ecdbb8e7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:28:10 +0100
Subject: [PATCH 100/784] Update composer.json

Updated composer.json for packagist publishing
---
 composer.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 00faaa7bf..24f37c8fd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,13 @@
 {
-  "name": "facebook/webdriver",
-  "description": "A php client for WebDriver",
-  "keywords": ["webdriver", "selenium", "php", "facebook"],
-  "homepage": "https://github.com/facebook/php-webdriver",
+  "name": "janoszen/webdriver",
+  "description": "A php client for WebDriver (fork of facebook/webdriver)",
+  "keywords": ["webdriver", "selenium", "php"],
+  "homepage": "https://github.com/janoszen/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/facebook/php-webdriver/issues",
-    "forum": "https://www.facebook.com/groups/phpwebdriver/",
-    "source": "https://github.com/facebook/php-webdriver"
+    "issues": "https://github.com/janoszen/php-webdriver/issues",
+    "source": "https://github.com/janoszen/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"

From f88c2744bb0c722f345ec12df4691e3c673443e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:29:26 +0100
Subject: [PATCH 101/784] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d5272c4f4..85047203d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 php-webdriver -- WebDriver bindings for PHP
 ===========================================
 
+Attention! This is a fork of facebook/webdriver and has been altered to include namespacing to avoid naming collisions.
+
 ##  DESCRIPTION
 
 This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.

From 1f3fb9d9736e73839d0328fa2d05e4147c5999e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:30:48 +0100
Subject: [PATCH 102/784] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 85047203d..657d6ad73 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,11 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
     git clone git@github.com:facebook/php-webdriver.git
 
 ### Packagist
-Add the dependency. https://packagist.org/packages/facebook/webdriver
+Add the dependency. https://packagist.org/packages/janoszen/webdriver
 
     {
       "require": {
-        "facebook/webdriver": "dev-master"
+        "janoszen/webdriver": "dev-master"
       }
     }
     
@@ -100,8 +100,8 @@ If you're reading this you've already found our Github repository. If you have a
 
 We love to have your help to make php-webdriver better. Feel free to 
 
-*   open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem. 
-*   fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
+*   open an [issue](https://github.com/janoszen/php-webdriver/issues) if you run into any problem. 
+*   fork the project and submit [pull request](https://github.com/janoszen/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)

From 85c149dd60f526ad712c80ea51c6f0f0e0aa2bcb Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 11:42:45 +0100
Subject: [PATCH 103/784] try to get credentias from url using regex

---
 lib/remote/HttpCommandExecutor.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index c88641981..9dbd200ea 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -111,11 +111,17 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    * @param string $url
    */
   public function __construct($url, $auth_method, $auth_creds) {
-    $this->url = $url;
+  
+  preg_match("/^http[s]?//(.*):(.*)@.*/", $url, $matches);
+  
+  print "matches:\n"
+  print_r($matches);
+
+  $this->url = $url;
     $this->curl = curl_init();
     curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
-    curl_setopt($this->curl, CURLOPT_HTTPAUTH, $auth_method);
+    curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
     curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
     curl_setopt(
       $this->curl,

From 456a6ddecfa6ba57b404261681b9c411fd2503a4 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 11:44:35 +0100
Subject: [PATCH 104/784] syntax error

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 9dbd200ea..b41c4780b 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -114,7 +114,7 @@ public function __construct($url, $auth_method, $auth_creds) {
   
   preg_match("/^http[s]?//(.*):(.*)@.*/", $url, $matches);
   
-  print "matches:\n"
+  print "matches:\n";
   print_r($matches);
 
   $this->url = $url;

From 17d668425c68d14743d517f7f0a931c474117219 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 11:46:09 +0100
Subject: [PATCH 105/784] escaping error in regex

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index b41c4780b..f5b8c5e74 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -112,7 +112,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    */
   public function __construct($url, $auth_method, $auth_creds) {
   
-  preg_match("/^http[s]?//(.*):(.*)@.*/", $url, $matches);
+  preg_match("/^http[s]?\/\/(.*):(.*)@.*/", $url, $matches);
   
   print "matches:\n";
   print_r($matches);

From 4f47b3fcb16e15ffd33e56712f8a3e7760fa9391 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 12:07:19 +0100
Subject: [PATCH 106/784] fixed regex

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index f5b8c5e74..8e85ca084 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -112,7 +112,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    */
   public function __construct($url, $auth_method, $auth_creds) {
   
-  preg_match("/^http[s]?\/\/(.*):(.*)@.*/", $url, $matches);
+  preg_match("/^https?:\/\/(.*):(.*)@.*/U", $url, $matches);
   
   print "matches:\n";
   print_r($matches);

From a72065a13639c3d5eb4ff1555433a4567ed15845 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 12:10:03 +0100
Subject: [PATCH 107/784] debug

---
 lib/remote/HttpCommandExecutor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 8e85ca084..87d92cb62 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -114,6 +114,7 @@ public function __construct($url, $auth_method, $auth_creds) {
   
   preg_match("/^https?:\/\/(.*):(.*)@.*/U", $url, $matches);
   
+  print "url:\n$url\n";
   print "matches:\n";
   print_r($matches);
 

From be999f3555e93ac55f2e88dcf2fcad11f543ac1f Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 12:13:29 +0100
Subject: [PATCH 108/784] tweaked the regex some more

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 87d92cb62..e11d23764 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -112,7 +112,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    */
   public function __construct($url, $auth_method, $auth_creds) {
   
-  preg_match("/^https?:\/\/(.*):(.*)@.*/U", $url, $matches);
+  preg_match("/^(https?:\/\/)(.*):(.*)@(.*)/U", $url, $matches);
   
   print "url:\n$url\n";
   print "matches:\n";

From d35fd19c845a0731e47d36fc84552b08e73da10f Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:30:08 +0100
Subject: [PATCH 109/784] fix regex

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index e11d23764..2ef953bdb 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -112,7 +112,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    */
   public function __construct($url, $auth_method, $auth_creds) {
   
-  preg_match("/^(https?:\/\/)(.*):(.*)@(.*)/U", $url, $matches);
+  preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches);
   
   print "url:\n$url\n";
   print "matches:\n";

From 386f7f9957a9a0416276af6c842ba9339c908d22 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:34:14 +0100
Subject: [PATCH 110/784] get the creds from regex

---
 lib/remote/HttpCommandExecutor.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 2ef953bdb..a06c68064 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -113,10 +113,11 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
   public function __construct($url, $auth_method, $auth_creds) {
   
   preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches);
-  
+  $url = $matches[1].$matches[4];
+  $auth_creds = $matches[2].":".$matches[3];
   print "url:\n$url\n";
-  print "matches:\n";
-  print_r($matches);
+  //print "matches:\n";
+  //print_r($matches);
 
   $this->url = $url;
     $this->curl = curl_init();

From 4304bcec899ee7053ff2ac6621f458d7d45ba460 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:38:04 +0100
Subject: [PATCH 111/784] removed auth arguments

---
 lib/remote/HttpCommandExecutor.php |  3 ++-
 lib/remote/RemoteWebDriver.php     | 12 ++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a06c68064..1300f4131 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -110,8 +110,9 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
   /**
    * @param string $url
    */
-  public function __construct($url, $auth_method, $auth_creds) {
+  public function __construct($url) {
   
+  // Get credentials from $url (if any)
   preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches);
   $url = $matches[1].$matches[4];
   $auth_creds = $matches[2].":".$matches[3];
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 638c44432..3675d5953 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -52,9 +52,7 @@ protected function __construct() {}
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = 300000,
-    $auth_method = null,
-    $auth_creds = null
+    $timeout_in_ms = 300000
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -64,7 +62,7 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
-    $executor = new HttpCommandExecutor($url, $auth_method, $auth_creds);
+    $executor = new HttpCommandExecutor($url);
     $executor->setTimeout($timeout_in_ms);
 
     $command = new WebDriverCommand(
@@ -94,13 +92,11 @@ public static function create(
    */
   public static function createBySessionID(
     $session_id,
-    $url = 'http://localhost:4444/wd/hub',
-    $auth_method = null,
-    $auth_creds = null
+    $url = 'http://localhost:4444/wd/hub'
   ) {
     $driver = new static();
     $driver->setSessionID($session_id)
-           ->setCommandExecutor(new HttpCommandExecutor($url, $auth_method, $auth_creds));
+           ->setCommandExecutor(new HttpCommandExecutor($url));
     return $driver;
   }
 

From d477c2c664a7f45b70b2947ea88250e09c926363 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:45:39 +0100
Subject: [PATCH 112/784] check if creds have been found

---
 lib/remote/HttpCommandExecutor.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 1300f4131..bf661b27e 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -114,11 +114,13 @@ public function __construct($url) {
   
   // Get credentials from $url (if any)
   preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches);
-  $url = $matches[1].$matches[4];
-  $auth_creds = $matches[2].":".$matches[3];
+  if(array_key_exists($matches[4])){
+    $url = $matches[1].$matches[4];
+    $auth_creds = $matches[2].":".$matches[3];
+  }
   print "url:\n$url\n";
-  //print "matches:\n";
-  //print_r($matches);
+  print "matches:\n";
+  print_r($matches);
 
   $this->url = $url;
     $this->curl = curl_init();

From a9849d8d86c6c5602a412e042c4b2dab275ec379 Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:47:03 +0100
Subject: [PATCH 113/784] whoopsie

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index bf661b27e..451fd83e7 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -114,7 +114,7 @@ public function __construct($url) {
   
   // Get credentials from $url (if any)
   preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches);
-  if(array_key_exists($matches[4])){
+  if(array_key_exists(4, $matches)){
     $url = $matches[1].$matches[4];
     $auth_creds = $matches[2].":".$matches[3];
   }

From cc18cb2a391ae6936b9e3289507aa3cece3b90ca Mon Sep 17 00:00:00 2001
From: Vernier Slenter <vernier.slenter@qnh.nl>
Date: Fri, 31 Oct 2014 13:52:53 +0100
Subject: [PATCH 114/784] cleanup

---
 lib/remote/HttpCommandExecutor.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 451fd83e7..eb4521814 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -118,16 +118,15 @@ public function __construct($url) {
     $url = $matches[1].$matches[4];
     $auth_creds = $matches[2].":".$matches[3];
   }
-  print "url:\n$url\n";
-  print "matches:\n";
-  print_r($matches);
 
   $this->url = $url;
     $this->curl = curl_init();
     curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
-    curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-    curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
+    if(strlen($auth_creds) > 0){
+      curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+      curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
+    }
     curl_setopt(
       $this->curl,
       CURLOPT_HTTPHEADER,

From 46d14c74cf0851ff96178e691dada0f5bfa65988 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 31 Oct 2014 16:42:19 -0700
Subject: [PATCH 115/784] FirefoxProfile on Windows

Windows uses \ as the DIRECTORY_SEPARATOR which is not compatible with the
regex matching in FirefoxProfile.
---
 lib/firefox/FirefoxProfile.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index af2184464..4e0c063bb 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -80,7 +80,12 @@ public function encode() {
       if (is_dir($name)) {
         continue;
       }
-      $path = preg_replace("#^{$temp_dir}/#", "", $name);
+      $dir_prefix = preg_replace(
+        '#\\\\#',
+        '\\\\\\\\',
+        $temp_dir.DIRECTORY_SEPARATOR
+      );
+      $path = preg_replace("#^{$dir_prefix}#", "", $name);
       $zip->addFile($name, $path);
     }
     $zip->close();

From f666d1d41aebc9b663ed20a2ffe748d9a34a29f5 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 4 Nov 2014 14:06:19 -0800
Subject: [PATCH 116/784] Fix a curl connect timeout issue

We are seeing error like this.
`'WebDriverCurlException' with message 'Curl error thrown for http POST to /session/38719813-dd76-4d78-838c-491016a2f4cf/url with params: {"url":"https:\/\/www.facebook.com\/"}`

This is because the default value for CURLOPT_TIMEOUT_MS is too small. Change it to a reasonable value.
---
 lib/remote/HttpCommandExecutor.php | 5 +++--
 lib/remote/RemoteWebDriver.php     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 51b0870fb..5942a632d 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -133,14 +133,15 @@ public function __construct($url) {
         'Accept: application/json',
       )
     );
-    $this->setTimeout(300000);
+    curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, 300000);
+    $this->setConnectionTimeout(300000);
   }
 
   /**
    * @param int $timeout
    * @return HttpCommandExecutor
    */
-  public function setTimeout($timeout) {
+  public function setConnectionTimeout($timeout) {
     // There is a PHP bug in some versions which didn't define the constant.
     curl_setopt($this->curl, /* CURLOPT_CONNECTTIMEOUT_MS */ 156, $timeout);
     return $this;
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 3675d5953..881ccc9aa 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -63,7 +63,7 @@ public static function create(
     }
 
     $executor = new HttpCommandExecutor($url);
-    $executor->setTimeout($timeout_in_ms);
+    $executor->setConnectionTimeout($timeout_in_ms);
 
     $command = new WebDriverCommand(
       null,

From 98894fc72f370e7a190a933f29f03f2c3f2323c0 Mon Sep 17 00:00:00 2001
From: Gabriel Preston <gpreston@gmail.com>
Date: Tue, 4 Nov 2014 14:47:55 -0800
Subject: [PATCH 117/784] Fix for creating a new session

New sessions should follow up a 300 level redirect with a GET instead of forcing another POST.
---
 lib/remote/HttpCommandExecutor.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 5942a632d..359d6a0e9 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -184,7 +184,13 @@ public function execute(WebDriverCommand $command) {
     }
 
     curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
-    curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
+    switch ($command->getName()) {
+      case 'newSession':
+        curl_setopt($this->curl, CURLOPT_POST, 1);
+        break;
+      default:
+        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
+    }
     $encoded_params = null;
     if ($http_method === 'POST' && $params && is_array($params)) {
       $encoded_params = json_encode($params);

From ad8cedc34488626307b0e4e380899182600a2655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Nov 2014 10:33:18 +0100
Subject: [PATCH 118/784] Fix missing return in DesiredCapabilities getter

---
 lib/remote/DesiredCapabilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index d0942d112..82fadf244 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -55,7 +55,7 @@ public function setVersion($version) {
    * @return mixed The value of a capability.
    */
   public function getCapability($name) {
-    $this->get($name);
+    return $this->get($name);
   }
 
   /**

From ae5df3a41cf7a316fc52d0c7dec30761e95eabc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D0=BD=D0=B4=D1=83=D0=BA=D0=BE=D0=B2=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <public-mail@alekciy.ru>
Date: Thu, 20 Nov 2014 12:53:18 +0400
Subject: [PATCH 119/784] Add get all sessions method

---
 lib/remote/HttpCommandExecutor.php |  1 +
 lib/remote/RemoteWebDriver.php     | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a8428d3f5..f8f104511 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -23,6 +23,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
    */
   protected static $commands = array(
+    DriverCommand::GET_ALL_SESSIONS =>        array('method' => 'GET', 'url' => '/sessions'),
     DriverCommand::ACCEPT_ALERT =>            array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
     DriverCommand::ADD_COOKIE =>              array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
     DriverCommand::CLEAR_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 881ccc9aa..4d40a8831 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -461,6 +461,29 @@ public function getSessionID() {
     return $this->sessionID;
   }
 
+  /**
+   * Get all selenium sessions.
+   *
+   * @param string $url The url of the remote server
+   * @param int $timeout_in_ms
+   * @return array
+   */
+  public static function getAllSessions(
+    $url = 'http://localhost:4444/wd/hub',
+    $timeout_in_ms = 300000
+  ) {
+    $executor = new HttpCommandExecutor($url);
+    $executor->setConnectionTimeout($timeout_in_ms);
+
+    $command = new WebDriverCommand(
+      null,
+      DriverCommand::GET_ALL_SESSIONS,
+      array()
+    );
+
+    return $executor->execute($command)->getValue();
+  }
+
   public function execute($command_name, $params = array()) {
     $command = new WebDriverCommand(
       $this->sessionID,

From b474dec77d0998d1eec1cce606c7e63a3a626342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 21 Nov 2014 12:14:31 +0100
Subject: [PATCH 120/784] Do not hardcode CURL's request timeout, added ability
 to set custom timeout.

---
 lib/remote/HttpCommandExecutor.php | 25 +++++++++++++++++++------
 lib/remote/RemoteWebDriver.php     |  1 +
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a8428d3f5..78dd95d85 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -133,24 +133,37 @@ public function __construct($url) {
         'Accept: application/json',
       )
     );
-    curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, 300000);
+
+    $this->setRequestTimeout(300000);
     $this->setConnectionTimeout(300000);
   }
 
   /**
-   * @param int $timeout
+   * Set timeout for the connect phase
+   *
+   * @param int $timeout_in_ms Timeout in milliseconds
    * @return HttpCommandExecutor
    */
-  public function setConnectionTimeout($timeout) {
+  public function setConnectionTimeout($timeout_in_ms) {
     // There is a PHP bug in some versions which didn't define the constant.
-    curl_setopt($this->curl, /* CURLOPT_CONNECTTIMEOUT_MS */ 156, $timeout);
+    curl_setopt($this->curl, /* CURLOPT_CONNECTTIMEOUT_MS */ 156, $timeout_in_ms);
     return $this;
   }
 
   /**
-   * @param WebDriverCommand $command
-   * @param array $curl_opts An array of curl options.
+   * Set maximum time the request is allowed to take
    *
+   * @param int $timeout_in_ms Timeout in milliseconds
+   * @return HttpCommandExecutor
+   */
+  public function setRequestTimeout($timeout_in_ms)
+  {
+    curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, $timeout_in_ms);
+    return $this;
+  }
+
+  /**
+   * @param WebDriverCommand $command
    * @return mixed
    */
   public function execute(WebDriverCommand $command) {
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 881ccc9aa..e589c04cb 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -64,6 +64,7 @@ public static function create(
 
     $executor = new HttpCommandExecutor($url);
     $executor->setConnectionTimeout($timeout_in_ms);
+    $executor->setRequestTimeout($timeout_in_ms);
 
     $command = new WebDriverCommand(
       null,

From b4a697243597da8686c82563e6b97c03e11b90ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 26 Nov 2014 01:00:44 +0100
Subject: [PATCH 121/784] Improve PHPDoc - missing @params, variable types,
 inconsistencies, typos etc.

---
 lib/WebDriver.php                             |  3 ++
 lib/WebDriverAlert.php                        |  1 +
 lib/WebDriverBy.php                           |  9 ++++++
 lib/WebDriverCapabilities.php                 |  2 ++
 lib/WebDriverCommandExecutor.php              |  1 +
 lib/WebDriverElement.php                      |  4 +--
 lib/WebDriverExceptions.php                   | 19 ++++++++++--
 lib/WebDriverExpectedCondition.php            |  8 ++---
 lib/WebDriverKeys.php                         |  2 +-
 lib/WebDriverMouse.php                        |  8 +++++
 lib/WebDriverNavigation.php                   |  1 +
 lib/WebDriverOptions.php                      |  4 ++-
 lib/WebDriverPoint.php                        |  4 +++
 lib/WebDriverWait.php                         |  1 +
 lib/WebDriverWindow.php                       |  6 ++--
 lib/chrome/ChromeOptions.php                  |  4 +--
 lib/firefox/FirefoxProfile.php                |  2 +-
 lib/interactions/WebDriverActions.php         | 30 +++++++++++++++++++
 lib/interactions/WebDriverCompositeAction.php |  1 +
 lib/interactions/WebDriverTouchActions.php    | 20 +++++++++++++
 lib/interactions/WebDriverTouchScreen.php     |  3 +-
 .../internal/WebDriverKeysRelatedAction.php   |  5 ++++
 .../internal/WebDriverSendKeysAction.php      |  6 ++++
 .../touch/WebDriverDownAction.php             |  5 ++++
 .../touch/WebDriverFlickAction.php            |  5 ++++
 .../touch/WebDriverFlickFromElementAction.php |  7 +++++
 .../touch/WebDriverMoveAction.php             |  5 ++++
 .../touch/WebDriverScrollAction.php           |  5 ++++
 .../WebDriverScrollFromElementAction.php      |  6 ++++
 .../touch/WebDriverTouchAction.php            |  4 +++
 lib/interactions/touch/WebDriverUpAction.php  |  5 ++++
 lib/net/URLChecker.php                        |  2 --
 lib/remote/DesiredCapabilities.php            | 14 ++++++++-
 lib/remote/HttpCommandExecutor.php            |  2 --
 lib/remote/RemoteExecuteMethod.php            |  2 ++
 lib/support/events/EventFiringWebDriver.php   |  2 +-
 lib/support/events/EventFiringWebElement.php  |  4 +--
 tests/functional/WebDriverTestCase.php        |  3 ++
 tests/functional/html/upload.html             |  2 +-
 39 files changed, 190 insertions(+), 27 deletions(-)

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 2f4515774..6c8ea3ea0 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -28,6 +28,7 @@ public function close();
   /**
    * Load a new web page in the current browser window.
    *
+   * @param string $url
    * @return WebDriver The current instance.
    */
   public function get($url);
@@ -91,6 +92,8 @@ public function takeScreenshot($save_as = null);
    *     WebDriverExpectedCondition::titleIs('WebDriver Page')
    *   );
    *
+   * @param int $timeout_in_second
+   * @param int $interval_in_millisecond
    * @return WebDriverWait
    */
   public function wait(
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index aa731402d..5a735371b 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -56,6 +56,7 @@ public function getText() {
   /**
    * Send keystrokes to javascript prompt() dialog
    *
+   * @param string $value
    * @return WebDriverAlert
    */
   public function sendKeys($value) {
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index 7e0e9cce0..3409afd25 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -48,6 +48,7 @@ public function getValue() {
    * Locates elements whose class name contains the search value; compound class
    * names are not permitted.
    *
+   * @param string $class_name
    * @return WebDriverBy
    */
   public static function className($class_name) {
@@ -57,6 +58,7 @@ public static function className($class_name) {
   /**
    * Locates elements matching a CSS selector.
    *
+   * @param string $css_selector
    * @return WebDriverBy
    */
   public static function cssSelector($css_selector) {
@@ -66,6 +68,7 @@ public static function cssSelector($css_selector) {
   /**
    * Locates elements whose ID attribute matches the search value.
    *
+   * @param string $id
    * @return WebDriverBy
    */
   public static function id($id) {
@@ -74,6 +77,8 @@ public static function id($id) {
 
   /**
    * Locates elements whose NAME attribute matches the search value.
+   *
+   * @param string $name
    * @return WebDriverBy
    */
   public static function name($name) {
@@ -83,6 +88,7 @@ public static function name($name) {
   /**
    * Locates anchor elements whose visible text matches the search value.
    *
+   * @param string $link_text
    * @return WebDriverBy
    */
   public static function linkText($link_text) {
@@ -93,6 +99,7 @@ public static function linkText($link_text) {
    * Locates anchor elements whose visible text partially matches the search
    * value.
    *
+   * @param string $partial_link_text
    * @return WebDriverBy
    */
   public static function partialLinkText($partial_link_text) {
@@ -102,6 +109,7 @@ public static function partialLinkText($partial_link_text) {
   /**
    * Locates elements whose tag name matches the search value.
    *
+   * @param string $tag_name
    * @return WebDriverBy
    */
   public static function tagName($tag_name) {
@@ -111,6 +119,7 @@ public static function tagName($tag_name) {
   /**
    * Locates elements matching an XPath expression.
    *
+   * @param string $xpath
    * @return WebDriverBy
    */
   public static function xpath($xpath) {
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 3eb65f474..1e70efb2c 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -21,6 +21,7 @@ interface WebDriverCapabilities {
   public function getBrowserName();
 
   /**
+   * @param string $name
    * @return mixed The value of a capability.
    */
   public function getCapability($name);
@@ -36,6 +37,7 @@ public function getPlatform();
   public function getVersion();
 
   /**
+   * @param string $capability_name
    * @return bool Whether the value is not null and not false.
    */
   public function is($capability_name);
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 481a9336a..ea1864f49 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -19,6 +19,7 @@
 interface WebDriverCommandExecutor {
 
   /**
+   * @param WebDriverCommand $command
    * @return mixed
    */
   public function execute(WebDriverCommand $command);
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 81bbbd5f6..62a0a1543 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -52,7 +52,7 @@ public function getCSSValue($css_property_name);
   /**
    * Get the location of element relative to the top-left corner of the page.
    *
-   * @return WebDriverLocation The location of the element.
+   * @return WebDriverPoint The location of the element.
    */
   public function getLocation();
 
@@ -60,7 +60,7 @@ public function getLocation();
    * Try scrolling the element into the view port and return the location of
    * element relative to the top-left corner of the page afterwards.
    *
-   * @return WebDriverLocation The location of the element.
+   * @return WebDriverPoint The location of the element.
    */
   public function getLocationOnScreenOnceScrolledIntoView();
 
diff --git a/lib/WebDriverExceptions.php b/lib/WebDriverExceptions.php
index b0d1f47a1..a098ec7f5 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/WebDriverExceptions.php
@@ -19,11 +19,18 @@ class WebDriverException extends Exception {
 
   private $results;
 
+  /**
+   * @param string $message
+   * @param mixed $results
+   */
   public function __construct($message, $results = null) {
     parent::__construct($message);
     $this->results = $results;
   }
 
+  /**
+   * @return mixed
+   */
   public function getResults() {
     return $this->results;
   }
@@ -32,6 +39,10 @@ public function getResults() {
    * Throw WebDriverExceptions.
    * For $status_code >= 0, they are errors defined in the json wired protocol.
    * For $status_code < 0, they are errors defined in php-webdriver.
+   *
+   * @param int $status_code
+   * @param string $message
+   * @param mixed $results
    */
   public static function throwException($status_code, $message, $results) {
     switch ($status_code) {
@@ -154,9 +165,13 @@ class UnrecognizedExceptionException extends WebDriverException {}
 
 class UnexpectedTagNameException extends WebDriverException {
 
+  /**
+   * @param string $expected_tag_name
+   * @param string $actual_tag_name
+   */
   public function __construct(
-      string $expected_tag_name,
-      string $actual_tag_name) {
+      $expected_tag_name,
+      $actual_tag_name) {
     parent::__construct(
       sprintf(
         "Element should have been \"%s\" but was \"%s\"",
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index a08a37a58..283db89e0 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -40,7 +40,7 @@ protected function __construct($apply) {
   /**
    * An expectation for checking the title of a page.
    *
-   * @param string title The expected title, which must be an exact match.
+   * @param string $title The expected title, which must be an exact match.
    * @return WebDriverExpectedCondition<bool> True when the title matches,
    *         false otherwise.
    */
@@ -55,7 +55,7 @@ function ($driver) use ($title) {
   /**
    * An expectation for checking substring of a page Title.
    *
-   * @param string title The expected substring of Title.
+   * @param string $title The expected substring of Title.
    * @return WebDriverExpectedCondition<bool> True when in title,
    *         false otherwise.
    */
@@ -187,7 +187,7 @@ function ($driver) use ($by, $text) {
    * Expectation for checking if iFrame exists.
    * If iFrame exists switches driver's focus to the iFrame
    *
-   * @param string frame_locator The locator used to find the iFrame
+   * @param string $frame_locator The locator used to find the iFrame
    *   expected to be either the id or name value of the i/frame
    * @return WebDriverExpectedCondition<WebDriver> object focused on new frame
    *         when frame is found bool false otherwise
@@ -328,7 +328,7 @@ function ($driver) use ($condition) {
   /**
    * An expectation for checking if the given element is selected.
    *
-   * @param mixed element_or_by Either the element or the locator.
+   * @param mixed $element_or_by Either the element or the locator.
    * @return WebDriverExpectedCondition<bool> whether the element is selected.
    */
   public static function elementToBeSelected($element_or_by) {
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index ae2b0875e..a471ead1b 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -86,7 +86,7 @@ class WebDriverKeys {
 
   /**
    * Encode input of `sendKeys()`.
-   * @params string|array $keys
+   * @param string|array $keys
    * @return array
    */
   public static function encode($keys) {
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index fce57601d..624a25c34 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -19,26 +19,33 @@
 interface WebDriverMouse {
 
   /**
+   * @param WebDriverCoordinates $where
    * @return WebDriverMouse
    */
   public function click(WebDriverCoordinates $where);
 
   /**
+   * @param WebDriverCoordinates $where
    * @return WebDriverMouse
    */
   public function contextClick(WebDriverCoordinates $where);
 
   /**
+   * @param WebDriverCoordinates $where
    * @return WebDriverMouse
    */
   public function doubleClick(WebDriverCoordinates $where);
 
   /**
+   * @param WebDriverCoordinates $where
    * @return WebDriverMouse
    */
   public function mouseDown(WebDriverCoordinates $where);
 
   /**
+   * @param WebDriverCoordinates $where
+   * @param int $x_offset
+   * @param int $y_offset
    * @return WebDriverMouse
    */
   public function mouseMove(WebDriverCoordinates $where,
@@ -46,6 +53,7 @@ public function mouseMove(WebDriverCoordinates $where,
                             $y_offset = null);
 
   /**
+   * @param WebDriverCoordinates $where
    * @return WebDriverMouse
    */
   public function mouseUp(WebDriverCoordinates $where);
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 13c662ad0..919232efe 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -63,6 +63,7 @@ public function refresh() {
   /**
    * Navigate to the given URL.
    *
+   * @param string $url
    * @return WebDriverNavigation The instance.
    */
   public function to($url) {
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 98a6d07c2..61b5eb16f 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -65,6 +65,7 @@ public function deleteAllCookies() {
   /**
    * Delete the cookie with the give name.
    *
+   * @param string $name
    * @return WebDriverOptions The current instance.
    */
   public function deleteCookieNamed($name) {
@@ -78,6 +79,7 @@ public function deleteCookieNamed($name) {
   /**
    * Get the cookie with a given name.
    *
+   * @param string $name
    * @return array The cookie, or null if no cookie with the given name is
    *               presented.
    */
@@ -141,7 +143,7 @@ public function window() {
   /**
    * Get the log for a given log type. Log buffer is reset after each request.
    *
-   * @param $logType The log type.
+   * @param string $log_type The log type.
    * @return array The list of log entries.
    * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
    */
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 74f78d74f..6992c15c7 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -46,6 +46,8 @@ public function getY() {
   /**
    * Set the point to a new position.
    *
+   * @param int $new_x
+   * @param int $new_y
    * @return WebDriverPoint The same instance with updated coordinates.
    */
   public function move($new_x, $new_y) {
@@ -57,6 +59,8 @@ public function move($new_x, $new_y) {
   /**
    * Move the current by offsets.
    *
+   * @param int $x_offset
+   * @param int $y_offset
    * @return WebDriverPoint The same instance with updated coordinates.
    */
   public function moveBy($x_offset, $y_offset) {
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 68b7b46f7..34d573552 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -40,6 +40,7 @@ public function __construct(
    * value is not falsey.
    *
    * @param (closure|WebDriverExpectedCondition)
+   * @param string $message
    * @return mixed The return value of $func_or_ec
    */
   public function until($func_or_ec, $message = "") {
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index e0b940042..0bf86388b 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -75,8 +75,7 @@ public function maximize() {
    * Set the size of the current window. This will change the outer window
    * dimension, not just the view port.
    *
-   * @param int $width The target window width.
-   * @param int $height The target height height.
+   * @param WebDriverDimension $size
    * @return WebDriverWindow The instance.
    */
   public function setSize(WebDriverDimension $size) {
@@ -93,8 +92,7 @@ public function setSize(WebDriverDimension $size) {
    * Set the position of the current window. This is relative to the upper left
    * corner of the screen.
    *
-   * @param int $width The target window width.
-   * @param int $height The target height height.
+   * @param WebDriverPoint $position
    * @return WebDriverWindow The instance.
    */
   public function setPosition(WebDriverPoint $position) {
diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index cef9b04f8..54562d602 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -58,7 +58,7 @@ public function setBinary($path) {
   }
 
   /**
-   * @param array $args
+   * @param array $arguments
    * @return ChromeOptions
    */
   public function addArguments(array $arguments) {
@@ -96,7 +96,7 @@ public function addEncodedExtensions(array $encoded_extensions) {
    * Sets an experimental option which has not exposed officially.
    *
    * @param string $name
-   * @parma mixed $value
+   * @param mixed $value
    * @return ChromeOptions
    */
   public function setExperimentalOption($name, $value) {
diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index 4e0c063bb..203592168 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -136,7 +136,7 @@ private function createTempDirectory($prefix = '') {
 
   /**
    * @param string $xpi The path to the .xpi extension.
-   * @param string The path to the unzip directory.
+   * @param string $target_dir The path to the unzip directory.
    * @return FirefoxProfile
    */
   private function extractTo($xpi, $target_dir) {
diff --git a/lib/interactions/WebDriverActions.php b/lib/interactions/WebDriverActions.php
index 301f1821a..e560db92b 100644
--- a/lib/interactions/WebDriverActions.php
+++ b/lib/interactions/WebDriverActions.php
@@ -41,6 +41,8 @@ public function perform() {
   /**
    * Mouse click.
    * If $element is provided, move to the middle of the element first.
+   *
+   * @param WebDriverElement $element
    * @return WebDriverActions
    */
   public function click(WebDriverElement $element = null) {
@@ -53,6 +55,8 @@ public function click(WebDriverElement $element = null) {
   /**
    * Mouse click and hold.
    * If $element is provided, move to the middle of the element first.
+   *
+   * @param WebDriverElement $element
    * @return WebDriverActions
    */
   public function clickAndHold(WebDriverElement $element = null) {
@@ -65,6 +69,8 @@ public function clickAndHold(WebDriverElement $element = null) {
   /**
    * Context-click (right click).
    * If $element is provided, move to the middle of the element first.
+   *
+   * @param WebDriverElement $element
    * @return WebDriverActions
    */
   public function contextClick(WebDriverElement $element = null) {
@@ -77,6 +83,8 @@ public function contextClick(WebDriverElement $element = null) {
   /**
    * Double click.
    * If $element is provided, move to the middle of the element first.
+   *
+   * @param WebDriverElement $element
    * @return WebDriverActions
    */
   public function doubleClick(WebDriverElement $element = null) {
@@ -88,6 +96,9 @@ public function doubleClick(WebDriverElement $element = null) {
 
   /**
    * Drag and drop from $source to $target.
+   *
+   * @param WebDriverElement $source
+   * @param WebDriverElement $target
    * @return WebDriverActions
    */
   public function dragAndDrop(WebDriverElement $source,
@@ -106,6 +117,10 @@ public function dragAndDrop(WebDriverElement $source,
 
   /**
    * Drag $source and drop by offset ($x_offset, $y_offset).
+   *
+   * @param WebDriverElement $source
+   * @param int $x_offset
+   * @param int $y_offset
    * @return WebDriverActions
    */
   public function dragAndDropBy(WebDriverElement $source,
@@ -125,6 +140,9 @@ public function dragAndDropBy(WebDriverElement $source,
 
   /**
    * Mouse move by offset.
+   *
+   * @param int $x_offset
+   * @param int $y_offset
    * @return WebDriverActions
    */
   public function moveByOffset($x_offset, $y_offset) {
@@ -137,6 +155,10 @@ public function moveByOffset($x_offset, $y_offset) {
   /**
    * Move to the middle of the given WebDriverElement. If offset are provided,
    * move the an offset from the top-left cornerof that element.
+   *
+   * @param WebDriverElement $element
+   * @param int $x_offset
+   * @param int $y_offset
    * @return WebDriverActions
    */
   public function moveToElement(WebDriverElement $element,
@@ -151,6 +173,8 @@ public function moveToElement(WebDriverElement $element,
   /**
    * Release the mouse button.
    * If $element is provided, move to the middle of the element first.
+   *
+   * @param WebDriverElement $element
    * @return WebDriverActions
    */
   public function release(WebDriverElement $element = null) {
@@ -165,6 +189,8 @@ public function release(WebDriverElement $element = null) {
    * If $element is provided, focus on that element first.
    *
    * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+   * @param WebDriverElement $element
+   * @param string $key
    * @return WebDriverActions
    */
   public function keyDown(WebDriverElement $element = null, $key = null) {
@@ -179,6 +205,8 @@ public function keyDown(WebDriverElement $element = null, $key = null) {
    * If $element is provided, focus on that element first.
    *
    * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+   * @param WebDriverElement $element
+   * @param string $key
    * @return WebDriverActions
    */
   public function keyUp(WebDriverElement $element = null, $key = null) {
@@ -193,6 +221,8 @@ public function keyUp(WebDriverElement $element = null, $key = null) {
    * If $element is provided, focus on that element first.
    *
    * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+   * @param WebDriverElement $element
+   * @param string $keys
    * @return WebDriverActions
    */
   public function sendKeys(WebDriverElement $element = null, $keys = null) {
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/interactions/WebDriverCompositeAction.php
index a8a7c9a34..8cb204b72 100644
--- a/lib/interactions/WebDriverCompositeAction.php
+++ b/lib/interactions/WebDriverCompositeAction.php
@@ -23,6 +23,7 @@ class WebDriverCompositeAction implements WebDriverAction {
   /**
    * Add an WebDriverAction to the sequence.
    *
+   * @param WebDriverAction $action
    * @return WebDriverCompositeAction The current instance.
    */
   public function addAction(WebDriverAction $action) {
diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/interactions/WebDriverTouchActions.php
index 31bfc7dde..38a5e76e4 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/interactions/WebDriverTouchActions.php
@@ -52,6 +52,7 @@ public function __construct(WebDriver $driver) {
   }
 
   /**
+   * @param WebDriverElement $element
    * @return WebDriverTouchActions
    */
   public function tap(WebDriverElement $element) {
@@ -62,6 +63,8 @@ public function tap(WebDriverElement $element) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function down($x, $y) {
@@ -72,6 +75,8 @@ public function down($x, $y) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function up($x, $y) {
@@ -82,6 +87,8 @@ public function up($x, $y) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function move($x, $y) {
@@ -92,6 +99,8 @@ public function move($x, $y) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function scroll($x, $y) {
@@ -102,6 +111,9 @@ public function scroll($x, $y) {
   }
 
   /**
+   * @param WebDriverElement $element
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function scrollFromElement(WebDriverElement $element, $x, $y) {
@@ -112,6 +124,7 @@ public function scrollFromElement(WebDriverElement $element, $x, $y) {
   }
 
   /**
+   * @param WebDriverElement $element
    * @return WebDriverTouchActions
    */
   public function doubleTap(WebDriverElement $element) {
@@ -122,6 +135,7 @@ public function doubleTap(WebDriverElement $element) {
   }
 
   /**
+   * @param WebDriverElement $element
    * @return WebDriverTouchActions
    */
   public function longPress(WebDriverElement $element) {
@@ -132,6 +146,8 @@ public function longPress(WebDriverElement $element) {
   }
 
   /**
+   * @param int $x
+   * @param int $y
    * @return WebDriverTouchActions
    */
   public function flick($x, $y) {
@@ -142,6 +158,10 @@ public function flick($x, $y) {
   }
 
   /**
+   * @param WebDriverElement $element
+   * @param int $x
+   * @param int $y
+   * @param int $speed
    * @return WebDriverTouchActions
    */
   public function flickFromElement(WebDriverElement $element, $x, $y, $speed) {
diff --git a/lib/interactions/WebDriverTouchScreen.php b/lib/interactions/WebDriverTouchScreen.php
index 0b739f13b..d38a8bccf 100644
--- a/lib/interactions/WebDriverTouchScreen.php
+++ b/lib/interactions/WebDriverTouchScreen.php
@@ -47,7 +47,7 @@ public function down($x, $y);
    * Flick on the touch screen using finger motion events. Use this flick
    * command if you don't care where the flick starts on the screen.
    *
-   * @param int $xpeed
+   * @param int $xspeed
    * @param int $yspeed
    * @return $this
    */
@@ -69,6 +69,7 @@ public function flickFromElement(
   /**
    * Long press on the touch screen using finger motion events.
    *
+   * @param WebDriverElement $element
    * @return $this
    */
   public function longPress(WebDriverElement $element);
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/interactions/internal/WebDriverKeysRelatedAction.php
index 1e334fb22..c97069d87 100644
--- a/lib/interactions/internal/WebDriverKeysRelatedAction.php
+++ b/lib/interactions/internal/WebDriverKeysRelatedAction.php
@@ -22,6 +22,11 @@ abstract class WebDriverKeysRelatedAction {
   protected $mouse;
   protected $locationProvider;
 
+  /**
+   * @param WebDriverKeyboard $keyboard
+   * @param WebDriverMouse $mouse
+   * @param WebDriverLocatable $location_provider
+   */
   public function __construct(
       WebDriverKeyboard $keyboard,
       WebDriverMouse $mouse,
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/interactions/internal/WebDriverSendKeysAction.php
index a75e2817f..8dcc69183 100644
--- a/lib/interactions/internal/WebDriverSendKeysAction.php
+++ b/lib/interactions/internal/WebDriverSendKeysAction.php
@@ -19,6 +19,12 @@ class WebDriverSendKeysAction
 
   private $keys;
 
+  /**
+   * @param WebDriverKeyboard $keyboard
+   * @param WebDriverMouse $mouse
+   * @param WebDriverLocatable $location_provider
+   * @param string $keys
+   */
   public function __construct(
       WebDriverKeyboard $keyboard,
       WebDriverMouse $mouse,
diff --git a/lib/interactions/touch/WebDriverDownAction.php b/lib/interactions/touch/WebDriverDownAction.php
index b3e5e35fe..43c4ed08d 100644
--- a/lib/interactions/touch/WebDriverDownAction.php
+++ b/lib/interactions/touch/WebDriverDownAction.php
@@ -20,6 +20,11 @@ class WebDriverDownAction
   private $x;
   private $y;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
     $this->x = $x;
     $this->y = $y;
diff --git a/lib/interactions/touch/WebDriverFlickAction.php b/lib/interactions/touch/WebDriverFlickAction.php
index 96333ec38..76337c468 100644
--- a/lib/interactions/touch/WebDriverFlickAction.php
+++ b/lib/interactions/touch/WebDriverFlickAction.php
@@ -17,6 +17,11 @@ class WebDriverFlickAction
   extends WebDriverTouchAction
   implements WebDriverAction {
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
     $this->x = $x;
     $this->y = $y;
diff --git a/lib/interactions/touch/WebDriverFlickFromElementAction.php b/lib/interactions/touch/WebDriverFlickFromElementAction.php
index 6cb1d6ec9..f361f1c29 100644
--- a/lib/interactions/touch/WebDriverFlickFromElementAction.php
+++ b/lib/interactions/touch/WebDriverFlickFromElementAction.php
@@ -21,6 +21,13 @@ class WebDriverFlickFromElementAction
   private $y;
   private $speed;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param WebDriverElement $element
+   * @param int $x
+   * @param int $y
+   * @param int $speed
+   */
   public function __construct(
     WebDriverTouchScreen $touch_screen,
     WebDriverElement $element, $x, $y, $speed
diff --git a/lib/interactions/touch/WebDriverMoveAction.php b/lib/interactions/touch/WebDriverMoveAction.php
index b0237bdab..2c089a343 100644
--- a/lib/interactions/touch/WebDriverMoveAction.php
+++ b/lib/interactions/touch/WebDriverMoveAction.php
@@ -20,6 +20,11 @@ class WebDriverMoveAction
   private $x;
   private $y;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
     $this->x = $x;
     $this->y = $y;
diff --git a/lib/interactions/touch/WebDriverScrollAction.php b/lib/interactions/touch/WebDriverScrollAction.php
index 9b5eeb583..082b1acaf 100644
--- a/lib/interactions/touch/WebDriverScrollAction.php
+++ b/lib/interactions/touch/WebDriverScrollAction.php
@@ -20,6 +20,11 @@ class WebDriverScrollAction
   private $x;
   private $y;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
     $this->x = $x;
     $this->y = $y;
diff --git a/lib/interactions/touch/WebDriverScrollFromElementAction.php b/lib/interactions/touch/WebDriverScrollFromElementAction.php
index aa6c3da7f..3c985b6bd 100644
--- a/lib/interactions/touch/WebDriverScrollFromElementAction.php
+++ b/lib/interactions/touch/WebDriverScrollFromElementAction.php
@@ -20,6 +20,12 @@ class WebDriverScrollFromElementAction
   private $x;
   private $y;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param WebDriverElement $element
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(
       WebDriverTouchScreen $touch_screen, WebDriverElement $element, $x, $y
   ) {
diff --git a/lib/interactions/touch/WebDriverTouchAction.php b/lib/interactions/touch/WebDriverTouchAction.php
index 1f1cabe82..99abced9c 100644
--- a/lib/interactions/touch/WebDriverTouchAction.php
+++ b/lib/interactions/touch/WebDriverTouchAction.php
@@ -28,6 +28,10 @@ abstract class WebDriverTouchAction {
    */
   protected $locationProvider;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param WebDriverLocatable $location_provider
+   */
   public function __construct(
     WebDriverTouchScreen $touch_screen,
     WebDriverLocatable $location_provider = null
diff --git a/lib/interactions/touch/WebDriverUpAction.php b/lib/interactions/touch/WebDriverUpAction.php
index b9fa26649..298302769 100644
--- a/lib/interactions/touch/WebDriverUpAction.php
+++ b/lib/interactions/touch/WebDriverUpAction.php
@@ -20,6 +20,11 @@ class WebDriverUpAction
   private $x;
   private $y;
 
+  /**
+   * @param WebDriverTouchScreen $touch_screen
+   * @param int $x
+   * @param int $y
+   */
   public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
     $this->x = $x;
     $this->y = $y;
diff --git a/lib/net/URLChecker.php b/lib/net/URLChecker.php
index 894c2ca37..97ca7c874 100644
--- a/lib/net/URLChecker.php
+++ b/lib/net/URLChecker.php
@@ -33,8 +33,6 @@ public function waitUntilAvailable($timeout_in_ms, $url) {
       $url,
       $timeout_in_ms
     ));
-
-    return $this;
   }
 
   public function waitUntilUnavailable($timeout_in_ms, $url) {
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index 82fadf244..191837371 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -29,6 +29,7 @@ public function getBrowserName() {
   }
 
   /**
+   * @param string $browser_name
    * @return DesiredCapabilities
    */
   public function setBrowserName($browser_name) {
@@ -44,6 +45,7 @@ public function getVersion() {
   }
 
   /**
+   * @param string $version
    * @return DesiredCapabilities
    */
   public function setVersion($version) {
@@ -52,6 +54,7 @@ public function setVersion($version) {
   }
 
   /**
+   * @param string $name
    * @return mixed The value of a capability.
    */
   public function getCapability($name) {
@@ -59,6 +62,8 @@ public function getCapability($name) {
   }
 
   /**
+   * @param string $name
+   * @param mixed $value
    * @return DesiredCapabilities
    */
   public function setCapability($name, $value) {
@@ -74,6 +79,7 @@ public function getPlatform() {
   }
 
   /**
+   * @param string $platform
    * @return DesiredCapabilities
    */
   public function setPlatform($platform) {
@@ -82,10 +88,11 @@ public function setPlatform($platform) {
   }
 
   /**
+   * @param string $capability_name
    * @return bool Whether the value is not null and not false.
    */
   public function is($capability_name) {
-    return (bool)$this->get($capability_name);
+    return (bool) $this->get($capability_name);
   }
 
   /**
@@ -98,6 +105,7 @@ public function isJavascriptEnabled() {
   /**
    * This is a htmlUnit-only option.
    *
+   * @param bool $enabled
    * @return DesiredCapabilities
    * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
    */
@@ -134,6 +142,8 @@ public function toArray() {
   }
 
   /**
+   * @param string $key
+   * @param mixed $value
    * @return DesiredCapabilities
    */
   private function set($key, $value) {
@@ -142,6 +152,8 @@ private function set($key, $value) {
   }
 
   /**
+   * @param string $key
+   * @param mixed $default
    * @return mixed
    */
   private function get($key, $default = null) {
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a8428d3f5..96b39a717 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -149,8 +149,6 @@ public function setConnectionTimeout($timeout) {
 
   /**
    * @param WebDriverCommand $command
-   * @param array $curl_opts An array of curl options.
-   *
    * @return mixed
    */
   public function execute(WebDriverCommand $command) {
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/remote/RemoteExecuteMethod.php
index 248627e81..1c06470b9 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/remote/RemoteExecuteMethod.php
@@ -25,6 +25,8 @@ public function __construct(RemoteWebDriver $driver) {
   }
 
   /**
+   * @param string $command_name
+   * @param array $parameters
    * @return mixed
    */
   public function execute(
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index 07d0990b1..b51c88e70 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -26,7 +26,7 @@ class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
   protected $dispatcher;
 
   /**
-   * @param WebDriver           $webdriver
+   * @param WebDriver $driver
    * @param WebDriverDispatcher $dispatcher
    */
   public function __construct(WebDriver $driver,
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/support/events/EventFiringWebElement.php
index 162aeca9c..1e0e499af 100644
--- a/lib/support/events/EventFiringWebElement.php
+++ b/lib/support/events/EventFiringWebElement.php
@@ -198,7 +198,7 @@ public function getCSSValue($css_property_name) {
   }
 
   /**
-   * @return WebDriverLocation
+   * @return WebDriverPoint
    * @throws WebDriverException
    */
   public function getLocation() {
@@ -210,7 +210,7 @@ public function getLocation() {
   }
 
   /**
-   * @return WebDriverLocation
+   * @return WebDriverPoint
    * @throws WebDriverException
    */
   public function getLocationOnScreenOnceScrolledIntoView() {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 92b017b34..4a5b77f6c 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -38,6 +38,9 @@ protected function tearDown() {
 
   /**
    * Get the URL of the test html.
+   *
+   * @param $path
+   * @return string
    */
   protected function getTestPath($path) {
     return 'file:///'.dirname(__FILE__).'/html/'.$path;
diff --git a/tests/functional/html/upload.html b/tests/functional/html/upload.html
index 957514f3f..d542ad04f 100644
--- a/tests/functional/html/upload.html
+++ b/tests/functional/html/upload.html
@@ -3,7 +3,7 @@
   <title>Upload a file</title>
 </head>
 <body>
-  <form method="post" enctype="mutipart/form-data">
+  <form method="post" enctype="multipart/form-data">
     <input type="file" id="upload"></input>
   </form>
 </body>

From 2e5479c6362f1369f059d85036e41ddad722eb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 26 Nov 2014 01:14:12 +0100
Subject: [PATCH 122/784] Fix private property name and visibility

---
 lib/interactions/internal/WebDriverSingleKeyAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/interactions/internal/WebDriverSingleKeyAction.php
index aa450e0d8..7d06cd330 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/interactions/internal/WebDriverSingleKeyAction.php
@@ -17,7 +17,7 @@ abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
     implements WebDriverAction {
 
-  private $keys;
+  protected $key;
 
   public function __construct(
       WebDriverKeyboard $keyboard,

From e51fef9653343e93ce2f0eff06ac18f3e2582e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 26 Nov 2014 01:19:30 +0100
Subject: [PATCH 123/784] Fix minor phpdoc typos

---
 lib/WebDriverExpectedCondition.php | 2 +-
 lib/remote/RemoteWebDriver.php     | 2 +-
 lib/remote/RemoteWebElement.php    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 283db89e0..256039e0c 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -396,7 +396,7 @@ function ($driver) {
    * An expectation with the logical opposite condition of the given condition.
    *
    * @param WebDriverExpectedCondition $condition The condition to be negated.
-   * @return mixed The nagation of the result of the given condition.
+   * @return mixed The negation of the result of the given condition.
    */
   public static function not(WebDriverExpectedCondition $condition) {
     return new WebDriverExpectedCondition(
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 881ccc9aa..89af3b212 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -422,7 +422,7 @@ private function newElement($id) {
   }
 
   /**
-   * Set the command executor of this RemoteWebdrver
+   * Set the command executor of this RemoteWebdriver
    *
    * @param WebDriverCommandExecutor $executor
    * @return RemoteWebDriver
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index 98b7d5f9c..ea4d1b992 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -319,7 +319,7 @@ private function upload($local_file) {
       throw new WebDriverException("You may only upload files: " . $local_file);
     }
 
-    // Create a temperary file in the system temp directory.
+    // Create a temporary file in the system temp directory.
     $temp_zip = tempnam('', 'WebDriverZip');
     $zip = new ZipArchive();
     if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
@@ -344,7 +344,7 @@ private function upload($local_file) {
    * Set the fileDetector in order to let the RemoteWebElement to know that
    * you are going to upload a file.
    *
-   * Bascially, if you want WebDriver trying to send a file, set the fileDector
+   * Basically, if you want WebDriver trying to send a file, set the fileDetector
    * to be LocalFileDetector. Otherwise, keep it UselessFileDetector.
    *
    *   eg. $element->setFileDetector(new LocalFileDetector);

From c06f562598cddaea1bcf397adce4ca5aab1b4b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 26 Nov 2014 01:24:49 +0100
Subject: [PATCH 124/784] Replace java-like types defintion with PHPDoc format

---
 lib/WebDriverExpectedCondition.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 256039e0c..ca9f4df7c 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -41,7 +41,7 @@ protected function __construct($apply) {
    * An expectation for checking the title of a page.
    *
    * @param string $title The expected title, which must be an exact match.
-   * @return WebDriverExpectedCondition<bool> True when the title matches,
+   * @return bool WebDriverExpectedCondition True when the title matches,
    *         false otherwise.
    */
   public static function titleIs($title) {
@@ -56,7 +56,7 @@ function ($driver) use ($title) {
    * An expectation for checking substring of a page Title.
    *
    * @param string $title The expected substring of Title.
-   * @return WebDriverExpectedCondition<bool> True when in title,
+   * @return bool WebDriverExpectedCondition True when in title,
    *         false otherwise.
    */
   public static function titleContains($title) {
@@ -145,7 +145,7 @@ function ($driver) use ($by) {
    *
    * @param WebDriverBy $by The locator used to find the element.
    * @param string $text The text to be presented in the element.
-   * @return WebDriverExpectedCondition<bool> Whether the text is presented.
+   * @return bool WebDriverExpectedCondition Whether the text is presented.
    */
   public static function textToBePresentInElement(
       WebDriverBy $by, $text) {
@@ -167,7 +167,7 @@ function ($driver) use ($by, $text) {
    *
    * @param WebDriverBy $by The locator used to find the element.
    * @param string $text The text to be presented in the element value.
-   * @return WebDriverExpectedCondition<bool> Whether the text is presented.
+   * @return bool WebDriverExpectedCondition Whether the text is presented.
    */
   public static function textToBePresentInElementValue(
       WebDriverBy $by, $text) {
@@ -209,7 +209,7 @@ function ($driver) use ($frame_locator) {
    * present on the DOM.
    *
    * @param WebDriverBy $by The locator used to find the element.
-   * @return WebDriverExpectedCondition<bool> Whether there is no element
+   * @return bool WebDriverExpectedCondition Whether there is no element
    *         located.
    */
   public static function invisibilityOfElementLocated(WebDriverBy $by) {
@@ -232,7 +232,7 @@ function ($driver) use ($by) {
    *
    * @param WebdriverBy $by The locator used to find the element.
    * @param string $text The text of the element.
-   * @return WebDriverExpectedCondition<bool> Whether the text is found in the
+   * @return bool WebDriverExpectedCondition Whether the text is found in the
    *         element located.
    */
   public static function invisibilityOfElementWithText(
@@ -284,7 +284,7 @@ function ($driver) use ($visibility_of_element_located) {
    * Wait until an element is no longer attached to the DOM.
    *
    * @param WebDriverElement $element The element to wait for.
-   * @return WebDriverExpectedCondition<bool> false if the element is still
+   * @return bool WebDriverExpectedCondition false if the element is still
    *         attached to the DOM, true otherwise.
    */
   public static function stalenessOf(WebDriverElement $element) {
@@ -329,7 +329,7 @@ function ($driver) use ($condition) {
    * An expectation for checking if the given element is selected.
    *
    * @param mixed $element_or_by Either the element or the locator.
-   * @return WebDriverExpectedCondition<bool> whether the element is selected.
+   * @return bool WebDriverExpectedCondition whether the element is selected.
    */
   public static function elementToBeSelected($element_or_by) {
     return WebDriverExpectedCondition::elementSelectionStateToBe(
@@ -343,7 +343,7 @@ public static function elementToBeSelected($element_or_by) {
    *
    * @param mixed $element_or_by Either the element or the locator.
    * @param bool $selected The required state.
-   * @return WebDriverExpectedCondition<bool> Whether the element is selected.
+   * @return bool WebDriverExpectedCondition Whether the element is selected.
    */
   public static function elementSelectionStateToBe(
       $element_or_by,

From 1454bf15eedada8e230fa39b1c0b9c52cd1a2da7 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Tue, 2 Dec 2014 11:15:41 +0800
Subject: [PATCH 125/784] An explanation to issue 188

---
 lib/chrome/ChromeOptions.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index cef9b04f8..92a769d71 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -120,6 +120,10 @@ public function toCapabilities() {
   public function toArray() {
     $options = $this->experimentalOptions;
 
+    // The selenium server expects a 'dictionary' instead of a 'list' when
+    // reading the chrome option. However, an empty array in PHP will be
+    // converted to a 'list' instead of a 'dictionary'. To fix it, we always
+    // set the 'binary' to avoid returning an empty array.
     $options['binary'] = $this->binary;
 
     if ($this->arguments) {

From 8a6526617639cda65be1d237e1da21e27378ade8 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Wed, 3 Dec 2014 14:23:29 +0100
Subject: [PATCH 126/784] review TouchActions to be performed and compliant
 with java

---
 lib/interactions/WebDriverTouchActions.php | 27 ++--------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/interactions/WebDriverTouchActions.php
index 31bfc7dde..108ef081a 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/interactions/WebDriverTouchActions.php
@@ -16,39 +16,16 @@
 /**
  * WebDriver action builder for touch events
  */
-class WebDriverTouchActions {
+class WebDriverTouchActions extends WebDriverActions {
 
   /**
    * @var WebDriverTouchScreen
    */
   protected $touchScreen;
 
-  /**
-   * @var WebDriver
-   */
-  protected $driver;
-
-  /**
-   * @var WebDriverKeyboard
-   */
-  protected $keyboard;
-
-  /**
-   * @var WebDriverMouse
-   */
-  protected $mouse;
-
-  /**
-   * @var WebDriverCompositeAction
-   */
-  protected $action;
-
   public function __construct(WebDriver $driver) {
-    $this->driver = $driver;
-    $this->keyboard = $driver->getKeyboard();
-    $this->mouse = $driver->getMouse();
+    parent::__construct($driver);
     $this->touchScreen = $driver->getTouch();
-    $this->action = new WebDriverCompositeAction();
   }
 
   /**

From c46d7230c4a20db978bbdbc34217b724f6832345 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 5 Dec 2014 10:04:55 -0800
Subject: [PATCH 127/784] keep the commands in order

---
 lib/remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index a773b91f9..f2dbcf2e6 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -23,7 +23,6 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
    *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
    */
   protected static $commands = array(
-    DriverCommand::GET_ALL_SESSIONS =>        array('method' => 'GET', 'url' => '/sessions'),
     DriverCommand::ACCEPT_ALERT =>            array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
     DriverCommand::ADD_COOKIE =>              array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
     DriverCommand::CLEAR_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
@@ -45,6 +44,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
     DriverCommand::GET_ACTIVE_ELEMENT =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
     DriverCommand::GET_ALERT_TEXT =>          array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
     DriverCommand::GET_ALL_COOKIES =>         array('method' => 'GET',  'url' => '/session/:sessionId/cookie'),
+    DriverCommand::GET_ALL_SESSIONS =>        array('method' => 'GET', 'url' => '/sessions'),
     DriverCommand::GET_AVAILABLE_LOG_TYPES => array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
     DriverCommand::GET_CURRENT_URL =>         array('method' => 'GET',  'url' => '/session/:sessionId/url'),
     DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('method' => 'GET',  'url' => '/session/:sessionId/window_handle'),

From 925ba2180b8e0037ef9dcf08e352d9c46ee89fc2 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Sun, 7 Dec 2014 21:00:38 +0100
Subject: [PATCH 128/784] Add ChromeDriverService parameter in ChromeDriver
 constructor

---
 lib/chrome/ChromeDriver.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index 186e0341e..71059171b 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -16,12 +16,13 @@
 class ChromeDriver extends RemoteWebDriver {
 
   public static function start(
-    DesiredCapabilities $desired_capabilities = null
+    DesiredCapabilities $desired_capabilities = null,
+    ChromeDriverService $service = null
   ) {
     if ($desired_capabilities === null) {
       $desired_capabilities = DesiredCapabilities::chrome();
     }
-    $service = ChromeDriverService::createDefaultService();
+    $service = $service ? $service : ChromeDriverService::createDefaultService();
     $executor = new DriverCommandExecutor($service);
     $driver = new static();
     $driver->setCommandExecutor($executor)

From 7a8a8d69d7d0d04fc4681499fe1458510de3d322 Mon Sep 17 00:00:00 2001
From: Yannick Chabbert <yannick.chabbert@makina-corpus.com>
Date: Sun, 14 Dec 2014 21:18:37 +0100
Subject: [PATCH 129/784] fix switch to main document

---
 lib/WebDriverTargetLocator.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index e330b151d..bc2d50cb3 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -33,7 +33,8 @@ public function __construct($executor, $driver) {
    * @return WebDriver The driver focused on the top window or the first frame.
    */
   public function defaultContent() {
-    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, array());
+    $params = array('id' => null);
+    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
     return $this->driver;
   }

From 03aca1f21cfea477221df490a37f31bdd8806389 Mon Sep 17 00:00:00 2001
From: James HD <james.hattersley-dykes@bbc.co.uk>
Date: Fri, 19 Dec 2014 16:17:04 +0000
Subject: [PATCH 130/784] trying out php 5.3.3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00faaa7bf..03545733b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.19"
+    "php": ">=5.3.3"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",

From 05bb0c62d3ec80fc60df62028b718628b9edc639 Mon Sep 17 00:00:00 2001
From: Wai Hon Law <whhone@gmail.com>
Date: Fri, 2 Jan 2015 18:44:06 -0800
Subject: [PATCH 131/784] Getting the active element

$active_element = $driver->switchTo()->activeElement();
---
 lib/WebDriverTargetLocator.php              | 50 +++--------
 lib/__init__.php                            |  3 +-
 lib/chrome/ChromeDriver.php                 |  2 +-
 lib/remote/RemoteTargetLocator.php          | 96 +++++++++++++++++++++
 lib/remote/RemoteWebDriver.php              | 16 +---
 lib/support/events/EventFiringWebDriver.php | 13 ---
 6 files changed, 116 insertions(+), 64 deletions(-)
 create mode 100644 lib/remote/RemoteTargetLocator.php

diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index e330b151d..9b23df527 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -16,15 +16,7 @@
 /**
  * Used to locate a given frame or window.
  */
-class WebDriverTargetLocator {
-
-  protected $executor;
-  protected $driver;
-
-  public function __construct($executor, $driver) {
-    $this->executor = $executor;
-    $this->driver = $driver;
-  }
+interface WebDriverTargetLocator {
 
   /**
    * Switch to the main document if the page contains iframes. Otherwise, switch
@@ -32,31 +24,16 @@ public function __construct($executor, $driver) {
    *
    * @return WebDriver The driver focused on the top window or the first frame.
    */
-  public function defaultContent() {
-    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, array());
-
-    return $this->driver;
-  }
+  public function defaultContent();
 
   /**
    * Switch to the iframe by its id or name.
    *
    * @param WebDriverElement|string $frame The WebDriverElement,
-                                           the id or the name of the frame.
+   *                                       the id or the name of the frame.
    * @return WebDriver The driver focused on the given frame.
    */
-  public function frame($frame) {
-    if ($frame instanceof WebDriverElement) {
-      $id = array('ELEMENT' => $frame->getID());
-    } else {
-      $id = (string)$frame;
-    }
-
-    $params = array('id' => $id);
-    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
-
-    return $this->driver;
-  }
+  public function frame($frame);
 
   /**
    * Switch the focus to another window by its handle.
@@ -65,12 +42,7 @@ public function frame($frame) {
    * @return WebDriver Tge driver focused on the given window.
    * @see WebDriver::getWindowHandles
    */
-  public function window($handle) {
-    $params = array('name' => (string)$handle);
-    $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
-
-    return $this->driver;
-  }
+  public function window($handle);
 
   /**
    * Switch to the currently active modal dialog for this particular driver
@@ -78,7 +50,13 @@ public function window($handle) {
    *
    * @return WebDriverAlert
    */
-  public function alert() {
-    return new WebDriverAlert($this->executor);
-  }
+  public function alert();
+
+  /**
+   * Switches to the element that currently has focus within the document
+   * currently "switched to", or the body element if this cannot be detected.
+   *
+   * @return WebDriverElement
+   */
+  public function activeElement();
 }
diff --git a/lib/__init__.php b/lib/__init__.php
index d10dd12ca..55219b491 100755
--- a/lib/__init__.php
+++ b/lib/__init__.php
@@ -24,6 +24,7 @@
 require_once('remote/FileDetector.php');
 require_once('WebDriverCapabilities.php');
 require_once('remote/ExecuteMethod.php');
+require_once('WebDriverTargetLocator.php');
 
 // abstract class
 require_once('interactions/internal/WebDriverKeysRelatedAction.php');
@@ -48,7 +49,6 @@
 require_once('WebDriverPlatform.php');
 require_once('WebDriverPoint.php');
 require_once('WebDriverSelect.php');
-require_once('WebDriverTargetLocator.php');
 require_once('WebDriverTimeouts.php');
 require_once('WebDriverWait.php');
 require_once('WebDriverWindow.php');
@@ -85,6 +85,7 @@
 require_once('remote/WebDriverCapabilityType.php');
 require_once('remote/DesiredCapabilities.php');
 require_once('remote/WebDriverResponse.php');
+require_once('remote/RemoteTargetLocator.php');
 
 require_once('remote/HttpCommandExecutor.php');
 require_once('remote/service/DriverCommandExecutor.php');
diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index cf2d21ccd..b1194628e 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -23,7 +23,7 @@ public static function start(
       $desired_capabilities = DesiredCapabilities::chrome();
     }
     if ($service === null) {
-        $service = ChromeDriverService::createDefaultService();
+      $service = ChromeDriverService::createDefaultService();
     }
     $executor = new DriverCommandExecutor($service);
     $driver = new static();
diff --git a/lib/remote/RemoteTargetLocator.php b/lib/remote/RemoteTargetLocator.php
new file mode 100644
index 000000000..86b61453e
--- /dev/null
+++ b/lib/remote/RemoteTargetLocator.php
@@ -0,0 +1,96 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+/**
+ * Used to locate a given frame or window for RemoteWebDriver.
+ */
+class RemoteTargetLocator implements WebDriverTargetLocator {
+
+  protected $executor;
+  protected $driver;
+
+  public function __construct($executor, $driver) {
+    $this->executor = $executor;
+    $this->driver = $driver;
+  }
+
+  /**
+   * Switch to the main document if the page contains iframes. Otherwise, switch
+   * to the first frame on the page.
+   *
+   * @return WebDriver The driver focused on the top window or the first frame.
+   */
+  public function defaultContent() {
+    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, array());
+
+    return $this->driver;
+  }
+
+  /**
+   * Switch to the iframe by its id or name.
+   *
+   * @param WebDriverElement|string $frame The WebDriverElement,
+                                           the id or the name of the frame.
+   * @return WebDriver The driver focused on the given frame.
+   */
+  public function frame($frame) {
+    if ($frame instanceof WebDriverElement) {
+      $id = array('ELEMENT' => $frame->getID());
+    } else {
+      $id = (string)$frame;
+    }
+
+    $params = array('id' => $id);
+    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
+
+    return $this->driver;
+  }
+
+  /**
+   * Switch the focus to another window by its handle.
+   *
+   * @param string $handle The handle of the window to be focused on.
+   * @return WebDriver Tge driver focused on the given window.
+   * @see WebDriver::getWindowHandles
+   */
+  public function window($handle) {
+    $params = array('name' => (string)$handle);
+    $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
+
+    return $this->driver;
+  }
+
+  /**
+   * Switch to the currently active modal dialog for this particular driver
+   * instance.
+   *
+   * @return WebDriverAlert
+   */
+  public function alert() {
+    return new WebDriverAlert($this->executor);
+  }
+
+  /**
+   * Switches to the element that currently has focus within the document
+   * currently "switched to", or the body element if this cannot be detected.
+   *
+   * @return RemoteWebElement
+   */
+  public function activeElement() {
+    $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT);
+    $method = new RemoteExecuteMethod($this->driver);
+    return new RemoteWebElement($method, $response['ELEMENT']);
+  }
+}
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index efa0e5f0d..ff944d1c4 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -348,11 +348,11 @@ public function navigate() {
   /**
    * Switch to a different window or frame.
    *
-   * @return WebDriverTargetLocator
-   * @see WebDriverTargetLocator
+   * @return RemoteTargetLocator
+   * @see RemoteTargetLocator
    */
   public function switchTo() {
-    return new WebDriverTargetLocator($this->getExecuteMethod(), $this);
+    return new RemoteTargetLocator($this->getExecuteMethod(), $this);
   }
 
   /**
@@ -401,16 +401,6 @@ public function action() {
     return new WebDriverActions($this);
   }
 
-  /**
-   * Get the element on the page that currently has focus.
-   *
-   * @return RemoteWebElement
-   */
-  public function getActiveElement() {
-    $response = $this->execute(DriverCommand::GET_ACTIVE_ELEMENT);
-    return $this->newElement($response['ELEMENT']);
-  }
-
   /**
    * Return the WebDriverElement with the given id.
    *
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index b51c88e70..5f09493eb 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -336,19 +336,6 @@ public function getTouch() {
     }
   }
 
-  /**
-   * Get the element on the page that currently has focus.
-   *
-   * @return WebDriverElement
-   */
-  public function getActiveElement() {
-    try {
-      return $this->driver->getActiveElement();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
-    }
-  }
-
   private function dispatchOnException($exception) {
     $this->dispatch('onException', $exception, $this);
     throw $exception;

From c84d655aec4f5e8db298ce1991da097180686203 Mon Sep 17 00:00:00 2001
From: Daniel Beardsley <daniel@ifixit.com>
Date: Tue, 6 Jan 2015 17:46:15 -0700
Subject: [PATCH 132/784] RemoteWebDriver: Allow specifying request timeout

Previously you could only set the request timeout after the first
request (NEW_SESSION) was sent. If you want to alter the timeout, you
presumably want to affect the first request too.
---
 lib/chrome/ChromeDriver.php    | 3 ++-
 lib/remote/RemoteWebDriver.php | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index b1194628e..bf500f2d7 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -47,7 +47,8 @@ public function startSession($desired_capabilities) {
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = 300000
+    $timeout_in_ms = 300000,
+    $request_timeout_in_ms = 300000
   ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index ff944d1c4..3f1032eed 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -47,12 +47,14 @@ protected function __construct() {}
    * @param string $url The url of the remote server
    * @param DesiredCapabilities $desired_capabilities The desired capabilities
    * @param int $connection_timeout_in_ms
+   * @param int $request_timeout_in_ms
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $connection_timeout_in_ms = 300000
+    $connection_timeout_in_ms = 300000,
+    $request_timeout_in_ms = 300000
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -64,6 +66,7 @@ public static function create(
 
     $executor = new HttpCommandExecutor($url);
     $executor->setConnectionTimeout($connection_timeout_in_ms);
+    $executor->setRequestTimeout($request_timeout_in_ms);
 
     $command = new WebDriverCommand(
       null,

From c4efbaf67b5b2cb00ab0d1230997fdbce160f930 Mon Sep 17 00:00:00 2001
From: jameshd <james.hattersley-dykes@bbc.co.uk>
Date: Thu, 8 Jan 2015 09:40:58 +0000
Subject: [PATCH 133/784] replaced constant with int value

---
 lib/remote/HttpCommandExecutor.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index f2dbcf2e6..3fb1fd540 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -161,7 +161,11 @@ public function setConnectionTimeout($timeout_in_ms) {
    * @return HttpCommandExecutor
    */
   public function setRequestTimeout($timeout_in_ms) {
-    curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, $timeout_in_ms);
+    curl_setopt(
+      $this->curl, 
+      /*CURLOPT_TIMEOUT_MS*/ 155, 
+      $timeout_in_ms
+    );
     return $this;
   }
 

From fcecaa3c5bbcf695045b25718f1c45216df158fe Mon Sep 17 00:00:00 2001
From: James HD <james.hattersley-dykes@bbc.co.uk>
Date: Thu, 8 Jan 2015 09:44:15 +0000
Subject: [PATCH 134/784] reverts to FB version of PHP

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 03545733b..00faaa7bf 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.3"
+    "php": ">=5.3.19"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",

From 3c4fec875fe172a1c12525393e02547404f3772c Mon Sep 17 00:00:00 2001
From: jameshd <james.hattersley-dykes@bbc.co.uk>
Date: Fri, 16 Jan 2015 16:21:53 +0000
Subject: [PATCH 135/784] downgrading php requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00faaa7bf..03545733b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.19"
+    "php": ">=5.3.3"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",

From c78f868f98aa46092fbcee83ae043b8dc11530b3 Mon Sep 17 00:00:00 2001
From: jameshd <james.hattersley-dykes@bbc.co.uk>
Date: Tue, 20 Jan 2015 16:02:59 +0000
Subject: [PATCH 136/784] corrected timeout typo

---
 lib/remote/HttpCommandExecutor.php | 4 ++--
 lib/remote/RemoteWebDriver.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index b1a52482d..3ef9955bb 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -134,8 +134,8 @@ public function __construct($url) {
         'Accept: application/json',
       )
     );
-    $this->setRequestTimeout(300000);
-    $this->setConnectionTimeout(300000);
+    $this->setRequestTimeout(30000);
+    $this->setConnectionTimeout(30000);
   }
 
   /**
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 1e61a0f68..2b0969f07 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -467,7 +467,7 @@ public function getSessionID() {
    */
   public static function getAllSessions(
     $url = 'http://localhost:4444/wd/hub',
-    $timeout_in_ms = 300000
+    $timeout_in_ms = 30000
   ) {
     $executor = new HttpCommandExecutor($url);
     $executor->setConnectionTimeout($timeout_in_ms);

From f76e0c5983b3a6264998f690209f53140f75dbbd Mon Sep 17 00:00:00 2001
From: James HD <james.hattersley-dykes@bbc.co.uk>
Date: Tue, 20 Jan 2015 16:04:42 +0000
Subject: [PATCH 137/784] reverts to FB version of PHP

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 03545733b..00faaa7bf 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.3"
+    "php": ">=5.3.19"
   },
   "require-dev": {
     "phpunit/phpunit": "3.7.*",

From 38d89d873e6c2dfdf40c8c40ba8c78c00dd249bb Mon Sep 17 00:00:00 2001
From: Arian <arianf@users.noreply.github.com>
Date: Sat, 7 Feb 2015 18:08:50 -0800
Subject: [PATCH 138/784] Fixed strpos: ending parentheses is in incorrect
 location

Fixed the current implementation of strpos, it currently looked like this

 `strpos($to_escape, "'" != false))` incorrectly passes `"'" != false` as the second argument.

Changed it to `if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {`
---
 lib/WebDriverSelect.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 09d15a56a..dc42d8f0f 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -259,7 +259,7 @@ public function deselectByVisibleText($text) {
    * @return string The escaped string.
    */
   protected function escapeQuotes($to_escape) {
-    if (strpos($to_escape, '"') !== false && strpos($to_escape, "'" != false)) {
+    if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {
       $substrings = explode('"', $to_escape);
 
       $escaped = "concat(";
@@ -274,7 +274,7 @@ protected function escapeQuotes($to_escape) {
       return $escaped;
     }
 
-    if (strpos($to_escape, '"' !== false)) {
+    if (strpos($to_escape, '"') !== false) {
       return sprintf("'%s'", $to_escape);
     }
 

From 0ee0fb672aae6137a49b570a8108ec22d07a56ef Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Wed, 22 Apr 2015 17:04:59 +0200
Subject: [PATCH 139/784] Updated webdriver from Facebook

---
 composer.json                          | 3 ++-
 lib/remote/RemoteTargetLocator.php     | 2 ++
 lib/remote/RemoteWebDriver.php         | 2 +-
 tests/functional/WebDriverTestCase.php | 4 +++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 24f37c8fd..4b5622180 100644
--- a/composer.json
+++ b/composer.json
@@ -18,5 +18,6 @@
   },
   "autoload": {
     "classmap": ["lib/"]
-  }
+  },
+  "minimum-stability": "dev"
 }
diff --git a/lib/remote/RemoteTargetLocator.php b/lib/remote/RemoteTargetLocator.php
index 949836675..841c4acf1 100644
--- a/lib/remote/RemoteTargetLocator.php
+++ b/lib/remote/RemoteTargetLocator.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index aafbb4b2f..246a7adfa 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -47,7 +47,7 @@ protected function __construct() {}
    * Construct the RemoteWebDriver by a desired capabilities.
    *
    * @param string $url The url of the remote server
-   * @param DesiredCapabilities $desired_capabilities The desired capabilities
+   * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
    * @param int|null $connection_timeout_in_ms
    * @param int|null $request_timeout_in_ms
    * @return RemoteWebDriver
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index db4248964..e4ef9db7c 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -35,7 +35,9 @@ protected function setUp() {
   }
   
   protected function tearDown() {
-    $this->driver->quit();
+    if ($this->driver) {
+	    $this->driver->quit();
+	  }
   }
 
   /**

From a5941cfd149a6563643341dfff57fd178253f009 Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Wed, 22 Apr 2015 17:08:46 +0200
Subject: [PATCH 140/784] Updated package name

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 4b5622180..41b0fce1e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-  "name": "janoszen/webdriver",
+  "name": "opsbears/webdriver",
   "description": "A php client for WebDriver (fork of facebook/webdriver)",
   "keywords": ["webdriver", "selenium", "php"],
-  "homepage": "https://github.com/janoszen/php-webdriver",
+  "homepage": "https://github.com/opsbears/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/janoszen/php-webdriver/issues",
-    "source": "https://github.com/janoszen/php-webdriver"
+    "issues": "https://github.com/opsbears/php-webdriver/issues",
+    "source": "https://github.com/opsbears/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"

From 6f61273b119c276fbdeb868b61d57f157a4673ba Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Mon, 18 May 2015 14:44:29 +0200
Subject: [PATCH 141/784] Issue facebook/php-webdriver#212 - Moving forward
 Implemented namespacing as discussed (needs testing)

---
 composer.json                                 |  14 ++-
 example.php                                   |   4 +-
 lib/{chrome => }/ChromeDriver.php             |   4 +-
 lib/{chrome => }/ChromeDriverService.php      |   2 +-
 lib/{chrome => }/ChromeOptions.php            |   2 +-
 lib/{remote => }/DesiredCapabilities.php      |   4 +-
 lib/{remote => }/DriverCommand.php            |   2 +-
 .../service => }/DriverCommandExecutor.php    |   5 +-
 lib/{remote/service => }/DriverService.php    |   4 +-
 .../events => }/EventFiringWebDriver.php      |   5 +-
 .../EventFiringWebDriverNavigation.php        |   4 +-
 .../events => }/EventFiringWebElement.php     |   4 +-
 .../ElementNotSelectableException.php         |  21 ++++
 lib/Exception/ElementNotVisibleException.php  |  20 +++
 lib/Exception/ExpectedException.php           |  21 ++++
 .../IMEEngineActivationFailedException.php    |  21 ++++
 lib/Exception/IMENotAvailableException.php    |  21 ++++
 lib/Exception/IndexOutOfBoundsException.php   |   7 ++
 .../InvalidCookieDomainException.php          |  20 +++
 lib/Exception/InvalidCoordinatesException.php |  21 ++++
 .../InvalidElementStateException.php          |  20 +++
 lib/Exception/InvalidSelectorException.php    |  21 ++++
 .../MoveTargetOutOfBoundsException.php        |  21 ++++
 lib/Exception/NoAlertOpenException.php        |  20 +++
 lib/Exception/NoCollectionException.php       |   7 ++
 lib/Exception/NoScriptResultException.php     |  20 +++
 lib/Exception/NoStringException.php           |   7 ++
 lib/Exception/NoStringLengthException.php     |  20 +++
 lib/Exception/NoStringWrapperException.php    |  20 +++
 lib/Exception/NoSuchCollectionException.php   |  20 +++
 lib/Exception/NoSuchDocumentException.php     |  21 ++++
 lib/Exception/NoSuchDriverException.php       |  20 +++
 lib/Exception/NoSuchElementException.php      |  20 +++
 lib/Exception/NoSuchFrameException.php        |  20 +++
 lib/Exception/NoSuchWindowException.php       |  20 +++
 lib/Exception/NullPointerException.php        |  21 ++++
 lib/Exception/ScriptTimeoutException.php      |  21 ++++
 lib/Exception/SessionNotCreatedException.php  |  21 ++++
 .../StaleElementReferenceException.php        |  20 +++
 lib/Exception/TimeOutException.php            |  20 +++
 lib/Exception/UnableToSetCookieException.php  |  20 +++
 .../UnexpectedAlertOpenException.php          |  20 +++
 .../UnexpectedJavascriptException.php         |  20 +++
 lib/Exception/UnexpectedTagNameException.php  |  34 +++++
 lib/Exception/UnknownCommandException.php     |  20 +++
 lib/Exception/UnknownServerException.php      |  20 +++
 .../UnrecognizedExceptionException.php        |  21 ++++
 .../UnsupportedOperationException.php         |  21 ++++
 lib/Exception/WebDriverCurlException.php      |  21 ++++
 .../WebDriverException.php}                   |  64 +---------
 lib/Exception/XPathLookupException.php        |  20 +++
 lib/{remote => }/ExecuteMethod.php            |   2 +-
 lib/{remote => }/FileDetector.php             |   2 +-
 lib/{firefox => }/FirefoxDriver.php           |   2 +-
 lib/{firefox => }/FirefoxProfile.php          |   7 +-
 lib/{remote => }/HttpCommandExecutor.php      |   5 +-
 lib/JavaScriptExecutor.php                    |   2 +-
 lib/{remote => }/LocalFileDetector.php        |   2 +-
 lib/{remote => }/RemoteExecuteMethod.php      |   2 +-
 lib/{remote => }/RemoteKeyboard.php           |   2 +-
 lib/{remote => }/RemoteMouse.php              |   2 +-
 lib/{remote => }/RemoteTargetLocator.php      |   2 +-
 lib/{remote => }/RemoteTouchScreen.php        |   2 +-
 lib/{remote => }/RemoteWebDriver.php          |   2 +-
 lib/{remote => }/RemoteWebElement.php         |   3 +-
 lib/{net => }/URLChecker.php                  |   5 +-
 lib/{remote => }/UselessFileDetector.php      |   2 +-
 lib/WebDriver.php                             |   2 +-
 lib/WebDriverAction.php                       |   2 +-
 lib/{interactions => }/WebDriverActions.php   |   2 +-
 lib/WebDriverAlert.php                        |   2 +-
 lib/{remote => }/WebDriverBrowserType.php     |   2 +-
 .../WebDriverButtonReleaseAction.php          |   2 +-
 lib/WebDriverBy.php                           |   2 +-
 lib/WebDriverCapabilities.php                 |   2 +-
 lib/{remote => }/WebDriverCapabilityType.php  |   2 +-
 .../internal => }/WebDriverClickAction.php    |   2 +-
 .../WebDriverClickAndHoldAction.php           |   2 +-
 lib/{remote => }/WebDriverCommand.php         |   2 +-
 lib/WebDriverCommandExecutor.php              |   2 +-
 .../WebDriverCompositeAction.php              |   2 +-
 .../WebDriverContextClickAction.php           |   2 +-
 .../internal => }/WebDriverCoordinates.php    |   3 +-
 lib/WebDriverDimension.php                    |   2 +-
 lib/WebDriverDispatcher.php                   |   2 +-
 .../WebDriverDoubleClickAction.php            |   2 +-
 .../touch => }/WebDriverDoubleTapAction.php   |   2 +-
 .../touch => }/WebDriverDownAction.php        |   2 +-
 lib/WebDriverElement.php                      |   2 +-
 lib/WebDriverEventListener.php                |   4 +-
 lib/WebDriverExpectedCondition.php            |   6 +-
 .../touch => }/WebDriverFlickAction.php       |   2 +-
 .../WebDriverFlickFromElementAction.php       |   2 +-
 lib/WebDriverHasInputDevices.php              |   2 +-
 .../internal => }/WebDriverKeyDownAction.php  |   2 +-
 .../internal => }/WebDriverKeyUpAction.php    |   2 +-
 lib/WebDriverKeyboard.php                     |   2 +-
 lib/WebDriverKeys.php                         |   2 +-
 .../WebDriverKeysRelatedAction.php            |   2 +-
 lib/{internal => }/WebDriverLocatable.php     |   2 +-
 .../touch => }/WebDriverLongPressAction.php   |   2 +-
 lib/WebDriverMouse.php                        |   2 +-
 .../internal => }/WebDriverMouseAction.php    |   2 +-
 .../WebDriverMouseMoveAction.php              |   2 +-
 .../touch => }/WebDriverMoveAction.php        |   2 +-
 .../WebDriverMoveToOffsetAction.php           |   2 +-
 lib/WebDriverNavigation.php                   |   2 +-
 lib/WebDriverOptions.php                      |   3 +-
 lib/WebDriverPlatform.php                     |   2 +-
 lib/WebDriverPoint.php                        |   2 +-
 lib/{remote => }/WebDriverResponse.php        |   2 +-
 .../touch => }/WebDriverScrollAction.php      |   2 +-
 .../WebDriverScrollFromElementAction.php      |   2 +-
 lib/WebDriverSearchContext.php                |   2 +-
 lib/WebDriverSelect.php                       |   5 +-
 .../internal => }/WebDriverSendKeysAction.php |   2 +-
 .../WebDriverSingleKeyAction.php              |   2 +-
 .../touch => }/WebDriverTapAction.php         |   2 +-
 lib/WebDriverTargetLocator.php                |   2 +-
 lib/WebDriverTimeouts.php                     |   2 +-
 .../touch => }/WebDriverTouchAction.php       |   2 +-
 .../WebDriverTouchActions.php                 |   2 +-
 .../WebDriverTouchScreen.php                  |   2 +-
 .../touch => }/WebDriverUpAction.php          |   2 +-
 lib/WebDriverWait.php                         |   4 +-
 lib/WebDriverWindow.php                       |   3 +-
 lib/__init__.php                              | 116 ------------------
 tests/bootstrap.php                           |   4 +-
 tests/functional/BaseTest.php                 |   2 +-
 tests/functional/FileUploadTest.php           |   2 +-
 tests/functional/WebDriverTestCase.php        |   2 +-
 tests/unit/bootstrap.php                      |   2 +-
 .../WebDriverButtonReleaseActionTest.php      |   8 +-
 .../internal/WebDriverClickActionTest.php     |   8 +-
 .../WebDriverClickAndHoldActionTest.php       |   8 +-
 .../WebDriverContextClickActionTest.php       |   8 +-
 .../internal/WebDriverCoordinatesTest.php     |   2 +-
 .../WebDriverDoubleClickActionTest.php        |   8 +-
 .../internal/WebDriverKeyDownActionTest.php   |  10 +-
 .../internal/WebDriverKeyUpActionTest.php     |  10 +-
 .../internal/WebDriverMouseMoveActionTest.php |   8 +-
 .../WebDriverMouseToOffsetActionTest.php      |   8 +-
 .../internal/WebDriverSendKeysActionTest.php  |  10 +-
 143 files changed, 936 insertions(+), 323 deletions(-)
 rename lib/{chrome => }/ChromeDriver.php (96%)
 rename lib/{chrome => }/ChromeDriverService.php (97%)
 rename lib/{chrome => }/ChromeOptions.php (99%)
 rename lib/{remote => }/DesiredCapabilities.php (99%)
 rename lib/{remote => }/DriverCommand.php (99%)
 rename lib/{remote/service => }/DriverCommandExecutor.php (93%)
 rename lib/{remote/service => }/DriverService.php (98%)
 rename lib/{support/events => }/EventFiringWebDriver.php (98%)
 rename lib/{support/events => }/EventFiringWebDriverNavigation.php (97%)
 rename lib/{support/events => }/EventFiringWebElement.php (98%)
 create mode 100644 lib/Exception/ElementNotSelectableException.php
 create mode 100644 lib/Exception/ElementNotVisibleException.php
 create mode 100644 lib/Exception/ExpectedException.php
 create mode 100644 lib/Exception/IMEEngineActivationFailedException.php
 create mode 100644 lib/Exception/IMENotAvailableException.php
 create mode 100644 lib/Exception/IndexOutOfBoundsException.php
 create mode 100644 lib/Exception/InvalidCookieDomainException.php
 create mode 100644 lib/Exception/InvalidCoordinatesException.php
 create mode 100644 lib/Exception/InvalidElementStateException.php
 create mode 100644 lib/Exception/InvalidSelectorException.php
 create mode 100644 lib/Exception/MoveTargetOutOfBoundsException.php
 create mode 100644 lib/Exception/NoAlertOpenException.php
 create mode 100644 lib/Exception/NoCollectionException.php
 create mode 100644 lib/Exception/NoScriptResultException.php
 create mode 100644 lib/Exception/NoStringException.php
 create mode 100644 lib/Exception/NoStringLengthException.php
 create mode 100644 lib/Exception/NoStringWrapperException.php
 create mode 100644 lib/Exception/NoSuchCollectionException.php
 create mode 100644 lib/Exception/NoSuchDocumentException.php
 create mode 100644 lib/Exception/NoSuchDriverException.php
 create mode 100644 lib/Exception/NoSuchElementException.php
 create mode 100644 lib/Exception/NoSuchFrameException.php
 create mode 100644 lib/Exception/NoSuchWindowException.php
 create mode 100644 lib/Exception/NullPointerException.php
 create mode 100644 lib/Exception/ScriptTimeoutException.php
 create mode 100644 lib/Exception/SessionNotCreatedException.php
 create mode 100644 lib/Exception/StaleElementReferenceException.php
 create mode 100644 lib/Exception/TimeOutException.php
 create mode 100644 lib/Exception/UnableToSetCookieException.php
 create mode 100644 lib/Exception/UnexpectedAlertOpenException.php
 create mode 100644 lib/Exception/UnexpectedJavascriptException.php
 create mode 100644 lib/Exception/UnexpectedTagNameException.php
 create mode 100644 lib/Exception/UnknownCommandException.php
 create mode 100644 lib/Exception/UnknownServerException.php
 create mode 100644 lib/Exception/UnrecognizedExceptionException.php
 create mode 100644 lib/Exception/UnsupportedOperationException.php
 create mode 100644 lib/Exception/WebDriverCurlException.php
 rename lib/{WebDriverExceptions.php => Exception/WebDriverException.php} (59%)
 create mode 100644 lib/Exception/XPathLookupException.php
 rename lib/{remote => }/ExecuteMethod.php (96%)
 rename lib/{remote => }/FileDetector.php (96%)
 rename lib/{firefox => }/FirefoxDriver.php (95%)
 rename lib/{firefox => }/FirefoxProfile.php (95%)
 rename lib/{remote => }/HttpCommandExecutor.php (99%)
 rename lib/{remote => }/LocalFileDetector.php (96%)
 rename lib/{remote => }/RemoteExecuteMethod.php (97%)
 rename lib/{remote => }/RemoteKeyboard.php (98%)
 rename lib/{remote => }/RemoteMouse.php (99%)
 rename lib/{remote => }/RemoteTargetLocator.php (99%)
 rename lib/{remote => }/RemoteTouchScreen.php (99%)
 rename lib/{remote => }/RemoteWebDriver.php (99%)
 rename lib/{remote => }/RemoteWebElement.php (99%)
 rename lib/{net => }/URLChecker.php (95%)
 rename lib/{remote => }/UselessFileDetector.php (96%)
 rename lib/{interactions => }/WebDriverActions.php (99%)
 rename lib/{remote => }/WebDriverBrowserType.php (97%)
 rename lib/{interactions/internal => }/WebDriverButtonReleaseAction.php (96%)
 rename lib/{remote => }/WebDriverCapabilityType.php (98%)
 rename lib/{interactions/internal => }/WebDriverClickAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverClickAndHoldAction.php (96%)
 rename lib/{remote => }/WebDriverCommand.php (97%)
 rename lib/{interactions => }/WebDriverCompositeAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverContextClickAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverCoordinates.php (94%)
 rename lib/{interactions/internal => }/WebDriverDoubleClickAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverDoubleTapAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverDownAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverFlickAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverFlickFromElementAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverKeyDownAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverKeyUpAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverKeysRelatedAction.php (97%)
 rename lib/{internal => }/WebDriverLocatable.php (96%)
 rename lib/{interactions/touch => }/WebDriverLongPressAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverMouseAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverMouseMoveAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverMoveAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverMoveToOffsetAction.php (97%)
 rename lib/{remote => }/WebDriverResponse.php (98%)
 rename lib/{interactions/touch => }/WebDriverScrollAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverScrollFromElementAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverSendKeysAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverSingleKeyAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverTapAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverTouchAction.php (97%)
 rename lib/{interactions => }/WebDriverTouchActions.php (99%)
 rename lib/{interactions => }/WebDriverTouchScreen.php (99%)
 rename lib/{interactions/touch => }/WebDriverUpAction.php (97%)
 delete mode 100755 lib/__init__.php

diff --git a/composer.json b/composer.json
index 41b0fce1e..7b57541f4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-  "name": "opsbears/webdriver",
-  "description": "A php client for WebDriver (fork of facebook/webdriver)",
+  "name": "facebook/webdriver",
+  "description": "A php client for WebDriver",
   "keywords": ["webdriver", "selenium", "php"],
-  "homepage": "https://github.com/opsbears/php-webdriver",
+  "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/opsbears/php-webdriver/issues",
-    "source": "https://github.com/opsbears/php-webdriver"
+    "issues": "https://github.com/facebook/php-webdriver/issues",
+    "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"
@@ -17,7 +17,9 @@
     "phpdocumentor/phpdocumentor": "2.*"
   },
   "autoload": {
-    "classmap": ["lib/"]
+    "psr-4": {
+		"Facebook\\WebDriver\\": "lib/"
+	}
   },
   "minimum-stability": "dev"
 }
diff --git a/example.php b/example.php
index 8cfac7461..b4834146c 100644
--- a/example.php
+++ b/example.php
@@ -1,9 +1,9 @@
 <?php
 // An example of using php-webdriver.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
-require_once('lib/__init__.php');
+require_once('vendor/autoload.php');
 
 // start Firefox with 5 second timeout
 $host = 'http://localhost:4444/wd/hub'; // this is the default
diff --git a/lib/chrome/ChromeDriver.php b/lib/ChromeDriver.php
similarity index 96%
rename from lib/chrome/ChromeDriver.php
rename to lib/ChromeDriver.php
index 10adb8ad3..3fb84ad58 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/ChromeDriver.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class ChromeDriver extends RemoteWebDriver {
 
diff --git a/lib/chrome/ChromeDriverService.php b/lib/ChromeDriverService.php
similarity index 97%
rename from lib/chrome/ChromeDriverService.php
rename to lib/ChromeDriverService.php
index 00206c023..9494bfd1a 100644
--- a/lib/chrome/ChromeDriverService.php
+++ b/lib/ChromeDriverService.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class ChromeDriverService extends DriverService {
 
diff --git a/lib/chrome/ChromeOptions.php b/lib/ChromeOptions.php
similarity index 99%
rename from lib/chrome/ChromeOptions.php
rename to lib/ChromeOptions.php
index 0f9b24cab..eb2f92e8c 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/ChromeOptions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The class manages the capabilities in ChromeDriver.
diff --git a/lib/remote/DesiredCapabilities.php b/lib/DesiredCapabilities.php
similarity index 99%
rename from lib/remote/DesiredCapabilities.php
rename to lib/DesiredCapabilities.php
index 8e06d64bf..d981f425c 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/DesiredCapabilities.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
 
 class DesiredCapabilities implements WebDriverCapabilities {
 
diff --git a/lib/remote/DriverCommand.php b/lib/DriverCommand.php
similarity index 99%
rename from lib/remote/DriverCommand.php
rename to lib/DriverCommand.php
index c6279dd4b..eb29e0d8d 100644
--- a/lib/remote/DriverCommand.php
+++ b/lib/DriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * This list of command defined in the WebDriver json wire protocol.
diff --git a/lib/remote/service/DriverCommandExecutor.php b/lib/DriverCommandExecutor.php
similarity index 93%
rename from lib/remote/service/DriverCommandExecutor.php
rename to lib/DriverCommandExecutor.php
index 3c6e573a1..228f21b4d 100644
--- a/lib/remote/service/DriverCommandExecutor.php
+++ b/lib/DriverCommandExecutor.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\WebDriverException;
 
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
@@ -48,7 +49,7 @@ public function execute(WebDriverCommand $command, $curl_opts = array()) {
         $this->service->stop();
       }
       return $value;
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
       if (!$this->service->isRunning()) {
         throw new WebDriverException('The driver server has died.');
       }
diff --git a/lib/remote/service/DriverService.php b/lib/DriverService.php
similarity index 98%
rename from lib/remote/service/DriverService.php
rename to lib/DriverService.php
index 0b707403e..6a573afe5 100644
--- a/lib/remote/service/DriverService.php
+++ b/lib/DriverService.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
 
 class DriverService {
 
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/EventFiringWebDriver.php
similarity index 98%
rename from lib/support/events/EventFiringWebDriver.php
rename to lib/EventFiringWebDriver.php
index cefe6d987..ebd5b9b7c 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/EventFiringWebDriver.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
diff --git a/lib/support/events/EventFiringWebDriverNavigation.php b/lib/EventFiringWebDriverNavigation.php
similarity index 97%
rename from lib/support/events/EventFiringWebDriverNavigation.php
rename to lib/EventFiringWebDriverNavigation.php
index 7f1e71b0a..c3feea060 100644
--- a/lib/support/events/EventFiringWebDriverNavigation.php
+++ b/lib/EventFiringWebDriverNavigation.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebDriverNavigation {
 
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/EventFiringWebElement.php
similarity index 98%
rename from lib/support/events/EventFiringWebElement.php
rename to lib/EventFiringWebElement.php
index f0b317cef..a955c59d6 100644
--- a/lib/support/events/EventFiringWebElement.php
+++ b/lib/EventFiringWebElement.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
diff --git a/lib/Exception/ElementNotSelectableException.php b/lib/Exception/ElementNotSelectableException.php
new file mode 100644
index 000000000..9acfb88f2
--- /dev/null
+++ b/lib/Exception/ElementNotSelectableException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ElementNotSelectableException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
new file mode 100644
index 000000000..c452d2daa
--- /dev/null
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class ElementNotVisibleException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
new file mode 100644
index 000000000..cd8f15cc5
--- /dev/null
+++ b/lib/Exception/ExpectedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ExpectedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
new file mode 100644
index 000000000..cd13d0181
--- /dev/null
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class IMEEngineActivationFailedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
new file mode 100644
index 000000000..94497c0d5
--- /dev/null
+++ b/lib/Exception/IMENotAvailableException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class IMENotAvailableException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
new file mode 100644
index 000000000..322f67b14
--- /dev/null
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class IndexOutOfBoundsException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidCookieDomainException.php b/lib/Exception/InvalidCookieDomainException.php
new file mode 100644
index 000000000..5dbaae9eb
--- /dev/null
+++ b/lib/Exception/InvalidCookieDomainException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class InvalidCookieDomainException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
new file mode 100644
index 000000000..571a107b2
--- /dev/null
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class InvalidCoordinatesException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidElementStateException.php b/lib/Exception/InvalidElementStateException.php
new file mode 100644
index 000000000..5c49c4c88
--- /dev/null
+++ b/lib/Exception/InvalidElementStateException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class InvalidElementStateException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidSelectorException.php b/lib/Exception/InvalidSelectorException.php
new file mode 100644
index 000000000..2c106970c
--- /dev/null
+++ b/lib/Exception/InvalidSelectorException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class InvalidSelectorException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/MoveTargetOutOfBoundsException.php b/lib/Exception/MoveTargetOutOfBoundsException.php
new file mode 100644
index 000000000..39e97adbd
--- /dev/null
+++ b/lib/Exception/MoveTargetOutOfBoundsException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class MoveTargetOutOfBoundsException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoAlertOpenException.php b/lib/Exception/NoAlertOpenException.php
new file mode 100644
index 000000000..cdc846e08
--- /dev/null
+++ b/lib/Exception/NoAlertOpenException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoAlertOpenException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
new file mode 100644
index 000000000..2bfe9069a
--- /dev/null
+++ b/lib/Exception/NoCollectionException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class NoCollectionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
new file mode 100644
index 000000000..80d23f7de
--- /dev/null
+++ b/lib/Exception/NoScriptResultException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoScriptResultException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
new file mode 100644
index 000000000..13c107b7d
--- /dev/null
+++ b/lib/Exception/NoStringException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class NoStringException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
new file mode 100644
index 000000000..8f50bb4ca
--- /dev/null
+++ b/lib/Exception/NoStringLengthException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoStringLengthException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
new file mode 100644
index 000000000..2e17124e2
--- /dev/null
+++ b/lib/Exception/NoStringWrapperException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoStringWrapperException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
new file mode 100644
index 000000000..d9e6c47ab
--- /dev/null
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchCollectionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchDocumentException.php b/lib/Exception/NoSuchDocumentException.php
new file mode 100644
index 000000000..b542fdfd6
--- /dev/null
+++ b/lib/Exception/NoSuchDocumentException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class NoSuchDocumentException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
new file mode 100644
index 000000000..c34735b9d
--- /dev/null
+++ b/lib/Exception/NoSuchDriverException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchDriverException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchElementException.php b/lib/Exception/NoSuchElementException.php
new file mode 100644
index 000000000..da39f7cab
--- /dev/null
+++ b/lib/Exception/NoSuchElementException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchElementException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchFrameException.php b/lib/Exception/NoSuchFrameException.php
new file mode 100644
index 000000000..474f4dc6e
--- /dev/null
+++ b/lib/Exception/NoSuchFrameException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchFrameException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchWindowException.php b/lib/Exception/NoSuchWindowException.php
new file mode 100644
index 000000000..bbeee4f0d
--- /dev/null
+++ b/lib/Exception/NoSuchWindowException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchWindowException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
new file mode 100644
index 000000000..00f2fb5bb
--- /dev/null
+++ b/lib/Exception/NullPointerException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class NullPointerException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ScriptTimeoutException.php b/lib/Exception/ScriptTimeoutException.php
new file mode 100644
index 000000000..4095728a2
--- /dev/null
+++ b/lib/Exception/ScriptTimeoutException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ScriptTimeoutException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/SessionNotCreatedException.php b/lib/Exception/SessionNotCreatedException.php
new file mode 100644
index 000000000..9b67edf94
--- /dev/null
+++ b/lib/Exception/SessionNotCreatedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class SessionNotCreatedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/StaleElementReferenceException.php b/lib/Exception/StaleElementReferenceException.php
new file mode 100644
index 000000000..7e265725c
--- /dev/null
+++ b/lib/Exception/StaleElementReferenceException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class StaleElementReferenceException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/TimeOutException.php b/lib/Exception/TimeOutException.php
new file mode 100644
index 000000000..6301f4144
--- /dev/null
+++ b/lib/Exception/TimeOutException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class TimeOutException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnableToSetCookieException.php b/lib/Exception/UnableToSetCookieException.php
new file mode 100644
index 000000000..7ece63e50
--- /dev/null
+++ b/lib/Exception/UnableToSetCookieException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnableToSetCookieException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedAlertOpenException.php b/lib/Exception/UnexpectedAlertOpenException.php
new file mode 100644
index 000000000..e97eddeae
--- /dev/null
+++ b/lib/Exception/UnexpectedAlertOpenException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedAlertOpenException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedJavascriptException.php b/lib/Exception/UnexpectedJavascriptException.php
new file mode 100644
index 000000000..c8da7e505
--- /dev/null
+++ b/lib/Exception/UnexpectedJavascriptException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedJavascriptException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedTagNameException.php b/lib/Exception/UnexpectedTagNameException.php
new file mode 100644
index 000000000..514abd374
--- /dev/null
+++ b/lib/Exception/UnexpectedTagNameException.php
@@ -0,0 +1,34 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedTagNameException extends WebDriverException {
+
+  /**
+   * @param string $expected_tag_name
+   * @param string $actual_tag_name
+   */
+  public function __construct(
+    $expected_tag_name,
+    $actual_tag_name) {
+    parent::__construct(
+      sprintf(
+        "Element should have been \"%s\" but was \"%s\"",
+        $expected_tag_name, $actual_tag_name
+      )
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/Exception/UnknownCommandException.php b/lib/Exception/UnknownCommandException.php
new file mode 100644
index 000000000..2d20b0096
--- /dev/null
+++ b/lib/Exception/UnknownCommandException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnknownCommandException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnknownServerException.php b/lib/Exception/UnknownServerException.php
new file mode 100644
index 000000000..13c3780c4
--- /dev/null
+++ b/lib/Exception/UnknownServerException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnknownServerException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnrecognizedExceptionException.php b/lib/Exception/UnrecognizedExceptionException.php
new file mode 100644
index 000000000..9d0046dc0
--- /dev/null
+++ b/lib/Exception/UnrecognizedExceptionException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class UnrecognizedExceptionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnsupportedOperationException.php b/lib/Exception/UnsupportedOperationException.php
new file mode 100644
index 000000000..781c2276a
--- /dev/null
+++ b/lib/Exception/UnsupportedOperationException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class UnsupportedOperationException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/WebDriverCurlException.php b/lib/Exception/WebDriverCurlException.php
new file mode 100644
index 000000000..9719565d2
--- /dev/null
+++ b/lib/Exception/WebDriverCurlException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class WebDriverCurlException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/WebDriverExceptions.php b/lib/Exception/WebDriverException.php
similarity index 59%
rename from lib/WebDriverExceptions.php
rename to lib/Exception/WebDriverException.php
index 45ed8b5d2..af90b7cf7 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/Exception/WebDriverException.php
@@ -13,11 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver\Exception;
 
-use \Exception;
-
-final class WebDriverCurlException extends Exception {} // When curls fail
+use Exception;
 
 class WebDriverException extends Exception {
 
@@ -128,61 +126,3 @@ public static function throwException($status_code, $message, $results) {
     }
   }
 }
-
-class IndexOutOfBoundsException extends WebDriverException {} // 1
-class NoCollectionException extends WebDriverException {} // 2
-class NoStringException extends WebDriverException {} // 3
-class NoStringLengthException extends WebDriverException {} // 4
-class NoStringWrapperException extends WebDriverException {} // 5
-class NoSuchDriverException extends WebDriverException {} // 6
-class NoSuchElementException extends WebDriverException {} // 7
-class NoSuchFrameException extends WebDriverException {} // 8
-class UnknownCommandException extends WebDriverException {} // 9
-class StaleElementReferenceException extends WebDriverException {} // 10
-class ElementNotVisibleException extends WebDriverException {} // 11
-class InvalidElementStateException extends WebDriverException {} // 12
-class UnknownServerException extends WebDriverException {} // 13
-class ExpectedException extends WebDriverException {} // 14
-class ElementNotSelectableException extends WebDriverException {} // 15
-class NoSuchDocumentException extends WebDriverException {} // 16
-class UnexpectedJavascriptException extends WebDriverException {} // 17
-class NoScriptResultException extends WebDriverException {} // 18
-class XPathLookupException extends WebDriverException {} // 19
-class NoSuchCollectionException extends WebDriverException {} // 20
-class TimeOutException extends WebDriverException {} // 21
-class NullPointerException extends WebDriverException {} // 22
-class NoSuchWindowException extends WebDriverException {} // 23
-class InvalidCookieDomainException extends WebDriverException {} // 24
-class UnableToSetCookieException extends WebDriverException {} // 25
-class UnexpectedAlertOpenException extends WebDriverException {} // 26
-class NoAlertOpenException extends WebDriverException {} // 27
-class ScriptTimeoutException extends WebDriverException {} // 28
-class InvalidCoordinatesException extends WebDriverException {}// 29
-class IMENotAvailableException extends WebDriverException {} // 30
-class IMEEngineActivationFailedException extends WebDriverException {}// 31
-class InvalidSelectorException extends WebDriverException {} // 32
-class SessionNotCreatedException extends WebDriverException {} // 33
-class MoveTargetOutOfBoundsException extends WebDriverException {} // 34
-
-// Fallback
-class UnrecognizedExceptionException extends WebDriverException {}
-
-class UnexpectedTagNameException extends WebDriverException {
-
-  /**
-   * @param string $expected_tag_name
-   * @param string $actual_tag_name
-   */
-  public function __construct(
-      $expected_tag_name,
-      $actual_tag_name) {
-    parent::__construct(
-      sprintf(
-        "Element should have been \"%s\" but was \"%s\"",
-        $expected_tag_name, $actual_tag_name
-      )
-    );
-  }
-}
-
-class UnsupportedOperationException extends WebDriverException {}
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
new file mode 100644
index 000000000..de9e2e707
--- /dev/null
+++ b/lib/Exception/XPathLookupException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class XPathLookupException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/remote/ExecuteMethod.php b/lib/ExecuteMethod.php
similarity index 96%
rename from lib/remote/ExecuteMethod.php
rename to lib/ExecuteMethod.php
index 5a06fca0d..f87ac29d8 100644
--- a/lib/remote/ExecuteMethod.php
+++ b/lib/ExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface ExecuteMethod {
 
diff --git a/lib/remote/FileDetector.php b/lib/FileDetector.php
similarity index 96%
rename from lib/remote/FileDetector.php
rename to lib/FileDetector.php
index 79216095c..5aeb0dee4 100644
--- a/lib/remote/FileDetector.php
+++ b/lib/FileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface FileDetector {
 
diff --git a/lib/firefox/FirefoxDriver.php b/lib/FirefoxDriver.php
similarity index 95%
rename from lib/firefox/FirefoxDriver.php
rename to lib/FirefoxDriver.php
index 7d4852129..019064e71 100644
--- a/lib/firefox/FirefoxDriver.php
+++ b/lib/FirefoxDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class FirefoxDriver {
 
diff --git a/lib/firefox/FirefoxProfile.php b/lib/FirefoxProfile.php
similarity index 95%
rename from lib/firefox/FirefoxProfile.php
rename to lib/FirefoxProfile.php
index 431c71a53..d72fc06c1 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/FirefoxProfile.php
@@ -13,8 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\WebDriverException;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use ZipArchive;
 
 class FirefoxProfile {
@@ -149,7 +152,7 @@ private function extractTo($xpi, $target_dir) {
       $zip->extractTo($target_dir);
       $zip->close();
     } else {
-      throw new Exception("Failed to open the firefox extension. '$xpi'");
+      throw new \Exception("Failed to open the firefox extension. '$xpi'");
     }
     return $this;
   }
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/HttpCommandExecutor.php
similarity index 99%
rename from lib/remote/HttpCommandExecutor.php
rename to lib/HttpCommandExecutor.php
index 7e8b16a88..c3c76fb9f 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/HttpCommandExecutor.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\WebDriverException;
+use InvalidArgumentException;
+use BadMethodCallException;
 
 /**
  * Command executor talking to the standalone server via HTTP.
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 18cba7866..3e0db1302 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver interface implemented by drivers that support JavaScript.
diff --git a/lib/remote/LocalFileDetector.php b/lib/LocalFileDetector.php
similarity index 96%
rename from lib/remote/LocalFileDetector.php
rename to lib/LocalFileDetector.php
index d8cac906e..a9a7488ce 100644
--- a/lib/remote/LocalFileDetector.php
+++ b/lib/LocalFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class LocalFileDetector implements FileDetector {
     /**
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/RemoteExecuteMethod.php
similarity index 97%
rename from lib/remote/RemoteExecuteMethod.php
rename to lib/RemoteExecuteMethod.php
index 4d874179c..3ab0a60ae 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/RemoteExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class RemoteExecuteMethod implements ExecuteMethod {
 
diff --git a/lib/remote/RemoteKeyboard.php b/lib/RemoteKeyboard.php
similarity index 98%
rename from lib/remote/RemoteKeyboard.php
rename to lib/RemoteKeyboard.php
index 9831b74f4..d7d3ebbdb 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/RemoteKeyboard.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute keyboard commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteMouse.php b/lib/RemoteMouse.php
similarity index 99%
rename from lib/remote/RemoteMouse.php
rename to lib/RemoteMouse.php
index 93168abf8..deb2164fd 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/RemoteMouse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute mouse commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteTargetLocator.php b/lib/RemoteTargetLocator.php
similarity index 99%
rename from lib/remote/RemoteTargetLocator.php
rename to lib/RemoteTargetLocator.php
index 841c4acf1..c33bd2c71 100644
--- a/lib/remote/RemoteTargetLocator.php
+++ b/lib/RemoteTargetLocator.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/RemoteTouchScreen.php
similarity index 99%
rename from lib/remote/RemoteTouchScreen.php
rename to lib/RemoteTouchScreen.php
index 6ef5d35d5..3ca3c19bd 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/RemoteTouchScreen.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute touch commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteWebDriver.php b/lib/RemoteWebDriver.php
similarity index 99%
rename from lib/remote/RemoteWebDriver.php
rename to lib/RemoteWebDriver.php
index 246a7adfa..86d9e0d8b 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/RemoteWebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
diff --git a/lib/remote/RemoteWebElement.php b/lib/RemoteWebElement.php
similarity index 99%
rename from lib/remote/RemoteWebElement.php
rename to lib/RemoteWebElement.php
index 5b92cebfe..178397165 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/RemoteWebElement.php
@@ -13,8 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\WebDriverException;
 use ZipArchive;
 
 /**
diff --git a/lib/net/URLChecker.php b/lib/URLChecker.php
similarity index 95%
rename from lib/net/URLChecker.php
rename to lib/URLChecker.php
index 13588203b..657488dbf 100644
--- a/lib/net/URLChecker.php
+++ b/lib/URLChecker.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
+use Facebook\WebDriver\Exception\TimeOutException;
 
 class URLChecker {
 
diff --git a/lib/remote/UselessFileDetector.php b/lib/UselessFileDetector.php
similarity index 96%
rename from lib/remote/UselessFileDetector.php
rename to lib/UselessFileDetector.php
index f21df9e64..ce4c55fc9 100644
--- a/lib/remote/UselessFileDetector.php
+++ b/lib/UselessFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class UselessFileDetector implements FileDetector {
   /**
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 14e102b92..b143583ca 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The interface for WebDriver.
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index cff1ca9ae..a5d2d32d8 100644
--- a/lib/WebDriverAction.php
+++ b/lib/WebDriverAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing a single user-interaction action.
diff --git a/lib/interactions/WebDriverActions.php b/lib/WebDriverActions.php
similarity index 99%
rename from lib/interactions/WebDriverActions.php
rename to lib/WebDriverActions.php
index eac0d14ae..37537e2b9 100644
--- a/lib/interactions/WebDriverActions.php
+++ b/lib/WebDriverActions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 84bc202c8..2f92ec4c4 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
diff --git a/lib/remote/WebDriverBrowserType.php b/lib/WebDriverBrowserType.php
similarity index 97%
rename from lib/remote/WebDriverBrowserType.php
rename to lib/WebDriverBrowserType.php
index 8db21c0a5..bbb9a529e 100644
--- a/lib/remote/WebDriverBrowserType.php
+++ b/lib/WebDriverBrowserType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * All the browsers supported by selenium
diff --git a/lib/interactions/internal/WebDriverButtonReleaseAction.php b/lib/WebDriverButtonReleaseAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverButtonReleaseAction.php
rename to lib/WebDriverButtonReleaseAction.php
index ea518877a..444632265 100644
--- a/lib/interactions/internal/WebDriverButtonReleaseAction.php
+++ b/lib/WebDriverButtonReleaseAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Move to the location and then release the mouse key.
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index ce25f308e..c409768a8 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The basic 8 mechanisms supported by webdriver to locate a web element.
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 3ccc30ee6..721db82e6 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface WebDriverCapabilities {
 
diff --git a/lib/remote/WebDriverCapabilityType.php b/lib/WebDriverCapabilityType.php
similarity index 98%
rename from lib/remote/WebDriverCapabilityType.php
rename to lib/WebDriverCapabilityType.php
index a7499d9e0..558abb4ab 100644
--- a/lib/remote/WebDriverCapabilityType.php
+++ b/lib/WebDriverCapabilityType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
diff --git a/lib/interactions/internal/WebDriverClickAction.php b/lib/WebDriverClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverClickAction.php
rename to lib/WebDriverClickAction.php
index 54adb4a6f..cc9263c17 100644
--- a/lib/interactions/internal/WebDriverClickAction.php
+++ b/lib/WebDriverClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/internal/WebDriverClickAndHoldAction.php b/lib/WebDriverClickAndHoldAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverClickAndHoldAction.php
rename to lib/WebDriverClickAndHoldAction.php
index 30169ff5b..6bc8d049b 100644
--- a/lib/interactions/internal/WebDriverClickAndHoldAction.php
+++ b/lib/WebDriverClickAndHoldAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Move the the location, click and hold.
diff --git a/lib/remote/WebDriverCommand.php b/lib/WebDriverCommand.php
similarity index 97%
rename from lib/remote/WebDriverCommand.php
rename to lib/WebDriverCommand.php
index 2300ce373..06660dadf 100644
--- a/lib/remote/WebDriverCommand.php
+++ b/lib/WebDriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverCommand {
 
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 7a3eb20fd..5f99a1d16 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface for all command executor.
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/WebDriverCompositeAction.php
similarity index 97%
rename from lib/interactions/WebDriverCompositeAction.php
rename to lib/WebDriverCompositeAction.php
index 261dde15d..de80c787f 100644
--- a/lib/interactions/WebDriverCompositeAction.php
+++ b/lib/WebDriverCompositeAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An action for aggregating actions and triggering all of them afterwards.
diff --git a/lib/interactions/internal/WebDriverContextClickAction.php b/lib/WebDriverContextClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverContextClickAction.php
rename to lib/WebDriverContextClickAction.php
index e1c3f96ad..5e2638dca 100644
--- a/lib/interactions/internal/WebDriverContextClickAction.php
+++ b/lib/WebDriverContextClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * You can call it 'Right Click' if you like.
diff --git a/lib/interactions/internal/WebDriverCoordinates.php b/lib/WebDriverCoordinates.php
similarity index 94%
rename from lib/interactions/internal/WebDriverCoordinates.php
rename to lib/WebDriverCoordinates.php
index 980051bac..e43b7fb75 100644
--- a/lib/interactions/internal/WebDriverCoordinates.php
+++ b/lib/WebDriverCoordinates.php
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 use Closure;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index a2572ecbf..c66278931 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Represent a dimension.
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 693763b70..ae9e5e8f7 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDispatcher {
 
diff --git a/lib/interactions/internal/WebDriverDoubleClickAction.php b/lib/WebDriverDoubleClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverDoubleClickAction.php
rename to lib/WebDriverDoubleClickAction.php
index d720e0d20..15c9e422c 100644
--- a/lib/interactions/internal/WebDriverDoubleClickAction.php
+++ b/lib/WebDriverDoubleClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/touch/WebDriverDoubleTapAction.php b/lib/WebDriverDoubleTapAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverDoubleTapAction.php
rename to lib/WebDriverDoubleTapAction.php
index c4bf374d6..c2cc7d381 100644
--- a/lib/interactions/touch/WebDriverDoubleTapAction.php
+++ b/lib/WebDriverDoubleTapAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverDownAction.php b/lib/WebDriverDownAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverDownAction.php
rename to lib/WebDriverDownAction.php
index 155e67eef..67fc73e55 100644
--- a/lib/interactions/touch/WebDriverDownAction.php
+++ b/lib/WebDriverDownAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDownAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index e060aa094..d49190604 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface for an HTML element in the WebDriver framework.
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 21c7f9002..4b458f649 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 interface WebDriverEventListener {
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index cb7526a43..ac1924a31 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\StaleElementReferenceException;
+use Facebook\WebDriver\Exception\NoSuchFrameException;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\NoAlertOpenException;
 
 /**
  * Canned ExpectedConditions which are generally useful within webdriver tests.
diff --git a/lib/interactions/touch/WebDriverFlickAction.php b/lib/WebDriverFlickAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverFlickAction.php
rename to lib/WebDriverFlickAction.php
index 8b80cf127..446340718 100644
--- a/lib/interactions/touch/WebDriverFlickAction.php
+++ b/lib/WebDriverFlickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverFlickAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverFlickFromElementAction.php b/lib/WebDriverFlickFromElementAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverFlickFromElementAction.php
rename to lib/WebDriverFlickFromElementAction.php
index 478b3e0ab..3781d6c0e 100644
--- a/lib/interactions/touch/WebDriverFlickFromElementAction.php
+++ b/lib/WebDriverFlickFromElementAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 67fb80947..76c82dddc 100644
--- a/lib/WebDriverHasInputDevices.php
+++ b/lib/WebDriverHasInputDevices.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface implemented by each driver that allows access to the input devices.
diff --git a/lib/interactions/internal/WebDriverKeyDownAction.php b/lib/WebDriverKeyDownAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverKeyDownAction.php
rename to lib/WebDriverKeyDownAction.php
index 70f5421eb..5d5aa2afe 100644
--- a/lib/interactions/internal/WebDriverKeyDownAction.php
+++ b/lib/WebDriverKeyDownAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
diff --git a/lib/interactions/internal/WebDriverKeyUpAction.php b/lib/WebDriverKeyUpAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverKeyUpAction.php
rename to lib/WebDriverKeyUpAction.php
index 24b5150f3..d41a5a2d8 100644
--- a/lib/interactions/internal/WebDriverKeyUpAction.php
+++ b/lib/WebDriverKeyUpAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index 06e6091dd..042e47108 100644
--- a/lib/WebDriverKeyboard.php
+++ b/lib/WebDriverKeyboard.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface WebDriverKeyboard {
 
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 64c76edd3..b946cec9f 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Representations of pressable keys that aren't text.
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/WebDriverKeysRelatedAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverKeysRelatedAction.php
rename to lib/WebDriverKeysRelatedAction.php
index 779718496..bcd45f7f7 100644
--- a/lib/interactions/internal/WebDriverKeysRelatedAction.php
+++ b/lib/WebDriverKeysRelatedAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all keyboard-related actions.
diff --git a/lib/internal/WebDriverLocatable.php b/lib/WebDriverLocatable.php
similarity index 96%
rename from lib/internal/WebDriverLocatable.php
rename to lib/WebDriverLocatable.php
index d315387a1..bb2aa9035 100644
--- a/lib/internal/WebDriverLocatable.php
+++ b/lib/WebDriverLocatable.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/interactions/touch/WebDriverLongPressAction.php b/lib/WebDriverLongPressAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverLongPressAction.php
rename to lib/WebDriverLongPressAction.php
index a34de2e10..5fc2b519e 100644
--- a/lib/interactions/touch/WebDriverLongPressAction.php
+++ b/lib/WebDriverLongPressAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverLongPressAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 5b79fcf76..5c90fa199 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/WebDriverMouseAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverMouseAction.php
rename to lib/WebDriverMouseAction.php
index 0d7b21309..5038daa45 100644
--- a/lib/interactions/internal/WebDriverMouseAction.php
+++ b/lib/WebDriverMouseAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all mouse-related actions.
diff --git a/lib/interactions/internal/WebDriverMouseMoveAction.php b/lib/WebDriverMouseMoveAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverMouseMoveAction.php
rename to lib/WebDriverMouseMoveAction.php
index 01e5c28bf..b24948daf 100644
--- a/lib/interactions/internal/WebDriverMouseMoveAction.php
+++ b/lib/WebDriverMouseMoveAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/touch/WebDriverMoveAction.php b/lib/WebDriverMoveAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverMoveAction.php
rename to lib/WebDriverMoveAction.php
index dae6e8ef1..32c324de7 100644
--- a/lib/interactions/touch/WebDriverMoveAction.php
+++ b/lib/WebDriverMoveAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMoveAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/internal/WebDriverMoveToOffsetAction.php b/lib/WebDriverMoveToOffsetAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverMoveToOffsetAction.php
rename to lib/WebDriverMoveToOffsetAction.php
index bdf41629e..fe1b0bfc2 100644
--- a/lib/interactions/internal/WebDriverMoveToOffsetAction.php
+++ b/lib/WebDriverMoveToOffsetAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 75baa18d5..f572b6f92 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An abstraction allowing the driver to access the browser's history and to
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 10f59d937..d673603b2 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use InvalidArgumentException;
 
 /**
  * Managing stuff you would do in a browser.
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index a16a4cb2a..4954bf56e 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The platforms supported by WebDriver.
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index ae8dbd667..0653eb988 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Represent a point.
diff --git a/lib/remote/WebDriverResponse.php b/lib/WebDriverResponse.php
similarity index 98%
rename from lib/remote/WebDriverResponse.php
rename to lib/WebDriverResponse.php
index 71b934074..a2d4dd244 100644
--- a/lib/remote/WebDriverResponse.php
+++ b/lib/WebDriverResponse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverResponse {
 
diff --git a/lib/interactions/touch/WebDriverScrollAction.php b/lib/WebDriverScrollAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverScrollAction.php
rename to lib/WebDriverScrollAction.php
index 817ed26aa..e7e183b31 100644
--- a/lib/interactions/touch/WebDriverScrollAction.php
+++ b/lib/WebDriverScrollAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverScrollAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverScrollFromElementAction.php b/lib/WebDriverScrollFromElementAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverScrollFromElementAction.php
rename to lib/WebDriverScrollFromElementAction.php
index 96109712a..63be82c48 100644
--- a/lib/interactions/touch/WebDriverScrollFromElementAction.php
+++ b/lib/WebDriverScrollFromElementAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 17f3417a4..07f7bbccc 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 85aabe832..cebeba364 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\UnexpectedTagNameException;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/WebDriverSendKeysAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverSendKeysAction.php
rename to lib/WebDriverSendKeysAction.php
index 889a2f91b..9b371a551 100644
--- a/lib/interactions/internal/WebDriverSendKeysAction.php
+++ b/lib/WebDriverSendKeysAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/WebDriverSingleKeyAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverSingleKeyAction.php
rename to lib/WebDriverSingleKeyAction.php
index 5b6c3c62d..a9280afe1 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/WebDriverSingleKeyAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/interactions/touch/WebDriverTapAction.php b/lib/WebDriverTapAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverTapAction.php
rename to lib/WebDriverTapAction.php
index b61056e99..27ef9627f 100644
--- a/lib/interactions/touch/WebDriverTapAction.php
+++ b/lib/WebDriverTapAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 53efb59ca..86e0939b8 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Used to locate a given frame or window.
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index f4732f708..aac26c146 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Managing timeout behavior for WebDriver instances.
diff --git a/lib/interactions/touch/WebDriverTouchAction.php b/lib/WebDriverTouchAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverTouchAction.php
rename to lib/WebDriverTouchAction.php
index a885467fe..06ba9fdab 100644
--- a/lib/interactions/touch/WebDriverTouchAction.php
+++ b/lib/WebDriverTouchAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all touch-related actions.
diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/WebDriverTouchActions.php
similarity index 99%
rename from lib/interactions/WebDriverTouchActions.php
rename to lib/WebDriverTouchActions.php
index 83281e839..a223f269d 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/WebDriverTouchActions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver action builder for touch events
diff --git a/lib/interactions/WebDriverTouchScreen.php b/lib/WebDriverTouchScreen.php
similarity index 99%
rename from lib/interactions/WebDriverTouchScreen.php
rename to lib/WebDriverTouchScreen.php
index be9a2474a..46f989013 100644
--- a/lib/interactions/WebDriverTouchScreen.php
+++ b/lib/WebDriverTouchScreen.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing touch screen operations.
diff --git a/lib/interactions/touch/WebDriverUpAction.php b/lib/WebDriverUpAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverUpAction.php
rename to lib/WebDriverUpAction.php
index 8745eb4c7..9e0035d1a 100644
--- a/lib/interactions/touch/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverUpAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 5d351c3eb..2b4464fba 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\TimeOutException;
 
 /**
  * A utility class, designed to help the user to wait until a condition turns
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index b4f649b77..c29deb06c 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
 
 /**
  * An abstraction allowing the driver to manipulate the browser's window
diff --git a/lib/__init__.php b/lib/__init__.php
deleted file mode 100755
index 55219b491..000000000
--- a/lib/__init__.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-// interface
-require_once('WebDriverSearchContext.php');
-require_once('JavaScriptExecutor.php');
-require_once('WebDriver.php');
-require_once('WebDriverElement.php');
-require_once('WebDriverCommandExecutor.php');
-require_once('WebDriverAction.php');
-require_once('WebDriverEventListener.php');
-require_once('remote/FileDetector.php');
-require_once('WebDriverCapabilities.php');
-require_once('remote/ExecuteMethod.php');
-require_once('WebDriverTargetLocator.php');
-
-// abstract class
-require_once('interactions/internal/WebDriverKeysRelatedAction.php');
-require_once('interactions/internal/WebDriverSingleKeyAction.php');
-
-require_once('remote/WebDriverCommand.php');
-
-require_once('net/URLChecker.php');
-
-// class
-require_once('WebDriverAlert.php');
-require_once('WebDriverBy.php');
-require_once('WebDriverDimension.php');
-require_once('WebDriverExceptions.php');
-require_once('WebDriverExpectedCondition.php');
-require_once('WebDriverHasInputDevices.php');
-require_once('WebDriverKeys.php');
-require_once('WebDriverNavigation.php');
-require_once('WebDriverMouse.php');
-require_once('WebDriverKeyboard.php');
-require_once('WebDriverOptions.php');
-require_once('WebDriverPlatform.php');
-require_once('WebDriverPoint.php');
-require_once('WebDriverSelect.php');
-require_once('WebDriverTimeouts.php');
-require_once('WebDriverWait.php');
-require_once('WebDriverWindow.php');
-require_once('interactions/WebDriverActions.php');
-require_once('interactions/internal/WebDriverMouseAction.php');
-require_once('interactions/WebDriverCompositeAction.php');
-require_once('interactions/internal/WebDriverButtonReleaseAction.php');
-require_once('interactions/internal/WebDriverClickAction.php');
-require_once('interactions/internal/WebDriverClickAndHoldAction.php');
-require_once('interactions/internal/WebDriverContextClickAction.php');
-require_once('interactions/internal/WebDriverCoordinates.php');
-require_once('interactions/internal/WebDriverDoubleClickAction.php');
-require_once('interactions/internal/WebDriverMouseMoveAction.php');
-require_once('interactions/internal/WebDriverMoveToOffsetAction.php');
-require_once('internal/WebDriverLocatable.php');
-require_once('chrome/ChromeOptions.php');
-require_once('firefox/FirefoxDriver.php');
-require_once('firefox/FirefoxProfile.php');
-require_once('remote/DriverCommand.php');
-require_once('remote/LocalFileDetector.php');
-require_once('remote/UselessFileDetector.php');
-require_once('remote/RemoteMouse.php');
-require_once('remote/RemoteKeyboard.php');
-
-require_once('remote/service/DriverService.php');
-require_once('chrome/ChromeDriverService.php');
-
-require_once('remote/RemoteWebDriver.php');
-require_once('chrome/ChromeDriver.php');
-
-require_once('remote/RemoteWebElement.php');
-require_once('remote/RemoteExecuteMethod.php');
-require_once('remote/WebDriverBrowserType.php');
-require_once('remote/WebDriverCapabilityType.php');
-require_once('remote/DesiredCapabilities.php');
-require_once('remote/WebDriverResponse.php');
-require_once('remote/RemoteTargetLocator.php');
-
-require_once('remote/HttpCommandExecutor.php');
-require_once('remote/service/DriverCommandExecutor.php');
-
-require_once('interactions/internal/WebDriverSendKeysAction.php');
-require_once('interactions/internal/WebDriverKeyDownAction.php');
-require_once('interactions/internal/WebDriverKeyUpAction.php');
-
-require_once('support/events/EventFiringWebDriver.php');
-require_once('support/events/EventFiringWebDriverNavigation.php');
-require_once('WebDriverDispatcher.php');
-require_once('support/events/EventFiringWebElement.php');
-
-// touch
-require_once('interactions/WebDriverTouchScreen.php');
-require_once('remote/RemoteTouchScreen.php');
-require_once('interactions/WebDriverTouchActions.php');
-require_once('interactions/touch/WebDriverTouchAction.php');
-require_once('interactions/touch/WebDriverDoubleTapAction.php');
-require_once('interactions/touch/WebDriverDownAction.php');
-require_once('interactions/touch/WebDriverFlickAction.php');
-require_once('interactions/touch/WebDriverFlickFromElementAction.php');
-require_once('interactions/touch/WebDriverLongPressAction.php');
-require_once('interactions/touch/WebDriverMoveAction.php');
-require_once('interactions/touch/WebDriverScrollAction.php');
-require_once('interactions/touch/WebDriverScrollFromElementAction.php');
-require_once('interactions/touch/WebDriverTapAction.php');
-require_once('interactions/touch/WebDriverUpAction.php');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 28437e38b..c12f2a118 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
-require_once __DIR__ . '/../lib/__init__.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index b74d27d77..351db6ed2 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class BaseTest extends WebDriverTestCase {
   
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 7f09aa8f0..8e7289973 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An example test case for php-webdriver.
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index e4ef9db7c..2c0793815 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The base class for test cases.
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 80da4bb38..77ad6b219 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 require_once __DIR__ . '/../../lib/__init__.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 2b489ff8c..645a85963 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index ca60ae668..fd1ece96f 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index 78781fae6..bf9a4cdea 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index ece8f3488..2ca80a538 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index f339e5044..a7fa52549 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index ae45d169b..bae50645d 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index 0cc5cb5cd..af9ce8e0e 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -26,9 +26,9 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -37,7 +37,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index daf7bfc06..98d4cf27d 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -26,9 +26,9 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -38,7 +38,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index 2c6ee400e..bbd306640 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index c6066d051..3fbc3b130 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -36,7 +36,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 6a51f8934..77fd71587 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -27,9 +27,9 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   private $keys;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -40,7 +40,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From 891331c6bbc6abf96c03194a456df97f6127d1f5 Mon Sep 17 00:00:00 2001
From: Andrey <andreykvital@gmail.com>
Date: Mon, 18 May 2015 21:34:46 -0300
Subject: [PATCH 142/784] Few improvements, avoiding some elses

---
 lib/WebDriverWait.php                              |  5 ++---
 lib/interactions/internal/WebDriverMouseAction.php |  4 ++--
 lib/remote/HttpCommandExecutor.php                 | 12 ++++++------
 lib/remote/service/DriverService.php               | 12 +++++-------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 34d573552..55ace62af 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -30,9 +30,8 @@ public function __construct(
       $timeout_in_second = null,
       $interval_in_millisecond = null) {
     $this->driver = $driver;
-    $this->timeout = ($timeout_in_second) ? $timeout_in_second : 30;
-    $this->interval =
-      ($interval_in_millisecond) ? $interval_in_millisecond : 250;
+    $this->timeout = $timeout_in_second ?: 30;
+    $this->interval = $interval_in_millisecond ?: 250;
   }
 
   /**
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/interactions/internal/WebDriverMouseAction.php
index 0bbdf0bf5..4c16a7b39 100644
--- a/lib/interactions/internal/WebDriverMouseAction.php
+++ b/lib/interactions/internal/WebDriverMouseAction.php
@@ -34,9 +34,9 @@ public function __construct(
   protected function getActionLocation() {
     if ($this->locationProvider !== null) {
       return $this->locationProvider->getCoordinates();
-    } else {
-      return null;
     }
+
+    return null;
   }
 
   /**
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 3ef9955bb..193031ddc 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -208,18 +208,18 @@ public function execute(WebDriverCommand $command) {
     curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
 
     // https://github.com/facebook/php-webdriver/issues/173
-    switch ($command->getName()) {
-      case DriverCommand::NEW_SESSION:
-        curl_setopt($this->curl, CURLOPT_POST, 1);
-        break;
-      default:
-        curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
+    if ($command->getName() === DriverCommand::NEW_SESSION) {
+      curl_setopt($this->curl, CURLOPT_POST, 1);
+    } else {
+      curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
     }
 
     $encoded_params = null;
+
     if ($http_method === 'POST' && $params && is_array($params)) {
       $encoded_params = json_encode($params);
     }
+
     curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
 
     $raw_results = trim(curl_exec($this->curl));
diff --git a/lib/remote/service/DriverService.php b/lib/remote/service/DriverService.php
index b8ba78831..607bf8fb8 100644
--- a/lib/remote/service/DriverService.php
+++ b/lib/remote/service/DriverService.php
@@ -55,12 +55,7 @@ public function __construct(
     $this->executable = self::checkExecutable($executable);
     $this->url = sprintf('http://localhost:%d', $port);
     $this->args = $args;
-
-    if ($environment === null) {
-      $this->environment = $_ENV;
-    } else {
-      $this->environment = $environment;
-    }
+    $this->environment = $environment ?: $_ENV;
   }
 
   /**
@@ -136,9 +131,12 @@ public function isRunning() {
   protected static function checkExecutable($executable) {
     if (!is_file($executable)) {
       throw new Exception("'$executable' is not a file.");
-    } else if (!is_executable($executable)) {
+    }
+
+    if (!is_executable($executable)) {
       throw new Exception("'$executable' is not executable.");
     }
+
     return $executable;
   }
 }

From 0ad98e98fa22d21c7fa591fa4feb6e2b79e3246d Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Tue, 19 May 2015 12:29:22 +0200
Subject: [PATCH 143/784] Issue facebook/php-webdriver#212 - Moved classes to
 subnamespaces (needs manual testing)

---
 example.php                                   |  3 ++
 lib/{ => Chrome}/ChromeDriver.php             | 25 +++++++++--
 lib/{ => Chrome}/ChromeDriverService.php      |  4 +-
 lib/{ => Chrome}/ChromeOptions.php            |  4 +-
 lib/Exception/WebDriverException.php          | 41 ++++++++++++++++++-
 lib/{ => Firefox}/FirefoxDriver.php           |  2 +-
 lib/{ => Firefox}/FirefoxProfile.php          |  8 +++-
 .../WebDriverButtonReleaseAction.php          |  4 +-
 .../Internal}/WebDriverClickAction.php        |  4 +-
 .../Internal}/WebDriverClickAndHoldAction.php |  4 +-
 .../Internal}/WebDriverContextClickAction.php |  4 +-
 .../Internal}/WebDriverCoordinates.php        |  4 +-
 .../Internal}/WebDriverDoubleClickAction.php  |  4 +-
 .../Internal}/WebDriverKeyDownAction.php      |  4 +-
 .../Internal}/WebDriverKeyUpAction.php        |  4 +-
 .../Internal}/WebDriverKeysRelatedAction.php  |  6 ++-
 .../Internal}/WebDriverMouseAction.php        | 12 +++++-
 .../Internal}/WebDriverMouseMoveAction.php    |  4 +-
 .../Internal}/WebDriverMoveToOffsetAction.php |  6 ++-
 .../Internal}/WebDriverSendKeysAction.php     |  7 +++-
 .../Internal}/WebDriverSingleKeyAction.php    |  7 +++-
 .../Touch}/WebDriverDoubleTapAction.php       |  4 +-
 .../Touch}/WebDriverDownAction.php            |  4 +-
 .../Touch}/WebDriverFlickAction.php           |  4 +-
 .../WebDriverFlickFromElementAction.php       |  5 ++-
 .../Touch}/WebDriverLongPressAction.php       |  4 +-
 .../Touch}/WebDriverMoveAction.php            |  4 +-
 .../Touch}/WebDriverScrollAction.php          |  4 +-
 .../WebDriverScrollFromElementAction.php      |  5 ++-
 .../Touch}/WebDriverTapAction.php             |  4 +-
 .../Touch}/WebDriverTouchAction.php           |  5 ++-
 .../Touch}/WebDriverTouchScreen.php           |  4 +-
 lib/{ => Interactions}/WebDriverActions.php   | 15 ++++++-
 .../WebDriverCompositeAction.php              |  4 +-
 .../WebDriverTouchActions.php                 | 16 +++++++-
 lib/Internal/WebDriverLocatable.php           | 29 +++++++++++++
 lib/{ => Net}/URLChecker.php                  |  2 +-
 lib/{ => Remote}/DesiredCapabilities.php      |  7 +++-
 lib/{ => Remote}/DriverCommand.php            |  2 +-
 lib/{ => Remote}/ExecuteMethod.php            |  4 +-
 lib/{ => Remote}/FileDetector.php             |  2 +-
 lib/{ => Remote}/HttpCommandExecutor.php      |  7 +++-
 lib/{ => Remote}/LocalFileDetector.php        |  4 +-
 lib/{ => Remote}/RemoteExecuteMethod.php      |  2 +-
 lib/{ => Remote}/RemoteKeyboard.php           |  5 ++-
 lib/{ => Remote}/RemoteMouse.php              |  5 ++-
 lib/{ => Remote}/RemoteTargetLocator.php      |  7 +++-
 lib/{ => Remote}/RemoteTouchScreen.php        |  5 ++-
 lib/{ => Remote}/RemoteWebDriver.php          | 12 +++++-
 lib/{ => Remote}/RemoteWebElement.php         |  9 +++-
 .../Service}/DriverCommandExecutor.php        | 10 ++++-
 lib/{ => Remote/Service}/DriverService.php    |  3 +-
 lib/{ => Remote}/UselessFileDetector.php      |  2 +-
 lib/{ => Remote}/WebDriverBrowserType.php     |  2 +-
 lib/{ => Remote}/WebDriverCapabilityType.php  |  2 +-
 lib/{ => Remote}/WebDriverCommand.php         |  2 +-
 lib/{ => Remote}/WebDriverResponse.php        |  2 +-
 .../Events}/EventFiringWebDriver.php          | 11 ++++-
 .../EventFiringWebDriverNavigation.php        |  4 +-
 .../Events}/EventFiringWebElement.php         |  9 +++-
 lib/WebDriverAlert.php                        |  2 +
 lib/WebDriverCommandExecutor.php              |  3 ++
 lib/WebDriverDispatcher.php                   |  2 +
 lib/WebDriverEventListener.php                |  2 +
 lib/WebDriverExpectedCondition.php            |  1 +
 lib/WebDriverLocatable.php                    | 27 ------------
 lib/WebDriverMouse.php                        |  2 +
 lib/WebDriverNavigation.php                   |  3 ++
 lib/WebDriverOptions.php                      |  3 ++
 lib/WebDriverSelect.php                       |  1 +
 lib/WebDriverTimeouts.php                     |  2 +
 lib/WebDriverUpAction.php                     |  3 ++
 lib/WebDriverWait.php                         |  6 +++
 lib/WebDriverWindow.php                       |  2 +
 tests/functional/FileUploadTest.php           |  2 +
 tests/functional/WebDriverTestCase.php        |  4 ++
 tests/unit/bootstrap.php                      |  2 +-
 .../WebDriverButtonReleaseActionTest.php      |  7 +++-
 .../internal/WebDriverClickActionTest.php     |  7 +++-
 .../WebDriverClickAndHoldActionTest.php       |  7 +++-
 .../WebDriverContextClickActionTest.php       |  7 +++-
 .../internal/WebDriverCoordinatesTest.php     |  2 +
 .../WebDriverDoubleClickActionTest.php        |  7 +++-
 .../internal/WebDriverKeyDownActionTest.php   |  8 +++-
 .../internal/WebDriverKeyUpActionTest.php     |  8 +++-
 .../internal/WebDriverMouseMoveActionTest.php |  8 +++-
 .../WebDriverMouseToOffsetActionTest.php      |  8 +++-
 .../internal/WebDriverSendKeysActionTest.php  |  8 +++-
 88 files changed, 424 insertions(+), 112 deletions(-)
 rename lib/{ => Chrome}/ChromeDriver.php (72%)
 rename lib/{ => Chrome}/ChromeDriverService.php (92%)
 rename lib/{ => Chrome}/ChromeOptions.php (97%)
 rename lib/{ => Firefox}/FirefoxDriver.php (94%)
 rename lib/{ => Firefox}/FirefoxProfile.php (96%)
 rename lib/{ => Interactions/Internal}/WebDriverButtonReleaseAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverClickAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverClickAndHoldAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverContextClickAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverCoordinates.php (92%)
 rename lib/{ => Interactions/Internal}/WebDriverDoubleClickAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeyDownAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeyUpAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeysRelatedAction.php (88%)
 rename lib/{ => Interactions/Internal}/WebDriverMouseAction.php (85%)
 rename lib/{ => Interactions/Internal}/WebDriverMouseMoveAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverMoveToOffsetAction.php (87%)
 rename lib/{ => Interactions/Internal}/WebDriverSendKeysAction.php (84%)
 rename lib/{ => Interactions/Internal}/WebDriverSingleKeyAction.php (81%)
 rename lib/{ => Interactions/Touch}/WebDriverDoubleTapAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverDownAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverFlickAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverFlickFromElementAction.php (91%)
 rename lib/{ => Interactions/Touch}/WebDriverLongPressAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverMoveAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverScrollAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverScrollFromElementAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverTapAction.php (89%)
 rename lib/{ => Interactions/Touch}/WebDriverTouchAction.php (89%)
 rename lib/{ => Interactions/Touch}/WebDriverTouchScreen.php (97%)
 rename lib/{ => Interactions}/WebDriverActions.php (88%)
 rename lib/{ => Interactions}/WebDriverCompositeAction.php (94%)
 rename lib/{ => Interactions}/WebDriverTouchActions.php (81%)
 create mode 100644 lib/Internal/WebDriverLocatable.php
 rename lib/{ => Net}/URLChecker.php (98%)
 rename lib/{ => Remote}/DesiredCapabilities.php (96%)
 rename lib/{ => Remote}/DriverCommand.php (99%)
 rename lib/{ => Remote}/ExecuteMethod.php (90%)
 rename lib/{ => Remote}/FileDetector.php (96%)
 rename lib/{ => Remote}/HttpCommandExecutor.php (99%)
 rename lib/{ => Remote}/LocalFileDetector.php (91%)
 rename lib/{ => Remote}/RemoteExecuteMethod.php (96%)
 rename lib/{ => Remote}/RemoteKeyboard.php (93%)
 rename lib/{ => Remote}/RemoteMouse.php (95%)
 rename lib/{ => Remote}/RemoteTargetLocator.php (93%)
 rename lib/{ => Remote}/RemoteTouchScreen.php (96%)
 rename lib/{ => Remote}/RemoteWebDriver.php (96%)
 rename lib/{ => Remote}/RemoteWebElement.php (96%)
 rename lib/{ => Remote/Service}/DriverCommandExecutor.php (85%)
 rename lib/{ => Remote/Service}/DriverService.php (97%)
 rename lib/{ => Remote}/UselessFileDetector.php (95%)
 rename lib/{ => Remote}/WebDriverBrowserType.php (97%)
 rename lib/{ => Remote}/WebDriverCapabilityType.php (97%)
 rename lib/{ => Remote}/WebDriverCommand.php (96%)
 rename lib/{ => Remote}/WebDriverResponse.php (97%)
 rename lib/{ => Support/Events}/EventFiringWebDriver.php (95%)
 rename lib/{ => Support/Events}/EventFiringWebDriverNavigation.php (96%)
 rename lib/{ => Support/Events}/EventFiringWebElement.php (95%)
 delete mode 100644 lib/WebDriverLocatable.php

diff --git a/example.php b/example.php
index b4834146c..556a100a0 100644
--- a/example.php
+++ b/example.php
@@ -3,6 +3,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
 require_once('vendor/autoload.php');
 
 // start Firefox with 5 second timeout
diff --git a/lib/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
similarity index 72%
rename from lib/ChromeDriver.php
rename to lib/Chrome/ChromeDriver.php
index 3fb84ad58..67427205d 100644
--- a/lib/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -13,9 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverCommand;
 
 class ChromeDriver extends RemoteWebDriver {
 
@@ -49,10 +54,14 @@ public function startSession($desired_capabilities) {
   }
 
   /**
-   * @param string $url The url of the remote server
+   * Always throws an exception. Use ChromeDriver::start() instead.
+   *
+   * @param string              $url                  The url of the remote server
    * @param DesiredCapabilities $desired_capabilities The desired capabilities
-   * @param int|null $connection_timeout_in_ms
-   * @param int|null $request_timeout_in_ms
+   * @param int|null            $timeout_in_ms
+   * @param int|null            $request_timeout_in_ms
+   *
+   * @throws WebDriverException
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
@@ -63,6 +72,14 @@ public static function create(
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }
 
+  /**
+   * Always throws an exception. Use ChromeDriver::start() instead.
+   *
+   * @param string $session_id The existing session id
+   * @param string $url        The url of the remote server
+   *
+   * @throws WebDriverException
+   */
   public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub'
diff --git a/lib/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
similarity index 92%
rename from lib/ChromeDriverService.php
rename to lib/Chrome/ChromeDriverService.php
index 9494bfd1a..d60f376a6 100644
--- a/lib/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\Service\DriverService;
 
 class ChromeDriverService extends DriverService {
 
diff --git a/lib/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
similarity index 97%
rename from lib/ChromeOptions.php
rename to lib/Chrome/ChromeOptions.php
index eb2f92e8c..5cc125f56 100644
--- a/lib/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\DesiredCapabilities;
 
 /**
  * The class manages the capabilities in ChromeDriver.
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index af90b7cf7..a23f42103 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -42,9 +42,46 @@ public function getResults() {
    * For $status_code >= 0, they are errors defined in the json wired protocol.
    * For $status_code < 0, they are errors defined in php-webdriver.
    *
-   * @param int $status_code
+   * @param int    $status_code
    * @param string $message
-   * @param mixed $results
+   * @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
    */
   public static function throwException($status_code, $message, $results) {
     switch ($status_code) {
diff --git a/lib/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
similarity index 94%
rename from lib/FirefoxDriver.php
rename to lib/Firefox/FirefoxDriver.php
index 019064e71..8afbe0c2d 100644
--- a/lib/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Firefox;
 
 class FirefoxDriver {
 
diff --git a/lib/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
similarity index 96%
rename from lib/FirefoxProfile.php
rename to lib/Firefox/FirefoxProfile.php
index d72fc06c1..d15d9556e 100644
--- a/lib/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Firefox;
 
 use Facebook\WebDriver\Exception\WebDriverException;
 use RecursiveDirectoryIterator;
@@ -127,7 +127,9 @@ private function installExtension($extension, $profile_dir) {
 
   /**
    * @param string $prefix Prefix of the temp directory.
+   *
    * @return string The path to the temp directory created.
+   * @throws WebDriverException
    */
   private function createTempDirectory($prefix = '') {
     $temp_dir = tempnam('', $prefix);
@@ -142,9 +144,11 @@ private function createTempDirectory($prefix = '') {
   }
 
   /**
-   * @param string $xpi The path to the .xpi extension.
+   * @param string $xpi        The path to the .xpi extension.
    * @param string $target_dir The path to the unzip directory.
+   *
    * @return FirefoxProfile
+   * @throws \Exception
    */
   private function extractTo($xpi, $target_dir) {
     $zip = new ZipArchive();
diff --git a/lib/WebDriverButtonReleaseAction.php b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
similarity index 90%
rename from lib/WebDriverButtonReleaseAction.php
rename to lib/Interactions/Internal/WebDriverButtonReleaseAction.php
index 444632265..a63570ae6 100644
--- a/lib/WebDriverButtonReleaseAction.php
+++ b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * Move to the location and then release the mouse key.
diff --git a/lib/WebDriverClickAction.php b/lib/Interactions/Internal/WebDriverClickAction.php
similarity index 89%
rename from lib/WebDriverClickAction.php
rename to lib/Interactions/Internal/WebDriverClickAction.php
index cc9263c17..f110d34bd 100644
--- a/lib/WebDriverClickAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverClickAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverClickAndHoldAction.php b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
similarity index 90%
rename from lib/WebDriverClickAndHoldAction.php
rename to lib/Interactions/Internal/WebDriverClickAndHoldAction.php
index 6bc8d049b..264d1503f 100644
--- a/lib/WebDriverClickAndHoldAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * Move the the location, click and hold.
diff --git a/lib/WebDriverContextClickAction.php b/lib/Interactions/Internal/WebDriverContextClickAction.php
similarity index 90%
rename from lib/WebDriverContextClickAction.php
rename to lib/Interactions/Internal/WebDriverContextClickAction.php
index 5e2638dca..d431173e9 100644
--- a/lib/WebDriverContextClickAction.php
+++ b/lib/Interactions/Internal/WebDriverContextClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * You can call it 'Right Click' if you like.
diff --git a/lib/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
similarity index 92%
rename from lib/WebDriverCoordinates.php
rename to lib/Interactions/Internal/WebDriverCoordinates.php
index e43b7fb75..89aae19bb 100644
--- a/lib/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -13,10 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
 
 use Closure;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\WebDriverPoint;
 
 /**
  * Interface representing basic mouse operations.
@@ -43,6 +44,7 @@ public function __construct(
 
   /**
    * @return WebDriverPoint
+   * @throws UnsupportedOperationException
    */
   public function onScreen() {
     throw new UnsupportedOperationException(
diff --git a/lib/WebDriverDoubleClickAction.php b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
similarity index 89%
rename from lib/WebDriverDoubleClickAction.php
rename to lib/Interactions/Internal/WebDriverDoubleClickAction.php
index 15c9e422c..218a05b5e 100644
--- a/lib/WebDriverDoubleClickAction.php
+++ b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverKeyDownAction.php b/lib/Interactions/Internal/WebDriverKeyDownAction.php
similarity index 89%
rename from lib/WebDriverKeyDownAction.php
rename to lib/Interactions/Internal/WebDriverKeyDownAction.php
index 5d5aa2afe..29350e484 100644
--- a/lib/WebDriverKeyDownAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyDownAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeyUpAction.php b/lib/Interactions/Internal/WebDriverKeyUpAction.php
similarity index 89%
rename from lib/WebDriverKeyUpAction.php
rename to lib/Interactions/Internal/WebDriverKeyUpAction.php
index d41a5a2d8..9b89747eb 100644
--- a/lib/WebDriverKeyUpAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyUpAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
similarity index 88%
rename from lib/WebDriverKeysRelatedAction.php
rename to lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index bcd45f7f7..77892cc25 100644
--- a/lib/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
+use Facebook\WebDriver\WebDriverKeyboard;
 
 /**
  * Base class for all keyboard-related actions.
diff --git a/lib/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
similarity index 85%
rename from lib/WebDriverMouseAction.php
rename to lib/Interactions/Internal/WebDriverMouseAction.php
index 5038daa45..e261cc9b5 100644
--- a/lib/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -13,14 +13,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverMouse;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
 
 /**
  * Base class for all mouse-related actions.
  */
 class WebDriverMouseAction {
 
+  /**
+   * @var WebDriverMouse
+   */
   protected $mouse;
+
+  /**
+   * @var WebDriverLocatable
+   */
   protected $locationProvider;
 
   public function __construct(
diff --git a/lib/WebDriverMouseMoveAction.php b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
similarity index 89%
rename from lib/WebDriverMouseMoveAction.php
rename to lib/Interactions/Internal/WebDriverMouseMoveAction.php
index b24948daf..d229904fc 100644
--- a/lib/WebDriverMouseMoveAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
similarity index 87%
rename from lib/WebDriverMoveToOffsetAction.php
rename to lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index fe1b0bfc2..f1e0270f8 100644
--- a/lib/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
similarity index 84%
rename from lib/WebDriverSendKeysAction.php
rename to lib/Interactions/Internal/WebDriverSendKeysAction.php
index 9b371a551..2c9512dd3 100644
--- a/lib/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
similarity index 81%
rename from lib/WebDriverSingleKeyAction.php
rename to lib/Interactions/Internal/WebDriverSingleKeyAction.php
index a9280afe1..86cd74936 100644
--- a/lib/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/WebDriverDoubleTapAction.php b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
similarity index 90%
rename from lib/WebDriverDoubleTapAction.php
rename to lib/Interactions/Touch/WebDriverDoubleTapAction.php
index c2cc7d381..92ccfa222 100644
--- a/lib/WebDriverDoubleTapAction.php
+++ b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
similarity index 92%
rename from lib/WebDriverDownAction.php
rename to lib/Interactions/Touch/WebDriverDownAction.php
index 67fc73e55..eb946008f 100644
--- a/lib/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDownAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
similarity index 92%
rename from lib/WebDriverFlickAction.php
rename to lib/Interactions/Touch/WebDriverFlickAction.php
index 446340718..575c3eb4d 100644
--- a/lib/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverFlickAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
similarity index 91%
rename from lib/WebDriverFlickFromElementAction.php
rename to lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index 3781d6c0e..afd13ab8c 100644
--- a/lib/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverElement;
 
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverLongPressAction.php b/lib/Interactions/Touch/WebDriverLongPressAction.php
similarity index 90%
rename from lib/WebDriverLongPressAction.php
rename to lib/Interactions/Touch/WebDriverLongPressAction.php
index 5fc2b519e..c46770d86 100644
--- a/lib/WebDriverLongPressAction.php
+++ b/lib/Interactions/Touch/WebDriverLongPressAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverLongPressAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverMoveAction.php b/lib/Interactions/Touch/WebDriverMoveAction.php
similarity index 92%
rename from lib/WebDriverMoveAction.php
rename to lib/Interactions/Touch/WebDriverMoveAction.php
index 32c324de7..330783271 100644
--- a/lib/WebDriverMoveAction.php
+++ b/lib/Interactions/Touch/WebDriverMoveAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverMoveAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverScrollAction.php b/lib/Interactions/Touch/WebDriverScrollAction.php
similarity index 92%
rename from lib/WebDriverScrollAction.php
rename to lib/Interactions/Touch/WebDriverScrollAction.php
index e7e183b31..8dc1f14b7 100644
--- a/lib/WebDriverScrollAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverScrollAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverScrollFromElementAction.php b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
similarity index 90%
rename from lib/WebDriverScrollFromElementAction.php
rename to lib/Interactions/Touch/WebDriverScrollFromElementAction.php
index 63be82c48..df31f13b0 100644
--- a/lib/WebDriverScrollFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverElement;
 
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTapAction.php b/lib/Interactions/Touch/WebDriverTapAction.php
similarity index 89%
rename from lib/WebDriverTapAction.php
rename to lib/Interactions/Touch/WebDriverTapAction.php
index 27ef9627f..835acc848 100644
--- a/lib/WebDriverTapAction.php
+++ b/lib/Interactions/Touch/WebDriverTapAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
similarity index 89%
rename from lib/WebDriverTouchAction.php
rename to lib/Interactions/Touch/WebDriverTouchAction.php
index 06ba9fdab..e267f1ab3 100644
--- a/lib/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 
 /**
  * Base class for all touch-related actions.
diff --git a/lib/WebDriverTouchScreen.php b/lib/Interactions/Touch/WebDriverTouchScreen.php
similarity index 97%
rename from lib/WebDriverTouchScreen.php
rename to lib/Interactions/Touch/WebDriverTouchScreen.php
index 46f989013..cb753cd0d 100644
--- a/lib/WebDriverTouchScreen.php
+++ b/lib/Interactions/Touch/WebDriverTouchScreen.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverElement;
 
 /**
  * Interface representing touch screen operations.
diff --git a/lib/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
similarity index 88%
rename from lib/WebDriverActions.php
rename to lib/Interactions/WebDriverActions.php
index 37537e2b9..4d8a623d8 100644
--- a/lib/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -13,7 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
diff --git a/lib/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
similarity index 94%
rename from lib/WebDriverCompositeAction.php
rename to lib/Interactions/WebDriverCompositeAction.php
index de80c787f..63d9863d7 100644
--- a/lib/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * An action for aggregating actions and triggering all of them afterwards.
diff --git a/lib/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
similarity index 81%
rename from lib/WebDriverTouchActions.php
rename to lib/Interactions/WebDriverTouchActions.php
index a223f269d..ec77242fc 100644
--- a/lib/WebDriverTouchActions.php
+++ b/lib/Interactions/WebDriverTouchActions.php
@@ -13,7 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\Interactions\Touch\WebDriverDoubleTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverFlickAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverFlickFromElementAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverLongPressAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverScrollFromElementAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverDownAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverMoveAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverScrollAction;
+use Facebook\WebDriver\WebDriverUpAction;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * WebDriver action builder for touch events
diff --git a/lib/Internal/WebDriverLocatable.php b/lib/Internal/WebDriverLocatable.php
new file mode 100644
index 000000000..1523c35c0
--- /dev/null
+++ b/lib/Internal/WebDriverLocatable.php
@@ -0,0 +1,29 @@
+<?php
+// copyright 2004-present facebook. all rights reserved.
+//
+// licensed under the apache license, version 2.0 (the "license");
+// you may not use this file except in compliance with the license.
+// you may obtain a copy of the license at
+//
+//   http://www.apache.org/licenses/license-2.0
+//
+// unless required by applicable law or agreed to in writing, software
+// distributed under the license is distributed on an "as is" basis,
+// 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\WebDriver\Internal;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
+/**
+ * interface representing basic mouse operations.
+ */
+interface WebDriverLocatable {
+
+  /**
+   * @return WebDriverCoordinates
+   */
+  public function getCoordinates();
+}
diff --git a/lib/URLChecker.php b/lib/Net/URLChecker.php
similarity index 98%
rename from lib/URLChecker.php
rename to lib/Net/URLChecker.php
index 657488dbf..b41d68c25 100644
--- a/lib/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Net;
 
 use Exception;
 use Facebook\WebDriver\Exception\TimeOutException;
diff --git a/lib/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
similarity index 96%
rename from lib/DesiredCapabilities.php
rename to lib/Remote/DesiredCapabilities.php
index d981f425c..4fe5dfaf4 100644
--- a/lib/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -13,9 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 use Exception;
+use Facebook\WebDriver\Chrome\ChromeOptions;
+use Facebook\WebDriver\Firefox\FirefoxDriver;
+use Facebook\WebDriver\Firefox\FirefoxProfile;
+use Facebook\WebDriver\WebDriverCapabilities;
+use Facebook\WebDriver\WebDriverPlatform;
 
 class DesiredCapabilities implements WebDriverCapabilities {
 
diff --git a/lib/DriverCommand.php b/lib/Remote/DriverCommand.php
similarity index 99%
rename from lib/DriverCommand.php
rename to lib/Remote/DriverCommand.php
index eb29e0d8d..61ad9d515 100644
--- a/lib/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * This list of command defined in the WebDriver json wire protocol.
diff --git a/lib/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
similarity index 90%
rename from lib/ExecuteMethod.php
rename to lib/Remote/ExecuteMethod.php
index f87ac29d8..aa13af5ea 100644
--- a/lib/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Remote\WebDriverResponse;
 
 interface ExecuteMethod {
 
diff --git a/lib/FileDetector.php b/lib/Remote/FileDetector.php
similarity index 96%
rename from lib/FileDetector.php
rename to lib/Remote/FileDetector.php
index 5aeb0dee4..a6e52f48d 100644
--- a/lib/FileDetector.php
+++ b/lib/Remote/FileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 interface FileDetector {
 
diff --git a/lib/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
similarity index 99%
rename from lib/HttpCommandExecutor.php
rename to lib/Remote/HttpCommandExecutor.php
index c3c76fb9f..a6f556a56 100644
--- a/lib/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -13,8 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\WebDriverCommandExecutor;
 use InvalidArgumentException;
 use BadMethodCallException;
 
@@ -178,7 +180,10 @@ public function setRequestTimeout($timeout_in_ms) {
 
   /**
    * @param WebDriverCommand $command
+   *
    * @return mixed
+   *
+   * @throws WebDriverException
    */
   public function execute(WebDriverCommand $command) {
     if (!isset(self::$commands[$command->getName()])) {
diff --git a/lib/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
similarity index 91%
rename from lib/LocalFileDetector.php
rename to lib/Remote/LocalFileDetector.php
index a9a7488ce..c6d44f78c 100644
--- a/lib/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Remote\FileDetector;
 
 class LocalFileDetector implements FileDetector {
     /**
diff --git a/lib/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
similarity index 96%
rename from lib/RemoteExecuteMethod.php
rename to lib/Remote/RemoteExecuteMethod.php
index 3ab0a60ae..e0ded1032 100644
--- a/lib/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class RemoteExecuteMethod implements ExecuteMethod {
 
diff --git a/lib/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
similarity index 93%
rename from lib/RemoteKeyboard.php
rename to lib/Remote/RemoteKeyboard.php
index d7d3ebbdb..2b297d1d9 100644
--- a/lib/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\WebDriverKeys;
+use Facebook\WebDriver\WebDriverKeyboard;
 
 /**
  * Execute keyboard commands for RemoteWebDriver.
diff --git a/lib/RemoteMouse.php b/lib/Remote/RemoteMouse.php
similarity index 95%
rename from lib/RemoteMouse.php
rename to lib/Remote/RemoteMouse.php
index deb2164fd..c2e0d2263 100644
--- a/lib/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\WebDriverMouse;
 
 /**
  * Execute mouse commands for RemoteWebDriver.
diff --git a/lib/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
similarity index 93%
rename from lib/RemoteTargetLocator.php
rename to lib/Remote/RemoteTargetLocator.php
index c33bd2c71..e2f5a0aea 100644
--- a/lib/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\WebDriverTargetLocator;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverAlert;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
diff --git a/lib/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
similarity index 96%
rename from lib/RemoteTouchScreen.php
rename to lib/Remote/RemoteTouchScreen.php
index 3ca3c19bd..7929d5db3 100644
--- a/lib/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\WebDriverElement;
 
 /**
  * Execute touch commands for RemoteWebDriver.
diff --git a/lib/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
similarity index 96%
rename from lib/RemoteWebDriver.php
rename to lib/Remote/RemoteWebDriver.php
index 86d9e0d8b..4f3be385e 100644
--- a/lib/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -13,7 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverCommandExecutor;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverNavigation;
+use Facebook\WebDriver\WebDriverOptions;
+use Facebook\WebDriver\WebDriverWait;
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
diff --git a/lib/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
similarity index 96%
rename from lib/RemoteWebElement.php
rename to lib/Remote/RemoteWebElement.php
index 178397165..4de82eab5 100644
--- a/lib/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -13,9 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDimension;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverKeys;
+use Facebook\WebDriver\WebDriverPoint;
 use ZipArchive;
 
 /**
diff --git a/lib/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
similarity index 85%
rename from lib/DriverCommandExecutor.php
rename to lib/Remote/Service/DriverCommandExecutor.php
index 228f21b4d..f4857e933 100644
--- a/lib/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -13,8 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote\Service;
+
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\HttpCommandExecutor;
+use Facebook\WebDriver\Remote\WebDriverCommand;
 
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
@@ -34,9 +38,11 @@ public function __construct(DriverService $service) {
 
   /**
    * @param WebDriverCommand $command
-   * @param array $curl_opts
+   * @param array            $curl_opts
    *
    * @return mixed
+   * @throws WebDriverException
+   * @throws \Exception
    */
   public function execute(WebDriverCommand $command, $curl_opts = array()) {
     if ($command->getName() === DriverCommand::NEW_SESSION) {
diff --git a/lib/DriverService.php b/lib/Remote/Service/DriverService.php
similarity index 97%
rename from lib/DriverService.php
rename to lib/Remote/Service/DriverService.php
index 6a573afe5..2dc660202 100644
--- a/lib/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote\Service;
 
 use Exception;
+use Facebook\WebDriver\Net\URLChecker;
 
 class DriverService {
 
diff --git a/lib/UselessFileDetector.php b/lib/Remote/UselessFileDetector.php
similarity index 95%
rename from lib/UselessFileDetector.php
rename to lib/Remote/UselessFileDetector.php
index ce4c55fc9..9a8090038 100644
--- a/lib/UselessFileDetector.php
+++ b/lib/Remote/UselessFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class UselessFileDetector implements FileDetector {
   /**
diff --git a/lib/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
similarity index 97%
rename from lib/WebDriverBrowserType.php
rename to lib/Remote/WebDriverBrowserType.php
index bbb9a529e..5ab1df391 100644
--- a/lib/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * All the browsers supported by selenium
diff --git a/lib/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
similarity index 97%
rename from lib/WebDriverCapabilityType.php
rename to lib/Remote/WebDriverCapabilityType.php
index 558abb4ab..552db09be 100644
--- a/lib/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
diff --git a/lib/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
similarity index 96%
rename from lib/WebDriverCommand.php
rename to lib/Remote/WebDriverCommand.php
index 06660dadf..303af3cfb 100644
--- a/lib/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class WebDriverCommand {
 
diff --git a/lib/WebDriverResponse.php b/lib/Remote/WebDriverResponse.php
similarity index 97%
rename from lib/WebDriverResponse.php
rename to lib/Remote/WebDriverResponse.php
index a2d4dd244..d3fcdadcb 100644
--- a/lib/WebDriverResponse.php
+++ b/lib/Remote/WebDriverResponse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class WebDriverResponse {
 
diff --git a/lib/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
similarity index 95%
rename from lib/EventFiringWebDriver.php
rename to lib/Support/Events/EventFiringWebDriver.php
index ebd5b9b7c..d21c224c8 100644
--- a/lib/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -13,10 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverOptions;
+use Facebook\WebDriver\WebDriverTargetLocator;
+use Facebook\WebDriver\WebDriverWait;
 
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
diff --git a/lib/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
similarity index 96%
rename from lib/EventFiringWebDriverNavigation.php
rename to lib/Support/Events/EventFiringWebDriverNavigation.php
index c3feea060..56341e2c2 100644
--- a/lib/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -13,9 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverNavigation;
 
 class EventFiringWebDriverNavigation {
 
diff --git a/lib/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
similarity index 95%
rename from lib/EventFiringWebElement.php
rename to lib/Support/Events/EventFiringWebElement.php
index a955c59d6..3084ec1b5 100644
--- a/lib/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -13,9 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDimension;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverPoint;
 
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 2f92ec4c4..8bef6d846 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 5f99a1d16..d58998f70 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\WebDriverCommand;
+
 /**
  * Interface for all command executor.
  */
@@ -22,6 +24,7 @@ interface WebDriverCommandExecutor {
 
   /**
    * @param WebDriverCommand $command
+   *
    * @return mixed
    */
   public function execute(WebDriverCommand $command);
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index ae9e5e8f7..c8caea4d9 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
+
 class WebDriverDispatcher {
 
   /**
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 4b458f649..afea9c0fd 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -16,6 +16,8 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
+use Facebook\WebDriver\Support\Events\EventFiringWebElement;
 
 interface WebDriverEventListener {
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index ac1924a31..3de9a9731 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\StaleElementReferenceException;
 use Facebook\WebDriver\Exception\NoSuchFrameException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
diff --git a/lib/WebDriverLocatable.php b/lib/WebDriverLocatable.php
deleted file mode 100644
index bb2aa9035..000000000
--- a/lib/WebDriverLocatable.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
-
-/**
- * Interface representing basic mouse operations.
- */
-interface WebDriverLocatable {
-
-  /**
-   * @return WebDriverCoordinates
-   */
-  public function getCoordinates();
-}
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 5c90fa199..847bc2cd0 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index f572b6f92..8dd382dea 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
+
 /**
  * An abstraction allowing the driver to access the browser's history and to
  * navigate to a given URL.
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index d673603b2..9f48b05d1 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -14,6 +14,9 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
 use InvalidArgumentException;
 
 /**
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index cebeba364..80e434caa 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\UnexpectedTagNameException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index aac26c146..2af6882ec 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+
 /**
  * Managing timeout behavior for WebDriver instances.
  */
diff --git a/lib/WebDriverUpAction.php b/lib/WebDriverUpAction.php
index 9e0035d1a..2394f41a1 100644
--- a/lib/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+
 class WebDriverUpAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 2b4464fba..d1551e72a 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\TimeOutException;
 
@@ -45,7 +46,12 @@ public function __construct(
    *
    * @param (closure|WebDriverExpectedCondition)
    * @param string $message
+   *
    * @return mixed The return value of $func_or_ec
+
+   * @throws NoSuchElementException
+   * @throws TimeOutException
+   * @throws \Exception
    */
   public function until($func_or_ec, $message = "") {
     $end = microtime(true) + $this->timeout;
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index c29deb06c..dcfa19534 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -14,7 +14,9 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
+use Facebook\WebDriver\Remote\DriverCommand;
 
 /**
  * An abstraction allowing the driver to manipulate the browser's window
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 8e7289973..0ab233a14 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\LocalFileDetector;
+
 /**
  * An example test case for php-webdriver.
  * 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 2c0793815..73b3c2b58 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -15,6 +15,10 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use Facebook\WebDriver\Remote\WebDriverCapabilityType;
+
 /**
  * The base class for test cases.
  */
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 77ad6b219..db3b0d958 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -2,4 +2,4 @@
 
 namespace Facebook\WebDriver;
 
-require_once __DIR__ . '/../../lib/__init__.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 645a85963..3a4779855 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
+
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverButtonReleaseAction
@@ -26,7 +28,7 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index fd1ece96f..07dd8e5c2 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
+
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAction
@@ -26,7 +28,7 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index bf9a4cdea..7bcefd0d5 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
+
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAndHoldAction
@@ -26,7 +28,7 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index 2ca80a538..b85a1d7db 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverContextClickAction
@@ -26,7 +28,7 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index a7fa52549..6002c58bd 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
     $in_view_port = function() { };
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index bae50645d..958c2e3cf 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverDoubleClickAction
@@ -26,7 +28,7 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index af9ce8e0e..2f0ddf593 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyDownAction
@@ -28,7 +30,8 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -37,7 +40,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index 98d4cf27d..51c3a9548 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
+
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyUpAction
@@ -28,7 +30,8 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -38,7 +41,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index bbd306640..1b8f89f78 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
+
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMouseMoveAction
@@ -26,7 +28,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +37,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index 3fbc3b130..cca46496d 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
@@ -26,7 +28,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -36,7 +39,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 77fd71587..e5782b9c3 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
+
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverSendKeysAction
@@ -29,7 +31,8 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -40,7 +43,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From 35ff1cb1a8533a03eb47c56b35c477a7913d3356 Mon Sep 17 00:00:00 2001
From: 0x20h <kohj@informatik.uni-marburg.de>
Date: Tue, 19 May 2015 23:26:21 +0200
Subject: [PATCH 144/784] test setup

- moved phpunit to project directory and renamed to standard .dist
- removed namespace from bootstrap.php
- removed unnecessary bootstrap/phpunit config from tests/unit
- moved tests/unit files
---
 .travis.yml                                   | 15 ++++++++++-
 README.md                                     | 10 +++-----
 composer.json                                 | 13 +++++++---
 tests/unit/phpunit.xml => phpunit.xml.dist    | 10 +++++---
 tests/bootstrap.php                           |  4 ---
 tests/phpunit.xml                             | 25 -------------------
 .../WebDriverButtonReleaseActionTest.php      |  0
 .../WebDriverClickActionTest.php              |  0
 .../WebDriverClickAndHoldActionTest.php       |  0
 .../WebDriverContextClickActionTest.php       |  0
 .../WebDriverCoordinatesTest.php              |  0
 .../WebDriverDoubleClickActionTest.php        |  0
 .../WebDriverKeyDownActionTest.php            |  0
 .../WebDriverKeyUpActionTest.php              |  0
 .../WebDriverMouseMoveActionTest.php          |  0
 .../WebDriverMouseToOffsetActionTest.php      |  0
 .../WebDriverSendKeysActionTest.php           |  0
 tests/unit/bootstrap.php                      |  5 ----
 18 files changed, 34 insertions(+), 48 deletions(-)
 rename tests/unit/phpunit.xml => phpunit.xml.dist (69%)
 delete mode 100644 tests/phpunit.xml
 rename tests/unit/{interactions/internal => }/WebDriverButtonReleaseActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverClickAndHoldActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverContextClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverCoordinatesTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverDoubleClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverKeyDownActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverKeyUpActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverMouseMoveActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverMouseToOffsetActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverSendKeysActionTest.php (100%)
 delete mode 100644 tests/unit/bootstrap.php

diff --git a/.travis.yml b/.travis.yml
index 1342b9d4b..8b74804b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,21 @@
 language: php
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - hhvm
 
-script: phpunit -c ./tests/unit
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
+  - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
+  - sleep 3
+
+script: ./vendor/bin/phpunit
+
+after_script:
+  - cat selenium.log
diff --git a/README.md b/README.md
index 657d6ad73..d5272c4f4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 php-webdriver -- WebDriver bindings for PHP
 ===========================================
 
-Attention! This is a fork of facebook/webdriver and has been altered to include namespacing to avoid naming collisions.
-
 ##  DESCRIPTION
 
 This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
@@ -19,11 +17,11 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
     git clone git@github.com:facebook/php-webdriver.git
 
 ### Packagist
-Add the dependency. https://packagist.org/packages/janoszen/webdriver
+Add the dependency. https://packagist.org/packages/facebook/webdriver
 
     {
       "require": {
-        "janoszen/webdriver": "dev-master"
+        "facebook/webdriver": "dev-master"
       }
     }
     
@@ -100,8 +98,8 @@ If you're reading this you've already found our Github repository. If you have a
 
 We love to have your help to make php-webdriver better. Feel free to 
 
-*   open an [issue](https://github.com/janoszen/php-webdriver/issues) if you run into any problem. 
-*   fork the project and submit [pull request](https://github.com/janoszen/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
+*   open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem. 
+*   fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
diff --git a/composer.json b/composer.json
index 7b57541f4..53e36c14d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,22 @@
 {
   "name": "facebook/webdriver",
   "description": "A php client for WebDriver",
-  "keywords": ["webdriver", "selenium", "php"],
+  "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
     "issues": "https://github.com/facebook/php-webdriver/issues",
+    "forum": "https://www.facebook.com/groups/phpwebdriver/",
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"
   },
   "require-dev": {
-    "phpunit/phpunit": "3.7.*",
+    "phpunit/phpunit": "3.7.*"
+  },
+  "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"
   },
   "autoload": {
@@ -21,5 +24,9 @@
 		"Facebook\\WebDriver\\": "lib/"
 	}
   },
-  "minimum-stability": "dev"
+  "autoload-dev": {
+    "psr-4": {
+      "Facebook\\WebDriver\\": "tests/functional"
+    }
+  }
 }
diff --git a/tests/unit/phpunit.xml b/phpunit.xml.dist
similarity index 69%
rename from tests/unit/phpunit.xml
rename to phpunit.xml.dist
index 0338c9327..4dfdec0a7 100644
--- a/tests/unit/phpunit.xml
+++ b/phpunit.xml.dist
@@ -11,12 +11,14 @@
         processIsolation            = "false"
         stopOnFailure               = "false"
         syntaxCheck                 = "false"
-        bootstrap                   = "bootstrap.php" >
+        bootstrap                   = "tests/bootstrap.php" >
 
     <testsuites>
-        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
-            <directory>../unit</directory>
+        <testsuite name="Unit-Testsuite">
+            <directory>tests/unit</directory>
+        </testsuite>
+        <testsuite name="Functional-Testsuite">
+            <directory>tests/functional/</directory>
         </testsuite>
     </testsuites>
-
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c12f2a118..f9e62ac66 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,2 @@
 <?php
-
-namespace Facebook\WebDriver;
-
 require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 88bf4dbde..000000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-        backupGlobals               = "false"
-        backupStaticAttributes      = "false"
-        colors                      = "true"
-        convertErrorsToExceptions   = "true"
-        convertNoticesToExceptions  = "true"
-        convertWarningsToExceptions = "true"
-        processIsolation            = "false"
-        stopOnFailure               = "false"
-        syntaxCheck                 = "false"
-        bootstrap                   = "bootstrap.php" >
-
-    <testsuites>
-        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
-            <directory>./unit</directory>
-        </testsuite>
-        <testsuite name="Facebook PHP-Webdriver Functional Testsuite">
-            <directory>./functional</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/WebDriverButtonReleaseActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
rename to tests/unit/WebDriverButtonReleaseActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/WebDriverClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverClickActionTest.php
rename to tests/unit/WebDriverClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/WebDriverClickAndHoldActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
rename to tests/unit/WebDriverClickAndHoldActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/WebDriverContextClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverContextClickActionTest.php
rename to tests/unit/WebDriverContextClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/WebDriverCoordinatesTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverCoordinatesTest.php
rename to tests/unit/WebDriverCoordinatesTest.php
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/WebDriverDoubleClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
rename to tests/unit/WebDriverDoubleClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/WebDriverKeyDownActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
rename to tests/unit/WebDriverKeyDownActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/WebDriverKeyUpActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
rename to tests/unit/WebDriverKeyUpActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/WebDriverMouseMoveActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
rename to tests/unit/WebDriverMouseMoveActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/WebDriverMouseToOffsetActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
rename to tests/unit/WebDriverMouseToOffsetActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/WebDriverSendKeysActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
rename to tests/unit/WebDriverSendKeysActionTest.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
deleted file mode 100644
index db3b0d958..000000000
--- a/tests/unit/bootstrap.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace Facebook\WebDriver;
-
-require_once __DIR__ . '/../../vendor/autoload.php';

From d78ed4e78d1096a6bfd2ec151af0245dd4298b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Wed, 20 May 2015 00:22:27 +0200
Subject: [PATCH 145/784] Changed code formating for composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 53e36c14d..486f17678 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
   },
   "autoload": {
     "psr-4": {
-		"Facebook\\WebDriver\\": "lib/"
-	}
+      "Facebook\\WebDriver\\": "lib/"
+    }
   },
   "autoload-dev": {
     "psr-4": {

From 56a0666b92a651bed2c31e11a83543aaec2bd622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 20 May 2015 02:02:10 +0200
Subject: [PATCH 146/784] Upgrade PHPUnit to latest 4.6

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 486f17678..8d4095415 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook/webdriver",
-  "description": "A php client for WebDriver",
+  "description": "A PHP client for WebDriver",
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
@@ -14,7 +14,7 @@
     "php": ">=5.3.19"
   },
   "require-dev": {
-    "phpunit/phpunit": "3.7.*"
+    "phpunit/phpunit": "4.6.*"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"

From 586a35d5afcbe38e7940e26276da361c4a09a5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 20 May 2015 02:02:46 +0200
Subject: [PATCH 147/784] Run tests on PHP 5.6 and PHP 7

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8b74804b4..a54d35732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,15 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7
   - hhvm
 
-before_script:
+install:
   - composer self-update
   - composer install --no-interaction --prefer-source
+
+before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar

From c9332a4320a32c3b99040f52a8a24f3a9d28b10e Mon Sep 17 00:00:00 2001
From: 0x20h <kohj@informatik.uni-marburg.de>
Date: Fri, 22 May 2015 21:59:45 +0200
Subject: [PATCH 148/784] Fix flaky build.

Just wait until we can connect to the server, then start the tests.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a54d35732..e973cacd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
   - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
-  - sleep 3
+  - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done;
 
 script: ./vendor/bin/phpunit
 

From 6cc1d7a54b89767aee50daae408e3afda103cb03 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jeroen@asystance.nl>
Date: Wed, 27 May 2015 15:51:49 +0200
Subject: [PATCH 149/784] Made RemoteWebElement extendable by having newElement
 use subclass constructor

An alternative would have been to make the method protected (it is now private).

This change enables users to extend the RemoteWebElement API by subclassing it.
---
 lib/remote/RemoteWebElement.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index ea4d1b992..59cc7e4c3 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -405,6 +405,7 @@ public function equals(WebDriverElement $other) {
    * @return RemoteWebElement
    */
   private function newElement($id) {
-    return new RemoteWebElement($this->executor, $id);
+    $class = get_class($this);
+    return new $class($this->executor, $id);
   }
 }

From fb1ea62d34596fc2f4675511cd30e603de2ec034 Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Tue, 14 Oct 2014 22:24:35 +0200
Subject: [PATCH 150/784] Moved the webdriver to a namespace (see issue #169 on
 the original repo)

---
 example.php                                          |  2 ++
 lib/JavaScriptExecutor.php                           |  2 ++
 lib/WebDriver.php                                    |  2 ++
 lib/WebDriverAction.php                              |  2 ++
 lib/WebDriverAlert.php                               |  2 ++
 lib/WebDriverBy.php                                  |  2 ++
 lib/WebDriverCapabilities.php                        |  2 ++
 lib/WebDriverCommandExecutor.php                     |  2 ++
 lib/WebDriverDimension.php                           |  2 ++
 lib/WebDriverDispatcher.php                          |  2 ++
 lib/WebDriverElement.php                             |  2 ++
 lib/WebDriverEventListener.php                       |  2 ++
 lib/WebDriverExceptions.php                          |  4 ++++
 lib/WebDriverExpectedCondition.php                   |  2 ++
 lib/WebDriverHasInputDevices.php                     |  2 ++
 lib/WebDriverKeyboard.php                            |  2 ++
 lib/WebDriverKeys.php                                |  2 ++
 lib/WebDriverMouse.php                               |  2 ++
 lib/WebDriverNavigation.php                          |  2 ++
 lib/WebDriverOptions.php                             |  2 ++
 lib/WebDriverPlatform.php                            |  2 ++
 lib/WebDriverPoint.php                               |  2 ++
 lib/WebDriverSearchContext.php                       |  2 ++
 lib/WebDriverSelect.php                              |  2 ++
 lib/WebDriverTargetLocator.php                       |  2 ++
 lib/WebDriverTimeouts.php                            |  2 ++
 lib/WebDriverWait.php                                |  2 ++
 lib/WebDriverWindow.php                              |  2 ++
 lib/chrome/ChromeDriver.php                          |  2 ++
 lib/chrome/ChromeDriverService.php                   |  2 ++
 lib/chrome/ChromeOptions.php                         |  2 ++
 lib/firefox/FirefoxDriver.php                        |  2 ++
 lib/firefox/FirefoxProfile.php                       |  4 ++++
 lib/interactions/WebDriverActions.php                |  2 ++
 lib/interactions/WebDriverCompositeAction.php        |  2 ++
 lib/interactions/WebDriverTouchActions.php           |  2 ++
 lib/interactions/WebDriverTouchScreen.php            |  2 ++
 .../internal/WebDriverButtonReleaseAction.php        |  2 ++
 lib/interactions/internal/WebDriverClickAction.php   |  2 ++
 .../internal/WebDriverClickAndHoldAction.php         |  2 ++
 .../internal/WebDriverContextClickAction.php         |  2 ++
 lib/interactions/internal/WebDriverCoordinates.php   |  4 ++++
 .../internal/WebDriverDoubleClickAction.php          |  2 ++
 lib/interactions/internal/WebDriverKeyDownAction.php |  2 ++
 lib/interactions/internal/WebDriverKeyUpAction.php   |  2 ++
 .../internal/WebDriverKeysRelatedAction.php          |  2 ++
 lib/interactions/internal/WebDriverMouseAction.php   |  2 ++
 .../internal/WebDriverMouseMoveAction.php            |  2 ++
 .../internal/WebDriverMoveToOffsetAction.php         |  2 ++
 .../internal/WebDriverSendKeysAction.php             |  2 ++
 .../internal/WebDriverSingleKeyAction.php            |  2 ++
 lib/interactions/touch/WebDriverDoubleTapAction.php  |  2 ++
 lib/interactions/touch/WebDriverDownAction.php       |  2 ++
 lib/interactions/touch/WebDriverFlickAction.php      |  2 ++
 .../touch/WebDriverFlickFromElementAction.php        |  2 ++
 lib/interactions/touch/WebDriverLongPressAction.php  |  2 ++
 lib/interactions/touch/WebDriverMoveAction.php       |  2 ++
 lib/interactions/touch/WebDriverScrollAction.php     |  2 ++
 .../touch/WebDriverScrollFromElementAction.php       |  2 ++
 lib/interactions/touch/WebDriverTapAction.php        |  2 ++
 lib/interactions/touch/WebDriverTouchAction.php      |  2 ++
 lib/interactions/touch/WebDriverUpAction.php         |  2 ++
 lib/internal/WebDriverLocatable.php                  |  2 ++
 lib/net/URLChecker.php                               |  2 ++
 lib/remote/DesiredCapabilities.php                   |  2 ++
 lib/remote/DriverCommand.php                         |  2 ++
 lib/remote/ExecuteMethod.php                         |  2 ++
 lib/remote/FileDetector.php                          |  2 ++
 lib/remote/HttpCommandExecutor.php                   |  2 ++
 lib/remote/LocalFileDetector.php                     |  2 ++
 lib/remote/RemoteExecuteMethod.php                   |  2 ++
 lib/remote/RemoteKeyboard.php                        |  2 ++
 lib/remote/RemoteMouse.php                           |  2 ++
 lib/remote/RemoteTouchScreen.php                     |  2 ++
 lib/remote/RemoteWebDriver.php                       |  2 ++
 lib/remote/RemoteWebElement.php                      |  4 ++++
 lib/remote/UselessFileDetector.php                   |  2 ++
 lib/remote/WebDriverBrowserType.php                  |  2 ++
 lib/remote/WebDriverCapabilityType.php               |  2 ++
 lib/remote/WebDriverCommand.php                      |  2 ++
 lib/remote/WebDriverResponse.php                     |  2 ++
 lib/remote/service/DriverCommandExecutor.php         |  2 ++
 lib/remote/service/DriverService.php                 |  2 ++
 lib/support/events/EventFiringWebDriver.php          |  2 ++
 .../events/EventFiringWebDriverNavigation.php        |  2 ++
 lib/support/events/EventFiringWebElement.php         |  2 ++
 tests/bootstrap.php                                  |  2 ++
 tests/functional/BaseTest.php                        |  4 +++-
 tests/functional/FileUploadTest.php                  |  2 ++
 tests/functional/WebDriverTestCase.php               |  4 +++-
 tests/unit/bootstrap.php                             |  2 ++
 .../internal/WebDriverButtonReleaseActionTest.php    | 10 ++++++----
 .../internal/WebDriverClickActionTest.php            | 10 ++++++----
 .../internal/WebDriverClickAndHoldActionTest.php     | 10 ++++++----
 .../internal/WebDriverContextClickActionTest.php     | 10 ++++++----
 .../internal/WebDriverCoordinatesTest.php            |  4 +++-
 .../internal/WebDriverDoubleClickActionTest.php      | 10 ++++++----
 .../internal/WebDriverKeyDownActionTest.php          | 12 +++++++-----
 .../internal/WebDriverKeyUpActionTest.php            | 12 +++++++-----
 .../internal/WebDriverMouseMoveActionTest.php        | 10 ++++++----
 .../internal/WebDriverMouseToOffsetActionTest.php    | 10 ++++++----
 .../internal/WebDriverSendKeysActionTest.php         | 12 +++++++-----
 102 files changed, 258 insertions(+), 46 deletions(-)

diff --git a/example.php b/example.php
index a1e133b91..8cfac7461 100644
--- a/example.php
+++ b/example.php
@@ -1,6 +1,8 @@
 <?php
 // An example of using php-webdriver.
 
+namespace Selenium\WebDriver;
+
 require_once('lib/__init__.php');
 
 // start Firefox with 5 second timeout
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 131a7fef1..18cba7866 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver interface implemented by drivers that support JavaScript.
  */
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 6c8ea3ea0..14e102b92 100755
--- 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 Selenium\WebDriver;
+
 /**
  * The interface for WebDriver.
  */
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index 80a310a64..cff1ca9ae 100644
--- 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 Selenium\WebDriver;
+
 /**
  * Interface representing a single user-interaction action.
  */
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 5a735371b..84bc202c8 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index 3409afd25..ce25f308e 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The basic 8 mechanisms supported by webdriver to locate a web element.
  * ie. 'class name', 'css selector', 'id', 'name', 'link text',
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 1e70efb2c..3ccc30ee6 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface WebDriverCapabilities {
 
   /**
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index ea1864f49..7a3eb20fd 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface for all command executor.
  */
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 545370fac..a2572ecbf 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Represent a dimension.
  */
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index c5c4f191f..693763b70 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDispatcher {
 
   /**
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 62a0a1543..e060aa094 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 7c6620649..21c7f9002 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface WebDriverEventListener {
 
   /**
diff --git a/lib/WebDriverExceptions.php b/lib/WebDriverExceptions.php
index a098ec7f5..45ed8b5d2 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/WebDriverExceptions.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use \Exception;
+
 final class WebDriverCurlException extends Exception {} // When curls fail
 
 class WebDriverException extends Exception {
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index ca9f4df7c..cb7526a43 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Canned ExpectedConditions which are generally useful within webdriver tests.
  *
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 949c26dc8..67fb80947 100644
--- 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 Selenium\WebDriver;
+
 /**
  * Interface implemented by each driver that allows access to the input devices.
  */
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index 1e39000aa..06e6091dd 100644
--- 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 Selenium\WebDriver;
+
 interface WebDriverKeyboard {
 
   /**
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index a471ead1b..64c76edd3 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Representations of pressable keys that aren't text.
  * These are stored in the Unicode PUA (Private Use Area) code points.
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 624a25c34..5b79fcf76 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 919232efe..75baa18d5 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to access the browser's history and to
  * navigate to a given URL.
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 61b5eb16f..10f59d937 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Managing stuff you would do in a browser.
  */
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 9d0e413fc..a16a4cb2a 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The platforms supported by WebDriver.
  */
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 6992c15c7..ae8dbd667 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Represent a point.
  */
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index dacea3f33..17f3417a4 100644
--- 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 Selenium\WebDriver;
+
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for
  * WebDriverElement inside.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index dc42d8f0f..85aabe832 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
  */
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 9b23df527..53efb59ca 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Used to locate a given frame or window.
  */
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 885c5f190..f4732f708 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Managing timeout behavior for WebDriver instances.
  */
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 55ace62af..c4264f49a 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * A utility class, designed to help the user to wait until a condition turns
  * true.
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 0bf86388b..b4f649b77 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An abstraction allowing the driver to manipulate the browser's window
  */
diff --git a/lib/chrome/ChromeDriver.php b/lib/chrome/ChromeDriver.php
index 36309cbfb..10adb8ad3 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/chrome/ChromeDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class ChromeDriver extends RemoteWebDriver {
 
   public static function start(
diff --git a/lib/chrome/ChromeDriverService.php b/lib/chrome/ChromeDriverService.php
index c4de774e7..00206c023 100644
--- a/lib/chrome/ChromeDriverService.php
+++ b/lib/chrome/ChromeDriverService.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class ChromeDriverService extends DriverService {
 
   // The environment variable storing the path to the chrome driver executable.
diff --git a/lib/chrome/ChromeOptions.php b/lib/chrome/ChromeOptions.php
index d61a8ddc4..0f9b24cab 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/chrome/ChromeOptions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The class manages the capabilities in ChromeDriver.
  *
diff --git a/lib/firefox/FirefoxDriver.php b/lib/firefox/FirefoxDriver.php
index b1580baa6..7d4852129 100644
--- a/lib/firefox/FirefoxDriver.php
+++ b/lib/firefox/FirefoxDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class FirefoxDriver {
 
   const PROFILE = 'firefox_profile';
diff --git a/lib/firefox/FirefoxProfile.php b/lib/firefox/FirefoxProfile.php
index 203592168..431c71a53 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/firefox/FirefoxProfile.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use ZipArchive;
+
 class FirefoxProfile {
 
   /**
diff --git a/lib/interactions/WebDriverActions.php b/lib/interactions/WebDriverActions.php
index e560db92b..eac0d14ae 100644
--- a/lib/interactions/WebDriverActions.php
+++ b/lib/interactions/WebDriverActions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver action builder. It implements the builder pattern.
  */
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/interactions/WebDriverCompositeAction.php
index 8cb204b72..261dde15d 100644
--- a/lib/interactions/WebDriverCompositeAction.php
+++ b/lib/interactions/WebDriverCompositeAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An action for aggregating actions and triggering all of them afterwards.
  */
diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/interactions/WebDriverTouchActions.php
index 5be31d427..83281e839 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/interactions/WebDriverTouchActions.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriver action builder for touch events
  */
diff --git a/lib/interactions/WebDriverTouchScreen.php b/lib/interactions/WebDriverTouchScreen.php
index d38a8bccf..be9a2474a 100644
--- a/lib/interactions/WebDriverTouchScreen.php
+++ b/lib/interactions/WebDriverTouchScreen.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing touch screen operations.
  */
diff --git a/lib/interactions/internal/WebDriverButtonReleaseAction.php b/lib/interactions/internal/WebDriverButtonReleaseAction.php
index 76ebb7092..ea518877a 100644
--- a/lib/interactions/internal/WebDriverButtonReleaseAction.php
+++ b/lib/interactions/internal/WebDriverButtonReleaseAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Move to the location and then release the mouse key.
  */
diff --git a/lib/interactions/internal/WebDriverClickAction.php b/lib/interactions/internal/WebDriverClickAction.php
index 0aba9dc16..54adb4a6f 100644
--- a/lib/interactions/internal/WebDriverClickAction.php
+++ b/lib/interactions/internal/WebDriverClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverClickAndHoldAction.php b/lib/interactions/internal/WebDriverClickAndHoldAction.php
index 80622ed11..30169ff5b 100644
--- a/lib/interactions/internal/WebDriverClickAndHoldAction.php
+++ b/lib/interactions/internal/WebDriverClickAndHoldAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Move the the location, click and hold.
  */
diff --git a/lib/interactions/internal/WebDriverContextClickAction.php b/lib/interactions/internal/WebDriverContextClickAction.php
index 4802fdc3a..e1c3f96ad 100644
--- a/lib/interactions/internal/WebDriverContextClickAction.php
+++ b/lib/interactions/internal/WebDriverContextClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * You can call it 'Right Click' if you like.
  */
diff --git a/lib/interactions/internal/WebDriverCoordinates.php b/lib/interactions/internal/WebDriverCoordinates.php
index 18cc42020..980051bac 100644
--- a/lib/interactions/internal/WebDriverCoordinates.php
+++ b/lib/interactions/internal/WebDriverCoordinates.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use Closure;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/interactions/internal/WebDriverDoubleClickAction.php b/lib/interactions/internal/WebDriverDoubleClickAction.php
index 41fd41716..d720e0d20 100644
--- a/lib/interactions/internal/WebDriverDoubleClickAction.php
+++ b/lib/interactions/internal/WebDriverDoubleClickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyDownAction.php b/lib/interactions/internal/WebDriverKeyDownAction.php
index 1de8ae0ed..70f5421eb 100644
--- a/lib/interactions/internal/WebDriverKeyDownAction.php
+++ b/lib/interactions/internal/WebDriverKeyDownAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeyUpAction.php b/lib/interactions/internal/WebDriverKeyUpAction.php
index 06e652700..24b5150f3 100644
--- a/lib/interactions/internal/WebDriverKeyUpAction.php
+++ b/lib/interactions/internal/WebDriverKeyUpAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/interactions/internal/WebDriverKeysRelatedAction.php
index c97069d87..779718496 100644
--- a/lib/interactions/internal/WebDriverKeysRelatedAction.php
+++ b/lib/interactions/internal/WebDriverKeysRelatedAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all keyboard-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/interactions/internal/WebDriverMouseAction.php
index 4c16a7b39..d02b638f4 100644
--- a/lib/interactions/internal/WebDriverMouseAction.php
+++ b/lib/interactions/internal/WebDriverMouseAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all mouse-related actions.
  */
diff --git a/lib/interactions/internal/WebDriverMouseMoveAction.php b/lib/interactions/internal/WebDriverMouseMoveAction.php
index ca21d3511..01e5c28bf 100644
--- a/lib/interactions/internal/WebDriverMouseMoveAction.php
+++ b/lib/interactions/internal/WebDriverMouseMoveAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverMoveToOffsetAction.php b/lib/interactions/internal/WebDriverMoveToOffsetAction.php
index d82558b55..bdf41629e 100644
--- a/lib/interactions/internal/WebDriverMoveToOffsetAction.php
+++ b/lib/interactions/internal/WebDriverMoveToOffsetAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/interactions/internal/WebDriverSendKeysAction.php
index 8dcc69183..889a2f91b 100644
--- a/lib/interactions/internal/WebDriverSendKeysAction.php
+++ b/lib/interactions/internal/WebDriverSendKeysAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
     implements WebDriverAction {
diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/interactions/internal/WebDriverSingleKeyAction.php
index 7d06cd330..5b6c3c62d 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/interactions/internal/WebDriverSingleKeyAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
     implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverDoubleTapAction.php b/lib/interactions/touch/WebDriverDoubleTapAction.php
index 00b2c28a4..c4bf374d6 100644
--- a/lib/interactions/touch/WebDriverDoubleTapAction.php
+++ b/lib/interactions/touch/WebDriverDoubleTapAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverDownAction.php b/lib/interactions/touch/WebDriverDownAction.php
index 43c4ed08d..155e67eef 100644
--- a/lib/interactions/touch/WebDriverDownAction.php
+++ b/lib/interactions/touch/WebDriverDownAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverDownAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverFlickAction.php b/lib/interactions/touch/WebDriverFlickAction.php
index 76337c468..8b80cf127 100644
--- a/lib/interactions/touch/WebDriverFlickAction.php
+++ b/lib/interactions/touch/WebDriverFlickAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverFlickAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverFlickFromElementAction.php b/lib/interactions/touch/WebDriverFlickFromElementAction.php
index f361f1c29..478b3e0ab 100644
--- a/lib/interactions/touch/WebDriverFlickFromElementAction.php
+++ b/lib/interactions/touch/WebDriverFlickFromElementAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverLongPressAction.php b/lib/interactions/touch/WebDriverLongPressAction.php
index 556c1d47f..a34de2e10 100644
--- a/lib/interactions/touch/WebDriverLongPressAction.php
+++ b/lib/interactions/touch/WebDriverLongPressAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverLongPressAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverMoveAction.php b/lib/interactions/touch/WebDriverMoveAction.php
index 2c089a343..dae6e8ef1 100644
--- a/lib/interactions/touch/WebDriverMoveAction.php
+++ b/lib/interactions/touch/WebDriverMoveAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverMoveAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverScrollAction.php b/lib/interactions/touch/WebDriverScrollAction.php
index 082b1acaf..817ed26aa 100644
--- a/lib/interactions/touch/WebDriverScrollAction.php
+++ b/lib/interactions/touch/WebDriverScrollAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverScrollAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverScrollFromElementAction.php b/lib/interactions/touch/WebDriverScrollFromElementAction.php
index 3c985b6bd..96109712a 100644
--- a/lib/interactions/touch/WebDriverScrollFromElementAction.php
+++ b/lib/interactions/touch/WebDriverScrollFromElementAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverTapAction.php b/lib/interactions/touch/WebDriverTapAction.php
index fb1a71004..b61056e99 100644
--- a/lib/interactions/touch/WebDriverTapAction.php
+++ b/lib/interactions/touch/WebDriverTapAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverTapAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/interactions/touch/WebDriverTouchAction.php b/lib/interactions/touch/WebDriverTouchAction.php
index 99abced9c..a885467fe 100644
--- a/lib/interactions/touch/WebDriverTouchAction.php
+++ b/lib/interactions/touch/WebDriverTouchAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Base class for all touch-related actions.
  */
diff --git a/lib/interactions/touch/WebDriverUpAction.php b/lib/interactions/touch/WebDriverUpAction.php
index 298302769..8745eb4c7 100644
--- a/lib/interactions/touch/WebDriverUpAction.php
+++ b/lib/interactions/touch/WebDriverUpAction.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverUpAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/internal/WebDriverLocatable.php b/lib/internal/WebDriverLocatable.php
index 5250d1347..d315387a1 100644
--- a/lib/internal/WebDriverLocatable.php
+++ b/lib/internal/WebDriverLocatable.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/net/URLChecker.php b/lib/net/URLChecker.php
index 97ca7c874..13588203b 100644
--- a/lib/net/URLChecker.php
+++ b/lib/net/URLChecker.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class URLChecker {
 
   const POLL_INTERVAL_MS = 500;
diff --git a/lib/remote/DesiredCapabilities.php b/lib/remote/DesiredCapabilities.php
index 191837371..8e06d64bf 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/remote/DesiredCapabilities.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class DesiredCapabilities implements WebDriverCapabilities {
 
   private $capabilities;
diff --git a/lib/remote/DriverCommand.php b/lib/remote/DriverCommand.php
index 837e5e9de..c6279dd4b 100644
--- a/lib/remote/DriverCommand.php
+++ b/lib/remote/DriverCommand.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * This list of command defined in the WebDriver json wire protocol.
  */
diff --git a/lib/remote/ExecuteMethod.php b/lib/remote/ExecuteMethod.php
index 8d934bd32..5a06fca0d 100644
--- a/lib/remote/ExecuteMethod.php
+++ b/lib/remote/ExecuteMethod.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface ExecuteMethod {
 
   /**
diff --git a/lib/remote/FileDetector.php b/lib/remote/FileDetector.php
index 134f6b95b..79216095c 100644
--- a/lib/remote/FileDetector.php
+++ b/lib/remote/FileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 interface FileDetector {
 
   /**
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/remote/HttpCommandExecutor.php
index 193031ddc..0a45c0052 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/remote/HttpCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Command executor talking to the standalone server via HTTP.
  */
diff --git a/lib/remote/LocalFileDetector.php b/lib/remote/LocalFileDetector.php
index f0107b0ba..d8cac906e 100644
--- a/lib/remote/LocalFileDetector.php
+++ b/lib/remote/LocalFileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class LocalFileDetector implements FileDetector {
     /**
      * @param string $file
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/remote/RemoteExecuteMethod.php
index 1c06470b9..4d874179c 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/remote/RemoteExecuteMethod.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class RemoteExecuteMethod implements ExecuteMethod {
 
   private $driver;
diff --git a/lib/remote/RemoteKeyboard.php b/lib/remote/RemoteKeyboard.php
index 2a3cc5477..9831b74f4 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/remote/RemoteKeyboard.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute keyboard commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteMouse.php b/lib/remote/RemoteMouse.php
index 66d010252..93168abf8 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/remote/RemoteMouse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute mouse commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/remote/RemoteTouchScreen.php
index 652020dea..6ef5d35d5 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/remote/RemoteTouchScreen.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Execute touch commands for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index 2b0969f07..aafbb4b2f 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
    * @var HttpCommandExecutor
diff --git a/lib/remote/RemoteWebElement.php b/lib/remote/RemoteWebElement.php
index 59cc7e4c3..3f78d1cc1 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/remote/RemoteWebElement.php
@@ -13,6 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
+use ZipArchive;
+
 /**
  * Represents an HTML element.
  */
diff --git a/lib/remote/UselessFileDetector.php b/lib/remote/UselessFileDetector.php
index db4c3f2cd..f21df9e64 100644
--- a/lib/remote/UselessFileDetector.php
+++ b/lib/remote/UselessFileDetector.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class UselessFileDetector implements FileDetector {
   /**
    * @param string $file
diff --git a/lib/remote/WebDriverBrowserType.php b/lib/remote/WebDriverBrowserType.php
index b0f7aea1d..8db21c0a5 100644
--- a/lib/remote/WebDriverBrowserType.php
+++ b/lib/remote/WebDriverBrowserType.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * All the browsers supported by selenium
  */
diff --git a/lib/remote/WebDriverCapabilityType.php b/lib/remote/WebDriverCapabilityType.php
index 11fec888a..a7499d9e0 100644
--- a/lib/remote/WebDriverCapabilityType.php
+++ b/lib/remote/WebDriverCapabilityType.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
  * Wire Protocol.
diff --git a/lib/remote/WebDriverCommand.php b/lib/remote/WebDriverCommand.php
index d9d94c909..2300ce373 100644
--- a/lib/remote/WebDriverCommand.php
+++ b/lib/remote/WebDriverCommand.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverCommand {
 
   private $sessionID;
diff --git a/lib/remote/WebDriverResponse.php b/lib/remote/WebDriverResponse.php
index a42e3067c..71b934074 100644
--- a/lib/remote/WebDriverResponse.php
+++ b/lib/remote/WebDriverResponse.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class WebDriverResponse {
 
   /**
diff --git a/lib/remote/service/DriverCommandExecutor.php b/lib/remote/service/DriverCommandExecutor.php
index 51cdda466..3c6e573a1 100644
--- a/lib/remote/service/DriverCommandExecutor.php
+++ b/lib/remote/service/DriverCommandExecutor.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
  * a remote server.
diff --git a/lib/remote/service/DriverService.php b/lib/remote/service/DriverService.php
index 607bf8fb8..c8a9bdb9c 100644
--- a/lib/remote/service/DriverService.php
+++ b/lib/remote/service/DriverService.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class DriverService {
 
   /**
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/support/events/EventFiringWebDriver.php
index 5f09493eb..cefe6d987 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/support/events/EventFiringWebDriver.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
   /**
diff --git a/lib/support/events/EventFiringWebDriverNavigation.php b/lib/support/events/EventFiringWebDriverNavigation.php
index 5fb96f929..7f1e71b0a 100644
--- a/lib/support/events/EventFiringWebDriverNavigation.php
+++ b/lib/support/events/EventFiringWebDriverNavigation.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebDriverNavigation {
 
   /**
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/support/events/EventFiringWebElement.php
index 1e0e499af..f0b317cef 100644
--- a/lib/support/events/EventFiringWebElement.php
+++ b/lib/support/events/EventFiringWebElement.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
   /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 46df8183e..28437e38b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 
+namespace Selenium\WebDriver;
+
 require_once __DIR__ . '/../lib/__init__.php';
 require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 69c076cbb..b74d27d77 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 class BaseTest extends WebDriverTestCase {
   
   public function testGetTitle() {
@@ -94,4 +96,4 @@ public function testGetByTagName() {
       $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
     );
   }
-}
\ No newline at end of file
+}
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 84ec454e8..7f09aa8f0 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * An example test case for php-webdriver.
  * 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 4a5b77f6c..db4248964 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -13,10 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * The base class for test cases.
  */
-class WebDriverTestCase extends PHPUnit_Framework_TestCase {
+class WebDriverTestCase extends \PHPUnit_Framework_TestCase {
 
   /** @var RemoteWebDriver $driver */
   protected $driver;
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 562467964..80da4bb38 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -1,3 +1,5 @@
 <?php
 
+namespace Selenium\WebDriver;
+
 require_once __DIR__ . '/../../lib/__init__.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 609415846..2b489ff8c 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverButtonReleaseAction
    */
@@ -23,8 +25,8 @@ class WebDriverButtonReleaseActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index 98fd39197..ca60ae668 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index fe1826ee0..78781fae6 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAndHoldAction
    */
@@ -23,8 +25,8 @@ class WebDriverClickAndHoldActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index 7ac3162cc..ece8f3488 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverContextClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverContextClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index cf4cc0d12..f339e5044 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverCoordinatesTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
     $in_view_port = function() { };
     $on_page = function() { };
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index a0c85ac0d..ae45d169b 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverDoubleClickAction
    */
@@ -23,8 +25,8 @@ class WebDriverDoubleClickActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index f82b25cb1..0cc5cb5cd 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyDownAction
    */
@@ -24,9 +26,9 @@ class WebDriverKeyDownActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -35,7 +37,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index e35277bd7..daf7bfc06 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyUpAction
    */
@@ -24,9 +26,9 @@ class WebDriverKeyUpActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -36,7 +38,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index aec3444d3..2c6ee400e 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMouseMoveAction
    */
@@ -23,8 +25,8 @@ class WebDriverMouseMoveActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -32,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index 2cd2bc75d..c6066d051 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
    */
@@ -23,8 +25,8 @@ class WebDriverMouseToOffsetActionTest extends PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -34,7 +36,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 9f9cad84b..6a51f8934 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase {
+namespace Selenium\WebDriver;
+
+class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverSendKeysAction
    */
@@ -25,9 +27,9 @@ class WebDriverSendKeysActionTest extends PHPUnit_Framework_TestCase {
   private $keys;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('WebDriverMouse');
-    $this->locationProvider = $this->getMock('WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -38,7 +40,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From ea0c8dfaec0363624a314b5a46b9d69ab26c29f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:28:10 +0100
Subject: [PATCH 151/784] Update composer.json

Updated composer.json for packagist publishing
---
 composer.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 00faaa7bf..24f37c8fd 100644
--- a/composer.json
+++ b/composer.json
@@ -1,14 +1,13 @@
 {
-  "name": "facebook/webdriver",
-  "description": "A php client for WebDriver",
-  "keywords": ["webdriver", "selenium", "php", "facebook"],
-  "homepage": "https://github.com/facebook/php-webdriver",
+  "name": "janoszen/webdriver",
+  "description": "A php client for WebDriver (fork of facebook/webdriver)",
+  "keywords": ["webdriver", "selenium", "php"],
+  "homepage": "https://github.com/janoszen/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/facebook/php-webdriver/issues",
-    "forum": "https://www.facebook.com/groups/phpwebdriver/",
-    "source": "https://github.com/facebook/php-webdriver"
+    "issues": "https://github.com/janoszen/php-webdriver/issues",
+    "source": "https://github.com/janoszen/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"

From 6bcd3c529e981518103da553d908f6ece4c14fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:29:26 +0100
Subject: [PATCH 152/784] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d5272c4f4..85047203d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 php-webdriver -- WebDriver bindings for PHP
 ===========================================
 
+Attention! This is a fork of facebook/webdriver and has been altered to include namespacing to avoid naming collisions.
+
 ##  DESCRIPTION
 
 This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.

From c28f0d3ccd7dbb6518f2499872fd47ecb79b02f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Fri, 31 Oct 2014 11:30:48 +0100
Subject: [PATCH 153/784] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 85047203d..657d6ad73 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,11 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
     git clone git@github.com:facebook/php-webdriver.git
 
 ### Packagist
-Add the dependency. https://packagist.org/packages/facebook/webdriver
+Add the dependency. https://packagist.org/packages/janoszen/webdriver
 
     {
       "require": {
-        "facebook/webdriver": "dev-master"
+        "janoszen/webdriver": "dev-master"
       }
     }
     
@@ -100,8 +100,8 @@ If you're reading this you've already found our Github repository. If you have a
 
 We love to have your help to make php-webdriver better. Feel free to 
 
-*   open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem. 
-*   fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
+*   open an [issue](https://github.com/janoszen/php-webdriver/issues) if you run into any problem. 
+*   fork the project and submit [pull request](https://github.com/janoszen/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)

From 213167e5f124a6103789a7736c71aff0191f386a Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Wed, 22 Apr 2015 17:04:59 +0200
Subject: [PATCH 154/784] Updated webdriver from Facebook

---
 composer.json                          | 3 ++-
 lib/remote/RemoteTargetLocator.php     | 2 ++
 lib/remote/RemoteWebDriver.php         | 2 +-
 tests/functional/WebDriverTestCase.php | 4 +++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 24f37c8fd..4b5622180 100644
--- a/composer.json
+++ b/composer.json
@@ -18,5 +18,6 @@
   },
   "autoload": {
     "classmap": ["lib/"]
-  }
+  },
+  "minimum-stability": "dev"
 }
diff --git a/lib/remote/RemoteTargetLocator.php b/lib/remote/RemoteTargetLocator.php
index 949836675..841c4acf1 100644
--- a/lib/remote/RemoteTargetLocator.php
+++ b/lib/remote/RemoteTargetLocator.php
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+namespace Selenium\WebDriver;
+
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
  */
diff --git a/lib/remote/RemoteWebDriver.php b/lib/remote/RemoteWebDriver.php
index aafbb4b2f..246a7adfa 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/remote/RemoteWebDriver.php
@@ -47,7 +47,7 @@ protected function __construct() {}
    * Construct the RemoteWebDriver by a desired capabilities.
    *
    * @param string $url The url of the remote server
-   * @param DesiredCapabilities $desired_capabilities The desired capabilities
+   * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
    * @param int|null $connection_timeout_in_ms
    * @param int|null $request_timeout_in_ms
    * @return RemoteWebDriver
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index db4248964..e4ef9db7c 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -35,7 +35,9 @@ protected function setUp() {
   }
   
   protected function tearDown() {
-    $this->driver->quit();
+    if ($this->driver) {
+	    $this->driver->quit();
+	  }
   }
 
   /**

From 311fdcf87fd5ad17241cc6b87d9bc344bf65fad3 Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Wed, 22 Apr 2015 17:08:46 +0200
Subject: [PATCH 155/784] Updated package name

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 4b5622180..41b0fce1e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-  "name": "janoszen/webdriver",
+  "name": "opsbears/webdriver",
   "description": "A php client for WebDriver (fork of facebook/webdriver)",
   "keywords": ["webdriver", "selenium", "php"],
-  "homepage": "https://github.com/janoszen/php-webdriver",
+  "homepage": "https://github.com/opsbears/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/janoszen/php-webdriver/issues",
-    "source": "https://github.com/janoszen/php-webdriver"
+    "issues": "https://github.com/opsbears/php-webdriver/issues",
+    "source": "https://github.com/opsbears/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"

From ac6d82f1a3272398650701bd1c9d5a28bfc7f7b5 Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Mon, 18 May 2015 14:44:29 +0200
Subject: [PATCH 156/784] Issue facebook/php-webdriver#212 - Moving forward
 Implemented namespacing as discussed (needs testing)

---
 composer.json                                 |  14 ++-
 example.php                                   |   4 +-
 lib/{chrome => }/ChromeDriver.php             |   4 +-
 lib/{chrome => }/ChromeDriverService.php      |   2 +-
 lib/{chrome => }/ChromeOptions.php            |   2 +-
 lib/{remote => }/DesiredCapabilities.php      |   4 +-
 lib/{remote => }/DriverCommand.php            |   2 +-
 .../service => }/DriverCommandExecutor.php    |   5 +-
 lib/{remote/service => }/DriverService.php    |   4 +-
 .../events => }/EventFiringWebDriver.php      |   5 +-
 .../EventFiringWebDriverNavigation.php        |   4 +-
 .../events => }/EventFiringWebElement.php     |   4 +-
 .../ElementNotSelectableException.php         |  21 ++++
 lib/Exception/ElementNotVisibleException.php  |  20 +++
 lib/Exception/ExpectedException.php           |  21 ++++
 .../IMEEngineActivationFailedException.php    |  21 ++++
 lib/Exception/IMENotAvailableException.php    |  21 ++++
 lib/Exception/IndexOutOfBoundsException.php   |   7 ++
 .../InvalidCookieDomainException.php          |  20 +++
 lib/Exception/InvalidCoordinatesException.php |  21 ++++
 .../InvalidElementStateException.php          |  20 +++
 lib/Exception/InvalidSelectorException.php    |  21 ++++
 .../MoveTargetOutOfBoundsException.php        |  21 ++++
 lib/Exception/NoAlertOpenException.php        |  20 +++
 lib/Exception/NoCollectionException.php       |   7 ++
 lib/Exception/NoScriptResultException.php     |  20 +++
 lib/Exception/NoStringException.php           |   7 ++
 lib/Exception/NoStringLengthException.php     |  20 +++
 lib/Exception/NoStringWrapperException.php    |  20 +++
 lib/Exception/NoSuchCollectionException.php   |  20 +++
 lib/Exception/NoSuchDocumentException.php     |  21 ++++
 lib/Exception/NoSuchDriverException.php       |  20 +++
 lib/Exception/NoSuchElementException.php      |  20 +++
 lib/Exception/NoSuchFrameException.php        |  20 +++
 lib/Exception/NoSuchWindowException.php       |  20 +++
 lib/Exception/NullPointerException.php        |  21 ++++
 lib/Exception/ScriptTimeoutException.php      |  21 ++++
 lib/Exception/SessionNotCreatedException.php  |  21 ++++
 .../StaleElementReferenceException.php        |  20 +++
 lib/Exception/TimeOutException.php            |  20 +++
 lib/Exception/UnableToSetCookieException.php  |  20 +++
 .../UnexpectedAlertOpenException.php          |  20 +++
 .../UnexpectedJavascriptException.php         |  20 +++
 lib/Exception/UnexpectedTagNameException.php  |  34 +++++
 lib/Exception/UnknownCommandException.php     |  20 +++
 lib/Exception/UnknownServerException.php      |  20 +++
 .../UnrecognizedExceptionException.php        |  21 ++++
 .../UnsupportedOperationException.php         |  21 ++++
 lib/Exception/WebDriverCurlException.php      |  21 ++++
 .../WebDriverException.php}                   |  64 +---------
 lib/Exception/XPathLookupException.php        |  20 +++
 lib/{remote => }/ExecuteMethod.php            |   2 +-
 lib/{remote => }/FileDetector.php             |   2 +-
 lib/{firefox => }/FirefoxDriver.php           |   2 +-
 lib/{firefox => }/FirefoxProfile.php          |   7 +-
 lib/{remote => }/HttpCommandExecutor.php      |   5 +-
 lib/JavaScriptExecutor.php                    |   2 +-
 lib/{remote => }/LocalFileDetector.php        |   2 +-
 lib/{remote => }/RemoteExecuteMethod.php      |   2 +-
 lib/{remote => }/RemoteKeyboard.php           |   2 +-
 lib/{remote => }/RemoteMouse.php              |   2 +-
 lib/{remote => }/RemoteTargetLocator.php      |   2 +-
 lib/{remote => }/RemoteTouchScreen.php        |   2 +-
 lib/{remote => }/RemoteWebDriver.php          |   2 +-
 lib/{remote => }/RemoteWebElement.php         |   3 +-
 lib/{net => }/URLChecker.php                  |   5 +-
 lib/{remote => }/UselessFileDetector.php      |   2 +-
 lib/WebDriver.php                             |   2 +-
 lib/WebDriverAction.php                       |   2 +-
 lib/{interactions => }/WebDriverActions.php   |   2 +-
 lib/WebDriverAlert.php                        |   2 +-
 lib/{remote => }/WebDriverBrowserType.php     |   2 +-
 .../WebDriverButtonReleaseAction.php          |   2 +-
 lib/WebDriverBy.php                           |   2 +-
 lib/WebDriverCapabilities.php                 |   2 +-
 lib/{remote => }/WebDriverCapabilityType.php  |   2 +-
 .../internal => }/WebDriverClickAction.php    |   2 +-
 .../WebDriverClickAndHoldAction.php           |   2 +-
 lib/{remote => }/WebDriverCommand.php         |   2 +-
 lib/WebDriverCommandExecutor.php              |   2 +-
 .../WebDriverCompositeAction.php              |   2 +-
 .../WebDriverContextClickAction.php           |   2 +-
 .../internal => }/WebDriverCoordinates.php    |   3 +-
 lib/WebDriverDimension.php                    |   2 +-
 lib/WebDriverDispatcher.php                   |   2 +-
 .../WebDriverDoubleClickAction.php            |   2 +-
 .../touch => }/WebDriverDoubleTapAction.php   |   2 +-
 .../touch => }/WebDriverDownAction.php        |   2 +-
 lib/WebDriverElement.php                      |   2 +-
 lib/WebDriverEventListener.php                |   4 +-
 lib/WebDriverExpectedCondition.php            |   6 +-
 .../touch => }/WebDriverFlickAction.php       |   2 +-
 .../WebDriverFlickFromElementAction.php       |   2 +-
 lib/WebDriverHasInputDevices.php              |   2 +-
 .../internal => }/WebDriverKeyDownAction.php  |   2 +-
 .../internal => }/WebDriverKeyUpAction.php    |   2 +-
 lib/WebDriverKeyboard.php                     |   2 +-
 lib/WebDriverKeys.php                         |   2 +-
 .../WebDriverKeysRelatedAction.php            |   2 +-
 lib/{internal => }/WebDriverLocatable.php     |   2 +-
 .../touch => }/WebDriverLongPressAction.php   |   2 +-
 lib/WebDriverMouse.php                        |   2 +-
 .../internal => }/WebDriverMouseAction.php    |   2 +-
 .../WebDriverMouseMoveAction.php              |   2 +-
 .../touch => }/WebDriverMoveAction.php        |   2 +-
 .../WebDriverMoveToOffsetAction.php           |   2 +-
 lib/WebDriverNavigation.php                   |   2 +-
 lib/WebDriverOptions.php                      |   3 +-
 lib/WebDriverPlatform.php                     |   2 +-
 lib/WebDriverPoint.php                        |   2 +-
 lib/{remote => }/WebDriverResponse.php        |   2 +-
 .../touch => }/WebDriverScrollAction.php      |   2 +-
 .../WebDriverScrollFromElementAction.php      |   2 +-
 lib/WebDriverSearchContext.php                |   2 +-
 lib/WebDriverSelect.php                       |   5 +-
 .../internal => }/WebDriverSendKeysAction.php |   2 +-
 .../WebDriverSingleKeyAction.php              |   2 +-
 .../touch => }/WebDriverTapAction.php         |   2 +-
 lib/WebDriverTargetLocator.php                |   2 +-
 lib/WebDriverTimeouts.php                     |   2 +-
 .../touch => }/WebDriverTouchAction.php       |   2 +-
 .../WebDriverTouchActions.php                 |   2 +-
 .../WebDriverTouchScreen.php                  |   2 +-
 .../touch => }/WebDriverUpAction.php          |   2 +-
 lib/WebDriverWait.php                         |   4 +-
 lib/WebDriverWindow.php                       |   3 +-
 lib/__init__.php                              | 116 ------------------
 tests/bootstrap.php                           |   4 +-
 tests/functional/BaseTest.php                 |   2 +-
 tests/functional/FileUploadTest.php           |   2 +-
 tests/functional/WebDriverTestCase.php        |   2 +-
 tests/unit/bootstrap.php                      |   2 +-
 .../WebDriverButtonReleaseActionTest.php      |   8 +-
 .../internal/WebDriverClickActionTest.php     |   8 +-
 .../WebDriverClickAndHoldActionTest.php       |   8 +-
 .../WebDriverContextClickActionTest.php       |   8 +-
 .../internal/WebDriverCoordinatesTest.php     |   2 +-
 .../WebDriverDoubleClickActionTest.php        |   8 +-
 .../internal/WebDriverKeyDownActionTest.php   |  10 +-
 .../internal/WebDriverKeyUpActionTest.php     |  10 +-
 .../internal/WebDriverMouseMoveActionTest.php |   8 +-
 .../WebDriverMouseToOffsetActionTest.php      |   8 +-
 .../internal/WebDriverSendKeysActionTest.php  |  10 +-
 143 files changed, 936 insertions(+), 323 deletions(-)
 rename lib/{chrome => }/ChromeDriver.php (96%)
 rename lib/{chrome => }/ChromeDriverService.php (97%)
 rename lib/{chrome => }/ChromeOptions.php (99%)
 rename lib/{remote => }/DesiredCapabilities.php (99%)
 rename lib/{remote => }/DriverCommand.php (99%)
 rename lib/{remote/service => }/DriverCommandExecutor.php (93%)
 rename lib/{remote/service => }/DriverService.php (98%)
 rename lib/{support/events => }/EventFiringWebDriver.php (98%)
 rename lib/{support/events => }/EventFiringWebDriverNavigation.php (97%)
 rename lib/{support/events => }/EventFiringWebElement.php (98%)
 create mode 100644 lib/Exception/ElementNotSelectableException.php
 create mode 100644 lib/Exception/ElementNotVisibleException.php
 create mode 100644 lib/Exception/ExpectedException.php
 create mode 100644 lib/Exception/IMEEngineActivationFailedException.php
 create mode 100644 lib/Exception/IMENotAvailableException.php
 create mode 100644 lib/Exception/IndexOutOfBoundsException.php
 create mode 100644 lib/Exception/InvalidCookieDomainException.php
 create mode 100644 lib/Exception/InvalidCoordinatesException.php
 create mode 100644 lib/Exception/InvalidElementStateException.php
 create mode 100644 lib/Exception/InvalidSelectorException.php
 create mode 100644 lib/Exception/MoveTargetOutOfBoundsException.php
 create mode 100644 lib/Exception/NoAlertOpenException.php
 create mode 100644 lib/Exception/NoCollectionException.php
 create mode 100644 lib/Exception/NoScriptResultException.php
 create mode 100644 lib/Exception/NoStringException.php
 create mode 100644 lib/Exception/NoStringLengthException.php
 create mode 100644 lib/Exception/NoStringWrapperException.php
 create mode 100644 lib/Exception/NoSuchCollectionException.php
 create mode 100644 lib/Exception/NoSuchDocumentException.php
 create mode 100644 lib/Exception/NoSuchDriverException.php
 create mode 100644 lib/Exception/NoSuchElementException.php
 create mode 100644 lib/Exception/NoSuchFrameException.php
 create mode 100644 lib/Exception/NoSuchWindowException.php
 create mode 100644 lib/Exception/NullPointerException.php
 create mode 100644 lib/Exception/ScriptTimeoutException.php
 create mode 100644 lib/Exception/SessionNotCreatedException.php
 create mode 100644 lib/Exception/StaleElementReferenceException.php
 create mode 100644 lib/Exception/TimeOutException.php
 create mode 100644 lib/Exception/UnableToSetCookieException.php
 create mode 100644 lib/Exception/UnexpectedAlertOpenException.php
 create mode 100644 lib/Exception/UnexpectedJavascriptException.php
 create mode 100644 lib/Exception/UnexpectedTagNameException.php
 create mode 100644 lib/Exception/UnknownCommandException.php
 create mode 100644 lib/Exception/UnknownServerException.php
 create mode 100644 lib/Exception/UnrecognizedExceptionException.php
 create mode 100644 lib/Exception/UnsupportedOperationException.php
 create mode 100644 lib/Exception/WebDriverCurlException.php
 rename lib/{WebDriverExceptions.php => Exception/WebDriverException.php} (59%)
 create mode 100644 lib/Exception/XPathLookupException.php
 rename lib/{remote => }/ExecuteMethod.php (96%)
 rename lib/{remote => }/FileDetector.php (96%)
 rename lib/{firefox => }/FirefoxDriver.php (95%)
 rename lib/{firefox => }/FirefoxProfile.php (95%)
 rename lib/{remote => }/HttpCommandExecutor.php (99%)
 rename lib/{remote => }/LocalFileDetector.php (96%)
 rename lib/{remote => }/RemoteExecuteMethod.php (97%)
 rename lib/{remote => }/RemoteKeyboard.php (98%)
 rename lib/{remote => }/RemoteMouse.php (99%)
 rename lib/{remote => }/RemoteTargetLocator.php (99%)
 rename lib/{remote => }/RemoteTouchScreen.php (99%)
 rename lib/{remote => }/RemoteWebDriver.php (99%)
 rename lib/{remote => }/RemoteWebElement.php (99%)
 rename lib/{net => }/URLChecker.php (95%)
 rename lib/{remote => }/UselessFileDetector.php (96%)
 rename lib/{interactions => }/WebDriverActions.php (99%)
 rename lib/{remote => }/WebDriverBrowserType.php (97%)
 rename lib/{interactions/internal => }/WebDriverButtonReleaseAction.php (96%)
 rename lib/{remote => }/WebDriverCapabilityType.php (98%)
 rename lib/{interactions/internal => }/WebDriverClickAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverClickAndHoldAction.php (96%)
 rename lib/{remote => }/WebDriverCommand.php (97%)
 rename lib/{interactions => }/WebDriverCompositeAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverContextClickAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverCoordinates.php (94%)
 rename lib/{interactions/internal => }/WebDriverDoubleClickAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverDoubleTapAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverDownAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverFlickAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverFlickFromElementAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverKeyDownAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverKeyUpAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverKeysRelatedAction.php (97%)
 rename lib/{internal => }/WebDriverLocatable.php (96%)
 rename lib/{interactions/touch => }/WebDriverLongPressAction.php (96%)
 rename lib/{interactions/internal => }/WebDriverMouseAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverMouseMoveAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverMoveAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverMoveToOffsetAction.php (97%)
 rename lib/{remote => }/WebDriverResponse.php (98%)
 rename lib/{interactions/touch => }/WebDriverScrollAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverScrollFromElementAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverSendKeysAction.php (97%)
 rename lib/{interactions/internal => }/WebDriverSingleKeyAction.php (97%)
 rename lib/{interactions/touch => }/WebDriverTapAction.php (96%)
 rename lib/{interactions/touch => }/WebDriverTouchAction.php (97%)
 rename lib/{interactions => }/WebDriverTouchActions.php (99%)
 rename lib/{interactions => }/WebDriverTouchScreen.php (99%)
 rename lib/{interactions/touch => }/WebDriverUpAction.php (97%)
 delete mode 100755 lib/__init__.php

diff --git a/composer.json b/composer.json
index 41b0fce1e..7b57541f4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,13 @@
 {
-  "name": "opsbears/webdriver",
-  "description": "A php client for WebDriver (fork of facebook/webdriver)",
+  "name": "facebook/webdriver",
+  "description": "A php client for WebDriver",
   "keywords": ["webdriver", "selenium", "php"],
-  "homepage": "https://github.com/opsbears/php-webdriver",
+  "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
-    "issues": "https://github.com/opsbears/php-webdriver/issues",
-    "source": "https://github.com/opsbears/php-webdriver"
+    "issues": "https://github.com/facebook/php-webdriver/issues",
+    "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"
@@ -17,7 +17,9 @@
     "phpdocumentor/phpdocumentor": "2.*"
   },
   "autoload": {
-    "classmap": ["lib/"]
+    "psr-4": {
+		"Facebook\\WebDriver\\": "lib/"
+	}
   },
   "minimum-stability": "dev"
 }
diff --git a/example.php b/example.php
index 8cfac7461..b4834146c 100644
--- a/example.php
+++ b/example.php
@@ -1,9 +1,9 @@
 <?php
 // An example of using php-webdriver.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
-require_once('lib/__init__.php');
+require_once('vendor/autoload.php');
 
 // start Firefox with 5 second timeout
 $host = 'http://localhost:4444/wd/hub'; // this is the default
diff --git a/lib/chrome/ChromeDriver.php b/lib/ChromeDriver.php
similarity index 96%
rename from lib/chrome/ChromeDriver.php
rename to lib/ChromeDriver.php
index 10adb8ad3..3fb84ad58 100644
--- a/lib/chrome/ChromeDriver.php
+++ b/lib/ChromeDriver.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class ChromeDriver extends RemoteWebDriver {
 
diff --git a/lib/chrome/ChromeDriverService.php b/lib/ChromeDriverService.php
similarity index 97%
rename from lib/chrome/ChromeDriverService.php
rename to lib/ChromeDriverService.php
index 00206c023..9494bfd1a 100644
--- a/lib/chrome/ChromeDriverService.php
+++ b/lib/ChromeDriverService.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class ChromeDriverService extends DriverService {
 
diff --git a/lib/chrome/ChromeOptions.php b/lib/ChromeOptions.php
similarity index 99%
rename from lib/chrome/ChromeOptions.php
rename to lib/ChromeOptions.php
index 0f9b24cab..eb2f92e8c 100644
--- a/lib/chrome/ChromeOptions.php
+++ b/lib/ChromeOptions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The class manages the capabilities in ChromeDriver.
diff --git a/lib/remote/DesiredCapabilities.php b/lib/DesiredCapabilities.php
similarity index 99%
rename from lib/remote/DesiredCapabilities.php
rename to lib/DesiredCapabilities.php
index 8e06d64bf..d981f425c 100644
--- a/lib/remote/DesiredCapabilities.php
+++ b/lib/DesiredCapabilities.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
 
 class DesiredCapabilities implements WebDriverCapabilities {
 
diff --git a/lib/remote/DriverCommand.php b/lib/DriverCommand.php
similarity index 99%
rename from lib/remote/DriverCommand.php
rename to lib/DriverCommand.php
index c6279dd4b..eb29e0d8d 100644
--- a/lib/remote/DriverCommand.php
+++ b/lib/DriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * This list of command defined in the WebDriver json wire protocol.
diff --git a/lib/remote/service/DriverCommandExecutor.php b/lib/DriverCommandExecutor.php
similarity index 93%
rename from lib/remote/service/DriverCommandExecutor.php
rename to lib/DriverCommandExecutor.php
index 3c6e573a1..228f21b4d 100644
--- a/lib/remote/service/DriverCommandExecutor.php
+++ b/lib/DriverCommandExecutor.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\WebDriverException;
 
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
@@ -48,7 +49,7 @@ public function execute(WebDriverCommand $command, $curl_opts = array()) {
         $this->service->stop();
       }
       return $value;
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
       if (!$this->service->isRunning()) {
         throw new WebDriverException('The driver server has died.');
       }
diff --git a/lib/remote/service/DriverService.php b/lib/DriverService.php
similarity index 98%
rename from lib/remote/service/DriverService.php
rename to lib/DriverService.php
index c8a9bdb9c..77384b9d0 100644
--- a/lib/remote/service/DriverService.php
+++ b/lib/DriverService.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
 
 class DriverService {
 
diff --git a/lib/support/events/EventFiringWebDriver.php b/lib/EventFiringWebDriver.php
similarity index 98%
rename from lib/support/events/EventFiringWebDriver.php
rename to lib/EventFiringWebDriver.php
index cefe6d987..ebd5b9b7c 100644
--- a/lib/support/events/EventFiringWebDriver.php
+++ b/lib/EventFiringWebDriver.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
diff --git a/lib/support/events/EventFiringWebDriverNavigation.php b/lib/EventFiringWebDriverNavigation.php
similarity index 97%
rename from lib/support/events/EventFiringWebDriverNavigation.php
rename to lib/EventFiringWebDriverNavigation.php
index 7f1e71b0a..c3feea060 100644
--- a/lib/support/events/EventFiringWebDriverNavigation.php
+++ b/lib/EventFiringWebDriverNavigation.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebDriverNavigation {
 
diff --git a/lib/support/events/EventFiringWebElement.php b/lib/EventFiringWebElement.php
similarity index 98%
rename from lib/support/events/EventFiringWebElement.php
rename to lib/EventFiringWebElement.php
index f0b317cef..a955c59d6 100644
--- a/lib/support/events/EventFiringWebElement.php
+++ b/lib/EventFiringWebElement.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
diff --git a/lib/Exception/ElementNotSelectableException.php b/lib/Exception/ElementNotSelectableException.php
new file mode 100644
index 000000000..9acfb88f2
--- /dev/null
+++ b/lib/Exception/ElementNotSelectableException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ElementNotSelectableException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
new file mode 100644
index 000000000..c452d2daa
--- /dev/null
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class ElementNotVisibleException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
new file mode 100644
index 000000000..cd8f15cc5
--- /dev/null
+++ b/lib/Exception/ExpectedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ExpectedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
new file mode 100644
index 000000000..cd13d0181
--- /dev/null
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class IMEEngineActivationFailedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
new file mode 100644
index 000000000..94497c0d5
--- /dev/null
+++ b/lib/Exception/IMENotAvailableException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class IMENotAvailableException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
new file mode 100644
index 000000000..322f67b14
--- /dev/null
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class IndexOutOfBoundsException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidCookieDomainException.php b/lib/Exception/InvalidCookieDomainException.php
new file mode 100644
index 000000000..5dbaae9eb
--- /dev/null
+++ b/lib/Exception/InvalidCookieDomainException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class InvalidCookieDomainException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
new file mode 100644
index 000000000..571a107b2
--- /dev/null
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class InvalidCoordinatesException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidElementStateException.php b/lib/Exception/InvalidElementStateException.php
new file mode 100644
index 000000000..5c49c4c88
--- /dev/null
+++ b/lib/Exception/InvalidElementStateException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class InvalidElementStateException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/InvalidSelectorException.php b/lib/Exception/InvalidSelectorException.php
new file mode 100644
index 000000000..2c106970c
--- /dev/null
+++ b/lib/Exception/InvalidSelectorException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class InvalidSelectorException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/MoveTargetOutOfBoundsException.php b/lib/Exception/MoveTargetOutOfBoundsException.php
new file mode 100644
index 000000000..39e97adbd
--- /dev/null
+++ b/lib/Exception/MoveTargetOutOfBoundsException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class MoveTargetOutOfBoundsException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoAlertOpenException.php b/lib/Exception/NoAlertOpenException.php
new file mode 100644
index 000000000..cdc846e08
--- /dev/null
+++ b/lib/Exception/NoAlertOpenException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoAlertOpenException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
new file mode 100644
index 000000000..2bfe9069a
--- /dev/null
+++ b/lib/Exception/NoCollectionException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class NoCollectionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
new file mode 100644
index 000000000..80d23f7de
--- /dev/null
+++ b/lib/Exception/NoScriptResultException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoScriptResultException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
new file mode 100644
index 000000000..13c107b7d
--- /dev/null
+++ b/lib/Exception/NoStringException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+class NoStringException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
new file mode 100644
index 000000000..8f50bb4ca
--- /dev/null
+++ b/lib/Exception/NoStringLengthException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoStringLengthException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
new file mode 100644
index 000000000..2e17124e2
--- /dev/null
+++ b/lib/Exception/NoStringWrapperException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoStringWrapperException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
new file mode 100644
index 000000000..d9e6c47ab
--- /dev/null
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchCollectionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchDocumentException.php b/lib/Exception/NoSuchDocumentException.php
new file mode 100644
index 000000000..b542fdfd6
--- /dev/null
+++ b/lib/Exception/NoSuchDocumentException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class NoSuchDocumentException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
new file mode 100644
index 000000000..c34735b9d
--- /dev/null
+++ b/lib/Exception/NoSuchDriverException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchDriverException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchElementException.php b/lib/Exception/NoSuchElementException.php
new file mode 100644
index 000000000..da39f7cab
--- /dev/null
+++ b/lib/Exception/NoSuchElementException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchElementException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchFrameException.php b/lib/Exception/NoSuchFrameException.php
new file mode 100644
index 000000000..474f4dc6e
--- /dev/null
+++ b/lib/Exception/NoSuchFrameException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchFrameException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NoSuchWindowException.php b/lib/Exception/NoSuchWindowException.php
new file mode 100644
index 000000000..bbeee4f0d
--- /dev/null
+++ b/lib/Exception/NoSuchWindowException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class NoSuchWindowException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
new file mode 100644
index 000000000..00f2fb5bb
--- /dev/null
+++ b/lib/Exception/NullPointerException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class NullPointerException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/ScriptTimeoutException.php b/lib/Exception/ScriptTimeoutException.php
new file mode 100644
index 000000000..4095728a2
--- /dev/null
+++ b/lib/Exception/ScriptTimeoutException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class ScriptTimeoutException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/SessionNotCreatedException.php b/lib/Exception/SessionNotCreatedException.php
new file mode 100644
index 000000000..9b67edf94
--- /dev/null
+++ b/lib/Exception/SessionNotCreatedException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class SessionNotCreatedException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/StaleElementReferenceException.php b/lib/Exception/StaleElementReferenceException.php
new file mode 100644
index 000000000..7e265725c
--- /dev/null
+++ b/lib/Exception/StaleElementReferenceException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class StaleElementReferenceException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/TimeOutException.php b/lib/Exception/TimeOutException.php
new file mode 100644
index 000000000..6301f4144
--- /dev/null
+++ b/lib/Exception/TimeOutException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class TimeOutException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnableToSetCookieException.php b/lib/Exception/UnableToSetCookieException.php
new file mode 100644
index 000000000..7ece63e50
--- /dev/null
+++ b/lib/Exception/UnableToSetCookieException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnableToSetCookieException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedAlertOpenException.php b/lib/Exception/UnexpectedAlertOpenException.php
new file mode 100644
index 000000000..e97eddeae
--- /dev/null
+++ b/lib/Exception/UnexpectedAlertOpenException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedAlertOpenException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedJavascriptException.php b/lib/Exception/UnexpectedJavascriptException.php
new file mode 100644
index 000000000..c8da7e505
--- /dev/null
+++ b/lib/Exception/UnexpectedJavascriptException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedJavascriptException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnexpectedTagNameException.php b/lib/Exception/UnexpectedTagNameException.php
new file mode 100644
index 000000000..514abd374
--- /dev/null
+++ b/lib/Exception/UnexpectedTagNameException.php
@@ -0,0 +1,34 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnexpectedTagNameException extends WebDriverException {
+
+  /**
+   * @param string $expected_tag_name
+   * @param string $actual_tag_name
+   */
+  public function __construct(
+    $expected_tag_name,
+    $actual_tag_name) {
+    parent::__construct(
+      sprintf(
+        "Element should have been \"%s\" but was \"%s\"",
+        $expected_tag_name, $actual_tag_name
+      )
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/Exception/UnknownCommandException.php b/lib/Exception/UnknownCommandException.php
new file mode 100644
index 000000000..2d20b0096
--- /dev/null
+++ b/lib/Exception/UnknownCommandException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnknownCommandException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnknownServerException.php b/lib/Exception/UnknownServerException.php
new file mode 100644
index 000000000..13c3780c4
--- /dev/null
+++ b/lib/Exception/UnknownServerException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class UnknownServerException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnrecognizedExceptionException.php b/lib/Exception/UnrecognizedExceptionException.php
new file mode 100644
index 000000000..9d0046dc0
--- /dev/null
+++ b/lib/Exception/UnrecognizedExceptionException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class UnrecognizedExceptionException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/UnsupportedOperationException.php b/lib/Exception/UnsupportedOperationException.php
new file mode 100644
index 000000000..781c2276a
--- /dev/null
+++ b/lib/Exception/UnsupportedOperationException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class UnsupportedOperationException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/Exception/WebDriverCurlException.php b/lib/Exception/WebDriverCurlException.php
new file mode 100644
index 000000000..9719565d2
--- /dev/null
+++ b/lib/Exception/WebDriverCurlException.php
@@ -0,0 +1,21 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+
+class WebDriverCurlException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/WebDriverExceptions.php b/lib/Exception/WebDriverException.php
similarity index 59%
rename from lib/WebDriverExceptions.php
rename to lib/Exception/WebDriverException.php
index 45ed8b5d2..af90b7cf7 100644
--- a/lib/WebDriverExceptions.php
+++ b/lib/Exception/WebDriverException.php
@@ -13,11 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver\Exception;
 
-use \Exception;
-
-final class WebDriverCurlException extends Exception {} // When curls fail
+use Exception;
 
 class WebDriverException extends Exception {
 
@@ -128,61 +126,3 @@ public static function throwException($status_code, $message, $results) {
     }
   }
 }
-
-class IndexOutOfBoundsException extends WebDriverException {} // 1
-class NoCollectionException extends WebDriverException {} // 2
-class NoStringException extends WebDriverException {} // 3
-class NoStringLengthException extends WebDriverException {} // 4
-class NoStringWrapperException extends WebDriverException {} // 5
-class NoSuchDriverException extends WebDriverException {} // 6
-class NoSuchElementException extends WebDriverException {} // 7
-class NoSuchFrameException extends WebDriverException {} // 8
-class UnknownCommandException extends WebDriverException {} // 9
-class StaleElementReferenceException extends WebDriverException {} // 10
-class ElementNotVisibleException extends WebDriverException {} // 11
-class InvalidElementStateException extends WebDriverException {} // 12
-class UnknownServerException extends WebDriverException {} // 13
-class ExpectedException extends WebDriverException {} // 14
-class ElementNotSelectableException extends WebDriverException {} // 15
-class NoSuchDocumentException extends WebDriverException {} // 16
-class UnexpectedJavascriptException extends WebDriverException {} // 17
-class NoScriptResultException extends WebDriverException {} // 18
-class XPathLookupException extends WebDriverException {} // 19
-class NoSuchCollectionException extends WebDriverException {} // 20
-class TimeOutException extends WebDriverException {} // 21
-class NullPointerException extends WebDriverException {} // 22
-class NoSuchWindowException extends WebDriverException {} // 23
-class InvalidCookieDomainException extends WebDriverException {} // 24
-class UnableToSetCookieException extends WebDriverException {} // 25
-class UnexpectedAlertOpenException extends WebDriverException {} // 26
-class NoAlertOpenException extends WebDriverException {} // 27
-class ScriptTimeoutException extends WebDriverException {} // 28
-class InvalidCoordinatesException extends WebDriverException {}// 29
-class IMENotAvailableException extends WebDriverException {} // 30
-class IMEEngineActivationFailedException extends WebDriverException {}// 31
-class InvalidSelectorException extends WebDriverException {} // 32
-class SessionNotCreatedException extends WebDriverException {} // 33
-class MoveTargetOutOfBoundsException extends WebDriverException {} // 34
-
-// Fallback
-class UnrecognizedExceptionException extends WebDriverException {}
-
-class UnexpectedTagNameException extends WebDriverException {
-
-  /**
-   * @param string $expected_tag_name
-   * @param string $actual_tag_name
-   */
-  public function __construct(
-      $expected_tag_name,
-      $actual_tag_name) {
-    parent::__construct(
-      sprintf(
-        "Element should have been \"%s\" but was \"%s\"",
-        $expected_tag_name, $actual_tag_name
-      )
-    );
-  }
-}
-
-class UnsupportedOperationException extends WebDriverException {}
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
new file mode 100644
index 000000000..de9e2e707
--- /dev/null
+++ b/lib/Exception/XPathLookupException.php
@@ -0,0 +1,20 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class XPathLookupException extends WebDriverException {
+
+}
\ No newline at end of file
diff --git a/lib/remote/ExecuteMethod.php b/lib/ExecuteMethod.php
similarity index 96%
rename from lib/remote/ExecuteMethod.php
rename to lib/ExecuteMethod.php
index 5a06fca0d..f87ac29d8 100644
--- a/lib/remote/ExecuteMethod.php
+++ b/lib/ExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface ExecuteMethod {
 
diff --git a/lib/remote/FileDetector.php b/lib/FileDetector.php
similarity index 96%
rename from lib/remote/FileDetector.php
rename to lib/FileDetector.php
index 79216095c..5aeb0dee4 100644
--- a/lib/remote/FileDetector.php
+++ b/lib/FileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface FileDetector {
 
diff --git a/lib/firefox/FirefoxDriver.php b/lib/FirefoxDriver.php
similarity index 95%
rename from lib/firefox/FirefoxDriver.php
rename to lib/FirefoxDriver.php
index 7d4852129..019064e71 100644
--- a/lib/firefox/FirefoxDriver.php
+++ b/lib/FirefoxDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class FirefoxDriver {
 
diff --git a/lib/firefox/FirefoxProfile.php b/lib/FirefoxProfile.php
similarity index 95%
rename from lib/firefox/FirefoxProfile.php
rename to lib/FirefoxProfile.php
index 431c71a53..d72fc06c1 100644
--- a/lib/firefox/FirefoxProfile.php
+++ b/lib/FirefoxProfile.php
@@ -13,8 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\WebDriverException;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
 use ZipArchive;
 
 class FirefoxProfile {
@@ -149,7 +152,7 @@ private function extractTo($xpi, $target_dir) {
       $zip->extractTo($target_dir);
       $zip->close();
     } else {
-      throw new Exception("Failed to open the firefox extension. '$xpi'");
+      throw new \Exception("Failed to open the firefox extension. '$xpi'");
     }
     return $this;
   }
diff --git a/lib/remote/HttpCommandExecutor.php b/lib/HttpCommandExecutor.php
similarity index 99%
rename from lib/remote/HttpCommandExecutor.php
rename to lib/HttpCommandExecutor.php
index 0a45c0052..4e3bc085f 100644
--- a/lib/remote/HttpCommandExecutor.php
+++ b/lib/HttpCommandExecutor.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\WebDriverException;
+use InvalidArgumentException;
+use BadMethodCallException;
 
 /**
  * Command executor talking to the standalone server via HTTP.
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 18cba7866..3e0db1302 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver interface implemented by drivers that support JavaScript.
diff --git a/lib/remote/LocalFileDetector.php b/lib/LocalFileDetector.php
similarity index 96%
rename from lib/remote/LocalFileDetector.php
rename to lib/LocalFileDetector.php
index d8cac906e..a9a7488ce 100644
--- a/lib/remote/LocalFileDetector.php
+++ b/lib/LocalFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class LocalFileDetector implements FileDetector {
     /**
diff --git a/lib/remote/RemoteExecuteMethod.php b/lib/RemoteExecuteMethod.php
similarity index 97%
rename from lib/remote/RemoteExecuteMethod.php
rename to lib/RemoteExecuteMethod.php
index 4d874179c..3ab0a60ae 100644
--- a/lib/remote/RemoteExecuteMethod.php
+++ b/lib/RemoteExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class RemoteExecuteMethod implements ExecuteMethod {
 
diff --git a/lib/remote/RemoteKeyboard.php b/lib/RemoteKeyboard.php
similarity index 98%
rename from lib/remote/RemoteKeyboard.php
rename to lib/RemoteKeyboard.php
index 9831b74f4..d7d3ebbdb 100644
--- a/lib/remote/RemoteKeyboard.php
+++ b/lib/RemoteKeyboard.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute keyboard commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteMouse.php b/lib/RemoteMouse.php
similarity index 99%
rename from lib/remote/RemoteMouse.php
rename to lib/RemoteMouse.php
index 93168abf8..deb2164fd 100644
--- a/lib/remote/RemoteMouse.php
+++ b/lib/RemoteMouse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute mouse commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteTargetLocator.php b/lib/RemoteTargetLocator.php
similarity index 99%
rename from lib/remote/RemoteTargetLocator.php
rename to lib/RemoteTargetLocator.php
index 841c4acf1..c33bd2c71 100644
--- a/lib/remote/RemoteTargetLocator.php
+++ b/lib/RemoteTargetLocator.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
diff --git a/lib/remote/RemoteTouchScreen.php b/lib/RemoteTouchScreen.php
similarity index 99%
rename from lib/remote/RemoteTouchScreen.php
rename to lib/RemoteTouchScreen.php
index 6ef5d35d5..3ca3c19bd 100644
--- a/lib/remote/RemoteTouchScreen.php
+++ b/lib/RemoteTouchScreen.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Execute touch commands for RemoteWebDriver.
diff --git a/lib/remote/RemoteWebDriver.php b/lib/RemoteWebDriver.php
similarity index 99%
rename from lib/remote/RemoteWebDriver.php
rename to lib/RemoteWebDriver.php
index 246a7adfa..86d9e0d8b 100644
--- a/lib/remote/RemoteWebDriver.php
+++ b/lib/RemoteWebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
diff --git a/lib/remote/RemoteWebElement.php b/lib/RemoteWebElement.php
similarity index 99%
rename from lib/remote/RemoteWebElement.php
rename to lib/RemoteWebElement.php
index 3f78d1cc1..98d6cca07 100644
--- a/lib/remote/RemoteWebElement.php
+++ b/lib/RemoteWebElement.php
@@ -13,8 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\WebDriverException;
 use ZipArchive;
 
 /**
diff --git a/lib/net/URLChecker.php b/lib/URLChecker.php
similarity index 95%
rename from lib/net/URLChecker.php
rename to lib/URLChecker.php
index 13588203b..657488dbf 100644
--- a/lib/net/URLChecker.php
+++ b/lib/URLChecker.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Exception;
+use Facebook\WebDriver\Exception\TimeOutException;
 
 class URLChecker {
 
diff --git a/lib/remote/UselessFileDetector.php b/lib/UselessFileDetector.php
similarity index 96%
rename from lib/remote/UselessFileDetector.php
rename to lib/UselessFileDetector.php
index f21df9e64..ce4c55fc9 100644
--- a/lib/remote/UselessFileDetector.php
+++ b/lib/UselessFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class UselessFileDetector implements FileDetector {
   /**
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 14e102b92..b143583ca 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The interface for WebDriver.
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index cff1ca9ae..a5d2d32d8 100644
--- a/lib/WebDriverAction.php
+++ b/lib/WebDriverAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing a single user-interaction action.
diff --git a/lib/interactions/WebDriverActions.php b/lib/WebDriverActions.php
similarity index 99%
rename from lib/interactions/WebDriverActions.php
rename to lib/WebDriverActions.php
index eac0d14ae..37537e2b9 100644
--- a/lib/interactions/WebDriverActions.php
+++ b/lib/WebDriverActions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 84bc202c8..2f92ec4c4 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
diff --git a/lib/remote/WebDriverBrowserType.php b/lib/WebDriverBrowserType.php
similarity index 97%
rename from lib/remote/WebDriverBrowserType.php
rename to lib/WebDriverBrowserType.php
index 8db21c0a5..bbb9a529e 100644
--- a/lib/remote/WebDriverBrowserType.php
+++ b/lib/WebDriverBrowserType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * All the browsers supported by selenium
diff --git a/lib/interactions/internal/WebDriverButtonReleaseAction.php b/lib/WebDriverButtonReleaseAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverButtonReleaseAction.php
rename to lib/WebDriverButtonReleaseAction.php
index ea518877a..444632265 100644
--- a/lib/interactions/internal/WebDriverButtonReleaseAction.php
+++ b/lib/WebDriverButtonReleaseAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Move to the location and then release the mouse key.
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index ce25f308e..c409768a8 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The basic 8 mechanisms supported by webdriver to locate a web element.
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 3ccc30ee6..721db82e6 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface WebDriverCapabilities {
 
diff --git a/lib/remote/WebDriverCapabilityType.php b/lib/WebDriverCapabilityType.php
similarity index 98%
rename from lib/remote/WebDriverCapabilityType.php
rename to lib/WebDriverCapabilityType.php
index a7499d9e0..558abb4ab 100644
--- a/lib/remote/WebDriverCapabilityType.php
+++ b/lib/WebDriverCapabilityType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
diff --git a/lib/interactions/internal/WebDriverClickAction.php b/lib/WebDriverClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverClickAction.php
rename to lib/WebDriverClickAction.php
index 54adb4a6f..cc9263c17 100644
--- a/lib/interactions/internal/WebDriverClickAction.php
+++ b/lib/WebDriverClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/internal/WebDriverClickAndHoldAction.php b/lib/WebDriverClickAndHoldAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverClickAndHoldAction.php
rename to lib/WebDriverClickAndHoldAction.php
index 30169ff5b..6bc8d049b 100644
--- a/lib/interactions/internal/WebDriverClickAndHoldAction.php
+++ b/lib/WebDriverClickAndHoldAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Move the the location, click and hold.
diff --git a/lib/remote/WebDriverCommand.php b/lib/WebDriverCommand.php
similarity index 97%
rename from lib/remote/WebDriverCommand.php
rename to lib/WebDriverCommand.php
index 2300ce373..06660dadf 100644
--- a/lib/remote/WebDriverCommand.php
+++ b/lib/WebDriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverCommand {
 
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 7a3eb20fd..5f99a1d16 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface for all command executor.
diff --git a/lib/interactions/WebDriverCompositeAction.php b/lib/WebDriverCompositeAction.php
similarity index 97%
rename from lib/interactions/WebDriverCompositeAction.php
rename to lib/WebDriverCompositeAction.php
index 261dde15d..de80c787f 100644
--- a/lib/interactions/WebDriverCompositeAction.php
+++ b/lib/WebDriverCompositeAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An action for aggregating actions and triggering all of them afterwards.
diff --git a/lib/interactions/internal/WebDriverContextClickAction.php b/lib/WebDriverContextClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverContextClickAction.php
rename to lib/WebDriverContextClickAction.php
index e1c3f96ad..5e2638dca 100644
--- a/lib/interactions/internal/WebDriverContextClickAction.php
+++ b/lib/WebDriverContextClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * You can call it 'Right Click' if you like.
diff --git a/lib/interactions/internal/WebDriverCoordinates.php b/lib/WebDriverCoordinates.php
similarity index 94%
rename from lib/interactions/internal/WebDriverCoordinates.php
rename to lib/WebDriverCoordinates.php
index 980051bac..e43b7fb75 100644
--- a/lib/interactions/internal/WebDriverCoordinates.php
+++ b/lib/WebDriverCoordinates.php
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 use Closure;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index a2572ecbf..c66278931 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Represent a dimension.
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 693763b70..ae9e5e8f7 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDispatcher {
 
diff --git a/lib/interactions/internal/WebDriverDoubleClickAction.php b/lib/WebDriverDoubleClickAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverDoubleClickAction.php
rename to lib/WebDriverDoubleClickAction.php
index d720e0d20..15c9e422c 100644
--- a/lib/interactions/internal/WebDriverDoubleClickAction.php
+++ b/lib/WebDriverDoubleClickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/touch/WebDriverDoubleTapAction.php b/lib/WebDriverDoubleTapAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverDoubleTapAction.php
rename to lib/WebDriverDoubleTapAction.php
index c4bf374d6..c2cc7d381 100644
--- a/lib/interactions/touch/WebDriverDoubleTapAction.php
+++ b/lib/WebDriverDoubleTapAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverDownAction.php b/lib/WebDriverDownAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverDownAction.php
rename to lib/WebDriverDownAction.php
index 155e67eef..67fc73e55 100644
--- a/lib/interactions/touch/WebDriverDownAction.php
+++ b/lib/WebDriverDownAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDownAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index e060aa094..d49190604 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface for an HTML element in the WebDriver framework.
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 21c7f9002..4b458f649 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
 
 interface WebDriverEventListener {
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index cb7526a43..ac1924a31 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\StaleElementReferenceException;
+use Facebook\WebDriver\Exception\NoSuchFrameException;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\NoAlertOpenException;
 
 /**
  * Canned ExpectedConditions which are generally useful within webdriver tests.
diff --git a/lib/interactions/touch/WebDriverFlickAction.php b/lib/WebDriverFlickAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverFlickAction.php
rename to lib/WebDriverFlickAction.php
index 8b80cf127..446340718 100644
--- a/lib/interactions/touch/WebDriverFlickAction.php
+++ b/lib/WebDriverFlickAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverFlickAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverFlickFromElementAction.php b/lib/WebDriverFlickFromElementAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverFlickFromElementAction.php
rename to lib/WebDriverFlickFromElementAction.php
index 478b3e0ab..3781d6c0e 100644
--- a/lib/interactions/touch/WebDriverFlickFromElementAction.php
+++ b/lib/WebDriverFlickFromElementAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 67fb80947..76c82dddc 100644
--- a/lib/WebDriverHasInputDevices.php
+++ b/lib/WebDriverHasInputDevices.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface implemented by each driver that allows access to the input devices.
diff --git a/lib/interactions/internal/WebDriverKeyDownAction.php b/lib/WebDriverKeyDownAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverKeyDownAction.php
rename to lib/WebDriverKeyDownAction.php
index 70f5421eb..5d5aa2afe 100644
--- a/lib/interactions/internal/WebDriverKeyDownAction.php
+++ b/lib/WebDriverKeyDownAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
diff --git a/lib/interactions/internal/WebDriverKeyUpAction.php b/lib/WebDriverKeyUpAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverKeyUpAction.php
rename to lib/WebDriverKeyUpAction.php
index 24b5150f3..d41a5a2d8 100644
--- a/lib/interactions/internal/WebDriverKeyUpAction.php
+++ b/lib/WebDriverKeyUpAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index 06e6091dd..042e47108 100644
--- a/lib/WebDriverKeyboard.php
+++ b/lib/WebDriverKeyboard.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 interface WebDriverKeyboard {
 
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 64c76edd3..b946cec9f 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Representations of pressable keys that aren't text.
diff --git a/lib/interactions/internal/WebDriverKeysRelatedAction.php b/lib/WebDriverKeysRelatedAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverKeysRelatedAction.php
rename to lib/WebDriverKeysRelatedAction.php
index 779718496..bcd45f7f7 100644
--- a/lib/interactions/internal/WebDriverKeysRelatedAction.php
+++ b/lib/WebDriverKeysRelatedAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all keyboard-related actions.
diff --git a/lib/internal/WebDriverLocatable.php b/lib/WebDriverLocatable.php
similarity index 96%
rename from lib/internal/WebDriverLocatable.php
rename to lib/WebDriverLocatable.php
index d315387a1..bb2aa9035 100644
--- a/lib/internal/WebDriverLocatable.php
+++ b/lib/WebDriverLocatable.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/interactions/touch/WebDriverLongPressAction.php b/lib/WebDriverLongPressAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverLongPressAction.php
rename to lib/WebDriverLongPressAction.php
index a34de2e10..5fc2b519e 100644
--- a/lib/interactions/touch/WebDriverLongPressAction.php
+++ b/lib/WebDriverLongPressAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverLongPressAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 5b79fcf76..5c90fa199 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing basic mouse operations.
diff --git a/lib/interactions/internal/WebDriverMouseAction.php b/lib/WebDriverMouseAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverMouseAction.php
rename to lib/WebDriverMouseAction.php
index d02b638f4..8c3c1cb2a 100644
--- a/lib/interactions/internal/WebDriverMouseAction.php
+++ b/lib/WebDriverMouseAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all mouse-related actions.
diff --git a/lib/interactions/internal/WebDriverMouseMoveAction.php b/lib/WebDriverMouseMoveAction.php
similarity index 96%
rename from lib/interactions/internal/WebDriverMouseMoveAction.php
rename to lib/WebDriverMouseMoveAction.php
index 01e5c28bf..b24948daf 100644
--- a/lib/interactions/internal/WebDriverMouseMoveAction.php
+++ b/lib/WebDriverMouseMoveAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
diff --git a/lib/interactions/touch/WebDriverMoveAction.php b/lib/WebDriverMoveAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverMoveAction.php
rename to lib/WebDriverMoveAction.php
index dae6e8ef1..32c324de7 100644
--- a/lib/interactions/touch/WebDriverMoveAction.php
+++ b/lib/WebDriverMoveAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMoveAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/internal/WebDriverMoveToOffsetAction.php b/lib/WebDriverMoveToOffsetAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverMoveToOffsetAction.php
rename to lib/WebDriverMoveToOffsetAction.php
index bdf41629e..fe1b0bfc2 100644
--- a/lib/interactions/internal/WebDriverMoveToOffsetAction.php
+++ b/lib/WebDriverMoveToOffsetAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 75baa18d5..f572b6f92 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An abstraction allowing the driver to access the browser's history and to
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 10f59d937..d673603b2 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use InvalidArgumentException;
 
 /**
  * Managing stuff you would do in a browser.
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index a16a4cb2a..4954bf56e 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The platforms supported by WebDriver.
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index ae8dbd667..0653eb988 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Represent a point.
diff --git a/lib/remote/WebDriverResponse.php b/lib/WebDriverResponse.php
similarity index 98%
rename from lib/remote/WebDriverResponse.php
rename to lib/WebDriverResponse.php
index 71b934074..a2d4dd244 100644
--- a/lib/remote/WebDriverResponse.php
+++ b/lib/WebDriverResponse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverResponse {
 
diff --git a/lib/interactions/touch/WebDriverScrollAction.php b/lib/WebDriverScrollAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverScrollAction.php
rename to lib/WebDriverScrollAction.php
index 817ed26aa..e7e183b31 100644
--- a/lib/interactions/touch/WebDriverScrollAction.php
+++ b/lib/WebDriverScrollAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverScrollAction
   extends WebDriverTouchAction
diff --git a/lib/interactions/touch/WebDriverScrollFromElementAction.php b/lib/WebDriverScrollFromElementAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverScrollFromElementAction.php
rename to lib/WebDriverScrollFromElementAction.php
index 96109712a..63be82c48 100644
--- a/lib/interactions/touch/WebDriverScrollFromElementAction.php
+++ b/lib/WebDriverScrollFromElementAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 17f3417a4..07f7bbccc 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 85aabe832..cebeba364 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\UnexpectedTagNameException;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
diff --git a/lib/interactions/internal/WebDriverSendKeysAction.php b/lib/WebDriverSendKeysAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverSendKeysAction.php
rename to lib/WebDriverSendKeysAction.php
index 889a2f91b..9b371a551 100644
--- a/lib/interactions/internal/WebDriverSendKeysAction.php
+++ b/lib/WebDriverSendKeysAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/interactions/internal/WebDriverSingleKeyAction.php b/lib/WebDriverSingleKeyAction.php
similarity index 97%
rename from lib/interactions/internal/WebDriverSingleKeyAction.php
rename to lib/WebDriverSingleKeyAction.php
index 5b6c3c62d..a9280afe1 100644
--- a/lib/interactions/internal/WebDriverSingleKeyAction.php
+++ b/lib/WebDriverSingleKeyAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/interactions/touch/WebDriverTapAction.php b/lib/WebDriverTapAction.php
similarity index 96%
rename from lib/interactions/touch/WebDriverTapAction.php
rename to lib/WebDriverTapAction.php
index b61056e99..27ef9627f 100644
--- a/lib/interactions/touch/WebDriverTapAction.php
+++ b/lib/WebDriverTapAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 53efb59ca..86e0939b8 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Used to locate a given frame or window.
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index f4732f708..aac26c146 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Managing timeout behavior for WebDriver instances.
diff --git a/lib/interactions/touch/WebDriverTouchAction.php b/lib/WebDriverTouchAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverTouchAction.php
rename to lib/WebDriverTouchAction.php
index a885467fe..06ba9fdab 100644
--- a/lib/interactions/touch/WebDriverTouchAction.php
+++ b/lib/WebDriverTouchAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Base class for all touch-related actions.
diff --git a/lib/interactions/WebDriverTouchActions.php b/lib/WebDriverTouchActions.php
similarity index 99%
rename from lib/interactions/WebDriverTouchActions.php
rename to lib/WebDriverTouchActions.php
index 83281e839..a223f269d 100644
--- a/lib/interactions/WebDriverTouchActions.php
+++ b/lib/WebDriverTouchActions.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * WebDriver action builder for touch events
diff --git a/lib/interactions/WebDriverTouchScreen.php b/lib/WebDriverTouchScreen.php
similarity index 99%
rename from lib/interactions/WebDriverTouchScreen.php
rename to lib/WebDriverTouchScreen.php
index be9a2474a..46f989013 100644
--- a/lib/interactions/WebDriverTouchScreen.php
+++ b/lib/WebDriverTouchScreen.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * Interface representing touch screen operations.
diff --git a/lib/interactions/touch/WebDriverUpAction.php b/lib/WebDriverUpAction.php
similarity index 97%
rename from lib/interactions/touch/WebDriverUpAction.php
rename to lib/WebDriverUpAction.php
index 8745eb4c7..9e0035d1a 100644
--- a/lib/interactions/touch/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverUpAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index c4264f49a..3ee5cb46f 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\TimeOutException;
 
 /**
  * A utility class, designed to help the user to wait until a condition turns
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index b4f649b77..c29deb06c 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
+use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
 
 /**
  * An abstraction allowing the driver to manipulate the browser's window
diff --git a/lib/__init__.php b/lib/__init__.php
deleted file mode 100755
index 55219b491..000000000
--- a/lib/__init__.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
-
-// interface
-require_once('WebDriverSearchContext.php');
-require_once('JavaScriptExecutor.php');
-require_once('WebDriver.php');
-require_once('WebDriverElement.php');
-require_once('WebDriverCommandExecutor.php');
-require_once('WebDriverAction.php');
-require_once('WebDriverEventListener.php');
-require_once('remote/FileDetector.php');
-require_once('WebDriverCapabilities.php');
-require_once('remote/ExecuteMethod.php');
-require_once('WebDriverTargetLocator.php');
-
-// abstract class
-require_once('interactions/internal/WebDriverKeysRelatedAction.php');
-require_once('interactions/internal/WebDriverSingleKeyAction.php');
-
-require_once('remote/WebDriverCommand.php');
-
-require_once('net/URLChecker.php');
-
-// class
-require_once('WebDriverAlert.php');
-require_once('WebDriverBy.php');
-require_once('WebDriverDimension.php');
-require_once('WebDriverExceptions.php');
-require_once('WebDriverExpectedCondition.php');
-require_once('WebDriverHasInputDevices.php');
-require_once('WebDriverKeys.php');
-require_once('WebDriverNavigation.php');
-require_once('WebDriverMouse.php');
-require_once('WebDriverKeyboard.php');
-require_once('WebDriverOptions.php');
-require_once('WebDriverPlatform.php');
-require_once('WebDriverPoint.php');
-require_once('WebDriverSelect.php');
-require_once('WebDriverTimeouts.php');
-require_once('WebDriverWait.php');
-require_once('WebDriverWindow.php');
-require_once('interactions/WebDriverActions.php');
-require_once('interactions/internal/WebDriverMouseAction.php');
-require_once('interactions/WebDriverCompositeAction.php');
-require_once('interactions/internal/WebDriverButtonReleaseAction.php');
-require_once('interactions/internal/WebDriverClickAction.php');
-require_once('interactions/internal/WebDriverClickAndHoldAction.php');
-require_once('interactions/internal/WebDriverContextClickAction.php');
-require_once('interactions/internal/WebDriverCoordinates.php');
-require_once('interactions/internal/WebDriverDoubleClickAction.php');
-require_once('interactions/internal/WebDriverMouseMoveAction.php');
-require_once('interactions/internal/WebDriverMoveToOffsetAction.php');
-require_once('internal/WebDriverLocatable.php');
-require_once('chrome/ChromeOptions.php');
-require_once('firefox/FirefoxDriver.php');
-require_once('firefox/FirefoxProfile.php');
-require_once('remote/DriverCommand.php');
-require_once('remote/LocalFileDetector.php');
-require_once('remote/UselessFileDetector.php');
-require_once('remote/RemoteMouse.php');
-require_once('remote/RemoteKeyboard.php');
-
-require_once('remote/service/DriverService.php');
-require_once('chrome/ChromeDriverService.php');
-
-require_once('remote/RemoteWebDriver.php');
-require_once('chrome/ChromeDriver.php');
-
-require_once('remote/RemoteWebElement.php');
-require_once('remote/RemoteExecuteMethod.php');
-require_once('remote/WebDriverBrowserType.php');
-require_once('remote/WebDriverCapabilityType.php');
-require_once('remote/DesiredCapabilities.php');
-require_once('remote/WebDriverResponse.php');
-require_once('remote/RemoteTargetLocator.php');
-
-require_once('remote/HttpCommandExecutor.php');
-require_once('remote/service/DriverCommandExecutor.php');
-
-require_once('interactions/internal/WebDriverSendKeysAction.php');
-require_once('interactions/internal/WebDriverKeyDownAction.php');
-require_once('interactions/internal/WebDriverKeyUpAction.php');
-
-require_once('support/events/EventFiringWebDriver.php');
-require_once('support/events/EventFiringWebDriverNavigation.php');
-require_once('WebDriverDispatcher.php');
-require_once('support/events/EventFiringWebElement.php');
-
-// touch
-require_once('interactions/WebDriverTouchScreen.php');
-require_once('remote/RemoteTouchScreen.php');
-require_once('interactions/WebDriverTouchActions.php');
-require_once('interactions/touch/WebDriverTouchAction.php');
-require_once('interactions/touch/WebDriverDoubleTapAction.php');
-require_once('interactions/touch/WebDriverDownAction.php');
-require_once('interactions/touch/WebDriverFlickAction.php');
-require_once('interactions/touch/WebDriverFlickFromElementAction.php');
-require_once('interactions/touch/WebDriverLongPressAction.php');
-require_once('interactions/touch/WebDriverMoveAction.php');
-require_once('interactions/touch/WebDriverScrollAction.php');
-require_once('interactions/touch/WebDriverScrollFromElementAction.php');
-require_once('interactions/touch/WebDriverTapAction.php');
-require_once('interactions/touch/WebDriverUpAction.php');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 28437e38b..c12f2a118 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
-require_once __DIR__ . '/../lib/__init__.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index b74d27d77..351db6ed2 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class BaseTest extends WebDriverTestCase {
   
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 7f09aa8f0..8e7289973 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * An example test case for php-webdriver.
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index e4ef9db7c..2c0793815 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 /**
  * The base class for test cases.
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 80da4bb38..77ad6b219 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -1,5 +1,5 @@
 <?php
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 require_once __DIR__ . '/../../lib/__init__.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 2b489ff8c..645a85963 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index ca60ae668..fd1ece96f 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index 78781fae6..bf9a4cdea 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index ece8f3488..2ca80a538 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index f339e5044..a7fa52549 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index ae45d169b..bae50645d 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index 0cc5cb5cd..af9ce8e0e 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -26,9 +26,9 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -37,7 +37,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index daf7bfc06..98d4cf27d 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -26,9 +26,9 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -38,7 +38,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index 2c6ee400e..bbd306640 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +34,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index c6066d051..3fbc3b130 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -25,8 +25,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -36,7 +36,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 6a51f8934..77fd71587 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Selenium\WebDriver;
+namespace Facebook\WebDriver;
 
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
@@ -27,9 +27,9 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   private $keys;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Selenium\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Selenium\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Selenium\WebDriver\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
+    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -40,7 +40,7 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Selenium\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From b4151c3041a816acbb303fe55c5cbf04ce3145e3 Mon Sep 17 00:00:00 2001
From: Janos Pasztor <janos@pasztor.at>
Date: Tue, 19 May 2015 12:29:22 +0200
Subject: [PATCH 157/784] Issue facebook/php-webdriver#212 - Moved classes to
 subnamespaces (needs manual testing)

---
 example.php                                   |  3 ++
 lib/{ => Chrome}/ChromeDriver.php             | 25 +++++++++--
 lib/{ => Chrome}/ChromeDriverService.php      |  4 +-
 lib/{ => Chrome}/ChromeOptions.php            |  4 +-
 lib/Exception/WebDriverException.php          | 41 ++++++++++++++++++-
 lib/{ => Firefox}/FirefoxDriver.php           |  2 +-
 lib/{ => Firefox}/FirefoxProfile.php          |  8 +++-
 .../WebDriverButtonReleaseAction.php          |  4 +-
 .../Internal}/WebDriverClickAction.php        |  4 +-
 .../Internal}/WebDriverClickAndHoldAction.php |  4 +-
 .../Internal}/WebDriverContextClickAction.php |  4 +-
 .../Internal}/WebDriverCoordinates.php        |  4 +-
 .../Internal}/WebDriverDoubleClickAction.php  |  4 +-
 .../Internal}/WebDriverKeyDownAction.php      |  4 +-
 .../Internal}/WebDriverKeyUpAction.php        |  4 +-
 .../Internal}/WebDriverKeysRelatedAction.php  |  6 ++-
 .../Internal}/WebDriverMouseAction.php        | 12 +++++-
 .../Internal}/WebDriverMouseMoveAction.php    |  4 +-
 .../Internal}/WebDriverMoveToOffsetAction.php |  6 ++-
 .../Internal}/WebDriverSendKeysAction.php     |  7 +++-
 .../Internal}/WebDriverSingleKeyAction.php    |  7 +++-
 .../Touch}/WebDriverDoubleTapAction.php       |  4 +-
 .../Touch}/WebDriverDownAction.php            |  4 +-
 .../Touch}/WebDriverFlickAction.php           |  4 +-
 .../WebDriverFlickFromElementAction.php       |  5 ++-
 .../Touch}/WebDriverLongPressAction.php       |  4 +-
 .../Touch}/WebDriverMoveAction.php            |  4 +-
 .../Touch}/WebDriverScrollAction.php          |  4 +-
 .../WebDriverScrollFromElementAction.php      |  5 ++-
 .../Touch}/WebDriverTapAction.php             |  4 +-
 .../Touch}/WebDriverTouchAction.php           |  5 ++-
 .../Touch}/WebDriverTouchScreen.php           |  4 +-
 lib/{ => Interactions}/WebDriverActions.php   | 15 ++++++-
 .../WebDriverCompositeAction.php              |  4 +-
 .../WebDriverTouchActions.php                 | 16 +++++++-
 lib/Internal/WebDriverLocatable.php           | 29 +++++++++++++
 lib/{ => Net}/URLChecker.php                  |  2 +-
 lib/{ => Remote}/DesiredCapabilities.php      |  7 +++-
 lib/{ => Remote}/DriverCommand.php            |  2 +-
 lib/{ => Remote}/ExecuteMethod.php            |  4 +-
 lib/{ => Remote}/FileDetector.php             |  2 +-
 lib/{ => Remote}/HttpCommandExecutor.php      |  7 +++-
 lib/{ => Remote}/LocalFileDetector.php        |  4 +-
 lib/{ => Remote}/RemoteExecuteMethod.php      |  2 +-
 lib/{ => Remote}/RemoteKeyboard.php           |  5 ++-
 lib/{ => Remote}/RemoteMouse.php              |  5 ++-
 lib/{ => Remote}/RemoteTargetLocator.php      |  7 +++-
 lib/{ => Remote}/RemoteTouchScreen.php        |  5 ++-
 lib/{ => Remote}/RemoteWebDriver.php          | 12 +++++-
 lib/{ => Remote}/RemoteWebElement.php         |  9 +++-
 .../Service}/DriverCommandExecutor.php        | 10 ++++-
 lib/{ => Remote/Service}/DriverService.php    |  3 +-
 lib/{ => Remote}/UselessFileDetector.php      |  2 +-
 lib/{ => Remote}/WebDriverBrowserType.php     |  2 +-
 lib/{ => Remote}/WebDriverCapabilityType.php  |  2 +-
 lib/{ => Remote}/WebDriverCommand.php         |  2 +-
 lib/{ => Remote}/WebDriverResponse.php        |  2 +-
 .../Events}/EventFiringWebDriver.php          | 11 ++++-
 .../EventFiringWebDriverNavigation.php        |  4 +-
 .../Events}/EventFiringWebElement.php         |  9 +++-
 lib/WebDriverAlert.php                        |  2 +
 lib/WebDriverCommandExecutor.php              |  3 ++
 lib/WebDriverDispatcher.php                   |  2 +
 lib/WebDriverEventListener.php                |  2 +
 lib/WebDriverExpectedCondition.php            |  1 +
 lib/WebDriverLocatable.php                    | 27 ------------
 lib/WebDriverMouse.php                        |  2 +
 lib/WebDriverNavigation.php                   |  3 ++
 lib/WebDriverOptions.php                      |  3 ++
 lib/WebDriverSelect.php                       |  1 +
 lib/WebDriverTimeouts.php                     |  2 +
 lib/WebDriverUpAction.php                     |  3 ++
 lib/WebDriverWait.php                         |  6 +++
 lib/WebDriverWindow.php                       |  2 +
 tests/functional/FileUploadTest.php           |  2 +
 tests/functional/WebDriverTestCase.php        |  4 ++
 tests/unit/bootstrap.php                      |  2 +-
 .../WebDriverButtonReleaseActionTest.php      |  7 +++-
 .../internal/WebDriverClickActionTest.php     |  7 +++-
 .../WebDriverClickAndHoldActionTest.php       |  7 +++-
 .../WebDriverContextClickActionTest.php       |  7 +++-
 .../internal/WebDriverCoordinatesTest.php     |  2 +
 .../WebDriverDoubleClickActionTest.php        |  7 +++-
 .../internal/WebDriverKeyDownActionTest.php   |  8 +++-
 .../internal/WebDriverKeyUpActionTest.php     |  8 +++-
 .../internal/WebDriverMouseMoveActionTest.php |  8 +++-
 .../WebDriverMouseToOffsetActionTest.php      |  8 +++-
 .../internal/WebDriverSendKeysActionTest.php  |  8 +++-
 88 files changed, 424 insertions(+), 112 deletions(-)
 rename lib/{ => Chrome}/ChromeDriver.php (72%)
 rename lib/{ => Chrome}/ChromeDriverService.php (92%)
 rename lib/{ => Chrome}/ChromeOptions.php (97%)
 rename lib/{ => Firefox}/FirefoxDriver.php (94%)
 rename lib/{ => Firefox}/FirefoxProfile.php (96%)
 rename lib/{ => Interactions/Internal}/WebDriverButtonReleaseAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverClickAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverClickAndHoldAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverContextClickAction.php (90%)
 rename lib/{ => Interactions/Internal}/WebDriverCoordinates.php (92%)
 rename lib/{ => Interactions/Internal}/WebDriverDoubleClickAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeyDownAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeyUpAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverKeysRelatedAction.php (88%)
 rename lib/{ => Interactions/Internal}/WebDriverMouseAction.php (85%)
 rename lib/{ => Interactions/Internal}/WebDriverMouseMoveAction.php (89%)
 rename lib/{ => Interactions/Internal}/WebDriverMoveToOffsetAction.php (87%)
 rename lib/{ => Interactions/Internal}/WebDriverSendKeysAction.php (84%)
 rename lib/{ => Interactions/Internal}/WebDriverSingleKeyAction.php (81%)
 rename lib/{ => Interactions/Touch}/WebDriverDoubleTapAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverDownAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverFlickAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverFlickFromElementAction.php (91%)
 rename lib/{ => Interactions/Touch}/WebDriverLongPressAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverMoveAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverScrollAction.php (92%)
 rename lib/{ => Interactions/Touch}/WebDriverScrollFromElementAction.php (90%)
 rename lib/{ => Interactions/Touch}/WebDriverTapAction.php (89%)
 rename lib/{ => Interactions/Touch}/WebDriverTouchAction.php (89%)
 rename lib/{ => Interactions/Touch}/WebDriverTouchScreen.php (97%)
 rename lib/{ => Interactions}/WebDriverActions.php (88%)
 rename lib/{ => Interactions}/WebDriverCompositeAction.php (94%)
 rename lib/{ => Interactions}/WebDriverTouchActions.php (81%)
 create mode 100644 lib/Internal/WebDriverLocatable.php
 rename lib/{ => Net}/URLChecker.php (98%)
 rename lib/{ => Remote}/DesiredCapabilities.php (96%)
 rename lib/{ => Remote}/DriverCommand.php (99%)
 rename lib/{ => Remote}/ExecuteMethod.php (90%)
 rename lib/{ => Remote}/FileDetector.php (96%)
 rename lib/{ => Remote}/HttpCommandExecutor.php (99%)
 rename lib/{ => Remote}/LocalFileDetector.php (91%)
 rename lib/{ => Remote}/RemoteExecuteMethod.php (96%)
 rename lib/{ => Remote}/RemoteKeyboard.php (93%)
 rename lib/{ => Remote}/RemoteMouse.php (95%)
 rename lib/{ => Remote}/RemoteTargetLocator.php (93%)
 rename lib/{ => Remote}/RemoteTouchScreen.php (96%)
 rename lib/{ => Remote}/RemoteWebDriver.php (96%)
 rename lib/{ => Remote}/RemoteWebElement.php (96%)
 rename lib/{ => Remote/Service}/DriverCommandExecutor.php (85%)
 rename lib/{ => Remote/Service}/DriverService.php (97%)
 rename lib/{ => Remote}/UselessFileDetector.php (95%)
 rename lib/{ => Remote}/WebDriverBrowserType.php (97%)
 rename lib/{ => Remote}/WebDriverCapabilityType.php (97%)
 rename lib/{ => Remote}/WebDriverCommand.php (96%)
 rename lib/{ => Remote}/WebDriverResponse.php (97%)
 rename lib/{ => Support/Events}/EventFiringWebDriver.php (95%)
 rename lib/{ => Support/Events}/EventFiringWebDriverNavigation.php (96%)
 rename lib/{ => Support/Events}/EventFiringWebElement.php (95%)
 delete mode 100644 lib/WebDriverLocatable.php

diff --git a/example.php b/example.php
index b4834146c..556a100a0 100644
--- a/example.php
+++ b/example.php
@@ -3,6 +3,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
 require_once('vendor/autoload.php');
 
 // start Firefox with 5 second timeout
diff --git a/lib/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
similarity index 72%
rename from lib/ChromeDriver.php
rename to lib/Chrome/ChromeDriver.php
index 3fb84ad58..67427205d 100644
--- a/lib/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -13,9 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverCommand;
 
 class ChromeDriver extends RemoteWebDriver {
 
@@ -49,10 +54,14 @@ public function startSession($desired_capabilities) {
   }
 
   /**
-   * @param string $url The url of the remote server
+   * Always throws an exception. Use ChromeDriver::start() instead.
+   *
+   * @param string              $url                  The url of the remote server
    * @param DesiredCapabilities $desired_capabilities The desired capabilities
-   * @param int|null $connection_timeout_in_ms
-   * @param int|null $request_timeout_in_ms
+   * @param int|null            $timeout_in_ms
+   * @param int|null            $request_timeout_in_ms
+   *
+   * @throws WebDriverException
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
@@ -63,6 +72,14 @@ public static function create(
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }
 
+  /**
+   * Always throws an exception. Use ChromeDriver::start() instead.
+   *
+   * @param string $session_id The existing session id
+   * @param string $url        The url of the remote server
+   *
+   * @throws WebDriverException
+   */
   public static function createBySessionID(
     $session_id,
     $url = 'http://localhost:4444/wd/hub'
diff --git a/lib/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
similarity index 92%
rename from lib/ChromeDriverService.php
rename to lib/Chrome/ChromeDriverService.php
index 9494bfd1a..d60f376a6 100644
--- a/lib/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\Service\DriverService;
 
 class ChromeDriverService extends DriverService {
 
diff --git a/lib/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
similarity index 97%
rename from lib/ChromeOptions.php
rename to lib/Chrome/ChromeOptions.php
index eb2f92e8c..5cc125f56 100644
--- a/lib/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\DesiredCapabilities;
 
 /**
  * The class manages the capabilities in ChromeDriver.
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index af90b7cf7..a23f42103 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -42,9 +42,46 @@ public function getResults() {
    * For $status_code >= 0, they are errors defined in the json wired protocol.
    * For $status_code < 0, they are errors defined in php-webdriver.
    *
-   * @param int $status_code
+   * @param int    $status_code
    * @param string $message
-   * @param mixed $results
+   * @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
    */
   public static function throwException($status_code, $message, $results) {
     switch ($status_code) {
diff --git a/lib/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
similarity index 94%
rename from lib/FirefoxDriver.php
rename to lib/Firefox/FirefoxDriver.php
index 019064e71..8afbe0c2d 100644
--- a/lib/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Firefox;
 
 class FirefoxDriver {
 
diff --git a/lib/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
similarity index 96%
rename from lib/FirefoxProfile.php
rename to lib/Firefox/FirefoxProfile.php
index d72fc06c1..d15d9556e 100644
--- a/lib/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Firefox;
 
 use Facebook\WebDriver\Exception\WebDriverException;
 use RecursiveDirectoryIterator;
@@ -127,7 +127,9 @@ private function installExtension($extension, $profile_dir) {
 
   /**
    * @param string $prefix Prefix of the temp directory.
+   *
    * @return string The path to the temp directory created.
+   * @throws WebDriverException
    */
   private function createTempDirectory($prefix = '') {
     $temp_dir = tempnam('', $prefix);
@@ -142,9 +144,11 @@ private function createTempDirectory($prefix = '') {
   }
 
   /**
-   * @param string $xpi The path to the .xpi extension.
+   * @param string $xpi        The path to the .xpi extension.
    * @param string $target_dir The path to the unzip directory.
+   *
    * @return FirefoxProfile
+   * @throws \Exception
    */
   private function extractTo($xpi, $target_dir) {
     $zip = new ZipArchive();
diff --git a/lib/WebDriverButtonReleaseAction.php b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
similarity index 90%
rename from lib/WebDriverButtonReleaseAction.php
rename to lib/Interactions/Internal/WebDriverButtonReleaseAction.php
index 444632265..a63570ae6 100644
--- a/lib/WebDriverButtonReleaseAction.php
+++ b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * Move to the location and then release the mouse key.
diff --git a/lib/WebDriverClickAction.php b/lib/Interactions/Internal/WebDriverClickAction.php
similarity index 89%
rename from lib/WebDriverClickAction.php
rename to lib/Interactions/Internal/WebDriverClickAction.php
index cc9263c17..f110d34bd 100644
--- a/lib/WebDriverClickAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverClickAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverClickAndHoldAction.php b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
similarity index 90%
rename from lib/WebDriverClickAndHoldAction.php
rename to lib/Interactions/Internal/WebDriverClickAndHoldAction.php
index 6bc8d049b..264d1503f 100644
--- a/lib/WebDriverClickAndHoldAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * Move the the location, click and hold.
diff --git a/lib/WebDriverContextClickAction.php b/lib/Interactions/Internal/WebDriverContextClickAction.php
similarity index 90%
rename from lib/WebDriverContextClickAction.php
rename to lib/Interactions/Internal/WebDriverContextClickAction.php
index 5e2638dca..d431173e9 100644
--- a/lib/WebDriverContextClickAction.php
+++ b/lib/Interactions/Internal/WebDriverContextClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * You can call it 'Right Click' if you like.
diff --git a/lib/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
similarity index 92%
rename from lib/WebDriverCoordinates.php
rename to lib/Interactions/Internal/WebDriverCoordinates.php
index e43b7fb75..89aae19bb 100644
--- a/lib/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -13,10 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
 
 use Closure;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\WebDriverPoint;
 
 /**
  * Interface representing basic mouse operations.
@@ -43,6 +44,7 @@ public function __construct(
 
   /**
    * @return WebDriverPoint
+   * @throws UnsupportedOperationException
    */
   public function onScreen() {
     throw new UnsupportedOperationException(
diff --git a/lib/WebDriverDoubleClickAction.php b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
similarity index 89%
rename from lib/WebDriverDoubleClickAction.php
rename to lib/Interactions/Internal/WebDriverDoubleClickAction.php
index 15c9e422c..218a05b5e 100644
--- a/lib/WebDriverDoubleClickAction.php
+++ b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDoubleClickAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverKeyDownAction.php b/lib/Interactions/Internal/WebDriverKeyDownAction.php
similarity index 89%
rename from lib/WebDriverKeyDownAction.php
rename to lib/Interactions/Internal/WebDriverKeyDownAction.php
index 5d5aa2afe..29350e484 100644
--- a/lib/WebDriverKeyDownAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyDownAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverKeyDownAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeyUpAction.php b/lib/Interactions/Internal/WebDriverKeyUpAction.php
similarity index 89%
rename from lib/WebDriverKeyUpAction.php
rename to lib/Interactions/Internal/WebDriverKeyUpAction.php
index d41a5a2d8..9b89747eb 100644
--- a/lib/WebDriverKeyUpAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyUpAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverKeyUpAction
     extends WebDriverSingleKeyAction
diff --git a/lib/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
similarity index 88%
rename from lib/WebDriverKeysRelatedAction.php
rename to lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index bcd45f7f7..77892cc25 100644
--- a/lib/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
+use Facebook\WebDriver\WebDriverKeyboard;
 
 /**
  * Base class for all keyboard-related actions.
diff --git a/lib/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
similarity index 85%
rename from lib/WebDriverMouseAction.php
rename to lib/Interactions/Internal/WebDriverMouseAction.php
index 8c3c1cb2a..f6a115f43 100644
--- a/lib/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -13,14 +13,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverMouse;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
 
 /**
  * Base class for all mouse-related actions.
  */
 class WebDriverMouseAction {
 
+  /**
+   * @var WebDriverMouse
+   */
   protected $mouse;
+
+  /**
+   * @var WebDriverLocatable
+   */
   protected $locationProvider;
 
   public function __construct(
diff --git a/lib/WebDriverMouseMoveAction.php b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
similarity index 89%
rename from lib/WebDriverMouseMoveAction.php
rename to lib/Interactions/Internal/WebDriverMouseMoveAction.php
index b24948daf..d229904fc 100644
--- a/lib/WebDriverMouseMoveAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverMouseMoveAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
similarity index 87%
rename from lib/WebDriverMoveToOffsetAction.php
rename to lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index fe1b0bfc2..f1e0270f8 100644
--- a/lib/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -13,7 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverMoveToOffsetAction
     extends WebDriverMouseAction
diff --git a/lib/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
similarity index 84%
rename from lib/WebDriverSendKeysAction.php
rename to lib/Interactions/Internal/WebDriverSendKeysAction.php
index 9b371a551..2c9512dd3 100644
--- a/lib/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverSendKeysAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
similarity index 81%
rename from lib/WebDriverSingleKeyAction.php
rename to lib/Interactions/Internal/WebDriverSingleKeyAction.php
index a9280afe1..86cd74936 100644
--- a/lib/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 abstract class WebDriverSingleKeyAction
     extends WebDriverKeysRelatedAction
diff --git a/lib/WebDriverDoubleTapAction.php b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
similarity index 90%
rename from lib/WebDriverDoubleTapAction.php
rename to lib/Interactions/Touch/WebDriverDoubleTapAction.php
index c2cc7d381..92ccfa222 100644
--- a/lib/WebDriverDoubleTapAction.php
+++ b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDoubleTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
similarity index 92%
rename from lib/WebDriverDownAction.php
rename to lib/Interactions/Touch/WebDriverDownAction.php
index 67fc73e55..eb946008f 100644
--- a/lib/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverDownAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
similarity index 92%
rename from lib/WebDriverFlickAction.php
rename to lib/Interactions/Touch/WebDriverFlickAction.php
index 446340718..575c3eb4d 100644
--- a/lib/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverFlickAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
similarity index 91%
rename from lib/WebDriverFlickFromElementAction.php
rename to lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index 3781d6c0e..afd13ab8c 100644
--- a/lib/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverElement;
 
 class WebDriverFlickFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverLongPressAction.php b/lib/Interactions/Touch/WebDriverLongPressAction.php
similarity index 90%
rename from lib/WebDriverLongPressAction.php
rename to lib/Interactions/Touch/WebDriverLongPressAction.php
index 5fc2b519e..c46770d86 100644
--- a/lib/WebDriverLongPressAction.php
+++ b/lib/Interactions/Touch/WebDriverLongPressAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverLongPressAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverMoveAction.php b/lib/Interactions/Touch/WebDriverMoveAction.php
similarity index 92%
rename from lib/WebDriverMoveAction.php
rename to lib/Interactions/Touch/WebDriverMoveAction.php
index 32c324de7..330783271 100644
--- a/lib/WebDriverMoveAction.php
+++ b/lib/Interactions/Touch/WebDriverMoveAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverMoveAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverScrollAction.php b/lib/Interactions/Touch/WebDriverScrollAction.php
similarity index 92%
rename from lib/WebDriverScrollAction.php
rename to lib/Interactions/Touch/WebDriverScrollAction.php
index e7e183b31..8dc1f14b7 100644
--- a/lib/WebDriverScrollAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverScrollAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverScrollFromElementAction.php b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
similarity index 90%
rename from lib/WebDriverScrollFromElementAction.php
rename to lib/Interactions/Touch/WebDriverScrollFromElementAction.php
index 63be82c48..df31f13b0 100644
--- a/lib/WebDriverScrollFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
+use Facebook\WebDriver\WebDriverElement;
 
 class WebDriverScrollFromElementAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTapAction.php b/lib/Interactions/Touch/WebDriverTapAction.php
similarity index 89%
rename from lib/WebDriverTapAction.php
rename to lib/Interactions/Touch/WebDriverTapAction.php
index 27ef9627f..835acc848 100644
--- a/lib/WebDriverTapAction.php
+++ b/lib/Interactions/Touch/WebDriverTapAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverAction;
 
 class WebDriverTapAction
   extends WebDriverTouchAction
diff --git a/lib/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
similarity index 89%
rename from lib/WebDriverTouchAction.php
rename to lib/Interactions/Touch/WebDriverTouchAction.php
index 06ba9fdab..e267f1ab3 100644
--- a/lib/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 
 /**
  * Base class for all touch-related actions.
diff --git a/lib/WebDriverTouchScreen.php b/lib/Interactions/Touch/WebDriverTouchScreen.php
similarity index 97%
rename from lib/WebDriverTouchScreen.php
rename to lib/Interactions/Touch/WebDriverTouchScreen.php
index 46f989013..cb753cd0d 100644
--- a/lib/WebDriverTouchScreen.php
+++ b/lib/Interactions/Touch/WebDriverTouchScreen.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions\Touch;
+
+use Facebook\WebDriver\WebDriverElement;
 
 /**
  * Interface representing touch screen operations.
diff --git a/lib/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
similarity index 88%
rename from lib/WebDriverActions.php
rename to lib/Interactions/WebDriverActions.php
index 37537e2b9..4d8a623d8 100644
--- a/lib/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -13,7 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
diff --git a/lib/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
similarity index 94%
rename from lib/WebDriverCompositeAction.php
rename to lib/Interactions/WebDriverCompositeAction.php
index de80c787f..63d9863d7 100644
--- a/lib/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\WebDriverAction;
 
 /**
  * An action for aggregating actions and triggering all of them afterwards.
diff --git a/lib/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
similarity index 81%
rename from lib/WebDriverTouchActions.php
rename to lib/Interactions/WebDriverTouchActions.php
index a223f269d..ec77242fc 100644
--- a/lib/WebDriverTouchActions.php
+++ b/lib/Interactions/WebDriverTouchActions.php
@@ -13,7 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Interactions;
+
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\Interactions\Touch\WebDriverDoubleTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverFlickAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverFlickFromElementAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverLongPressAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverScrollFromElementAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverDownAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverMoveAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverScrollAction;
+use Facebook\WebDriver\WebDriverUpAction;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * WebDriver action builder for touch events
diff --git a/lib/Internal/WebDriverLocatable.php b/lib/Internal/WebDriverLocatable.php
new file mode 100644
index 000000000..1523c35c0
--- /dev/null
+++ b/lib/Internal/WebDriverLocatable.php
@@ -0,0 +1,29 @@
+<?php
+// copyright 2004-present facebook. all rights reserved.
+//
+// licensed under the apache license, version 2.0 (the "license");
+// you may not use this file except in compliance with the license.
+// you may obtain a copy of the license at
+//
+//   http://www.apache.org/licenses/license-2.0
+//
+// unless required by applicable law or agreed to in writing, software
+// distributed under the license is distributed on an "as is" basis,
+// 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\WebDriver\Internal;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
+/**
+ * interface representing basic mouse operations.
+ */
+interface WebDriverLocatable {
+
+  /**
+   * @return WebDriverCoordinates
+   */
+  public function getCoordinates();
+}
diff --git a/lib/URLChecker.php b/lib/Net/URLChecker.php
similarity index 98%
rename from lib/URLChecker.php
rename to lib/Net/URLChecker.php
index 657488dbf..b41d68c25 100644
--- a/lib/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Net;
 
 use Exception;
 use Facebook\WebDriver\Exception\TimeOutException;
diff --git a/lib/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
similarity index 96%
rename from lib/DesiredCapabilities.php
rename to lib/Remote/DesiredCapabilities.php
index d981f425c..4fe5dfaf4 100644
--- a/lib/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -13,9 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 use Exception;
+use Facebook\WebDriver\Chrome\ChromeOptions;
+use Facebook\WebDriver\Firefox\FirefoxDriver;
+use Facebook\WebDriver\Firefox\FirefoxProfile;
+use Facebook\WebDriver\WebDriverCapabilities;
+use Facebook\WebDriver\WebDriverPlatform;
 
 class DesiredCapabilities implements WebDriverCapabilities {
 
diff --git a/lib/DriverCommand.php b/lib/Remote/DriverCommand.php
similarity index 99%
rename from lib/DriverCommand.php
rename to lib/Remote/DriverCommand.php
index eb29e0d8d..61ad9d515 100644
--- a/lib/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * This list of command defined in the WebDriver json wire protocol.
diff --git a/lib/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
similarity index 90%
rename from lib/ExecuteMethod.php
rename to lib/Remote/ExecuteMethod.php
index f87ac29d8..aa13af5ea 100644
--- a/lib/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Remote\WebDriverResponse;
 
 interface ExecuteMethod {
 
diff --git a/lib/FileDetector.php b/lib/Remote/FileDetector.php
similarity index 96%
rename from lib/FileDetector.php
rename to lib/Remote/FileDetector.php
index 5aeb0dee4..a6e52f48d 100644
--- a/lib/FileDetector.php
+++ b/lib/Remote/FileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 interface FileDetector {
 
diff --git a/lib/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
similarity index 99%
rename from lib/HttpCommandExecutor.php
rename to lib/Remote/HttpCommandExecutor.php
index 4e3bc085f..7ad9092f8 100644
--- a/lib/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -13,8 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\WebDriverCommandExecutor;
 use InvalidArgumentException;
 use BadMethodCallException;
 
@@ -178,7 +180,10 @@ public function setRequestTimeout($timeout_in_ms) {
 
   /**
    * @param WebDriverCommand $command
+   *
    * @return mixed
+   *
+   * @throws WebDriverException
    */
   public function execute(WebDriverCommand $command) {
     if (!isset(self::$commands[$command->getName()])) {
diff --git a/lib/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
similarity index 91%
rename from lib/LocalFileDetector.php
rename to lib/Remote/LocalFileDetector.php
index a9a7488ce..c6d44f78c 100644
--- a/lib/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -13,7 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Remote\FileDetector;
 
 class LocalFileDetector implements FileDetector {
     /**
diff --git a/lib/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
similarity index 96%
rename from lib/RemoteExecuteMethod.php
rename to lib/Remote/RemoteExecuteMethod.php
index 3ab0a60ae..e0ded1032 100644
--- a/lib/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class RemoteExecuteMethod implements ExecuteMethod {
 
diff --git a/lib/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
similarity index 93%
rename from lib/RemoteKeyboard.php
rename to lib/Remote/RemoteKeyboard.php
index d7d3ebbdb..2b297d1d9 100644
--- a/lib/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\WebDriverKeys;
+use Facebook\WebDriver\WebDriverKeyboard;
 
 /**
  * Execute keyboard commands for RemoteWebDriver.
diff --git a/lib/RemoteMouse.php b/lib/Remote/RemoteMouse.php
similarity index 95%
rename from lib/RemoteMouse.php
rename to lib/Remote/RemoteMouse.php
index deb2164fd..c2e0d2263 100644
--- a/lib/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\WebDriverMouse;
 
 /**
  * Execute mouse commands for RemoteWebDriver.
diff --git a/lib/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
similarity index 93%
rename from lib/RemoteTargetLocator.php
rename to lib/Remote/RemoteTargetLocator.php
index c33bd2c71..e2f5a0aea 100644
--- a/lib/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -13,7 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\WebDriverTargetLocator;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverAlert;
+use Facebook\WebDriver\WebDriver;
 
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
diff --git a/lib/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
similarity index 96%
rename from lib/RemoteTouchScreen.php
rename to lib/Remote/RemoteTouchScreen.php
index 3ca3c19bd..7929d5db3 100644
--- a/lib/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -13,7 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\WebDriverElement;
 
 /**
  * Execute touch commands for RemoteWebDriver.
diff --git a/lib/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
similarity index 96%
rename from lib/RemoteWebDriver.php
rename to lib/Remote/RemoteWebDriver.php
index 86d9e0d8b..4f3be385e 100644
--- a/lib/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -13,7 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverCommandExecutor;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverNavigation;
+use Facebook\WebDriver\WebDriverOptions;
+use Facebook\WebDriver\WebDriverWait;
 
 class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
   /**
diff --git a/lib/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
similarity index 96%
rename from lib/RemoteWebElement.php
rename to lib/Remote/RemoteWebElement.php
index 98d6cca07..53fc1e908 100644
--- a/lib/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -13,9 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDimension;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverKeys;
+use Facebook\WebDriver\WebDriverPoint;
 use ZipArchive;
 
 /**
diff --git a/lib/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
similarity index 85%
rename from lib/DriverCommandExecutor.php
rename to lib/Remote/Service/DriverCommandExecutor.php
index 228f21b4d..f4857e933 100644
--- a/lib/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -13,8 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote\Service;
+
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\HttpCommandExecutor;
+use Facebook\WebDriver\Remote\WebDriverCommand;
 
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
@@ -34,9 +38,11 @@ public function __construct(DriverService $service) {
 
   /**
    * @param WebDriverCommand $command
-   * @param array $curl_opts
+   * @param array            $curl_opts
    *
    * @return mixed
+   * @throws WebDriverException
+   * @throws \Exception
    */
   public function execute(WebDriverCommand $command, $curl_opts = array()) {
     if ($command->getName() === DriverCommand::NEW_SESSION) {
diff --git a/lib/DriverService.php b/lib/Remote/Service/DriverService.php
similarity index 97%
rename from lib/DriverService.php
rename to lib/Remote/Service/DriverService.php
index 77384b9d0..09ad7c815 100644
--- a/lib/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -13,9 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote\Service;
 
 use Exception;
+use Facebook\WebDriver\Net\URLChecker;
 
 class DriverService {
 
diff --git a/lib/UselessFileDetector.php b/lib/Remote/UselessFileDetector.php
similarity index 95%
rename from lib/UselessFileDetector.php
rename to lib/Remote/UselessFileDetector.php
index ce4c55fc9..9a8090038 100644
--- a/lib/UselessFileDetector.php
+++ b/lib/Remote/UselessFileDetector.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class UselessFileDetector implements FileDetector {
   /**
diff --git a/lib/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
similarity index 97%
rename from lib/WebDriverBrowserType.php
rename to lib/Remote/WebDriverBrowserType.php
index bbb9a529e..5ab1df391 100644
--- a/lib/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * All the browsers supported by selenium
diff --git a/lib/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
similarity index 97%
rename from lib/WebDriverCapabilityType.php
rename to lib/Remote/WebDriverCapabilityType.php
index 558abb4ab..552db09be 100644
--- a/lib/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver
diff --git a/lib/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
similarity index 96%
rename from lib/WebDriverCommand.php
rename to lib/Remote/WebDriverCommand.php
index 06660dadf..303af3cfb 100644
--- a/lib/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class WebDriverCommand {
 
diff --git a/lib/WebDriverResponse.php b/lib/Remote/WebDriverResponse.php
similarity index 97%
rename from lib/WebDriverResponse.php
rename to lib/Remote/WebDriverResponse.php
index a2d4dd244..d3fcdadcb 100644
--- a/lib/WebDriverResponse.php
+++ b/lib/Remote/WebDriverResponse.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Remote;
 
 class WebDriverResponse {
 
diff --git a/lib/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
similarity index 95%
rename from lib/EventFiringWebDriver.php
rename to lib/Support/Events/EventFiringWebDriver.php
index ebd5b9b7c..d21c224c8 100644
--- a/lib/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -13,10 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverOptions;
+use Facebook\WebDriver\WebDriverTargetLocator;
+use Facebook\WebDriver\WebDriverWait;
 
 class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
 
diff --git a/lib/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
similarity index 96%
rename from lib/EventFiringWebDriverNavigation.php
rename to lib/Support/Events/EventFiringWebDriverNavigation.php
index c3feea060..56341e2c2 100644
--- a/lib/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -13,9 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverNavigation;
 
 class EventFiringWebDriverNavigation {
 
diff --git a/lib/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
similarity index 95%
rename from lib/EventFiringWebElement.php
rename to lib/Support/Events/EventFiringWebElement.php
index a955c59d6..3084ec1b5 100644
--- a/lib/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -13,9 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
+namespace Facebook\WebDriver\Support\Events;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverDimension;
+use Facebook\WebDriver\WebDriverDispatcher;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverPoint;
 
 class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
 
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 2f92ec4c4..8bef6d846 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 5f99a1d16..d58998f70 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\WebDriverCommand;
+
 /**
  * Interface for all command executor.
  */
@@ -22,6 +24,7 @@ interface WebDriverCommandExecutor {
 
   /**
    * @param WebDriverCommand $command
+   *
    * @return mixed
    */
   public function execute(WebDriverCommand $command);
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index ae9e5e8f7..c8caea4d9 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
+
 class WebDriverDispatcher {
 
   /**
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 4b458f649..afea9c0fd 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -16,6 +16,8 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
+use Facebook\WebDriver\Support\Events\EventFiringWebElement;
 
 interface WebDriverEventListener {
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index ac1924a31..3de9a9731 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\StaleElementReferenceException;
 use Facebook\WebDriver\Exception\NoSuchFrameException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
diff --git a/lib/WebDriverLocatable.php b/lib/WebDriverLocatable.php
deleted file mode 100644
index bb2aa9035..000000000
--- a/lib/WebDriverLocatable.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
-
-/**
- * Interface representing basic mouse operations.
- */
-interface WebDriverLocatable {
-
-  /**
-   * @return WebDriverCoordinates
-   */
-  public function getCoordinates();
-}
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 5c90fa199..847bc2cd0 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
 /**
  * Interface representing basic mouse operations.
  */
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index f572b6f92..8dd382dea 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
+
 /**
  * An abstraction allowing the driver to access the browser's history and to
  * navigate to a given URL.
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index d673603b2..9f48b05d1 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -14,6 +14,9 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
 use InvalidArgumentException;
 
 /**
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index cebeba364..80e434caa 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\UnexpectedTagNameException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index aac26c146..2af6882ec 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DriverCommand;
+
 /**
  * Managing timeout behavior for WebDriver instances.
  */
diff --git a/lib/WebDriverUpAction.php b/lib/WebDriverUpAction.php
index 9e0035d1a..2394f41a1 100644
--- a/lib/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+
 class WebDriverUpAction
   extends WebDriverTouchAction
   implements WebDriverAction {
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 3ee5cb46f..4b43b3755 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\TimeOutException;
 
@@ -44,7 +45,12 @@ public function __construct(
    *
    * @param (closure|WebDriverExpectedCondition)
    * @param string $message
+   *
    * @return mixed The return value of $func_or_ec
+
+   * @throws NoSuchElementException
+   * @throws TimeOutException
+   * @throws \Exception
    */
   public function until($func_or_ec, $message = "") {
     $end = microtime(true) + $this->timeout;
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index c29deb06c..dcfa19534 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -14,7 +14,9 @@
 // limitations under the License.
 
 namespace Facebook\WebDriver;
+
 use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
+use Facebook\WebDriver\Remote\DriverCommand;
 
 /**
  * An abstraction allowing the driver to manipulate the browser's window
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 8e7289973..0ab233a14 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\LocalFileDetector;
+
 /**
  * An example test case for php-webdriver.
  * 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 2c0793815..73b3c2b58 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -15,6 +15,10 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use Facebook\WebDriver\Remote\WebDriverCapabilityType;
+
 /**
  * The base class for test cases.
  */
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 77ad6b219..db3b0d958 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -2,4 +2,4 @@
 
 namespace Facebook\WebDriver;
 
-require_once __DIR__ . '/../../lib/__init__.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
index 645a85963..3a4779855 100644
--- a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
+
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverButtonReleaseAction
@@ -26,7 +28,7 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverButtonReleaseAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/interactions/internal/WebDriverClickActionTest.php
index fd1ece96f..07dd8e5c2 100644
--- a/tests/unit/interactions/internal/WebDriverClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
+
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAction
@@ -26,7 +28,7 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
index bf9a4cdea..7bcefd0d5 100644
--- a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
+
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverClickAndHoldAction
@@ -26,7 +28,7 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverClickAndHoldAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
index 2ca80a538..b85a1d7db 100644
--- a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverContextClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverContextClickAction
@@ -26,7 +28,7 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverContextClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
index a7fa52549..6002c58bd 100644
--- a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/interactions/internal/WebDriverCoordinatesTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
     $in_view_port = function() { };
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
index bae50645d..958c2e3cf 100644
--- a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverDoubleClickAction
@@ -26,7 +28,7 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +36,8 @@ public function setUp() {
   }
 
   public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverDoubleClickAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
index af9ce8e0e..2f0ddf593 100644
--- a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyDownAction
@@ -28,7 +30,8 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -37,7 +40,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
index 98d4cf27d..51c3a9548 100644
--- a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
+
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverKeyUpAction
@@ -28,7 +30,8 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
       $this->webDriverMouse,
@@ -38,7 +41,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
index bbd306640..1b8f89f78 100644
--- a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
+
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMouseMoveAction
@@ -26,7 +28,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
       $this->locationProvider
@@ -34,7 +37,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMouseMoveAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
index 3fbc3b130..cca46496d 100644
--- a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
@@ -26,7 +28,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
 
   public function setUp() {
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
       $this->locationProvider,
@@ -36,7 +39,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
     $this->webDriverMoveToOffsetAction->perform();
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
index 77fd71587..e5782b9c3 100644
--- a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
+
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverSendKeysAction
@@ -29,7 +31,8 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   public function setUp() {
     $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
     $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\WebDriverLocatable');
+    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
       $this->webDriverKeyboard,
@@ -40,7 +43,8 @@ public function setUp() {
   }
 
   public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\WebDriverCoordinates')->disableOriginalConstructor()->getMock();
+    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+      ->disableOriginalConstructor()->getMock();
     $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
     $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
     $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));

From 647442075fb9395b61b8ba3d52369d9b351340f4 Mon Sep 17 00:00:00 2001
From: 0x20h <kohj@informatik.uni-marburg.de>
Date: Tue, 19 May 2015 23:26:21 +0200
Subject: [PATCH 158/784] test setup

- moved phpunit to project directory and renamed to standard .dist
- removed namespace from bootstrap.php
- removed unnecessary bootstrap/phpunit config from tests/unit
- moved tests/unit files
---
 .travis.yml                                   | 15 ++++++++++-
 README.md                                     | 10 +++-----
 composer.json                                 | 13 +++++++---
 tests/unit/phpunit.xml => phpunit.xml.dist    | 10 +++++---
 tests/bootstrap.php                           |  4 ---
 tests/phpunit.xml                             | 25 -------------------
 .../WebDriverButtonReleaseActionTest.php      |  0
 .../WebDriverClickActionTest.php              |  0
 .../WebDriverClickAndHoldActionTest.php       |  0
 .../WebDriverContextClickActionTest.php       |  0
 .../WebDriverCoordinatesTest.php              |  0
 .../WebDriverDoubleClickActionTest.php        |  0
 .../WebDriverKeyDownActionTest.php            |  0
 .../WebDriverKeyUpActionTest.php              |  0
 .../WebDriverMouseMoveActionTest.php          |  0
 .../WebDriverMouseToOffsetActionTest.php      |  0
 .../WebDriverSendKeysActionTest.php           |  0
 tests/unit/bootstrap.php                      |  5 ----
 18 files changed, 34 insertions(+), 48 deletions(-)
 rename tests/unit/phpunit.xml => phpunit.xml.dist (69%)
 delete mode 100644 tests/phpunit.xml
 rename tests/unit/{interactions/internal => }/WebDriverButtonReleaseActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverClickAndHoldActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverContextClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverCoordinatesTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverDoubleClickActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverKeyDownActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverKeyUpActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverMouseMoveActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverMouseToOffsetActionTest.php (100%)
 rename tests/unit/{interactions/internal => }/WebDriverSendKeysActionTest.php (100%)
 delete mode 100644 tests/unit/bootstrap.php

diff --git a/.travis.yml b/.travis.yml
index 1342b9d4b..8b74804b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,21 @@
 language: php
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - hhvm
 
-script: phpunit -c ./tests/unit
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
+  - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
+  - sleep 3
+
+script: ./vendor/bin/phpunit
+
+after_script:
+  - cat selenium.log
diff --git a/README.md b/README.md
index 657d6ad73..d5272c4f4 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 php-webdriver -- WebDriver bindings for PHP
 ===========================================
 
-Attention! This is a fork of facebook/webdriver and has been altered to include namespacing to avoid naming collisions.
-
 ##  DESCRIPTION
 
 This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
@@ -19,11 +17,11 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
     git clone git@github.com:facebook/php-webdriver.git
 
 ### Packagist
-Add the dependency. https://packagist.org/packages/janoszen/webdriver
+Add the dependency. https://packagist.org/packages/facebook/webdriver
 
     {
       "require": {
-        "janoszen/webdriver": "dev-master"
+        "facebook/webdriver": "dev-master"
       }
     }
     
@@ -100,8 +98,8 @@ If you're reading this you've already found our Github repository. If you have a
 
 We love to have your help to make php-webdriver better. Feel free to 
 
-*   open an [issue](https://github.com/janoszen/php-webdriver/issues) if you run into any problem. 
-*   fork the project and submit [pull request](https://github.com/janoszen/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
+*   open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem. 
+*   fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
diff --git a/composer.json b/composer.json
index 7b57541f4..53e36c14d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,22 @@
 {
   "name": "facebook/webdriver",
   "description": "A php client for WebDriver",
-  "keywords": ["webdriver", "selenium", "php"],
+  "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
   "license": "Apache-2.0",
   "support": {
     "issues": "https://github.com/facebook/php-webdriver/issues",
+    "forum": "https://www.facebook.com/groups/phpwebdriver/",
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
     "php": ">=5.3.19"
   },
   "require-dev": {
-    "phpunit/phpunit": "3.7.*",
+    "phpunit/phpunit": "3.7.*"
+  },
+  "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"
   },
   "autoload": {
@@ -21,5 +24,9 @@
 		"Facebook\\WebDriver\\": "lib/"
 	}
   },
-  "minimum-stability": "dev"
+  "autoload-dev": {
+    "psr-4": {
+      "Facebook\\WebDriver\\": "tests/functional"
+    }
+  }
 }
diff --git a/tests/unit/phpunit.xml b/phpunit.xml.dist
similarity index 69%
rename from tests/unit/phpunit.xml
rename to phpunit.xml.dist
index 0338c9327..4dfdec0a7 100644
--- a/tests/unit/phpunit.xml
+++ b/phpunit.xml.dist
@@ -11,12 +11,14 @@
         processIsolation            = "false"
         stopOnFailure               = "false"
         syntaxCheck                 = "false"
-        bootstrap                   = "bootstrap.php" >
+        bootstrap                   = "tests/bootstrap.php" >
 
     <testsuites>
-        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
-            <directory>../unit</directory>
+        <testsuite name="Unit-Testsuite">
+            <directory>tests/unit</directory>
+        </testsuite>
+        <testsuite name="Functional-Testsuite">
+            <directory>tests/functional/</directory>
         </testsuite>
     </testsuites>
-
 </phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c12f2a118..f9e62ac66 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,6 +1,2 @@
 <?php
-
-namespace Facebook\WebDriver;
-
 require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/functional/WebDriverTestCase.php';
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index 88bf4dbde..000000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-        backupGlobals               = "false"
-        backupStaticAttributes      = "false"
-        colors                      = "true"
-        convertErrorsToExceptions   = "true"
-        convertNoticesToExceptions  = "true"
-        convertWarningsToExceptions = "true"
-        processIsolation            = "false"
-        stopOnFailure               = "false"
-        syntaxCheck                 = "false"
-        bootstrap                   = "bootstrap.php" >
-
-    <testsuites>
-        <testsuite name="Facebook PHP-Webdriver Unit Testsuite">
-            <directory>./unit</directory>
-        </testsuite>
-        <testsuite name="Facebook PHP-Webdriver Functional Testsuite">
-            <directory>./functional</directory>
-        </testsuite>
-    </testsuites>
-
-</phpunit>
diff --git a/tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php b/tests/unit/WebDriverButtonReleaseActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverButtonReleaseActionTest.php
rename to tests/unit/WebDriverButtonReleaseActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverClickActionTest.php b/tests/unit/WebDriverClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverClickActionTest.php
rename to tests/unit/WebDriverClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php b/tests/unit/WebDriverClickAndHoldActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverClickAndHoldActionTest.php
rename to tests/unit/WebDriverClickAndHoldActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverContextClickActionTest.php b/tests/unit/WebDriverContextClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverContextClickActionTest.php
rename to tests/unit/WebDriverContextClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverCoordinatesTest.php b/tests/unit/WebDriverCoordinatesTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverCoordinatesTest.php
rename to tests/unit/WebDriverCoordinatesTest.php
diff --git a/tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php b/tests/unit/WebDriverDoubleClickActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverDoubleClickActionTest.php
rename to tests/unit/WebDriverDoubleClickActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverKeyDownActionTest.php b/tests/unit/WebDriverKeyDownActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverKeyDownActionTest.php
rename to tests/unit/WebDriverKeyDownActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverKeyUpActionTest.php b/tests/unit/WebDriverKeyUpActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverKeyUpActionTest.php
rename to tests/unit/WebDriverKeyUpActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php b/tests/unit/WebDriverMouseMoveActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverMouseMoveActionTest.php
rename to tests/unit/WebDriverMouseMoveActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/WebDriverMouseToOffsetActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverMouseToOffsetActionTest.php
rename to tests/unit/WebDriverMouseToOffsetActionTest.php
diff --git a/tests/unit/interactions/internal/WebDriverSendKeysActionTest.php b/tests/unit/WebDriverSendKeysActionTest.php
similarity index 100%
rename from tests/unit/interactions/internal/WebDriverSendKeysActionTest.php
rename to tests/unit/WebDriverSendKeysActionTest.php
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
deleted file mode 100644
index db3b0d958..000000000
--- a/tests/unit/bootstrap.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace Facebook\WebDriver;
-
-require_once __DIR__ . '/../../vendor/autoload.php';

From 9ecb7bdf2cf8e9080f718ac7e1ebdb5ed4f3dd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1nos=20P=C3=A1sztor?= <business@janoszen.com>
Date: Wed, 20 May 2015 00:22:27 +0200
Subject: [PATCH 159/784] Changed code formating for composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 53e36c14d..486f17678 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
   },
   "autoload": {
     "psr-4": {
-		"Facebook\\WebDriver\\": "lib/"
-	}
+      "Facebook\\WebDriver\\": "lib/"
+    }
   },
   "autoload-dev": {
     "psr-4": {

From 2e80326a1ccf093cf2ddbdb43287917d0206b528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 20 May 2015 02:02:10 +0200
Subject: [PATCH 160/784] Upgrade PHPUnit to latest 4.6

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 486f17678..8d4095415 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook/webdriver",
-  "description": "A php client for WebDriver",
+  "description": "A PHP client for WebDriver",
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
@@ -14,7 +14,7 @@
     "php": ">=5.3.19"
   },
   "require-dev": {
-    "phpunit/phpunit": "3.7.*"
+    "phpunit/phpunit": "4.6.*"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"

From 617d041962a2e31997f3b8535e8b7d39cd96ea13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 20 May 2015 02:02:46 +0200
Subject: [PATCH 161/784] Run tests on PHP 5.6 and PHP 7

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8b74804b4..a54d35732 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,15 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7
   - hhvm
 
-before_script:
+install:
   - composer self-update
   - composer install --no-interaction --prefer-source
+
+before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar

From dabaf2c24cad52c86f2bca787d7b7fab68e00ace Mon Sep 17 00:00:00 2001
From: 0x20h <kohj@informatik.uni-marburg.de>
Date: Fri, 22 May 2015 21:59:45 +0200
Subject: [PATCH 162/784] Fix flaky build.

Just wait until we can connect to the server, then start the tests.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a54d35732..e973cacd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
   - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
-  - sleep 3
+  - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done;
 
 script: ./vendor/bin/phpunit
 

From 7ea23b83df640ab93a25d12476480852add5fb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 7 Jul 2015 00:17:55 -0400
Subject: [PATCH 163/784] Fix: Update Composer binary in before_install section

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e973cacd3..738b38f8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,10 @@ php:
   - 7
   - hhvm
 
-install:
+before_install:
   - composer self-update
+
+install:
   - composer install --no-interaction --prefer-source
 
 before_script:

From 0b2754b1620689b3041d2bced77cd2e8eaffcc45 Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Wed, 8 Jul 2015 14:18:06 -0700
Subject: [PATCH 164/784] Updated composer require

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d5272c4f4..bda69e9a3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Add the dependency. https://packagist.org/packages/facebook/webdriver
 
     {
       "require": {
-        "facebook/webdriver": "dev-master"
+        "facebook/webdriver": "~1.0"
       }
     }
     

From 63480bac5287c0faa63a792c2ad5e427c0fb07e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 7 Jul 2015 00:21:28 -0400
Subject: [PATCH 165/784] Enhancement: Cache dependencies installed with
 Composer between builds

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 738b38f8b..5c40b8b93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ php:
   - 7
   - hhvm
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 before_install:
   - composer self-update
 

From 64177ae824c73b14a82b9df7e93f260c2fd1fb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 7 Jul 2015 00:23:28 -0400
Subject: [PATCH 166/784] Enhancement: Direct builds to container-based
 infrastructure

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5c40b8b93..d3e71c8a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: php
 
+sudo: false
+
 php:
   - 5.3
   - 5.4

From 691bb162a6cd833936f32d14d9f273c146ada0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <am@localheinz.com>
Date: Tue, 7 Jul 2015 00:25:33 -0400
Subject: [PATCH 167/784] Enhancement: Specify environment variable in env
 section

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d3e71c8a3..20d852e96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,10 @@ php:
   - 7
   - hhvm
 
+env:
+  global:
+    - DISPLAY=:99.0
+
 cache:
   directories:
     - $HOME/.composer/cache
@@ -21,7 +25,6 @@ install:
   - composer install --no-interaction --prefer-source
 
 before_script:
-  - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
   - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &

From 1201e6693eeddf2a7c1e88aef60ee8600c91dbb4 Mon Sep 17 00:00:00 2001
From: Jenna Quindica <jdq22@cornell.edu>
Date: Wed, 15 Jul 2015 16:30:23 -0700
Subject: [PATCH 168/784] Added http proxy and port vars to support tests
 running on a remote server that's behind a proxy

---
 lib/Remote/HttpCommandExecutor.php | 11 ++++++++++-
 lib/Remote/RemoteWebDriver.php     |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 7ad9092f8..ebd47357e 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -117,11 +117,20 @@ class HttpCommandExecutor implements WebDriverCommandExecutor {
 
   /**
    * @param string $url
+   * @param string|null $http_proxy
+   * @param int|null $http_proxy_port
    */
-  public function __construct($url) {
+  public function __construct($url, $http_proxy = null, $http_proxy_port = null) {
     $this->url = $url;
     $this->curl = curl_init();
 
+    if (!empty($http_proxy)) {
+      curl_setopt($this->curl, CURLOPT_PROXY, $http_proxy);
+      if (!empty($http_proxy_port)) {
+        curl_setopt($this->curl, CURLOPT_PROXYPORT, $http_proxy_port);
+      }
+    }
+
     // Get credentials from $url (if any)
     $matches = null;
     if (preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches)) {
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 4f3be385e..9d8a6a76a 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -60,13 +60,17 @@ protected function __construct() {}
    * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
    * @param int|null $connection_timeout_in_ms
    * @param int|null $request_timeout_in_ms
+   * @param string|null $http_proxy The proxy to tunnel requests through
+   * @param int|null $http_proxy_port
    * @return RemoteWebDriver
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
     $connection_timeout_in_ms = null,
-    $request_timeout_in_ms = null
+    $request_timeout_in_ms = null,
+    $http_proxy = null,
+    $http_proxy_port = null
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
@@ -76,7 +80,7 @@ public static function create(
       $desired_capabilities = $desired_capabilities->toArray();
     }
 
-    $executor = new HttpCommandExecutor($url);
+    $executor = new HttpCommandExecutor($url, $http_proxy, $http_proxy_port);
     if ($connection_timeout_in_ms !== null) {
       $executor->setConnectionTimeout($connection_timeout_in_ms);
     }

From 2223ea5df8c1f806ee0088f8e0c34bd7e7ac4bcc Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jeroen@asystance.nl>
Date: Thu, 16 Jul 2015 14:07:58 +0200
Subject: [PATCH 169/784] improved some @return type docs

---
 lib/WebDriverSearchContext.php | 2 +-
 lib/WebDriverSelect.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 07f7bbccc..d9cff1038 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -36,7 +36,7 @@ public function findElement(WebDriverBy $locator);
    * Find all WebDriverElements within this element using the given mechanism.
    *
    * @param WebDriverBy $locator
-   * @return array A list of all WebDriverElements, or an empty array if
+   * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if
    *    nothing matches
    * @see WebDriverBy
    */
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 80e434caa..cc09a1ac6 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -48,14 +48,14 @@ public function isMultiple() {
   }
 
   /**
-   * @return array All options belonging to this select tag.
+   * @return WebDriverElement[] All options belonging to this select tag.
    */
   public function getOptions() {
     return $this->element->findElements(WebDriverBy::tagName('option'));
   }
 
   /**
-   * @return array All selected options belonging to this select tag.
+   * @return WebDriverElement[] All selected options belonging to this select tag.
    */
   public function getAllSelectedOptions() {
     $selected_options = array();

From 252e5ac7403b3686dd10a27ac563858bd1f37ba9 Mon Sep 17 00:00:00 2001
From: Jeroen Versteeg <jeroen@asystance.nl>
Date: Thu, 23 Jul 2015 11:10:12 +0200
Subject: [PATCH 170/784] DesiredCapabilities factory for Firefox disables
 Reader View help tooltip

This tooltip can hide window.document elements, which can break tests.
See http://stackoverflow.com/questions/30764805/how-to-disable-reader-view-in-firefox-using-webdriver
---
 lib/Remote/DesiredCapabilities.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 4fe5dfaf4..08ff2b978 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -195,10 +195,17 @@ public static function chrome() {
    * @return DesiredCapabilities
    */
   public static function firefox() {
-    return new DesiredCapabilities(array(
+    $caps = new DesiredCapabilities(array(
       WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
       WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
     ));
+
+    // disable the "Reader View" help tooltip, which can hide elements in the window.document
+    $profile = new FirefoxProfile();
+    $profile->setPreference('reader.parse-on-load.enabled', false);
+    $caps->setCapability(FirefoxDriver::PROFILE, $profile);
+
+    return $caps;
   }
 
   /**

From 6034d7120c42158f5772a7cf62c1ceb93e5eeabd Mon Sep 17 00:00:00 2001
From: Fredrik Forsmo <frozzare@users.noreply.github.com>
Date: Tue, 28 Jul 2015 15:22:59 +0200
Subject: [PATCH 171/784] Added syntax highlighting to readme

---
 README.md | 47 +++++++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index bda69e9a3..8c0719969 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,14 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
 ### Packagist
 Add the dependency. https://packagist.org/packages/facebook/webdriver
 
-    {
-      "require": {
-        "facebook/webdriver": "~1.0"
-      }
-    }
-    
+```json
+{
+  "require": {
+    "facebook/webdriver": "~1.0"
+  }
+}
+```
+
 Download the composer.phar
 
     curl -sS https://getcomposer.org/installer | php
@@ -32,8 +34,7 @@ Download the composer.phar
 Install the library.
 
     php composer.phar install
-        
-   
+
 
 ##  GETTING STARTED
 
@@ -41,26 +42,36 @@ Install the library.
 
 *   Download and run that file, replacing # with the current server version.
 
-        java -jar selenium-server-standalone-#.jar
+    ```
+    java -jar selenium-server-standalone-#.jar
+    ```
 
 *   Then when you create a session, be sure to pass the url to where your server is running.
 
-        // This would be the url of the host running the server-standalone.jar
-        $host = 'http://localhost:4444/wd/hub'; // this is the default
+    ```php
+    // This would be the url of the host running the server-standalone.jar
+    $host = 'http://localhost:4444/wd/hub'; // this is the default
+    ```
 
 *   Launch Firefox
 
-        $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
-        
+    ```php
+    $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
+    ```
+
 *   Launch Chrome
 
-        $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+    ```php
+    $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+    ```
 
-*   You can also customize the desired capabilities. 
+*   You can also customize the desired capabilities.
 
-        $desired_capabilities = DesiredCapabilities::firefox();
-        $desired_capabilities->setJavascriptEnabled(false);
-        RemoteWebDriver::create($host, $desired_capabilities);
+    ```php
+    $desired_capabilities = DesiredCapabilities::firefox();
+    $desired_capabilities->setJavascriptEnabled(false);
+    RemoteWebDriver::create($host, $desired_capabilities);
+    ```
 
 *   See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
 

From c90b3a9f6bf833526c2069bf6a74c332f670a324 Mon Sep 17 00:00:00 2001
From: EvanCoh <cohylakis@gmail.com>
Date: Mon, 3 Aug 2015 23:06:54 +0300
Subject: [PATCH 172/784] unit tests wrong namespace deletion

---
 tests/unit/WebDriverButtonReleaseActionTest.php | 2 --
 tests/unit/WebDriverClickActionTest.php         | 2 --
 tests/unit/WebDriverClickAndHoldActionTest.php  | 2 --
 tests/unit/WebDriverContextClickActionTest.php  | 2 --
 tests/unit/WebDriverCoordinatesTest.php         | 2 --
 tests/unit/WebDriverDoubleClickActionTest.php   | 2 --
 tests/unit/WebDriverKeyDownActionTest.php       | 2 --
 tests/unit/WebDriverKeyUpActionTest.php         | 2 --
 tests/unit/WebDriverMouseMoveActionTest.php     | 2 --
 tests/unit/WebDriverMouseToOffsetActionTest.php | 2 --
 tests/unit/WebDriverSendKeysActionTest.php      | 2 --
 11 files changed, 22 deletions(-)

diff --git a/tests/unit/WebDriverButtonReleaseActionTest.php b/tests/unit/WebDriverButtonReleaseActionTest.php
index 3a4779855..88e65b9f1 100644
--- a/tests/unit/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/WebDriverButtonReleaseActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
 
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverClickActionTest.php b/tests/unit/WebDriverClickActionTest.php
index 07dd8e5c2..b69b0bb69 100644
--- a/tests/unit/WebDriverClickActionTest.php
+++ b/tests/unit/WebDriverClickActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
 
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverClickAndHoldActionTest.php b/tests/unit/WebDriverClickAndHoldActionTest.php
index 7bcefd0d5..191337cb3 100644
--- a/tests/unit/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/WebDriverClickAndHoldActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
 
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverContextClickActionTest.php b/tests/unit/WebDriverContextClickActionTest.php
index b85a1d7db..1a23c6a19 100644
--- a/tests/unit/WebDriverContextClickActionTest.php
+++ b/tests/unit/WebDriverContextClickActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
 
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverCoordinatesTest.php b/tests/unit/WebDriverCoordinatesTest.php
index 6002c58bd..5371cc795 100644
--- a/tests/unit/WebDriverCoordinatesTest.php
+++ b/tests/unit/WebDriverCoordinatesTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverDoubleClickActionTest.php b/tests/unit/WebDriverDoubleClickActionTest.php
index 958c2e3cf..5904363fd 100644
--- a/tests/unit/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/WebDriverDoubleClickActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
 
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverKeyDownActionTest.php b/tests/unit/WebDriverKeyDownActionTest.php
index 2f0ddf593..ad1178432 100644
--- a/tests/unit/WebDriverKeyDownActionTest.php
+++ b/tests/unit/WebDriverKeyDownActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
 
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverKeyUpActionTest.php b/tests/unit/WebDriverKeyUpActionTest.php
index 51c3a9548..24e61638e 100644
--- a/tests/unit/WebDriverKeyUpActionTest.php
+++ b/tests/unit/WebDriverKeyUpActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
 
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverMouseMoveActionTest.php b/tests/unit/WebDriverMouseMoveActionTest.php
index 1b8f89f78..09f368e4b 100644
--- a/tests/unit/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/WebDriverMouseMoveActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
 
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverMouseToOffsetActionTest.php b/tests/unit/WebDriverMouseToOffsetActionTest.php
index cca46496d..03f0b5e4c 100644
--- a/tests/unit/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/WebDriverMouseToOffsetActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
 
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
diff --git a/tests/unit/WebDriverSendKeysActionTest.php b/tests/unit/WebDriverSendKeysActionTest.php
index e5782b9c3..ca6ea0df9 100644
--- a/tests/unit/WebDriverSendKeysActionTest.php
+++ b/tests/unit/WebDriverSendKeysActionTest.php
@@ -13,8 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-namespace Facebook\WebDriver;
-
 use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
 
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {

From 7eb613422bbbf3ac644ed2ad08ad814961766feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Nieves=20Fern=C3=A1ndez?=
 <tecnocat@users.noreply.github.com>
Date: Wed, 2 Sep 2015 11:17:29 +0200
Subject: [PATCH 173/784] Copy paste typo error

---
 example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example.php b/example.php
index 556a100a0..ea3ff4180 100644
--- a/example.php
+++ b/example.php
@@ -34,7 +34,7 @@
 // print the title of the current page
 echo "The title is " . $driver->getTitle() . "'\n";
 
-// print the title of the current page
+// print the URI of the current page
 echo "The current URI is " . $driver->getCurrentURL() . "'\n";
 
 // Search 'php' in the search box

From e38915816fb267bc1060e8c61851079bcae339be Mon Sep 17 00:00:00 2001
From: Daniel Beardsley <daniel@ifixit.com>
Date: Wed, 23 Sep 2015 15:38:28 -0700
Subject: [PATCH 174/784] RemoteWebElement: allow overriding construction

Previously, if a developer wanted to extend the RemoteWebElement()
class, you couldn't effectively do it. The name of the class
was hard-coded in a private factory method of RemoteWebDriver
that couldn't be overriden.

Now, a custom class that extends RemoteWebDriver can
construct a class derived from RemoteWebElement, allowing
extra functionality to be added to Elements themselves.

The same logic applies to the EventFiringWebElement.
---
 lib/Remote/RemoteWebDriver.php               | 2 +-
 lib/Remote/RemoteWebElement.php              | 5 ++---
 lib/Support/Events/EventFiringWebDriver.php  | 2 +-
 lib/Support/Events/EventFiringWebElement.php | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 9d8a6a76a..ad253e701 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -430,7 +430,7 @@ public function action() {
    * @param string $id The id of the element to be created.
    * @return RemoteWebElement
    */
-  private function newElement($id) {
+  protected function newElement($id) {
     return new RemoteWebElement($this->getExecuteMethod(), $id);
   }
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 53fc1e908..235e3872c 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -416,8 +416,7 @@ public function equals(WebDriverElement $other) {
    *
    * @return RemoteWebElement
    */
-  private function newElement($id) {
-    $class = get_class($this);
-    return new $class($this->executor, $id);
+  protected function newElement($id) {
+    return new static($this->executor, $id);
   }
 }
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index d21c224c8..ab279cb1d 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -85,7 +85,7 @@ public function getWebDriver() {
    * @param WebDriverElement $element
    * @return EventFiringWebElement
    */
-  private function newElement(WebDriverElement $element) {
+  protected function newElement(WebDriverElement $element) {
     return new EventFiringWebElement($element, $this->getDispatcher());
   }
 
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 3084ec1b5..3025bd8ba 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -78,8 +78,8 @@ public function getElement() {
    * @param WebDriverElement $element
    * @return EventFiringWebElement
    */
-  private function newElement(WebDriverElement $element) {
-    return new EventFiringWebElement($element, $this->getDispatcher());
+  protected function newElement(WebDriverElement $element) {
+    return new static($element, $this->getDispatcher());
   }
 
   /**

From 9c70763340e104731ac5d5d05eddceebfd340645 Mon Sep 17 00:00:00 2001
From: "achange@grovo" <achange-in-grovo@users.noreply.github.com>
Date: Thu, 15 Oct 2015 14:19:21 -0400
Subject: [PATCH 175/784] clarifying README.md for getting code

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8c0719969..7beb7564c 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,13 @@ Any complaint, question, idea? You can post it on the user group https://www.fac
 
 ##  GETTING THE CODE
 
-### Github
+There are two ways of getting the code:
+
+### Via Github
     git clone git@github.com:facebook/php-webdriver.git
 
-### Packagist
-Add the dependency. https://packagist.org/packages/facebook/webdriver
+### Via Packagist
+Add the dependency to composer.json (see https://packagist.org/packages/facebook/webdriver)
 
 ```json
 {
@@ -27,6 +29,8 @@ Add the dependency. https://packagist.org/packages/facebook/webdriver
 }
 ```
 
+## INSTALLATION
+
 Download the composer.phar
 
     curl -sS https://getcomposer.org/installer | php

From 6bb9fdfd077ea8f2f624e73cf138af0aca196112 Mon Sep 17 00:00:00 2001
From: Gregor Kralik <g.kralik@gmail.com>
Date: Thu, 22 Oct 2015 14:17:52 +0200
Subject: [PATCH 176/784] FirefoxProfile: clean up temporary files

during profile setup, some temporary files/folders are
created. these temporary files/folders can grow quite large,
so clean them up after the profile has been constructed to
prevent disk space issues.
---
 lib/Firefox/FirefoxProfile.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index d15d9556e..caefb1e4d 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -98,6 +98,11 @@ public function encode() {
     $zip->close();
 
     $profile = base64_encode(file_get_contents($temp_zip));
+
+    // clean up
+    rmdir($temp_dir);
+    unlink($temp_zip);
+    
     return $profile;
   }
 
@@ -122,6 +127,10 @@ private function installExtension($extension, $profile_dir) {
     mkdir($ext_dir, 0777, true);
 
     $this->extractTo($extension, $ext_dir);
+
+    // clean up
+    rmdir($temp_dir);
+    
     return $ext_dir;
   }
 

From da5cbd33c20e9e90eb97f89a0d0a8cdcabf747d2 Mon Sep 17 00:00:00 2001
From: Gregor Kralik <g.kralik@gmail.com>
Date: Thu, 22 Oct 2015 17:26:44 +0200
Subject: [PATCH 177/784] recursively delete temporary directories

rmdir() will only succeed if the target directory is empty.
use a helper function to recursively delete the target directory
contents before using rmdir() on it.
---
 lib/Firefox/FirefoxProfile.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index caefb1e4d..df76eaa6a 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -100,9 +100,9 @@ public function encode() {
     $profile = base64_encode(file_get_contents($temp_zip));
 
     // clean up
-    rmdir($temp_dir);
+    $this->deleteDirectory($temp_dir);
     unlink($temp_zip);
-    
+
     return $profile;
   }
 
@@ -129,8 +129,8 @@ private function installExtension($extension, $profile_dir) {
     $this->extractTo($extension, $ext_dir);
 
     // clean up
-    rmdir($temp_dir);
-    
+    $this->deleteDirectory($temp_dir);
+
     return $ext_dir;
   }
 
@@ -152,6 +152,23 @@ private function createTempDirectory($prefix = '') {
     return $temp_dir;
   }
 
+  /**
+   * @param string $directory The path to the directory.
+   */
+  private function deleteDirectory($directory) {
+    $dir = new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS);
+    $files = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
+
+    foreach($paths as $path) {
+      if ($path->isDir() && !$path->isLink()) {
+        rmdir($path->getPathname());
+      } else {
+        unlink($path->getPathname())
+      }
+    }
+
+    rmdir($directory;
+  }
   /**
    * @param string $xpi        The path to the .xpi extension.
    * @param string $target_dir The path to the unzip directory.

From 75f80c3b8cb2f44cce5190cc3f50e5766ca9ad11 Mon Sep 17 00:00:00 2001
From: Gregor Kralik <g.kralik@gmail.com>
Date: Thu, 22 Oct 2015 17:30:56 +0200
Subject: [PATCH 178/784] CS fix

---
 lib/Firefox/FirefoxProfile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index df76eaa6a..f5a82d0cb 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -169,6 +169,7 @@ private function deleteDirectory($directory) {
 
     rmdir($directory;
   }
+  
   /**
    * @param string $xpi        The path to the .xpi extension.
    * @param string $target_dir The path to the unzip directory.

From cb04dc709d082e2d576fd7ab4a3368aa2b3e21eb Mon Sep 17 00:00:00 2001
From: Gregor Kralik <g.kralik@gmail.com>
Date: Tue, 27 Oct 2015 09:06:09 +0100
Subject: [PATCH 179/784] fix some syntax errors

---
 lib/Firefox/FirefoxProfile.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index f5a82d0cb..004b8db0f 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -157,17 +157,17 @@ private function createTempDirectory($prefix = '') {
    */
   private function deleteDirectory($directory) {
     $dir = new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS);
-    $files = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
+    $paths = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
 
-    foreach($paths as $path) {
+    foreach ($paths as $path) {
       if ($path->isDir() && !$path->isLink()) {
         rmdir($path->getPathname());
       } else {
-        unlink($path->getPathname())
+        unlink($path->getPathname());
       }
     }
 
-    rmdir($directory;
+    rmdir($directory);
   }
   
   /**

From 01820c60a43ce14758f4369814323d1d666fa967 Mon Sep 17 00:00:00 2001
From: Phelipe Alves de Souza <sougyn@gmail.com>
Date: Sat, 31 Oct 2015 20:23:50 -0200
Subject: [PATCH 180/784] Method call uses 2 parameters, but method signature
 uses 1 parameters

---
 lib/Remote/Service/DriverCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index f4857e933..10ab2b90f 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -50,7 +50,7 @@ public function execute(WebDriverCommand $command, $curl_opts = array()) {
     }
 
     try {
-      $value = parent::execute($command, $curl_opts);
+      $value = parent::execute($command);
       if ($command->getName() === DriverCommand::QUIT) {
         $this->service->stop();
       }

From 3f4aa23e3965497dcb0c3663e10d83b5e2e8149c Mon Sep 17 00:00:00 2001
From: Phelipe Alves de Souza <sougyn@gmail.com>
Date: Sat, 31 Oct 2015 20:36:50 -0200
Subject: [PATCH 181/784] PHPDoc comment doesn't contain all necessary @throws
 tag(s)

---
 lib/Firefox/FirefoxProfile.php     |  1 +
 lib/Remote/DesiredCapabilities.php |  1 +
 lib/WebDriverSelect.php            | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index d15d9556e..1d869ff5a 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -45,6 +45,7 @@ public function addExtension($extension) {
    * @param string $key
    * @param string|bool|int $value
    * @return FirefoxProfile
+   * @throws WebDriverException
    */
   public function setPreference($key, $value) {
     if (is_string($value)) {
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 08ff2b978..915d544ec 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -115,6 +115,7 @@ public function isJavascriptEnabled() {
    * This is a htmlUnit-only option.
    *
    * @param bool $enabled
+   * @throws Exception
    * @return DesiredCapabilities
    * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
    */
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index cc09a1ac6..20082dd0b 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -68,6 +68,8 @@ public function getAllSelectedOptions() {
   }
 
   /**
+   * @throws NoSuchElementException
+   *
    * @return WebDriverElement The first selected option in this select tag (or
    *                          the currently selected option in a normal select)
    */
@@ -84,6 +86,8 @@ public function getFirstSelectedOption() {
   /**
    * Deselect all options in multiple select tag.
    *
+   * @throws UnsupportedOperationException
+   *
    * @return void
    */
   public function deselectAll() {
@@ -104,6 +108,9 @@ public function deselectAll() {
    * Select the option at the given index.
    *
    * @param int $index The index of the option. (0-based)
+   *
+   * @throws NoSuchElementException
+   *
    * @return void
    */
   public function selectByIndex($index) {
@@ -133,6 +140,9 @@ public function selectByIndex($index) {
    * <option value="foo">Bar</option>;
    *
    * @param string $value The value to match against.
+   *
+   * @throws NoSuchElementException
+   *
    * @return void
    */
   public function selectByValue($value) {
@@ -164,6 +174,9 @@ public function selectByValue($value) {
    * <option value="foo">Bar</option>;
    *
    * @param string $text The visible text to match against.
+   *
+   * @throws NoSuchElementException
+   *
    * @return void
    */
   public function selectByVisibleText($text) {

From 1d828236f0431542cecee1132ded87aca92f291f Mon Sep 17 00:00:00 2001
From: Phelipe Alves de Souza <sougyn@gmail.com>
Date: Sat, 31 Oct 2015 20:54:21 -0200
Subject: [PATCH 182/784] Removed unused imports

---
 lib/Remote/ExecuteMethod.php     | 2 --
 lib/Remote/LocalFileDetector.php | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lib/Remote/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
index aa13af5ea..ff13c58fe 100644
--- a/lib/Remote/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -15,8 +15,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Remote\WebDriverResponse;
-
 interface ExecuteMethod {
 
   /**
diff --git a/lib/Remote/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
index c6d44f78c..1308ed6a1 100644
--- a/lib/Remote/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -15,8 +15,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Remote\FileDetector;
-
 class LocalFileDetector implements FileDetector {
     /**
      * @param string $file

From a2130bae8a89836bb8a4f975316919d0dc8a9521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20V=C3=B6lk?= <patrick.voelk@check24.de>
Date: Tue, 3 Nov 2015 15:32:24 +0100
Subject: [PATCH 183/784] fix issue #259

---
 lib/Firefox/FirefoxProfile.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index ff41f6a30..a7d926652 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -16,6 +16,7 @@
 namespace Facebook\WebDriver\Firefox;
 
 use Facebook\WebDriver\Exception\WebDriverException;
+use FilesystemIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use ZipArchive;
@@ -170,7 +171,7 @@ private function deleteDirectory($directory) {
 
     rmdir($directory);
   }
-  
+
   /**
    * @param string $xpi        The path to the .xpi extension.
    * @param string $target_dir The path to the unzip directory.

From 1bd54495e3a971aef8e3b371f43db183f6022f66 Mon Sep 17 00:00:00 2001
From: John Nicholls <github-john@intobikes.co.uk>
Date: Wed, 4 Nov 2015 14:47:08 +0000
Subject: [PATCH 184/784] add missing single quotes

---
 example.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example.php b/example.php
index ea3ff4180..690a3b1c3 100644
--- a/example.php
+++ b/example.php
@@ -32,10 +32,10 @@
 $link->click();
 
 // print the title of the current page
-echo "The title is " . $driver->getTitle() . "'\n";
+echo "The title is '" . $driver->getTitle() . "'\n";
 
 // print the URI of the current page
-echo "The current URI is " . $driver->getCurrentURL() . "'\n";
+echo "The current URI is '" . $driver->getCurrentURL() . "'\n";
 
 // Search 'php' in the search box
 $input = $driver->findElement(

From 1a8d108040abbb419b12737cf6be2400ab344a00 Mon Sep 17 00:00:00 2001
From: Diogo Guerra <DGCarramona@users.noreply.github.com>
Date: Thu, 3 Dec 2015 10:51:29 +0100
Subject: [PATCH 185/784] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8d4095415..a420f3fdc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
-  "name": "facebook/webdriver",
-  "description": "A PHP client for WebDriver",
+  "name": "dguerra/facebook-webdriver",
+  "description": "A fork of Facebook PHP client for WebDriver",
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",

From 912a5e528c2e545a44d9030f5fcb8bebf1446006 Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 11:23:30 +0100
Subject: [PATCH 186/784] Added possibility to set RDF file

---
 lib/Firefox/FirefoxProfile.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index a7d926652..4ba192bb4 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -33,6 +33,11 @@ class FirefoxProfile {
    */
   private $extensions = array();
 
+  /**
+   * @var string
+   */
+  private $rdfFile;
+
   /**
    * @param string $extension The path to the xpi extension.
    * @return FirefoxProfile
@@ -42,6 +47,19 @@ public function addExtension($extension) {
     return $this;
   }
 
+  /**
+   * @param string $rdfFile The path to the rdf file
+   * @return FirefoxProfile
+   */
+  public function setRdfFile($rdfFile) {
+    if(!is_file($rdfFile)) {
+      return;
+    }
+    
+    $this->rdfFile = $rdfFile;
+    return $this;
+  }
+
   /**
    * @param string $key
    * @param string|bool|int $value
@@ -69,6 +87,10 @@ public function setPreference($key, $value) {
   public function encode() {
     $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
 
+    if(isset($this->rdfFile)) {
+      copy($this->rdfFile, $temp_dir . DIRECTORY_SEPARATOR . "mimeTypes.rdf");
+    }
+
     foreach ($this->extensions as $extension) {
       $this->installExtension($extension, $temp_dir);
     }

From 8865a365d3e9fe9ccd9b9395c56e38f257191116 Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 11:32:09 +0100
Subject: [PATCH 187/784] Added possibility to add datas for extensions

---
 lib/Firefox/FirefoxProfile.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 4ba192bb4..b1d0d5b23 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -33,6 +33,11 @@ class FirefoxProfile {
    */
   private $extensions = array();
 
+  /**
+   * @var array
+   */
+  private $extensionsDatas = array();
+
   /**
    * @var string
    */
@@ -47,6 +52,19 @@ public function addExtension($extension) {
     return $this;
   }
 
+  /**
+   * @param string $extensionDatas The path to the folder containing the datas to add to the extension
+   * @return FirefoxProfile
+   */  
+  public function addExtensionDatas($extensionDatas) {
+    if(!is_dir($extensionDatas)) {
+      return;
+    }
+
+    $this->extensionsDatas[dirname($extensionDatas)] = $extensionDatas;
+    return $this;
+  }
+
   /**
    * @param string $rdfFile The path to the rdf file
    * @return FirefoxProfile
@@ -95,6 +113,17 @@ public function encode() {
       $this->installExtension($extension, $temp_dir);
     }
 
+    foreach ($this->extensionsDatas as $dirname => $extensionDatas) {
+      mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname);
+      $files = scandir($extensionDatas);
+      foreach ($files as $file) {
+        if(is_file($file)
+           && $file != "."
+           && $file != "..") {
+          copy($extensionDatas . DIRECTORY_SEPARATOR . $file, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $file);
+      }
+    }
+
     $content = "";
     foreach ($this->preferences as $key => $value) {
       $content .= sprintf("user_pref(\"%s\", %s);\n", $key, $value);

From 26440448164ca03e4d7664316112785ec52c88ea Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 11:35:22 +0100
Subject: [PATCH 188/784] Renamed added vars to follow convention used by the
 others ones

---
 lib/Firefox/FirefoxProfile.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index b1d0d5b23..6b356ecd9 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -36,12 +36,12 @@ class FirefoxProfile {
   /**
    * @var array
    */
-  private $extensionsDatas = array();
+  private $extensions_datas = array();
 
   /**
    * @var string
    */
-  private $rdfFile;
+  private $rdf_file;
 
   /**
    * @param string $extension The path to the xpi extension.
@@ -53,28 +53,28 @@ public function addExtension($extension) {
   }
 
   /**
-   * @param string $extensionDatas The path to the folder containing the datas to add to the extension
+   * @param string $extension_datas The path to the folder containing the datas to add to the extension
    * @return FirefoxProfile
    */  
-  public function addExtensionDatas($extensionDatas) {
-    if(!is_dir($extensionDatas)) {
+  public function addExtensionDatas($extension_datas) {
+    if(!is_dir($extension_datas)) {
       return;
     }
 
-    $this->extensionsDatas[dirname($extensionDatas)] = $extensionDatas;
+    $this->extensions_datas[dirname($extension_datas)] = $extension_datas;
     return $this;
   }
 
   /**
-   * @param string $rdfFile The path to the rdf file
+   * @param string $rdf_file The path to the rdf file
    * @return FirefoxProfile
    */
-  public function setRdfFile($rdfFile) {
-    if(!is_file($rdfFile)) {
+  public function setRdfFile($rdf_file) {
+    if(!is_file($rdf_file)) {
       return;
     }
     
-    $this->rdfFile = $rdfFile;
+    $this->rdf_file = $rdf_file;
     return $this;
   }
 
@@ -105,22 +105,22 @@ public function setPreference($key, $value) {
   public function encode() {
     $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
 
-    if(isset($this->rdfFile)) {
-      copy($this->rdfFile, $temp_dir . DIRECTORY_SEPARATOR . "mimeTypes.rdf");
+    if(isset($this->rdf_file)) {
+      copy($this->rdf_file, $temp_dir . DIRECTORY_SEPARATOR . "mimeTypes.rdf");
     }
 
     foreach ($this->extensions as $extension) {
       $this->installExtension($extension, $temp_dir);
     }
 
-    foreach ($this->extensionsDatas as $dirname => $extensionDatas) {
+    foreach ($this->extensions_datas as $dirname => $extension_datas) {
       mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname);
-      $files = scandir($extensionDatas);
+      $files = scandir($extension_datas);
       foreach ($files as $file) {
         if(is_file($file)
            && $file != "."
            && $file != "..") {
-          copy($extensionDatas . DIRECTORY_SEPARATOR . $file, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $file);
+          copy($extension_datas . DIRECTORY_SEPARATOR . $file, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $file);
       }
     }
 

From 2d2588d6bb7873b250047766492c7ab77410ccec Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 11:37:20 +0100
Subject: [PATCH 189/784] Added prefix to extension temporary directory

---
 lib/Firefox/FirefoxProfile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 6b356ecd9..f23ddadde 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -165,7 +165,7 @@ public function encode() {
    * @return string The path to the directory of this extension.
    */
   private function installExtension($extension, $profile_dir) {
-    $temp_dir = $this->createTempDirectory();
+    $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfileExtension');
 
     $this->extractTo($extension, $temp_dir);
 

From 77289453ac3f33586e1f1aadb9a83f98e7c58aa5 Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 11:54:27 +0100
Subject: [PATCH 190/784] Corrected forgotten bracket

---
 lib/Firefox/FirefoxProfile.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index f23ddadde..fe21c2e99 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -121,6 +121,7 @@ public function encode() {
            && $file != "."
            && $file != "..") {
           copy($extension_datas . DIRECTORY_SEPARATOR . $file, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $file);
+        }
       }
     }
 

From d23382b50acf85d3bf7f76b9c5b4956660aa91ae Mon Sep 17 00:00:00 2001
From: DGuerra <diogo.guerra@exalog.com>
Date: Thu, 3 Dec 2015 14:19:22 +0100
Subject: [PATCH 191/784] Using correct function to get extension datas
 directory name

---
 lib/Firefox/FirefoxProfile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index fe21c2e99..62c809f84 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -61,7 +61,7 @@ public function addExtensionDatas($extension_datas) {
       return;
     }
 
-    $this->extensions_datas[dirname($extension_datas)] = $extension_datas;
+    $this->extensions_datas[basename($extension_datas)] = $extension_datas;
     return $this;
   }
 

From 7b1af60eb964450f10c3d9f42d810749786b4398 Mon Sep 17 00:00:00 2001
From: DGuerra <d.g.carramona@gmail.com>
Date: Fri, 4 Dec 2015 00:05:39 +0100
Subject: [PATCH 192/784] Extension datas directories added recursively

---
 composer.json                  |  4 ++--
 lib/Firefox/FirefoxProfile.php | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index a420f3fdc..8d4095415 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
-  "name": "dguerra/facebook-webdriver",
-  "description": "A fork of Facebook PHP client for WebDriver",
+  "name": "facebook/webdriver",
+  "description": "A PHP client for WebDriver",
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 62c809f84..3d7739f5c 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -57,7 +57,7 @@ public function addExtension($extension) {
    * @return FirefoxProfile
    */  
   public function addExtensionDatas($extension_datas) {
-    if(!is_dir($extension_datas)) {
+    if (!is_dir($extension_datas)) {
       return;
     }
 
@@ -70,7 +70,7 @@ public function addExtensionDatas($extension_datas) {
    * @return FirefoxProfile
    */
   public function setRdfFile($rdf_file) {
-    if(!is_file($rdf_file)) {
+    if (!is_file($rdf_file)) {
       return;
     }
     
@@ -105,7 +105,7 @@ public function setPreference($key, $value) {
   public function encode() {
     $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
 
-    if(isset($this->rdf_file)) {
+    if (isset($this->rdf_file)) {
       copy($this->rdf_file, $temp_dir . DIRECTORY_SEPARATOR . "mimeTypes.rdf");
     }
 
@@ -115,13 +115,13 @@ public function encode() {
 
     foreach ($this->extensions_datas as $dirname => $extension_datas) {
       mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname);
-      $files = scandir($extension_datas);
-      foreach ($files as $file) {
-        if(is_file($file)
-           && $file != "."
-           && $file != "..") {
-          copy($extension_datas . DIRECTORY_SEPARATOR . $file, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $file);
-        }
+      $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($extension_datas, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
+      foreach ($iterator as $item) {
+        if ($item->isDir()) {
+	  mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+	} else {
+	  copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+	}
       }
     }
 

From 3f9606a43831d1ccc0befb1570eeefb2b30049a1 Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Tue, 8 Dec 2015 08:35:18 -0800
Subject: [PATCH 193/784] Check isset for timeout in seconds

---
 lib/WebDriverWait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 4b43b3755..5cddd29c3 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -35,7 +35,7 @@ public function __construct(
       $timeout_in_second = null,
       $interval_in_millisecond = null) {
     $this->driver = $driver;
-    $this->timeout = $timeout_in_second ?: 30;
+    $this->timeout = isset($timeout_in_second) ? $timeout_in_second : 30;
     $this->interval = $interval_in_millisecond ?: 250;
   }
 

From ee78deaa5aa8cdc8c767f79bef834b17d0f70088 Mon Sep 17 00:00:00 2001
From: Tobias Kappe <tobias.kappe@gmail.com>
Date: Thu, 24 Dec 2015 14:47:58 +0100
Subject: [PATCH 194/784] Use sys_get_temp_dir rather than the empty string
 when calling tempnam.

The latter fails when using the empty string if an open_basedir restriction is
in effect.
---
 lib/Firefox/FirefoxProfile.php  | 4 ++--
 lib/Remote/RemoteWebElement.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 3d7739f5c..423bad924 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -132,7 +132,7 @@ public function encode() {
     file_put_contents($temp_dir.'/user.js', $content);
 
     $zip = new ZipArchive();
-    $temp_zip = tempnam('', 'WebDriverFirefoxProfileZip');
+    $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverFirefoxProfileZip');
     $zip->open($temp_zip, ZipArchive::CREATE);
 
     $dir = new RecursiveDirectoryIterator($temp_dir);
@@ -195,7 +195,7 @@ private function installExtension($extension, $profile_dir) {
    * @throws WebDriverException
    */
   private function createTempDirectory($prefix = '') {
-    $temp_dir = tempnam('', $prefix);
+    $temp_dir = tempnam(sys_get_temp_dir(), $prefix);
     if (file_exists($temp_dir)) {
       unlink($temp_dir);
       mkdir($temp_dir);
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 235e3872c..e9e1ca31e 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -332,7 +332,7 @@ private function upload($local_file) {
     }
 
     // Create a temporary file in the system temp directory.
-    $temp_zip = tempnam('', 'WebDriverZip');
+    $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
     $zip = new ZipArchive();
     if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
       return false;

From 64485b2f068f6198261793fe62582cc2d1a0cd7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 30 Dec 2015 14:01:01 +0100
Subject: [PATCH 195/784] Fix strict standards error

---
 lib/Chrome/ChromeDriver.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 67427205d..0cabccd91 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -56,18 +56,15 @@ public function startSession($desired_capabilities) {
   /**
    * Always throws an exception. Use ChromeDriver::start() instead.
    *
-   * @param string              $url                  The url of the remote server
-   * @param DesiredCapabilities $desired_capabilities The desired capabilities
-   * @param int|null            $timeout_in_ms
-   * @param int|null            $request_timeout_in_ms
-   *
    * @throws WebDriverException
    */
   public static function create(
     $url = 'http://localhost:4444/wd/hub',
     $desired_capabilities = null,
-    $timeout_in_ms = null,
-    $request_timeout_in_ms = null
+    $connection_timeout_in_ms = null,
+    $request_timeout_in_ms = null,
+    $http_proxy = null,
+    $http_proxy_port = null
   ) {
     throw new WebDriverException('Please use ChromeDriver::start() instead.');
   }

From 4967a61f12858ebfab64e77c4c44826fc256b351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 30 Dec 2015 18:48:44 +0100
Subject: [PATCH 196/784] Move tests to appropriate folders, use namespaces,
 improve phpdoc

---
 composer.json                                     |  5 +++--
 .../WebDriverButtonReleaseActionTest.php          | 12 +++++++-----
 .../Internal}/WebDriverClickActionTest.php        | 12 +++++++-----
 .../Internal}/WebDriverClickAndHoldActionTest.php | 12 +++++++-----
 .../Internal}/WebDriverContextClickActionTest.php | 12 +++++++-----
 .../Internal}/WebDriverCoordinatesTest.php        |  2 +-
 .../Internal}/WebDriverDoubleClickActionTest.php  | 12 +++++++-----
 .../Internal}/WebDriverKeyDownActionTest.php      | 14 +++++++++-----
 .../Internal}/WebDriverKeyUpActionTest.php        | 14 +++++++++-----
 .../Internal}/WebDriverMouseMoveActionTest.php    | 12 +++++++-----
 .../WebDriverMouseToOffsetActionTest.php          |  8 ++++++--
 .../Internal}/WebDriverSendKeysActionTest.php     | 15 ++++++++++-----
 12 files changed, 80 insertions(+), 50 deletions(-)
 rename tests/unit/{ => Interactions/Internal}/WebDriverButtonReleaseActionTest.php (82%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverClickActionTest.php (82%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverClickAndHoldActionTest.php (82%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverContextClickActionTest.php (83%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverCoordinatesTest.php (95%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverDoubleClickActionTest.php (83%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverKeyDownActionTest.php (80%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverKeyUpActionTest.php (80%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverMouseMoveActionTest.php (83%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverMouseToOffsetActionTest.php (85%)
 rename tests/unit/{ => Interactions/Internal}/WebDriverSendKeysActionTest.php (80%)

diff --git a/composer.json b/composer.json
index 8d4095415..be4ba7dd5 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,8 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Facebook\\WebDriver\\": "tests/functional"
-    }
+      "Facebook\\WebDriver\\": "tests/unit"
+    },
+    "classmap": ["tests/functional/"]
   }
 }
diff --git a/tests/unit/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
similarity index 82%
rename from tests/unit/WebDriverButtonReleaseActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index 88e65b9f1..982e8d268 100644
--- a/tests/unit/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverButtonReleaseAction
-   */
+  /** @var WebDriverButtonReleaseAction */
   private $webDriverButtonReleaseAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
similarity index 82%
rename from tests/unit/WebDriverClickActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index b69b0bb69..8fab683fe 100644
--- a/tests/unit/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverClickAction
-   */
+  /** @var WebDriverClickAction */
   private $webDriverClickAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
similarity index 82%
rename from tests/unit/WebDriverClickAndHoldActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index 191337cb3..b10ac2cea 100644
--- a/tests/unit/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverClickAndHoldAction
-   */
+  /** @var WebDriverClickAndHoldAction */
   private $webDriverClickAndHoldAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
similarity index 83%
rename from tests/unit/WebDriverContextClickActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index 1a23c6a19..a57cb127a 100644
--- a/tests/unit/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverContextClickAction
-   */
+  /** @var WebDriverContextClickAction */
   private $webDriverContextClickAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
similarity index 95%
rename from tests/unit/WebDriverCoordinatesTest.php
rename to tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index 5371cc795..d38c7220a 100644
--- a/tests/unit/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+namespace Facebook\WebDriver\Interactions\Internal;
 
 class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
   public function testConstruct() {
diff --git a/tests/unit/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
similarity index 83%
rename from tests/unit/WebDriverDoubleClickActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 5904363fd..7f09f64dc 100644
--- a/tests/unit/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverDoubleClickAction
-   */
+  /** @var WebDriverDoubleClickAction */
   private $webDriverDoubleClickAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
similarity index 80%
rename from tests/unit/WebDriverKeyDownActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index ad1178432..5bba82f4f 100644
--- a/tests/unit/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -13,16 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverKeyDownAction
-   */
+  /** @var WebDriverKeyDownAction */
   private $webDriverKeyDownAction;
-
+  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverKeyboard;
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
similarity index 80%
rename from tests/unit/WebDriverKeyUpActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 24e61638e..cd2b7b00c 100644
--- a/tests/unit/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -13,16 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverKeyUpAction
-   */
+  /** @var WebDriverKeyUpAction */
   private $webDriverKeyUpAction;
-
+  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverKeyboard;
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
similarity index 83%
rename from tests/unit/WebDriverMouseMoveActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 09f368e4b..6376adfa0 100644
--- a/tests/unit/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -13,15 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverMouseMoveAction
-   */
+  /** @var WebDriverMouseMoveAction */
   private $webDriverMouseMoveAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
similarity index 85%
rename from tests/unit/WebDriverMouseToOffsetActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index 03f0b5e4c..2ea16d552 100644
--- a/tests/unit/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -13,15 +13,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   /**
    * @type WebDriverMoveToOffsetAction
    */
   private $webDriverMoveToOffsetAction;
-
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
 
   public function setUp() {
diff --git a/tests/unit/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
similarity index 80%
rename from tests/unit/WebDriverSendKeysActionTest.php
rename to tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index ca6ea0df9..f7c2917d0 100644
--- a/tests/unit/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -13,17 +13,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverMouse;
 
 class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverSendKeysAction
-   */
+  /** @var WebDriverSendKeysAction */
   private $webDriverSendKeysAction;
-
+  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverKeyboard;
+  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
   private $webDriverMouse;
+  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
   private $locationProvider;
+  /** @var array */
   private $keys;
 
   public function setUp() {

From 07ab9b5c336038266b0164cc628dbf37d032bc4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 30 Dec 2015 18:56:48 +0100
Subject: [PATCH 197/784] Minor codestyle fixes

---
 lib/Chrome/ChromeOptions.php                 |  6 ++---
 lib/Firefox/FirefoxDriver.php                |  5 +++-
 lib/Firefox/FirefoxProfile.php               |  4 ++--
 lib/Remote/DriverCommand.php                 | 10 ++++----
 lib/Remote/RemoteWebDriver.php               |  2 +-
 lib/Remote/Service/DriverCommandExecutor.php |  3 +--
 lib/Remote/WebDriverBrowserType.php          |  5 +++-
 lib/Remote/WebDriverCapabilityType.php       |  8 ++++---
 lib/Remote/WebDriverCommand.php              | 18 ++++++++++++++-
 lib/WebDriverPlatform.php                    |  5 +++-
 phpunit.xml.dist                             | 24 +++++++++++---------
 11 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 5cc125f56..da387c55a 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -85,8 +85,7 @@ public function addExtensions(array $paths) {
   }
 
   /**
-   * @param array $encoded_extensions An array of base64 encoded of the
-   *                                  extensions.
+   * @param array $encoded_extensions An array of base64 encoded of the extensions.
    * @return ChromeOptions
    */
   public function addEncodedExtensions(array $encoded_extensions) {
@@ -109,8 +108,7 @@ public function setExperimentalOption($name, $value) {
   }
 
   /**
-   * @return DesiredCapabilities The DesiredCapabilities for Chrome with this
-   *                             options.
+   * @return DesiredCapabilities The DesiredCapabilities for Chrome with this options.
    */
   public function toCapabilities() {
     $capabilities = DesiredCapabilities::chrome();
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 8afbe0c2d..083af226b 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -16,6 +16,9 @@
 namespace Facebook\WebDriver\Firefox;
 
 class FirefoxDriver {
-
   const PROFILE = 'firefox_profile';
+
+  private function __construct()
+  {
+  }
 }
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 3d7739f5c..163d06049 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -55,7 +55,7 @@ public function addExtension($extension) {
   /**
    * @param string $extension_datas The path to the folder containing the datas to add to the extension
    * @return FirefoxProfile
-   */  
+   */
   public function addExtensionDatas($extension_datas) {
     if (!is_dir($extension_datas)) {
       return;
@@ -73,7 +73,7 @@ public function setRdfFile($rdf_file) {
     if (!is_file($rdf_file)) {
       return;
     }
-    
+
     $this->rdf_file = $rdf_file;
     return $this;
   }
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 61ad9d515..18e9fb37b 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -19,7 +19,6 @@
  * This list of command defined in the WebDriver json wire protocol.
  */
 class DriverCommand {
-
   const GET_ALL_SESSIONS = "getAllSessions";
   const GET_CAPABILITIES = "getCapabilities";
   const NEW_SESSION = "newSession";
@@ -126,16 +125,14 @@ class DriverCommand {
   const SET_SCREEN_ORIENTATION = "setScreenOrientation";
   const GET_SCREEN_ORIENTATION = "getScreenOrientation";
 
-  // These belong to the Advanced user interactions - an element is
-  // optional for these commands.
+  // These belong to the Advanced user interactions - an element is optional for these commands.
   const CLICK = "mouseClick";
   const DOUBLE_CLICK = "mouseDoubleClick";
   const MOUSE_DOWN = "mouseButtonDown";
   const MOUSE_UP = "mouseButtonUp";
   const MOVE_TO = "mouseMoveTo";
 
-  // Those allow interactions with the Input Methods installed on
-  // the system.
+  // Those allow interactions with the Input Methods installed on the system.
   const IME_GET_AVAILABLE_ENGINES = "imeGetAvailableEngines";
   const IME_GET_ACTIVE_ENGINE = "imeGetActiveEngine";
   const IME_IS_ACTIVATED = "imeIsActivated";
@@ -168,4 +165,7 @@ class DriverCommand {
   const GET_NETWORK_CONNECTION = "getNetworkConnection";
   const SET_NETWORK_CONNECTION = "setNetworkConnection";
 
+  private function __construct()
+  {
+  }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index ad253e701..1fda245b2 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -74,7 +74,7 @@ public static function create(
   ) {
     $url = preg_replace('#/+$#', '', $url);
 
-    // Passing DesiredCapabilities as $desired_capabilities is encourged but
+    // Passing DesiredCapabilities as $desired_capabilities is encouraged but
     // array is also accepted for legacy reason.
     if ($desired_capabilities instanceof DesiredCapabilities) {
       $desired_capabilities = $desired_capabilities->toArray();
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 10ab2b90f..2ac3414f1 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -38,13 +38,12 @@ public function __construct(DriverService $service) {
 
   /**
    * @param WebDriverCommand $command
-   * @param array            $curl_opts
    *
    * @return mixed
    * @throws WebDriverException
    * @throws \Exception
    */
-  public function execute(WebDriverCommand $command, $curl_opts = array()) {
+  public function execute(WebDriverCommand $command) {
     if ($command->getName() === DriverCommand::NEW_SESSION) {
       $this->service->start();
     }
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 5ab1df391..a9de79143 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -19,7 +19,6 @@
  * All the browsers supported by selenium
  */
 class WebDriverBrowserType {
-
   const FIREFOX = "firefox";
   const FIREFOX_2 = "firefox2";
   const FIREFOX_3 = "firefox3";
@@ -42,4 +41,8 @@ class WebDriverBrowserType {
   const IPHONE = "iphone";
   const IPAD = "iPad";
   const PHANTOMJS = "phantomjs";
+
+  private function __construct()
+  {
+  }
 }
diff --git a/lib/Remote/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
index 552db09be..459952364 100644
--- a/lib/Remote/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -16,11 +16,9 @@
 namespace Facebook\WebDriver\Remote;
 
 /**
- * WebDriverCapabilityType contains all constants defined in the WebDriver
- * Wire Protocol.
+ * WebDriverCapabilityType contains all constants defined in the WebDriver Wire Protocol.
  */
 class WebDriverCapabilityType {
-
   const BROWSER_NAME = 'browserName';
   const VERSION = 'version';
   const PLATFORM = 'platform';
@@ -37,4 +35,8 @@ class WebDriverCapabilityType {
   const ACCEPT_SSL_CERTS = 'acceptSslCerts';
   const NATIVE_EVENTS = 'nativeEvents';
   const PROXY = 'proxy';
+
+  private function __construct()
+  {
+  }
 }
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index 303af3cfb..cb90d2b64 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -16,25 +16,41 @@
 namespace Facebook\WebDriver\Remote;
 
 class WebDriverCommand {
-
+  /** @var string */
   private $sessionID;
+  /** @var string */
   private $name;
+  /** @var array */
   private $parameters;
 
+  /**
+   * @param string $session_id
+   * @param string $name Constant from DriverCommand
+   * @param array $parameters Array of
+   */
   public function __construct($session_id, $name, $parameters) {
     $this->sessionID = $session_id;
     $this->name = $name;
     $this->parameters = $parameters;
   }
 
+  /**
+   * @return string
+   */
   public function getName() {
     return $this->name;
   }
 
+  /**
+   * @return string
+   */
   public function getSessionID() {
     return $this->sessionID;
   }
 
+  /**
+   * @return array
+   */
   public function getParameters() {
     return $this->parameters;
   }
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 4954bf56e..9dc42fabd 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -19,7 +19,6 @@
  * The platforms supported by WebDriver.
  */
 class WebDriverPlatform {
-
   const ANDROID = 'ANDROID';
   const ANY = 'ANY';
   const LINUX = 'LINUX';
@@ -28,4 +27,8 @@ class WebDriverPlatform {
   const VISTA = 'VISTA';
   const WINDOWS = 'WINDOWS';
   const XP = 'XP';
+
+  private function __construct()
+  {
+  }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4dfdec0a7..83eb0ecef 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,18 +2,20 @@
 
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
-        backupGlobals               = "false"
-        backupStaticAttributes      = "false"
-        colors                      = "true"
-        convertErrorsToExceptions   = "true"
-        convertNoticesToExceptions  = "true"
-        convertWarningsToExceptions = "true"
-        processIsolation            = "false"
-        stopOnFailure               = "false"
-        syntaxCheck                 = "false"
-        bootstrap                   = "tests/bootstrap.php" >
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        backupGlobals="false"
+        backupStaticAttributes="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        bootstrap="tests/bootstrap.php"
+        >
 
-    <testsuites>
+<testsuites>
         <testsuite name="Unit-Testsuite">
             <directory>tests/unit</directory>
         </testsuite>

From ef5d08965a1b641e53d38dafe34617462e31a839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 30 Dec 2015 19:22:40 +0100
Subject: [PATCH 198/784] Define constants with common Firefox profile
 preferences

---
 lib/Firefox/FirefoxPreferences.php | 33 ++++++++++++++++++++++++++++++
 lib/Firefox/FirefoxProfile.php     | 13 ++++++++++++
 lib/Remote/DesiredCapabilities.php |  3 ++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 lib/Firefox/FirefoxPreferences.php

diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
new file mode 100644
index 000000000..6b7ca91dd
--- /dev/null
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -0,0 +1,33 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Firefox;
+
+/**
+ * Constants of common Firefox profile preferences (about:config values).
+ * @see http://kb.mozillazine.org/Firefox_:_FAQs_:_About:config_Entries
+ */
+class FirefoxPreferences {
+  /** @var string Port WebDriver uses to communicate with Firefox instance */
+  const WEBDRIVER_FIREFOX_PORT = 'webdriver_firefox_port';
+  /** @var string Should the reader view (FF 38+) be enabled? */
+  const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
+  /** @var string Browser homepage */
+  const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
+
+  private function __construct()
+  {
+  }
+}
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 163d06049..b0e789b9a 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -99,6 +99,19 @@ public function setPreference($key, $value) {
     return $this;
   }
 
+  /**
+   * @param $key
+   * @return mixed
+   */
+  public function getPreference($key)
+  {
+    if (array_key_exists($key, $this->preferences)) {
+      return $this->preferences[$key];
+    }
+
+    return null;
+  }
+
   /**
    * @return string
    */
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 915d544ec..ef732ec53 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -18,6 +18,7 @@
 use Exception;
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Firefox\FirefoxDriver;
+use Facebook\WebDriver\Firefox\FirefoxPreferences;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
 use Facebook\WebDriver\WebDriverCapabilities;
 use Facebook\WebDriver\WebDriverPlatform;
@@ -203,7 +204,7 @@ public static function firefox() {
 
     // disable the "Reader View" help tooltip, which can hide elements in the window.document
     $profile = new FirefoxProfile();
-    $profile->setPreference('reader.parse-on-load.enabled', false);
+    $profile->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
     $caps->setCapability(FirefoxDriver::PROFILE, $profile);
 
     return $caps;

From a0485d418a6841eaaec80b718676e8a8ed618a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 30 Dec 2015 19:23:23 +0100
Subject: [PATCH 199/784] Unit tests for WebDriverCommand and
 DesiredCapabilities

---
 tests/unit/Remote/DesiredCapabilitiesTest.php | 133 ++++++++++++++++++
 tests/unit/Remote/WebDriverCommandTest.php    |  28 ++++
 2 files changed, 161 insertions(+)
 create mode 100644 tests/unit/Remote/DesiredCapabilitiesTest.php
 create mode 100644 tests/unit/Remote/WebDriverCommandTest.php

diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
new file mode 100644
index 000000000..7f187f706
--- /dev/null
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -0,0 +1,133 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+use Facebook\WebDriver\Firefox\FirefoxDriver;
+use Facebook\WebDriver\Firefox\FirefoxPreferences;
+use Facebook\WebDriver\Firefox\FirefoxProfile;
+use Facebook\WebDriver\WebDriverPlatform;
+
+class DesiredCapabilitiesTest extends \PHPUnit_Framework_TestCase
+{
+  public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
+  {
+    $capabilities = new DesiredCapabilities(
+      array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY)
+    );
+
+    $this->assertSame('fooVal', $capabilities->getCapability('fooKey'));
+    $this->assertSame('ANY', $capabilities->getPlatform());
+
+    $this->assertSame(
+      array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY),
+      $capabilities->toArray()
+    );
+  }
+
+  public function testShouldInstantiateEmptyInstance()
+  {
+    $capabilities = new DesiredCapabilities();
+
+    $this->assertNull($capabilities->getCapability('foo'));
+    $this->assertSame(array(), $capabilities->toArray());
+  }
+
+  public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
+  {
+    $capabilities = new DesiredCapabilities();
+    // generic capability setter
+    $capabilities->setCapability('custom', 1337);
+    // specific setters
+    $capabilities->setBrowserName(WebDriverBrowserType::CHROME);
+    $capabilities->setPlatform(WebDriverPlatform::LINUX);
+    $capabilities->setVersion(333);
+
+    $this->assertSame(1337, $capabilities->getCapability('custom'));
+    $this->assertSame(WebDriverBrowserType::CHROME, $capabilities->getBrowserName());
+    $this->assertSame(WebDriverPlatform::LINUX, $capabilities->getPlatform());
+    $this->assertSame(333, $capabilities->getVersion());
+  }
+
+  /**
+   * @expectedException \Exception
+   * @expectedExceptionMessage isJavascriptEnable() is a htmlunit-only option
+   */
+  public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
+  {
+    $capabilities = new DesiredCapabilities();
+    $capabilities->setBrowserName(WebDriverBrowserType::FIREFOX);
+    $capabilities->setJavascriptEnabled(false);
+  }
+
+  public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser()
+  {
+    $capabilities = new DesiredCapabilities();
+    $capabilities->setBrowserName(WebDriverBrowserType::HTMLUNIT);
+    $capabilities->setJavascriptEnabled(false);
+
+    $this->assertFalse($capabilities->isJavascriptEnabled());
+  }
+
+  /**
+   * @dataProvider browserCapabilitiesProvider
+   * @param string $setupMethod
+   * @param string $expectedBrowser
+   * @param string $expectedPlatform
+   */
+  public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
+    $setupMethod,
+    $expectedBrowser,
+    $expectedPlatform
+  )
+  {
+    /** @var DesiredCapabilities $capabilities */
+    $capabilities = call_user_func(array('Facebook\WebDriver\Remote\DesiredCapabilities', $setupMethod));
+
+    $this->assertSame($expectedBrowser, $capabilities->getBrowserName());
+    $this->assertSame($expectedPlatform, $capabilities->getPlatform());
+  }
+
+  /**
+   * @return array
+   */
+  public function browserCapabilitiesProvider()
+  {
+    return array(
+      array('android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID),
+      array('chrome', WebDriverBrowserType::CHROME, WebDriverPlatform::ANY),
+      array('firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY),
+      array('htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
+      array('htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
+      array('internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS),
+      array('iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC),
+      array('ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC),
+      array('opera', WebDriverBrowserType::OPERA, WebDriverPlatform::ANY),
+      array('safari', WebDriverBrowserType::SAFARI, WebDriverPlatform::ANY),
+      array('phantomjs', WebDriverBrowserType::PHANTOMJS, WebDriverPlatform::ANY),
+    );
+  }
+
+  public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrowser()
+  {
+    $capabilities = DesiredCapabilities::firefox();
+
+    /** @var FirefoxProfile $firefoxProfile */
+    $firefoxProfile = $capabilities->getCapability(FirefoxDriver::PROFILE);
+    $this->assertInstanceOf('Facebook\WebDriver\Firefox\FirefoxProfile', $firefoxProfile);
+
+    $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
+  }
+}
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
new file mode 100644
index 000000000..b4b9fc052
--- /dev/null
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -0,0 +1,28 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
+{
+  public function testShouldSetOptionsUsingConstructot()
+  {
+    $command = new WebDriverCommand('session-id-123', 'bar-baz-name', array('foo' => 'bar'));
+
+    $this->assertSame('session-id-123', $command->getSessionID());
+    $this->assertSame('bar-baz-name', $command->getName());
+    $this->assertSame(array('foo' => 'bar'), $command->getParameters());
+  }
+}

From a7fd742c06ffc594cac8ccbec539f1196dcfabc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 1 Jan 2016 17:06:12 +0100
Subject: [PATCH 200/784] Added CHANGELOG.md (fixes #275)

---
 CHANGELOG.md | 14 ++++++++++++++
 README.md    | 19 +++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..2229754c1
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,14 @@
+# Changelog
+This project versioning adheres to [Semantic Versioning](http://semver.org/).
+
+## Unreleased
+- Added CHANGELOG.md
+
+## 1.1.1 - 2015-12-31
+- Fixed strict standards error in `ChromeDriver`
+- Added unit tests for `WebDriverCommand` and `DesiredCapabilities`
+- Fixed retrieving temporary path name in `FirefoxDriver` when `open_basedir` restriction is in effect 
+
+## 1.1.0 - 2015-12-08
+- FirefoxProfile improved - added possibility to set RDF file and to add datas for extensions
+- Fixed setting 0 second timeout of `WebDriverWait`
diff --git a/README.md b/README.md
index 7beb7564c..5f2b0a958 100644
--- a/README.md
+++ b/README.md
@@ -77,15 +77,10 @@ Install the library.
     RemoteWebDriver::create($host, $desired_capabilities);
     ```
 
-*   See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
+* See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
 
-## RUN UNIT TESTS
-
-To run unit tests simply run:
-
-    ./vendor/bin/phpunit -c ./tests
-
-Note: For the functional test suite, a running selenium server is required.
+## Changelog
+For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
 ## MORE INFORMATION
 
@@ -118,3 +113,11 @@ We love to have your help to make php-webdriver better. Feel free to
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
+
+### Run unit tests
+
+To run unit tests simply run:
+
+    ./vendor/bin/phpunit -c ./tests
+
+Note: For the functional test suite, a running selenium server is required.

From f89848df63108c8938e2c1cc45addd0c6d56e718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 1 Jan 2016 17:21:26 +0100
Subject: [PATCH 201/784] Cleanup README a bit

---
 README.md | 66 ++++++++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 5f2b0a958..cf25e6021 100644
--- a/README.md
+++ b/README.md
@@ -1,75 +1,61 @@
-php-webdriver -- WebDriver bindings for PHP
+php-webdriver – WebDriver bindings for PHP
 ===========================================
 
-##  DESCRIPTION
+## Description
+Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
 
-This WebDriver client aims to be as close as possible to bindings in other languages. The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
+This WebDriver client aims to be as close as possible to bindings in other languages.
+The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
 
-Looking for documentation about php-webdriver? See http://facebook.github.io/php-webdriver/
+This is new version of PHP client, rewritten from scratch starting 2013.
+Using the old version? Check out Adam Goucher's fork of it at https://github.com/Element-34/php-webdriver
 
-The PHP client was rewritten from scratch. Using the old version? Check out Adam Goucher's fork of it at https://github.com/Element-34/php-webdriver
+Looking for API documentation of php-webdriver? See http://facebook.github.io/php-webdriver/
 
 Any complaint, question, idea? You can post it on the user group https://www.facebook.com/groups/phpwebdriver/.
 
-##  GETTING THE CODE
+## Installation
 
-There are two ways of getting the code:
+Installation is possible using [Composer](https://getcomposer.org/).
 
-### Via Github
-    git clone git@github.com:facebook/php-webdriver.git
-
-### Via Packagist
-Add the dependency to composer.json (see https://packagist.org/packages/facebook/webdriver)
-
-```json
-{
-  "require": {
-    "facebook/webdriver": "~1.0"
-  }
-}
-```
-
-## INSTALLATION
-
-Download the composer.phar
+If you don't already use Composer, you can download the `composer.phar` binary:
 
     curl -sS https://getcomposer.org/installer | php
 
-Install the library.
-
-    php composer.phar install
+Then install the library:
 
+    php composer.phar require facebook/webdriver
 
-##  GETTING STARTED
+## Getting started
 
-*   All you need as the server for this client is the selenium-server-standalone-#.jar file provided here: http://selenium-release.storage.googleapis.com/index.html
+All you need as the server for this client is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
 
-*   Download and run that file, replacing # with the current server version.
+* Download and run that file, replacing # with the current server version.
 
     ```
     java -jar selenium-server-standalone-#.jar
     ```
 
-*   Then when you create a session, be sure to pass the url to where your server is running.
+Then when you create a session, be sure to pass the url to where your server is running.
 
     ```php
     // This would be the url of the host running the server-standalone.jar
     $host = 'http://localhost:4444/wd/hub'; // this is the default
     ```
 
-*   Launch Firefox
+* Launch Firefox:
 
     ```php
     $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
     ```
 
-*   Launch Chrome
+* Launch Chrome:
 
     ```php
     $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
     ```
 
-*   You can also customize the desired capabilities.
+You can also customize the desired capabilities:
 
     ```php
     $desired_capabilities = DesiredCapabilities::firefox();
@@ -82,13 +68,13 @@ Install the library.
 ## Changelog
 For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
-## MORE INFORMATION
+## More information
 
 Check out the Selenium docs and wiki at http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki
 
 Learn how to integrate it with PHPUnit [Blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) | [Demo Project](https://github.com/DavertMik/php-webdriver-demo)
 
-## SUPPORT
+## Support
 
 We have a great community willing to try and help you!
 
@@ -104,12 +90,12 @@ https://www.facebook.com/groups/phpwebdriver/
 
 If you're reading this you've already found our Github repository. If you have a question, feel free to submit it as an issue and our staff will do their best to help you as soon as possible.
 
-## CONTRIBUTING
+## Contributing
 
-We love to have your help to make php-webdriver better. Feel free to 
+We love to have your help to make php-webdriver better. Feel free to
 
-*   open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem. 
-*   fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed. 
+* open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem.
+* fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed.
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)

From 5f55880ea3eb0d3820c0731c9e6a33f801e9f707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 1 Jan 2016 17:22:06 +0100
Subject: [PATCH 202/784] Fix not working example in README
 (setJavascriptEnabled works only for htmlUnit browser, not Firefox

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cf25e6021..42883b931 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@ You can also customize the desired capabilities:
 
     ```php
     $desired_capabilities = DesiredCapabilities::firefox();
-    $desired_capabilities->setJavascriptEnabled(false);
-    RemoteWebDriver::create($host, $desired_capabilities);
+    $desired_capabilities->setCapability('acceptSslCerts', false);
+    $driver = RemoteWebDriver::create($host, $desired_capabilities);
     ```
 
 * See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.

From 49127be66fde8657080e1d48c26051f06a3b1cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 4 Jan 2016 18:17:28 +0100
Subject: [PATCH 203/784] Added information and rules for contributors

---
 CHANGELOG.md    |  1 +
 CONTRIBUTING.md | 36 ++++++++++++++++++++++++++++++++++++
 README.md       | 17 ++---------------
 3 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2229754c1..ff5496df5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 - Added CHANGELOG.md
+- Added CONTRIBUTING.md with information and rules for contributors
 
 ## 1.1.1 - 2015-12-31
 - Fixed strict standards error in `ChromeDriver`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..1da3f3d35
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,36 @@
+# Contributing to php-webdriver
+
+We love to have your help to make php-webdriver better!
+ 
+Feel free to open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem, or
+send a pull request (see bellow) with your contribution.
+
+## Workflow when contributing a patch
+
+1. Fork the project on GitHub
+2. Implement your code changes into separate branch
+3. Make sure all PHPUnit tests passes (see below). We also have Travis CI build which will automatically run tests on your pull request).
+4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
+5. Submit your [pull request](https://github.com/facebook/php-webdriver/pulls) against community branch
+ 
+Note before any pull request can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed.
+
+When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
+FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
+
+### Run unit tests
+
+There are two test-suites: one with unit tests only, second with functional tests, which require running selenium server.
+
+To execute all tests simply run:
+
+    ./vendor/bin/phpunit
+
+If you want to execute just the unit tests, run:
+
+    ./vendor/bin/phpunit --testsuite Unit-Testsuite
+    
+For the functional tests you must first download and start the selenium server, then run the `Functional-Testsuite` test suite:
+
+    java -jar selenium-server-standalone-2.48.2.jar -log selenium.log &
+    ./vendor/bin/phpunit --testsuite Functional-Testsuite
diff --git a/README.md b/README.md
index 42883b931..a69a01f54 100644
--- a/README.md
+++ b/README.md
@@ -92,18 +92,5 @@ If you're reading this you've already found our Github repository. If you have a
 
 ## Contributing
 
-We love to have your help to make php-webdriver better. Feel free to
-
-* open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem.
-* fork the project and submit [pull request](https://github.com/facebook/php-webdriver/pulls). Before the pull requests can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed.
-
-When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
-FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
-
-### Run unit tests
-
-To run unit tests simply run:
-
-    ./vendor/bin/phpunit -c ./tests
-
-Note: For the functional test suite, a running selenium server is required.
+We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information
+about contributing and developing php-webdriver.

From bc48fe4584e9816e6a8f4f7a2b7ecfda091850d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 5 Jan 2016 08:36:56 +0100
Subject: [PATCH 204/784] Rename test suites to make them easier to write

---
 CONTRIBUTING.md  | 6 +++---
 phpunit.xml.dist | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1da3f3d35..b426d475d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,9 +28,9 @@ To execute all tests simply run:
 
 If you want to execute just the unit tests, run:
 
-    ./vendor/bin/phpunit --testsuite Unit-Testsuite
+    ./vendor/bin/phpunit --testsuite unit
     
-For the functional tests you must first download and start the selenium server, then run the `Functional-Testsuite` test suite:
+For the functional tests you must first download and start the selenium server, then run the `functional` test suite:
 
     java -jar selenium-server-standalone-2.48.2.jar -log selenium.log &
-    ./vendor/bin/phpunit --testsuite Functional-Testsuite
+    ./vendor/bin/phpunit --testsuite functional
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 83eb0ecef..06dee9c0f 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,12 +15,12 @@
         bootstrap="tests/bootstrap.php"
         >
 
-<testsuites>
-        <testsuite name="Unit-Testsuite">
+    <testsuites>
+        <testsuite name="unit">
             <directory>tests/unit</directory>
         </testsuite>
-        <testsuite name="Functional-Testsuite">
-            <directory>tests/functional/</directory>
+        <testsuite name="functional">
+            <directory>tests/functional</directory>
         </testsuite>
     </testsuites>
 </phpunit>

From ebed69f8404ca5ca1ad4468b6bae9cb93e31a231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 6 Jan 2016 22:09:11 +0100
Subject: [PATCH 205/784] Fix code markdown in README

---
 README.md | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index a69a01f54..9f8d34d3d 100644
--- a/README.md
+++ b/README.md
@@ -30,18 +30,16 @@ Then install the library:
 
 All you need as the server for this client is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
 
-* Download and run that file, replacing # with the current server version.
+Download and run that file, replacing # with the current server version.
 
-    ```
     java -jar selenium-server-standalone-#.jar
-    ```
 
 Then when you create a session, be sure to pass the url to where your server is running.
 
-    ```php
-    // This would be the url of the host running the server-standalone.jar
-    $host = 'http://localhost:4444/wd/hub'; // this is the default
-    ```
+```php
+// This would be the url of the host running the server-standalone.jar
+$host = 'http://localhost:4444/wd/hub'; // this is the default
+```
 
 * Launch Firefox:
 
@@ -57,11 +55,11 @@ Then when you create a session, be sure to pass the url to where your server is
 
 You can also customize the desired capabilities:
 
-    ```php
-    $desired_capabilities = DesiredCapabilities::firefox();
-    $desired_capabilities->setCapability('acceptSslCerts', false);
-    $driver = RemoteWebDriver::create($host, $desired_capabilities);
-    ```
+```php
+$desired_capabilities = DesiredCapabilities::firefox();
+$desired_capabilities->setCapability('acceptSslCerts', false);
+$driver = RemoteWebDriver::create($host, $desired_capabilities);
+```
 
 * See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
 

From 017bf3bc88d3ae2cf5a8e98c8004bec1f2835927 Mon Sep 17 00:00:00 2001
From: Lars Moelleken <lmoelleken@menadwork.com>
Date: Mon, 1 Feb 2016 13:17:53 +0100
Subject: [PATCH 206/784] [+]: fixed function-call from
 "$checker->waitUntilUnAvailable()" -> "$checker->waitUntilUnavailable()" [~]:
 "\t" -> spaces [~]: "dirname(__FILE__)" -> "__DIR__" [*]: "<input></input>"
 -> <input />

---
 lib/Firefox/FirefoxProfile.php         | 21 ++++++++++++---------
 lib/Remote/Service/DriverService.php   |  2 +-
 tests/functional/WebDriverTestCase.php |  6 +++---
 tests/functional/html/upload.html      |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index bf23e5e7a..651e0b2eb 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -131,10 +131,10 @@ public function encode() {
       $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($extension_datas, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
       foreach ($iterator as $item) {
         if ($item->isDir()) {
-	  mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
-	} else {
-	  copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
-	}
+          mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+        } else {
+          copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+        }
       }
     }
 
@@ -150,15 +150,18 @@ public function encode() {
 
     $dir = new RecursiveDirectoryIterator($temp_dir);
     $files = new RecursiveIteratorIterator($dir);
+
+    $dir_prefix = preg_replace(
+        '#\\\\#',
+        '\\\\\\\\',
+        $temp_dir.DIRECTORY_SEPARATOR
+    );
+
     foreach ($files as $name => $object) {
       if (is_dir($name)) {
         continue;
       }
-      $dir_prefix = preg_replace(
-        '#\\\\#',
-        '\\\\\\\\',
-        $temp_dir.DIRECTORY_SEPARATOR
-      );
+
       $path = preg_replace("#^{$dir_prefix}#", "", $name);
       $zip->addFile($name, $path);
     }
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 09ad7c815..8a18e5d5d 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -109,7 +109,7 @@ public function stop() {
     $this->process = null;
 
     $checker = new URLChecker();
-    $checker->waitUntilUnAvailable(3 * 1000, $this->url.'/shutdown');
+    $checker->waitUntilUnavailable(3 * 1000, $this->url.'/shutdown');
 
     return $this;
   }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 73b3c2b58..9be2153d3 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -40,8 +40,8 @@ protected function setUp() {
   
   protected function tearDown() {
     if ($this->driver) {
-	    $this->driver->quit();
-	  }
+      $this->driver->quit();
+    }
   }
 
   /**
@@ -51,6 +51,6 @@ protected function tearDown() {
    * @return string
    */
   protected function getTestPath($path) {
-    return 'file:///'.dirname(__FILE__).'/html/'.$path;
+    return 'file:///'.__DIR__.'/html/'.$path;
   }
 }
diff --git a/tests/functional/html/upload.html b/tests/functional/html/upload.html
index d542ad04f..ed03702d3 100644
--- a/tests/functional/html/upload.html
+++ b/tests/functional/html/upload.html
@@ -4,7 +4,7 @@
 </head>
 <body>
   <form method="post" enctype="multipart/form-data">
-    <input type="file" id="upload"></input>
+    <input type="file" id="upload" />
   </form>
 </body>
 </html>

From 61274d2fa4b38162e7b25391321484fa8164da30 Mon Sep 17 00:00:00 2001
From: Lars Moelleken <lmoelleken@menadwork.com>
Date: Mon, 1 Feb 2016 13:18:53 +0100
Subject: [PATCH 207/784] [+]: ".gitattributes" <- prevent installing special
 files via composer

---
 .gitattributes | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..c3b6383af
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+* text=auto
+
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/example.php export-ignore
+/phpunit.xml.dist export-ignore

From 0f3048f2499285538a8be240afa9d722aa6fe1d4 Mon Sep 17 00:00:00 2001
From: javier gomez <javier.gomez.corio@gmail.com>
Date: Thu, 25 Feb 2016 10:39:39 +0100
Subject: [PATCH 208/784] Enhance moveToElement method description

---
 lib/Interactions/WebDriverActions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 4d8a623d8..3e11b3c0a 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -168,8 +168,8 @@ public function moveByOffset($x_offset, $y_offset) {
   }
 
   /**
-   * Move to the middle of the given WebDriverElement. If offset are provided,
-   * move the an offset from the top-left cornerof that element.
+   * Move to the middle of the given WebDriverElement.
+   * Extra shift, calculated from the top-left corner of the element, can be set by passing $x_offset and $y_offset parameters. 
    *
    * @param WebDriverElement $element
    * @param int $x_offset

From 09ec61c59a8fd86bd02b9efa28748ccc2ba6444a Mon Sep 17 00:00:00 2001
From: phpdave <davelhs03@yahoo.com>
Date: Tue, 15 Mar 2016 09:12:55 -0400
Subject: [PATCH 209/784] Updated Readme to fix DesiredCapabilities link

Fixing this issue https://github.com/facebook/php-webdriver/issues/283
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f8d34d3d..146d45ad6 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ $desired_capabilities->setCapability('acceptSslCerts', false);
 $driver = RemoteWebDriver::create($host, $desired_capabilities);
 ```
 
-* See https://code.google.com/p/selenium/wiki/DesiredCapabilities for more details.
+* See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities for more details.
 
 ## Changelog
 For latest changes see [CHANGELOG.md](CHANGELOG.md) file.

From 46661a59a094469227c5b10c6e8716f71079ec03 Mon Sep 17 00:00:00 2001
From: Jan Kohlhof <kohj@informatik.uni-marburg.de>
Date: Fri, 11 Mar 2016 22:55:45 +0100
Subject: [PATCH 210/784] Added ext-curl as dependency

As suggested correctly in #279
---
 CHANGELOG.md  | 1 +
 composer.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff5496df5..103ffee19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- Added ext-curl to composer.json
 - Added CHANGELOG.md
 - Added CONTRIBUTING.md with information and rules for contributors
 
diff --git a/composer.json b/composer.json
index be4ba7dd5..682e72479 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,8 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.19"
+    "php": ">=5.3.19",
+    "ext-curl": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "4.6.*"

From a7834be0fed2770ca9b760b443c10267352a917e Mon Sep 17 00:00:00 2001
From: Scott Davey <sdavey@datalink.com.au>
Date: Mon, 9 May 2016 17:30:24 +1000
Subject: [PATCH 211/784] Fixed PHP Fatal crash in RemoteWebDriver:507

---
 lib/Remote/RemoteWebDriver.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 1fda245b2..8fb7003c1 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -504,7 +504,11 @@ public function execute($command_name, $params = array()) {
       $params
     );
 
-    $response = $this->executor->execute($command);
-    return $response->getValue();
+	if ($this->executor) {
+		$response = $this->executor->execute($command);
+		return $response->getValue();
+	} else {
+		return null;
+	}
   }
 }

From 0eb0a0ad8c7177a5071d17853c982ba2507d25f3 Mon Sep 17 00:00:00 2001
From: Andre Fortin <andre.v.fortin@gmail.com>
Date: Fri, 3 Jun 2016 19:38:44 -0400
Subject: [PATCH 212/784] Throw exception if extension doesn't exist.

Update to make extractTo() throw an exception if the Firefox extension .xpi file doesn't exist, which should be the desired behavior.

Currently extractTo() only throws an error if the .xpi file exists AND is unable to open.

ZipArchive throws some Warning messages when you use extractTo() and close() on an initialized ZipArchive object which is the case if the file doesn't exist.
---
 lib/Firefox/FirefoxProfile.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 651e0b2eb..9617f4e77 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -249,11 +249,15 @@ private function deleteDirectory($directory) {
    */
   private function extractTo($xpi, $target_dir) {
     $zip = new ZipArchive();
-    if ($zip->open($xpi)) {
-      $zip->extractTo($target_dir);
-      $zip->close();
+    if (file_exists($xpi)) {
+      if ($zip->open($xpi)) {
+        $zip->extractTo($target_dir);
+        $zip->close();
+      } else {
+        throw new \Exception("Failed to open the firefox extension. '$xpi'");
+      }
     } else {
-      throw new \Exception("Failed to open the firefox extension. '$xpi'");
+      throw new \Exception("Firefox extension doesn't exist. '$xpi'");
     }
     return $this;
   }

From 14a6ff7d8b7f8303c79ac5154a9da9041817c089 Mon Sep 17 00:00:00 2001
From: Andre Fortin <andre.v.fortin@gmail.com>
Date: Sat, 4 Jun 2016 02:11:38 -0400
Subject: [PATCH 213/784] Fixed Hardcoded 'em' namespace in installExtension()
 prevents some extensions from loading:507

---
 lib/Firefox/FirefoxProfile.php | 42 ++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 9617f4e77..03830dc63 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -183,21 +183,33 @@ public function encode() {
    */
   private function installExtension($extension, $profile_dir) {
     $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfileExtension');
-
-    $this->extractTo($extension, $temp_dir);
-
-    $install_rdf_path = $temp_dir.'/install.rdf';
-    // This is a hacky way to parse the id since there is no offical
-    // RDF parser library.
-    $matches = array();
-    $xml = file_get_contents($install_rdf_path);
-    preg_match('#<em:id>([^<]+)</em:id>#', $xml, $matches);
-    $ext_dir = $profile_dir.'/extensions/'.$matches[1];
-
-    mkdir($ext_dir, 0777, true);
-
-    $this->extractTo($extension, $ext_dir);
-
+  	$this->extractTo($extension, $temp_dir);
+  	
+  	// This is a hacky way to parse the id since there is no offical RDF parser library.
+  	// Find the correct namespace for the id element.
+  	$install_rdf_path = $temp_dir.'/install.rdf';
+  	$xml = simplexml_load_file($install_rdf_path);
+  	$ns = $xml->getDocNamespaces();
+  	$prefix = '';
+  	if (!empty($ns)) {
+  	  foreach($ns as $key => $value) {
+  		  if (strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
+  			  if ($key != '') {
+  				  $prefix = $key . ':'; // Separate the namespace from the name.
+  				}
+  				break;
+  			}
+  		}
+  	}
+  	// Get the extension id from the install manifest.
+  	$matches = array();
+  	preg_match('#<'.$prefix.'id>([^<]+)</'.$prefix.'id>#', $xml->asXML(), $matches);
+  	if (isset($matches[1])) {
+  		$ext_dir = $profile_dir.'/extensions/'.$matches[1];
+  		mkdir($ext_dir, 0777, true);
+  		$this->extractTo($extension, $ext_dir);
+  	}
+  	
     // clean up
     $this->deleteDirectory($temp_dir);
 

From 4dc9974e643a9330d6c614bcf2c4454c200f922a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Jul 2016 02:09:35 +0200
Subject: [PATCH 214/784] Update changelog according to latest release

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 103ffee19..02933ab90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
+
+## 1.1.2 - 2016-06-04
 - Added ext-curl to composer.json
 - Added CHANGELOG.md
 - Added CONTRIBUTING.md with information and rules for contributors

From 29a41cb8e7f590ffdc613dab9a28ebafd5af5c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jul 2016 14:55:20 +0200
Subject: [PATCH 215/784] Allow PHPUnit 5.x for unit tests

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 682e72479..43c61fa88 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.6.*"
+    "phpunit/phpunit": "4.6.* || ~5.0"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"

From 1f158a0091db69ee82d1e1be604fbee15d230537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jul 2016 14:55:34 +0200
Subject: [PATCH 216/784] Replace deprecated ->getMock() call

---
 .../Internal/WebDriverButtonReleaseActionTest.php           | 4 ++--
 .../unit/Interactions/Internal/WebDriverClickActionTest.php | 4 ++--
 .../Internal/WebDriverClickAndHoldActionTest.php            | 4 ++--
 .../Internal/WebDriverContextClickActionTest.php            | 4 ++--
 .../Internal/WebDriverDoubleClickActionTest.php             | 4 ++--
 .../Interactions/Internal/WebDriverKeyDownActionTest.php    | 6 +++---
 .../unit/Interactions/Internal/WebDriverKeyUpActionTest.php | 6 +++---
 .../Interactions/Internal/WebDriverMouseMoveActionTest.php  | 4 ++--
 .../Internal/WebDriverMouseToOffsetActionTest.php           | 4 ++--
 .../Interactions/Internal/WebDriverSendKeysActionTest.php   | 6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index 982e8d268..58373d9b9 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -27,8 +27,8 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
     $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
       $this->webDriverMouse,
       $this->locationProvider
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 8fab683fe..c58d507d1 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -27,8 +27,8 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
     $this->webDriverClickAction = new WebDriverClickAction(
       $this->webDriverMouse,
       $this->locationProvider
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index b10ac2cea..ae046c58e 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -27,8 +27,8 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
     $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
       $this->webDriverMouse,
       $this->locationProvider
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index a57cb127a..d9b9ef2b8 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -27,8 +27,8 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
     $this->webDriverContextClickAction = new WebDriverContextClickAction(
       $this->webDriverMouse,
       $this->locationProvider
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 7f09f64dc..f1c6d3a02 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -27,8 +27,8 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
     $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
       $this->webDriverMouse,
       $this->locationProvider
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 5bba82f4f..10a6201e0 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -30,9 +30,9 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
     $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
       $this->webDriverKeyboard,
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index cd2b7b00c..75fb1bde9 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -30,9 +30,9 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
     $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
       $this->webDriverKeyboard,
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 6376adfa0..10edb2588 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -27,8 +27,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
     $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
       $this->webDriverMouse,
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index 2ea16d552..aeec43a5a 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -29,8 +29,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
   private $locationProvider;
 
   public function setUp() {
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
     $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
       $this->webDriverMouse,
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index f7c2917d0..bf1a5b8a7 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -32,9 +32,9 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
   private $keys;
 
   public function setUp() {
-    $this->webDriverKeyboard = $this->getMock('Facebook\WebDriver\WebDriverKeyboard');
-    $this->webDriverMouse = $this->getMock('Facebook\WebDriver\WebDriverMouse');
-    $this->locationProvider = $this->getMock('Facebook\WebDriver\Internal\WebDriverLocatable');
+    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
     $this->keys = array('t', 'e', 's', 't');
     $this->webDriverSendKeysAction = new WebDriverSendKeysAction(

From c051b545cbd566f87d05ce99a5bcfad2e5e0ae28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jul 2016 16:16:16 +0200
Subject: [PATCH 217/784] PSR-2 codestyle

---
 CHANGELOG.md                                  |   1 +
 lib/Chrome/ChromeDriver.php                   | 116 +-
 lib/Chrome/ChromeDriverService.php            |  23 +-
 lib/Chrome/ChromeOptions.php                  | 275 ++---
 .../ElementNotSelectableException.php         |   7 +-
 lib/Exception/ElementNotVisibleException.php  |   6 +-
 lib/Exception/ExpectedException.php           |   7 +-
 .../IMEEngineActivationFailedException.php    |   7 +-
 lib/Exception/IMENotAvailableException.php    |   7 +-
 lib/Exception/IndexOutOfBoundsException.php   |   6 +-
 .../InvalidCookieDomainException.php          |   6 +-
 lib/Exception/InvalidCoordinatesException.php |   7 +-
 .../InvalidElementStateException.php          |   6 +-
 lib/Exception/InvalidSelectorException.php    |   7 +-
 .../MoveTargetOutOfBoundsException.php        |   7 +-
 lib/Exception/NoAlertOpenException.php        |   6 +-
 lib/Exception/NoCollectionException.php       |   6 +-
 lib/Exception/NoScriptResultException.php     |   6 +-
 lib/Exception/NoStringException.php           |   6 +-
 lib/Exception/NoStringLengthException.php     |   6 +-
 lib/Exception/NoStringWrapperException.php    |   6 +-
 lib/Exception/NoSuchCollectionException.php   |   6 +-
 lib/Exception/NoSuchDocumentException.php     |   7 +-
 lib/Exception/NoSuchDriverException.php       |   6 +-
 lib/Exception/NoSuchElementException.php      |   6 +-
 lib/Exception/NoSuchFrameException.php        |   6 +-
 lib/Exception/NoSuchWindowException.php       |   6 +-
 lib/Exception/NullPointerException.php        |   7 +-
 lib/Exception/ScriptTimeoutException.php      |   7 +-
 lib/Exception/SessionNotCreatedException.php  |   7 +-
 .../StaleElementReferenceException.php        |   6 +-
 lib/Exception/TimeOutException.php            |   6 +-
 lib/Exception/UnableToSetCookieException.php  |   6 +-
 .../UnexpectedAlertOpenException.php          |   6 +-
 .../UnexpectedJavascriptException.php         |   6 +-
 lib/Exception/UnexpectedTagNameException.php  |  36 +-
 lib/Exception/UnknownCommandException.php     |   6 +-
 lib/Exception/UnknownServerException.php      |   6 +-
 .../UnrecognizedExceptionException.php        |   7 +-
 .../UnsupportedOperationException.php         |   7 +-
 lib/Exception/WebDriverCurlException.php      |   7 +-
 lib/Exception/WebDriverException.php          | 285 ++---
 lib/Exception/XPathLookupException.php        |   6 +-
 lib/Firefox/FirefoxDriver.php                 |  11 +-
 lib/Firefox/FirefoxPreferences.php            |  21 +-
 lib/Firefox/FirefoxProfile.php                | 479 +++++----
 .../Internal/WebDriverButtonReleaseAction.php |  13 +-
 .../Internal/WebDriverClickAction.php         |  13 +-
 .../Internal/WebDriverClickAndHoldAction.php  |  13 +-
 .../Internal/WebDriverContextClickAction.php  |  13 +-
 .../Internal/WebDriverCoordinates.php         |  89 +-
 .../Internal/WebDriverDoubleClickAction.php   |  13 +-
 .../Internal/WebDriverKeyDownAction.php       |  15 +-
 .../Internal/WebDriverKeyUpAction.php         |  15 +-
 .../Internal/WebDriverKeysRelatedAction.php   |  51 +-
 .../Internal/WebDriverMouseAction.php         |  63 +-
 .../Internal/WebDriverMouseMoveAction.php     |  13 +-
 .../Internal/WebDriverMoveToOffsetAction.php  |  44 +-
 .../Internal/WebDriverSendKeysAction.php      |  48 +-
 .../Internal/WebDriverSingleKeyAction.php     |  27 +-
 .../Touch/WebDriverDoubleTapAction.php        |  13 +-
 .../Touch/WebDriverDownAction.php             |  38 +-
 .../Touch/WebDriverFlickAction.php            |  34 +-
 .../Touch/WebDriverFlickFromElementAction.php |  64 +-
 .../Touch/WebDriverLongPressAction.php        |  13 +-
 .../Touch/WebDriverMoveAction.php             |  38 +-
 .../Touch/WebDriverScrollAction.php           |  38 +-
 .../WebDriverScrollFromElementAction.php      |  54 +-
 lib/Interactions/Touch/WebDriverTapAction.php |  13 +-
 .../Touch/WebDriverTouchAction.php            |  65 +-
 .../Touch/WebDriverTouchScreen.php            | 185 ++--
 lib/Interactions/WebDriverActions.php         | 473 +++++----
 lib/Interactions/WebDriverCompositeAction.php |  58 +-
 lib/Interactions/WebDriverTouchActions.php    | 304 +++---
 lib/Internal/WebDriverLocatable.php           |  14 +-
 lib/JavaScriptExecutor.php                    |  53 +-
 lib/Net/URLChecker.php                        | 102 +-
 lib/Remote/DesiredCapabilities.php            | 557 +++++-----
 lib/Remote/DriverCommand.php                  | 275 +++--
 lib/Remote/ExecuteMethod.php                  |  16 +-
 lib/Remote/FileDetector.php                   |  22 +-
 lib/Remote/HttpCommandExecutor.php            | 564 +++++-----
 lib/Remote/LocalFileDetector.php              |  15 +-
 lib/Remote/RemoteExecuteMethod.php            |  39 +-
 lib/Remote/RemoteKeyboard.php                 | 105 +-
 lib/Remote/RemoteMouse.php                    | 218 ++--
 lib/Remote/RemoteTargetLocator.php            | 147 +--
 lib/Remote/RemoteTouchScreen.php              | 350 +++---
 lib/Remote/RemoteWebDriver.php                | 994 +++++++++---------
 lib/Remote/RemoteWebElement.php               | 806 +++++++-------
 lib/Remote/Service/DriverCommandExecutor.php  |  68 +-
 lib/Remote/Service/DriverService.php          | 230 ++--
 lib/Remote/UselessFileDetector.php            |  18 +-
 lib/Remote/WebDriverBrowserType.php           |  52 +-
 lib/Remote/WebDriverCapabilityType.php        |  41 +-
 lib/Remote/WebDriverCommand.php               |  75 +-
 lib/Remote/WebDriverResponse.php              | 130 +--
 lib/Support/Events/EventFiringWebDriver.php   | 646 ++++++------
 .../Events/EventFiringWebDriverNavigation.php | 267 ++---
 lib/Support/Events/EventFiringWebElement.php  | 662 ++++++------
 lib/WebDriver.php                             | 229 ++--
 lib/WebDriverAction.php                       |  11 +-
 lib/WebDriverAlert.php                        |  95 +-
 lib/WebDriverBy.php                           | 199 ++--
 lib/WebDriverCapabilities.php                 |  66 +-
 lib/WebDriverCommandExecutor.php              |  16 +-
 lib/WebDriverDimension.php                    |  72 +-
 lib/WebDriverDispatcher.php                   | 117 ++-
 lib/WebDriverElement.php                      | 230 ++--
 lib/WebDriverEventListener.php                | 191 ++--
 lib/WebDriverExpectedCondition.php            | 801 +++++++-------
 lib/WebDriverHasInputDevices.php              |  20 +-
 lib/WebDriverKeyboard.php                     |  50 +-
 lib/WebDriverKeys.php                         | 176 ++--
 lib/WebDriverMouse.php                        |  74 +-
 lib/WebDriverNavigation.php                   |  95 +-
 lib/WebDriverOptions.php                      | 300 +++---
 lib/WebDriverPlatform.php                     |  25 +-
 lib/WebDriverPoint.php                        | 121 ++-
 lib/WebDriverSearchContext.php                |  42 +-
 lib/WebDriverSelect.php                       | 486 ++++-----
 lib/WebDriverTargetLocator.php                |  78 +-
 lib/WebDriverTimeouts.php                     | 101 +-
 lib/WebDriverUpAction.php                     |  38 +-
 lib/WebDriverWait.php                         |  91 +-
 lib/WebDriverWindow.php                       | 248 ++---
 tests/functional/BaseTest.php                 | 156 +--
 tests/functional/FileUploadTest.php           |  45 +-
 tests/functional/WebDriverTestCase.php        |  57 +-
 .../WebDriverButtonReleaseActionTest.php      |  47 +-
 .../Internal/WebDriverClickActionTest.php     |  47 +-
 .../WebDriverClickAndHoldActionTest.php       |  47 +-
 .../WebDriverContextClickActionTest.php       |  47 +-
 .../Internal/WebDriverCoordinatesTest.php     |  40 +-
 .../WebDriverDoubleClickActionTest.php        |  47 +-
 .../Internal/WebDriverKeyDownActionTest.php   |  57 +-
 .../Internal/WebDriverKeyUpActionTest.php     |  59 +-
 .../Internal/WebDriverMouseMoveActionTest.php |  47 +-
 .../WebDriverMouseToOffsetActionTest.php      |  55 +-
 .../Internal/WebDriverSendKeysActionTest.php  |  65 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php | 215 ++--
 tests/unit/Remote/WebDriverCommandTest.php    |  14 +-
 142 files changed, 7637 insertions(+), 7149 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02933ab90..f379bdaa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
+- Comply codestyle with [PSR-2](http://www.php-fig.org/psr/psr-2/)
 
 ## 1.1.2 - 2016-06-04
 - Added ext-curl to composer.json
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 0cabccd91..75131c215 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -15,72 +15,72 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\DriverCommand;
-use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
-use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
 
-class ChromeDriver extends RemoteWebDriver {
+class ChromeDriver extends RemoteWebDriver
+{
+    public static function start(DesiredCapabilities $desired_capabilities = null, ChromeDriverService $service = null)
+    {
+        if ($desired_capabilities === null) {
+            $desired_capabilities = DesiredCapabilities::chrome();
+        }
+        if ($service === null) {
+            $service = ChromeDriverService::createDefaultService();
+        }
+        $executor = new DriverCommandExecutor($service);
+        $driver = new static();
+        $driver->setCommandExecutor($executor)
+            ->startSession($desired_capabilities);
 
-  public static function start(
-    DesiredCapabilities $desired_capabilities = null,
-    ChromeDriverService $service = null
-  ) {
-    if ($desired_capabilities === null) {
-      $desired_capabilities = DesiredCapabilities::chrome();
+        return $driver;
     }
-    if ($service === null) {
-      $service = ChromeDriverService::createDefaultService();
-    }
-    $executor = new DriverCommandExecutor($service);
-    $driver = new static();
-    $driver->setCommandExecutor($executor)
-           ->startSession($desired_capabilities);
-    return $driver;
-  }
 
-  public function startSession($desired_capabilities) {
-    $command = new WebDriverCommand(
-      null,
-      DriverCommand::NEW_SESSION,
-      array(
-        'desiredCapabilities' => $desired_capabilities->toArray(),
-      )
-    );
-    $response = $this->executor->execute($command);
-    $this->setSessionID($response->getSessionID());
-  }
+    public function startSession($desired_capabilities)
+    {
+        $command = new WebDriverCommand(
+            null,
+            DriverCommand::NEW_SESSION,
+            array(
+                'desiredCapabilities' => $desired_capabilities->toArray(),
+            )
+        );
+        $response = $this->executor->execute($command);
+        $this->setSessionID($response->getSessionID());
+    }
 
-  /**
-   * Always throws an exception. Use ChromeDriver::start() instead.
-   *
-   * @throws WebDriverException
-   */
-  public static function create(
-    $url = 'http://localhost:4444/wd/hub',
-    $desired_capabilities = null,
-    $connection_timeout_in_ms = null,
-    $request_timeout_in_ms = null,
-    $http_proxy = null,
-    $http_proxy_port = null
-  ) {
-    throw new WebDriverException('Please use ChromeDriver::start() instead.');
-  }
+    /**
+     * Always throws an exception. Use ChromeDriver::start() instead.
+     *
+     * @throws WebDriverException
+     */
+    public static function create(
+        $url = 'http://localhost:4444/wd/hub',
+        $desired_capabilities = null,
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null,
+        $http_proxy = null,
+        $http_proxy_port = null
+    ) {
+        throw new WebDriverException('Please use ChromeDriver::start() instead.');
+    }
 
-  /**
-   * Always throws an exception. Use ChromeDriver::start() instead.
-   *
-   * @param string $session_id The existing session id
-   * @param string $url        The url of the remote server
-   *
-   * @throws WebDriverException
-   */
-  public static function createBySessionID(
-    $session_id,
-    $url = 'http://localhost:4444/wd/hub'
-  ) {
-    throw new WebDriverException('Please use ChromeDriver::start() instead.');
-  }
+    /**
+     * Always throws an exception. Use ChromeDriver::start() instead.
+     *
+     * @param string $session_id The existing session id
+     * @param string $url The url of the remote server
+     *
+     * @throws WebDriverException
+     */
+    public static function createBySessionID(
+        $session_id,
+        $url = 'http://localhost:4444/wd/hub'
+    ) {
+        throw new WebDriverException('Please use ChromeDriver::start() instead.');
+    }
 }
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index d60f376a6..a48207a46 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -17,17 +17,18 @@
 
 use Facebook\WebDriver\Remote\Service\DriverService;
 
-class ChromeDriverService extends DriverService {
+class ChromeDriverService extends DriverService
+{
+    // The environment variable storing the path to the chrome driver executable.
+    const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
 
-  // The environment variable storing the path to the chrome driver executable.
-  const CHROME_DRIVER_EXE_PROPERTY = "webdriver.chrome.driver";
-
-  public static function createDefaultService() {
-    $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
-    $port = 9515; // TODO: Get another port if the default port is used.
-    $args = array("--port=$port");
-    $service = new ChromeDriverService($exe, $port, $args);
-    return $service;
-  }
+    public static function createDefaultService()
+    {
+        $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+        $port = 9515; // TODO: Get another port if the default port is used.
+        $args = array("--port=$port");
+        $service = new self($exe, $port, $args);
 
+        return $service;
+    }
 }
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index da387c55a..3af14b9c3 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -22,141 +22,154 @@
  *
  * @see https://sites.google.com/a/chromium.org/chromedriver/capabilities
  */
-class ChromeOptions {
-
-  /**
-   * The key of chrome options in desired capabilities.
-   */
-  const CAPABILITY = "chromeOptions";
-
-  /**
-   * @var array
-   */
-  private $arguments = array();
-
-  /**
-   * @var string
-   */
-  private $binary = '';
-
-  /**
-   * @var array
-   */
-  private $extensions = array();
-
-  /**
-   * @var array
-   */
-  private $experimentalOptions = array();
-
-  /**
-   * Sets the path of the Chrome executable. The path should be either absolute
-   * or relative to the location running ChromeDriver server.
-   *
-   * @param string $path
-   * @return ChromeOptions
-   */
-  public function setBinary($path) {
-    $this->binary = $path;
-    return $this;
-  }
-
-  /**
-   * @param array $arguments
-   * @return ChromeOptions
-   */
-  public function addArguments(array $arguments) {
-    $this->arguments = array_merge($this->arguments, $arguments);
-    return $this;
-  }
-
-  /**
-   * Add a Chrome extension to install on browser startup. Each path should be
-   * a packed Chrome extension.
-   *
-   * @param array $paths
-   * @return ChromeOptions
-   */
-  public function addExtensions(array $paths) {
-    foreach ($paths as $path) {
-      $this->addExtension($path);
+class ChromeOptions
+{
+    /**
+     * The key of chrome options in desired capabilities.
+     */
+    const CAPABILITY = 'chromeOptions';
+    /**
+     * @var array
+     */
+    private $arguments = array();
+    /**
+     * @var string
+     */
+    private $binary = '';
+    /**
+     * @var array
+     */
+    private $extensions = array();
+    /**
+     * @var array
+     */
+    private $experimentalOptions = array();
+
+    /**
+     * Sets the path of the Chrome executable. The path should be either absolute
+     * or relative to the location running ChromeDriver server.
+     *
+     * @param string $path
+     * @return ChromeOptions
+     */
+    public function setBinary($path)
+    {
+        $this->binary = $path;
+
+        return $this;
     }
-    return $this;
-  }
-
-  /**
-   * @param array $encoded_extensions An array of base64 encoded of the extensions.
-   * @return ChromeOptions
-   */
-  public function addEncodedExtensions(array $encoded_extensions) {
-    foreach ($encoded_extensions as $encoded_extension) {
-      $this->addEncodedExtension($encoded_extension);
+
+    /**
+     * @param array $arguments
+     * @return ChromeOptions
+     */
+    public function addArguments(array $arguments)
+    {
+        $this->arguments = array_merge($this->arguments, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Add a Chrome extension to install on browser startup. Each path should be
+     * a packed Chrome extension.
+     *
+     * @param array $paths
+     * @return ChromeOptions
+     */
+    public function addExtensions(array $paths)
+    {
+        foreach ($paths as $path) {
+            $this->addExtension($path);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param array $encoded_extensions An array of base64 encoded of the extensions.
+     * @return ChromeOptions
+     */
+    public function addEncodedExtensions(array $encoded_extensions)
+    {
+        foreach ($encoded_extensions as $encoded_extension) {
+            $this->addEncodedExtension($encoded_extension);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets an experimental option which has not exposed officially.
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return ChromeOptions
+     */
+    public function setExperimentalOption($name, $value)
+    {
+        $this->experimentalOptions[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return DesiredCapabilities The DesiredCapabilities for Chrome with this options.
+     */
+    public function toCapabilities()
+    {
+        $capabilities = DesiredCapabilities::chrome();
+        $capabilities->setCapability(self::CAPABILITY, $this);
+
+        return $capabilities;
     }
-    return $this;
-  }
-
-  /**
-   * Sets an experimental option which has not exposed officially.
-   *
-   * @param string $name
-   * @param mixed $value
-   * @return ChromeOptions
-   */
-  public function setExperimentalOption($name, $value) {
-    $this->experimentalOptions[$name] = $value;
-    return $this;
-  }
-
-  /**
-   * @return DesiredCapabilities The DesiredCapabilities for Chrome with this options.
-   */
-  public function toCapabilities() {
-    $capabilities = DesiredCapabilities::chrome();
-    $capabilities->setCapability(self::CAPABILITY, $this);
-    return $capabilities;
-  }
-
-  /**
-   * @return array
-   */
-  public function toArray() {
-    $options = $this->experimentalOptions;
-
-    // The selenium server expects a 'dictionary' instead of a 'list' when
-    // reading the chrome option. However, an empty array in PHP will be
-    // converted to a 'list' instead of a 'dictionary'. To fix it, we always
-    // set the 'binary' to avoid returning an empty array.
-    $options['binary'] = $this->binary;
-
-    if ($this->arguments) {
-      $options['args'] = $this->arguments;
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $options = $this->experimentalOptions;
+
+        // The selenium server expects a 'dictionary' instead of a 'list' when
+        // reading the chrome option. However, an empty array in PHP will be
+        // converted to a 'list' instead of a 'dictionary'. To fix it, we always
+        // set the 'binary' to avoid returning an empty array.
+        $options['binary'] = $this->binary;
+
+        if ($this->arguments) {
+            $options['args'] = $this->arguments;
+        }
+
+        if ($this->extensions) {
+            $options['extensions'] = $this->extensions;
+        }
+
+        return $options;
     }
 
-    if ($this->extensions) {
-      $options['extensions'] = $this->extensions;
+    /**
+     * Add a Chrome extension to install on browser startup. Each path should be a
+     * packed Chrome extension.
+     *
+     * @param string $path
+     * @return ChromeOptions
+     */
+    private function addExtension($path)
+    {
+        $this->addEncodedExtension(base64_encode(file_get_contents($path)));
+
+        return $this;
     }
 
-    return $options;
-  }
-
-  /**
-   * Add a Chrome extension to install on browser startup. Each path should be a
-   * packed Chrome extension.
-   *
-   * @param string $path
-   * @return ChromeOptions
-   */
-  private function addExtension($path) {
-    $this->addEncodedExtension(base64_encode(file_get_contents($path)));
-    return $this;
-  }
-
-  /**
-   * @param string $encoded_extension Base64 encoded of the extension.
-   * @return ChromeOptions
-   */
-  private function addEncodedExtension($encoded_extension) {
-    $this->extensions[] = $encoded_extension;
-    return $this;
-  }
+    /**
+     * @param string $encoded_extension Base64 encoded of the extension.
+     * @return ChromeOptions
+     */
+    private function addEncodedExtension($encoded_extension)
+    {
+        $this->extensions[] = $encoded_extension;
+
+        return $this;
+    }
 }
diff --git a/lib/Exception/ElementNotSelectableException.php b/lib/Exception/ElementNotSelectableException.php
index 9acfb88f2..77c6accb0 100644
--- a/lib/Exception/ElementNotSelectableException.php
+++ b/lib/Exception/ElementNotSelectableException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class ElementNotSelectableException extends WebDriverException {
-
-}
\ No newline at end of file
+class ElementNotSelectableException extends WebDriverException
+{
+}
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
index c452d2daa..2de5fd10c 100644
--- a/lib/Exception/ElementNotVisibleException.php
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class ElementNotVisibleException extends WebDriverException {
-
-}
\ No newline at end of file
+class ElementNotVisibleException extends WebDriverException
+{
+}
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
index cd8f15cc5..9c43f47e3 100644
--- a/lib/Exception/ExpectedException.php
+++ b/lib/Exception/ExpectedException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class ExpectedException extends WebDriverException {
-
-}
\ No newline at end of file
+class ExpectedException extends WebDriverException
+{
+}
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
index cd13d0181..6e372c313 100644
--- a/lib/Exception/IMEEngineActivationFailedException.php
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class IMEEngineActivationFailedException extends WebDriverException {
-
-}
\ No newline at end of file
+class IMEEngineActivationFailedException extends WebDriverException
+{
+}
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
index 94497c0d5..aeb78dc48 100644
--- a/lib/Exception/IMENotAvailableException.php
+++ b/lib/Exception/IMENotAvailableException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class IMENotAvailableException extends WebDriverException {
-
-}
\ No newline at end of file
+class IMENotAvailableException extends WebDriverException
+{
+}
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
index 322f67b14..ad52d21e9 100644
--- a/lib/Exception/IndexOutOfBoundsException.php
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -2,6 +2,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class IndexOutOfBoundsException extends WebDriverException {
-
-}
\ No newline at end of file
+class IndexOutOfBoundsException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidCookieDomainException.php b/lib/Exception/InvalidCookieDomainException.php
index 5dbaae9eb..bae6c06db 100644
--- a/lib/Exception/InvalidCookieDomainException.php
+++ b/lib/Exception/InvalidCookieDomainException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class InvalidCookieDomainException extends WebDriverException {
-
-}
\ No newline at end of file
+class InvalidCookieDomainException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
index 571a107b2..53e9e9ef9 100644
--- a/lib/Exception/InvalidCoordinatesException.php
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class InvalidCoordinatesException extends WebDriverException {
-
-}
\ No newline at end of file
+class InvalidCoordinatesException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidElementStateException.php b/lib/Exception/InvalidElementStateException.php
index 5c49c4c88..94ec58f1a 100644
--- a/lib/Exception/InvalidElementStateException.php
+++ b/lib/Exception/InvalidElementStateException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class InvalidElementStateException extends WebDriverException {
-
-}
\ No newline at end of file
+class InvalidElementStateException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidSelectorException.php b/lib/Exception/InvalidSelectorException.php
index 2c106970c..530fba2f4 100644
--- a/lib/Exception/InvalidSelectorException.php
+++ b/lib/Exception/InvalidSelectorException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class InvalidSelectorException extends WebDriverException {
-
-}
\ No newline at end of file
+class InvalidSelectorException extends WebDriverException
+{
+}
diff --git a/lib/Exception/MoveTargetOutOfBoundsException.php b/lib/Exception/MoveTargetOutOfBoundsException.php
index 39e97adbd..7a96b5805 100644
--- a/lib/Exception/MoveTargetOutOfBoundsException.php
+++ b/lib/Exception/MoveTargetOutOfBoundsException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class MoveTargetOutOfBoundsException extends WebDriverException {
-
-}
\ No newline at end of file
+class MoveTargetOutOfBoundsException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoAlertOpenException.php b/lib/Exception/NoAlertOpenException.php
index cdc846e08..ebc19964e 100644
--- a/lib/Exception/NoAlertOpenException.php
+++ b/lib/Exception/NoAlertOpenException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoAlertOpenException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoAlertOpenException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
index 2bfe9069a..ec6335cdb 100644
--- a/lib/Exception/NoCollectionException.php
+++ b/lib/Exception/NoCollectionException.php
@@ -2,6 +2,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoCollectionException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoCollectionException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
index 80d23f7de..f86ca2215 100644
--- a/lib/Exception/NoScriptResultException.php
+++ b/lib/Exception/NoScriptResultException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoScriptResultException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoScriptResultException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
index 13c107b7d..790898607 100644
--- a/lib/Exception/NoStringException.php
+++ b/lib/Exception/NoStringException.php
@@ -2,6 +2,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoStringException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoStringException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
index 8f50bb4ca..7047d72d3 100644
--- a/lib/Exception/NoStringLengthException.php
+++ b/lib/Exception/NoStringLengthException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoStringLengthException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoStringLengthException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
index 2e17124e2..d5f75efd0 100644
--- a/lib/Exception/NoStringWrapperException.php
+++ b/lib/Exception/NoStringWrapperException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoStringWrapperException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoStringWrapperException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
index d9e6c47ab..9899cf2fe 100644
--- a/lib/Exception/NoSuchCollectionException.php
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchCollectionException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchCollectionException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchDocumentException.php b/lib/Exception/NoSuchDocumentException.php
index b542fdfd6..f3bba91fd 100644
--- a/lib/Exception/NoSuchDocumentException.php
+++ b/lib/Exception/NoSuchDocumentException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class NoSuchDocumentException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchDocumentException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
index c34735b9d..c227d676a 100644
--- a/lib/Exception/NoSuchDriverException.php
+++ b/lib/Exception/NoSuchDriverException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchDriverException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchDriverException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchElementException.php b/lib/Exception/NoSuchElementException.php
index da39f7cab..f8d730580 100644
--- a/lib/Exception/NoSuchElementException.php
+++ b/lib/Exception/NoSuchElementException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchElementException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchElementException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchFrameException.php b/lib/Exception/NoSuchFrameException.php
index 474f4dc6e..7168c84a8 100644
--- a/lib/Exception/NoSuchFrameException.php
+++ b/lib/Exception/NoSuchFrameException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchFrameException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchFrameException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchWindowException.php b/lib/Exception/NoSuchWindowException.php
index bbeee4f0d..142d32e64 100644
--- a/lib/Exception/NoSuchWindowException.php
+++ b/lib/Exception/NoSuchWindowException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchWindowException extends WebDriverException {
-
-}
\ No newline at end of file
+class NoSuchWindowException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
index 00f2fb5bb..cbc373a87 100644
--- a/lib/Exception/NullPointerException.php
+++ b/lib/Exception/NullPointerException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class NullPointerException extends WebDriverException {
-
-}
\ No newline at end of file
+class NullPointerException extends WebDriverException
+{
+}
diff --git a/lib/Exception/ScriptTimeoutException.php b/lib/Exception/ScriptTimeoutException.php
index 4095728a2..ed4203656 100644
--- a/lib/Exception/ScriptTimeoutException.php
+++ b/lib/Exception/ScriptTimeoutException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class ScriptTimeoutException extends WebDriverException {
-
-}
\ No newline at end of file
+class ScriptTimeoutException extends WebDriverException
+{
+}
diff --git a/lib/Exception/SessionNotCreatedException.php b/lib/Exception/SessionNotCreatedException.php
index 9b67edf94..f374141f1 100644
--- a/lib/Exception/SessionNotCreatedException.php
+++ b/lib/Exception/SessionNotCreatedException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class SessionNotCreatedException extends WebDriverException {
-
-}
\ No newline at end of file
+class SessionNotCreatedException extends WebDriverException
+{
+}
diff --git a/lib/Exception/StaleElementReferenceException.php b/lib/Exception/StaleElementReferenceException.php
index 7e265725c..2fbf99973 100644
--- a/lib/Exception/StaleElementReferenceException.php
+++ b/lib/Exception/StaleElementReferenceException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class StaleElementReferenceException extends WebDriverException {
-
-}
\ No newline at end of file
+class StaleElementReferenceException extends WebDriverException
+{
+}
diff --git a/lib/Exception/TimeOutException.php b/lib/Exception/TimeOutException.php
index 6301f4144..f7443e3d5 100644
--- a/lib/Exception/TimeOutException.php
+++ b/lib/Exception/TimeOutException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class TimeOutException extends WebDriverException {
-
-}
\ No newline at end of file
+class TimeOutException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnableToSetCookieException.php b/lib/Exception/UnableToSetCookieException.php
index 7ece63e50..0a1edae94 100644
--- a/lib/Exception/UnableToSetCookieException.php
+++ b/lib/Exception/UnableToSetCookieException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnableToSetCookieException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnableToSetCookieException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnexpectedAlertOpenException.php b/lib/Exception/UnexpectedAlertOpenException.php
index e97eddeae..422255a77 100644
--- a/lib/Exception/UnexpectedAlertOpenException.php
+++ b/lib/Exception/UnexpectedAlertOpenException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnexpectedAlertOpenException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnexpectedAlertOpenException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnexpectedJavascriptException.php b/lib/Exception/UnexpectedJavascriptException.php
index c8da7e505..5cf8a8f92 100644
--- a/lib/Exception/UnexpectedJavascriptException.php
+++ b/lib/Exception/UnexpectedJavascriptException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnexpectedJavascriptException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnexpectedJavascriptException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnexpectedTagNameException.php b/lib/Exception/UnexpectedTagNameException.php
index 514abd374..0703c7d4e 100644
--- a/lib/Exception/UnexpectedTagNameException.php
+++ b/lib/Exception/UnexpectedTagNameException.php
@@ -15,20 +15,22 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnexpectedTagNameException extends WebDriverException {
-
-  /**
-   * @param string $expected_tag_name
-   * @param string $actual_tag_name
-   */
-  public function __construct(
-    $expected_tag_name,
-    $actual_tag_name) {
-    parent::__construct(
-      sprintf(
-        "Element should have been \"%s\" but was \"%s\"",
-        $expected_tag_name, $actual_tag_name
-      )
-    );
-  }
-}
\ No newline at end of file
+class UnexpectedTagNameException extends WebDriverException
+{
+    /**
+     * @param string $expected_tag_name
+     * @param string $actual_tag_name
+     */
+    public function __construct(
+        $expected_tag_name,
+        $actual_tag_name
+    ) {
+        parent::__construct(
+            sprintf(
+                'Element should have been "%s" but was "%s"',
+                $expected_tag_name,
+                $actual_tag_name
+            )
+        );
+    }
+}
diff --git a/lib/Exception/UnknownCommandException.php b/lib/Exception/UnknownCommandException.php
index 2d20b0096..723d6dbef 100644
--- a/lib/Exception/UnknownCommandException.php
+++ b/lib/Exception/UnknownCommandException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnknownCommandException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnknownCommandException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnknownServerException.php b/lib/Exception/UnknownServerException.php
index 13c3780c4..c24b415ef 100644
--- a/lib/Exception/UnknownServerException.php
+++ b/lib/Exception/UnknownServerException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnknownServerException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnknownServerException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnrecognizedExceptionException.php b/lib/Exception/UnrecognizedExceptionException.php
index 9d0046dc0..fa1038605 100644
--- a/lib/Exception/UnrecognizedExceptionException.php
+++ b/lib/Exception/UnrecognizedExceptionException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class UnrecognizedExceptionException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnrecognizedExceptionException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnsupportedOperationException.php b/lib/Exception/UnsupportedOperationException.php
index 781c2276a..64f8d1930 100644
--- a/lib/Exception/UnsupportedOperationException.php
+++ b/lib/Exception/UnsupportedOperationException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class UnsupportedOperationException extends WebDriverException {
-
-}
\ No newline at end of file
+class UnsupportedOperationException extends WebDriverException
+{
+}
diff --git a/lib/Exception/WebDriverCurlException.php b/lib/Exception/WebDriverCurlException.php
index 9719565d2..f559826c0 100644
--- a/lib/Exception/WebDriverCurlException.php
+++ b/lib/Exception/WebDriverCurlException.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-
-class WebDriverCurlException extends WebDriverException {
-
-}
\ No newline at end of file
+class WebDriverCurlException extends WebDriverException
+{
+}
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index a23f42103..d05519b51 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -17,149 +17,152 @@
 
 use Exception;
 
-class WebDriverException extends Exception {
+class WebDriverException extends Exception
+{
+    private $results;
 
-  private $results;
-
-  /**
-   * @param string $message
-   * @param mixed $results
-   */
-  public function __construct($message, $results = null) {
-    parent::__construct($message);
-    $this->results = $results;
-  }
+    /**
+     * @param string $message
+     * @param mixed $results
+     */
+    public function __construct($message, $results = null)
+    {
+        parent::__construct($message);
+        $this->results = $results;
+    }
 
-  /**
-   * @return mixed
-   */
-  public function getResults() {
-    return $this->results;
-  }
+    /**
+     * @return mixed
+     */
+    public function getResults()
+    {
+        return $this->results;
+    }
 
-  /**
-   * Throw WebDriverExceptions.
-   * For $status_code >= 0, they are errors defined in the json wired protocol.
-   * For $status_code < 0, they are errors defined in php-webdriver.
-   *
-   * @param int    $status_code
-   * @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
-   */
-  public static function throwException($status_code, $message, $results) {
-    switch ($status_code) {
-      case -1:
-        throw new WebDriverCurlException($message);
-      case 0:
-        // Success
-        break;
-      case 1:
-        throw new IndexOutOfBoundsException($message, $results);
-      case 2:
-        throw new NoCollectionException($message, $results);
-      case 3:
-        throw new NoStringException($message, $results);
-      case 4:
-        throw new NoStringLengthException($message, $results);
-      case 5:
-        throw new NoStringWrapperException($message, $results);
-      case 6:
-        throw new NoSuchDriverException($message, $results);
-      case 7:
-        throw new NoSuchElementException($message, $results);
-      case 8:
-        throw new NoSuchFrameException($message, $results);
-      case 9:
-        throw new UnknownCommandException($message, $results);
-      case 10:
-        throw new StaleElementReferenceException($message, $results);
-      case 11:
-        throw new ElementNotVisibleException($message, $results);
-      case 12:
-        throw new InvalidElementStateException($message, $results);
-      case 13:
-        throw new UnknownServerException($message, $results);
-      case 14:
-        throw new ExpectedException($message, $results);
-      case 15:
-        throw new ElementNotSelectableException($message, $results);
-      case 16:
-        throw new NoSuchDocumentException($message, $results);
-      case 17:
-        throw new UnexpectedJavascriptException($message, $results);
-      case 18:
-        throw new NoScriptResultException($message, $results);
-      case 19:
-        throw new XPathLookupException($message, $results);
-      case 20:
-        throw new NoSuchCollectionException($message, $results);
-      case 21:
-        throw new TimeOutException($message, $results);
-      case 22:
-        throw new NullPointerException($message, $results);
-      case 23:
-        throw new NoSuchWindowException($message, $results);
-      case 24:
-        throw new InvalidCookieDomainException($message, $results);
-      case 25:
-        throw new UnableToSetCookieException($message, $results);
-      case 26:
-        throw new UnexpectedAlertOpenException($message, $results);
-      case 27:
-        throw new NoAlertOpenException($message, $results);
-      case 28:
-        throw new ScriptTimeoutException($message, $results);
-      case 29:
-        throw new InvalidCoordinatesException($message, $results);
-      case 30:
-        throw new IMENotAvailableException($message, $results);
-      case 31:
-        throw new IMEEngineActivationFailedException($message, $results);
-      case 32:
-        throw new InvalidSelectorException($message, $results);
-      case 33:
-        throw new SessionNotCreatedException($message, $results);
-      case 34:
-        throw new MoveTargetOutOfBoundsException($message, $results);
-      default:
-        throw new UnrecognizedExceptionException($message, $results);
+    /**
+     * Throw WebDriverExceptions.
+     * For $status_code >= 0, they are errors defined in the json wired protocol.
+     * For $status_code < 0, they are errors defined in php-webdriver.
+     *
+     * @param int $status_code
+     * @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
+     */
+    public static function throwException($status_code, $message, $results)
+    {
+        switch ($status_code) {
+            case -1:
+                throw new WebDriverCurlException($message);
+            case 0:
+                // Success
+                break;
+            case 1:
+                throw new IndexOutOfBoundsException($message, $results);
+            case 2:
+                throw new NoCollectionException($message, $results);
+            case 3:
+                throw new NoStringException($message, $results);
+            case 4:
+                throw new NoStringLengthException($message, $results);
+            case 5:
+                throw new NoStringWrapperException($message, $results);
+            case 6:
+                throw new NoSuchDriverException($message, $results);
+            case 7:
+                throw new NoSuchElementException($message, $results);
+            case 8:
+                throw new NoSuchFrameException($message, $results);
+            case 9:
+                throw new UnknownCommandException($message, $results);
+            case 10:
+                throw new StaleElementReferenceException($message, $results);
+            case 11:
+                throw new ElementNotVisibleException($message, $results);
+            case 12:
+                throw new InvalidElementStateException($message, $results);
+            case 13:
+                throw new UnknownServerException($message, $results);
+            case 14:
+                throw new ExpectedException($message, $results);
+            case 15:
+                throw new ElementNotSelectableException($message, $results);
+            case 16:
+                throw new NoSuchDocumentException($message, $results);
+            case 17:
+                throw new UnexpectedJavascriptException($message, $results);
+            case 18:
+                throw new NoScriptResultException($message, $results);
+            case 19:
+                throw new XPathLookupException($message, $results);
+            case 20:
+                throw new NoSuchCollectionException($message, $results);
+            case 21:
+                throw new TimeOutException($message, $results);
+            case 22:
+                throw new NullPointerException($message, $results);
+            case 23:
+                throw new NoSuchWindowException($message, $results);
+            case 24:
+                throw new InvalidCookieDomainException($message, $results);
+            case 25:
+                throw new UnableToSetCookieException($message, $results);
+            case 26:
+                throw new UnexpectedAlertOpenException($message, $results);
+            case 27:
+                throw new NoAlertOpenException($message, $results);
+            case 28:
+                throw new ScriptTimeoutException($message, $results);
+            case 29:
+                throw new InvalidCoordinatesException($message, $results);
+            case 30:
+                throw new IMENotAvailableException($message, $results);
+            case 31:
+                throw new IMEEngineActivationFailedException($message, $results);
+            case 32:
+                throw new InvalidSelectorException($message, $results);
+            case 33:
+                throw new SessionNotCreatedException($message, $results);
+            case 34:
+                throw new MoveTargetOutOfBoundsException($message, $results);
+            default:
+                throw new UnrecognizedExceptionException($message, $results);
+        }
     }
-  }
 }
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
index de9e2e707..c7f589dcc 100644
--- a/lib/Exception/XPathLookupException.php
+++ b/lib/Exception/XPathLookupException.php
@@ -15,6 +15,6 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class XPathLookupException extends WebDriverException {
-
-}
\ No newline at end of file
+class XPathLookupException extends WebDriverException
+{
+}
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 083af226b..9e0751238 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -15,10 +15,11 @@
 
 namespace Facebook\WebDriver\Firefox;
 
-class FirefoxDriver {
-  const PROFILE = 'firefox_profile';
+class FirefoxDriver
+{
+    const PROFILE = 'firefox_profile';
 
-  private function __construct()
-  {
-  }
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
index 6b7ca91dd..b869a2667 100644
--- a/lib/Firefox/FirefoxPreferences.php
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -19,15 +19,16 @@
  * Constants of common Firefox profile preferences (about:config values).
  * @see http://kb.mozillazine.org/Firefox_:_FAQs_:_About:config_Entries
  */
-class FirefoxPreferences {
-  /** @var string Port WebDriver uses to communicate with Firefox instance */
-  const WEBDRIVER_FIREFOX_PORT = 'webdriver_firefox_port';
-  /** @var string Should the reader view (FF 38+) be enabled? */
-  const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
-  /** @var string Browser homepage */
-  const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
+class FirefoxPreferences
+{
+    /** @var string Port WebDriver uses to communicate with Firefox instance */
+    const WEBDRIVER_FIREFOX_PORT = 'webdriver_firefox_port';
+    /** @var string Should the reader view (FF 38+) be enabled? */
+    const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
+    /** @var string Browser homepage */
+    const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
 
-  private function __construct()
-  {
-  }
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 03830dc63..925ac157f 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -21,256 +21,279 @@
 use RecursiveIteratorIterator;
 use ZipArchive;
 
-class FirefoxProfile {
-
-  /**
-   * @var array
-   */
-  private $preferences = array();
-
-  /**
-   * @var array
-   */
-  private $extensions = array();
-
-  /**
-   * @var array
-   */
-  private $extensions_datas = array();
-
-  /**
-   * @var string
-   */
-  private $rdf_file;
-
-  /**
-   * @param string $extension The path to the xpi extension.
-   * @return FirefoxProfile
-   */
-  public function addExtension($extension) {
-    $this->extensions[] = $extension;
-    return $this;
-  }
-
-  /**
-   * @param string $extension_datas The path to the folder containing the datas to add to the extension
-   * @return FirefoxProfile
-   */
-  public function addExtensionDatas($extension_datas) {
-    if (!is_dir($extension_datas)) {
-      return;
+class FirefoxProfile
+{
+    /**
+     * @var array
+     */
+    private $preferences = array();
+    /**
+     * @var array
+     */
+    private $extensions = array();
+    /**
+     * @var array
+     */
+    private $extensions_datas = array();
+    /**
+     * @var string
+     */
+    private $rdf_file;
+
+    /**
+     * @param string $extension The path to the xpi extension.
+     * @return FirefoxProfile
+     */
+    public function addExtension($extension)
+    {
+        $this->extensions[] = $extension;
+
+        return $this;
     }
 
-    $this->extensions_datas[basename($extension_datas)] = $extension_datas;
-    return $this;
-  }
-
-  /**
-   * @param string $rdf_file The path to the rdf file
-   * @return FirefoxProfile
-   */
-  public function setRdfFile($rdf_file) {
-    if (!is_file($rdf_file)) {
-      return;
-    }
+    /**
+     * @param string $extension_datas The path to the folder containing the datas to add to the extension
+     * @return FirefoxProfile
+     */
+    public function addExtensionDatas($extension_datas)
+    {
+        if (!is_dir($extension_datas)) {
+            return null;
+        }
 
-    $this->rdf_file = $rdf_file;
-    return $this;
-  }
-
-  /**
-   * @param string $key
-   * @param string|bool|int $value
-   * @return FirefoxProfile
-   * @throws WebDriverException
-   */
-  public function setPreference($key, $value) {
-    if (is_string($value)) {
-      $value = sprintf('"%s"', $value);
-    } else if (is_int($value)) {
-      $value = sprintf('%d', $value);
-    } else if (is_bool($value)) {
-      $value = $value ? 'true' : 'false';
-    } else {
-      throw new WebDriverException(
-        'The value of the preference should be either a string, int or bool.');
-    }
-    $this->preferences[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param $key
-   * @return mixed
-   */
-  public function getPreference($key)
-  {
-    if (array_key_exists($key, $this->preferences)) {
-      return $this->preferences[$key];
-    }
+        $this->extensions_datas[basename($extension_datas)] = $extension_datas;
 
-    return null;
-  }
+        return $this;
+    }
 
-  /**
-   * @return string
-   */
-  public function encode() {
-    $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
+    /**
+     * @param string $rdf_file The path to the rdf file
+     * @return FirefoxProfile
+     */
+    public function setRdfFile($rdf_file)
+    {
+        if (!is_file($rdf_file)) {
+            return null;
+        }
 
-    if (isset($this->rdf_file)) {
-      copy($this->rdf_file, $temp_dir . DIRECTORY_SEPARATOR . "mimeTypes.rdf");
-    }
+        $this->rdf_file = $rdf_file;
 
-    foreach ($this->extensions as $extension) {
-      $this->installExtension($extension, $temp_dir);
+        return $this;
     }
 
-    foreach ($this->extensions_datas as $dirname => $extension_datas) {
-      mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname);
-      $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($extension_datas, RecursiveDirectoryIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
-      foreach ($iterator as $item) {
-        if ($item->isDir()) {
-          mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+    /**
+     * @param string $key
+     * @param string|bool|int $value
+     * @throws WebDriverException
+     * @return FirefoxProfile
+     */
+    public function setPreference($key, $value)
+    {
+        if (is_string($value)) {
+            $value = sprintf('"%s"', $value);
         } else {
-          copy($item, $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR . $iterator->getSubPathName());
+            if (is_int($value)) {
+                $value = sprintf('%d', $value);
+            } else {
+                if (is_bool($value)) {
+                    $value = $value ? 'true' : 'false';
+                } else {
+                    throw new WebDriverException(
+                        'The value of the preference should be either a string, int or bool.'
+                    );
+                }
+            }
         }
-      }
+        $this->preferences[$key] = $value;
+
+        return $this;
     }
 
-    $content = "";
-    foreach ($this->preferences as $key => $value) {
-      $content .= sprintf("user_pref(\"%s\", %s);\n", $key, $value);
+    /**
+     * @param $key
+     * @return mixed
+     */
+    public function getPreference($key)
+    {
+        if (array_key_exists($key, $this->preferences)) {
+            return $this->preferences[$key];
+        }
+
+        return null;
     }
-    file_put_contents($temp_dir.'/user.js', $content);
 
-    $zip = new ZipArchive();
-    $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverFirefoxProfileZip');
-    $zip->open($temp_zip, ZipArchive::CREATE);
+    /**
+     * @return string
+     */
+    public function encode()
+    {
+        $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfile');
+
+        if (isset($this->rdf_file)) {
+            copy($this->rdf_file, $temp_dir . DIRECTORY_SEPARATOR . 'mimeTypes.rdf');
+        }
+
+        foreach ($this->extensions as $extension) {
+            $this->installExtension($extension, $temp_dir);
+        }
+
+        foreach ($this->extensions_datas as $dirname => $extension_datas) {
+            mkdir($temp_dir . DIRECTORY_SEPARATOR . $dirname);
+            $iterator = new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($extension_datas, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::SELF_FIRST
+            );
+            foreach ($iterator as $item) {
+                $target_dir = $temp_dir . DIRECTORY_SEPARATOR . $dirname . DIRECTORY_SEPARATOR
+                    . $iterator->getSubPathName();
+
+                if ($item->isDir()) {
+                    mkdir($target_dir);
+                } else {
+                    copy($item, $target_dir);
+                }
+            }
+        }
+
+        $content = '';
+        foreach ($this->preferences as $key => $value) {
+            $content .= sprintf("user_pref(\"%s\", %s);\n", $key, $value);
+        }
+        file_put_contents($temp_dir . '/user.js', $content);
+
+        $zip = new ZipArchive();
+        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverFirefoxProfileZip');
+        $zip->open($temp_zip, ZipArchive::CREATE);
+
+        $dir = new RecursiveDirectoryIterator($temp_dir);
+        $files = new RecursiveIteratorIterator($dir);
 
-    $dir = new RecursiveDirectoryIterator($temp_dir);
-    $files = new RecursiveIteratorIterator($dir);
+        $dir_prefix = preg_replace(
+            '#\\\\#',
+            '\\\\\\\\',
+            $temp_dir . DIRECTORY_SEPARATOR
+        );
 
-    $dir_prefix = preg_replace(
-        '#\\\\#',
-        '\\\\\\\\',
-        $temp_dir.DIRECTORY_SEPARATOR
-    );
+        foreach ($files as $name => $object) {
+            if (is_dir($name)) {
+                continue;
+            }
 
-    foreach ($files as $name => $object) {
-      if (is_dir($name)) {
-        continue;
-      }
+            $path = preg_replace("#^{$dir_prefix}#", '', $name);
+            $zip->addFile($name, $path);
+        }
+        $zip->close();
+
+        $profile = base64_encode(file_get_contents($temp_zip));
+
+        // clean up
+        $this->deleteDirectory($temp_dir);
+        unlink($temp_zip);
+
+        return $profile;
+    }
+
+    /**
+     * @param string $extension The path to the extension.
+     * @param string $profile_dir The path to the profile directory.
+     * @return string The path to the directory of this extension.
+     */
+    private function installExtension($extension, $profile_dir)
+    {
+        $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfileExtension');
+        $this->extractTo($extension, $temp_dir);
+
+        // This is a hacky way to parse the id since there is no offical RDF parser library.
+        // Find the correct namespace for the id element.
+        $install_rdf_path = $temp_dir . '/install.rdf';
+        $xml = simplexml_load_file($install_rdf_path);
+        $ns = $xml->getDocNamespaces();
+        $prefix = '';
+        if (!empty($ns)) {
+            foreach ($ns as $key => $value) {
+                if (strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
+                    if ($key != '') {
+                        $prefix = $key . ':'; // Separate the namespace from the name.
+                    }
+                    break;
+                }
+            }
+        }
+        // Get the extension id from the install manifest.
+        $matches = array();
+        preg_match('#<' . $prefix . 'id>([^<]+)</' . $prefix . 'id>#', $xml->asXML(), $matches);
+        if (isset($matches[1])) {
+            $ext_dir = $profile_dir . '/extensions/' . $matches[1];
+            mkdir($ext_dir, 0777, true);
+            $this->extractTo($extension, $ext_dir);
+        }
+
+        // clean up
+        $this->deleteDirectory($temp_dir);
 
-      $path = preg_replace("#^{$dir_prefix}#", "", $name);
-      $zip->addFile($name, $path);
+        return $ext_dir;
     }
-    $zip->close();
-
-    $profile = base64_encode(file_get_contents($temp_zip));
-
-    // clean up
-    $this->deleteDirectory($temp_dir);
-    unlink($temp_zip);
-
-    return $profile;
-  }
-
-  /**
-   * @param string $extension The path to the extension.
-   * @param string $profile_dir The path to the profile directory.
-   * @return string The path to the directory of this extension.
-   */
-  private function installExtension($extension, $profile_dir) {
-    $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfileExtension');
-  	$this->extractTo($extension, $temp_dir);
-  	
-  	// This is a hacky way to parse the id since there is no offical RDF parser library.
-  	// Find the correct namespace for the id element.
-  	$install_rdf_path = $temp_dir.'/install.rdf';
-  	$xml = simplexml_load_file($install_rdf_path);
-  	$ns = $xml->getDocNamespaces();
-  	$prefix = '';
-  	if (!empty($ns)) {
-  	  foreach($ns as $key => $value) {
-  		  if (strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
-  			  if ($key != '') {
-  				  $prefix = $key . ':'; // Separate the namespace from the name.
-  				}
-  				break;
-  			}
-  		}
-  	}
-  	// Get the extension id from the install manifest.
-  	$matches = array();
-  	preg_match('#<'.$prefix.'id>([^<]+)</'.$prefix.'id>#', $xml->asXML(), $matches);
-  	if (isset($matches[1])) {
-  		$ext_dir = $profile_dir.'/extensions/'.$matches[1];
-  		mkdir($ext_dir, 0777, true);
-  		$this->extractTo($extension, $ext_dir);
-  	}
-  	
-    // clean up
-    $this->deleteDirectory($temp_dir);
-
-    return $ext_dir;
-  }
-
-  /**
-   * @param string $prefix Prefix of the temp directory.
-   *
-   * @return string The path to the temp directory created.
-   * @throws WebDriverException
-   */
-  private function createTempDirectory($prefix = '') {
-    $temp_dir = tempnam(sys_get_temp_dir(), $prefix);
-    if (file_exists($temp_dir)) {
-      unlink($temp_dir);
-      mkdir($temp_dir);
-      if (!is_dir($temp_dir)) {
-        throw new WebDriverException('Cannot create firefox profile.');
-      }
+
+    /**
+     * @param string $prefix Prefix of the temp directory.
+     *
+     * @throws WebDriverException
+     * @return string The path to the temp directory created.
+     */
+    private function createTempDirectory($prefix = '')
+    {
+        $temp_dir = tempnam(sys_get_temp_dir(), $prefix);
+        if (file_exists($temp_dir)) {
+            unlink($temp_dir);
+            mkdir($temp_dir);
+            if (!is_dir($temp_dir)) {
+                throw new WebDriverException('Cannot create firefox profile.');
+            }
+        }
+
+        return $temp_dir;
     }
-    return $temp_dir;
-  }
-
-  /**
-   * @param string $directory The path to the directory.
-   */
-  private function deleteDirectory($directory) {
-    $dir = new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS);
-    $paths = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
-
-    foreach ($paths as $path) {
-      if ($path->isDir() && !$path->isLink()) {
-        rmdir($path->getPathname());
-      } else {
-        unlink($path->getPathname());
-      }
+
+    /**
+     * @param string $directory The path to the directory.
+     */
+    private function deleteDirectory($directory)
+    {
+        $dir = new RecursiveDirectoryIterator($directory, FilesystemIterator::SKIP_DOTS);
+        $paths = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::CHILD_FIRST);
+
+        foreach ($paths as $path) {
+            if ($path->isDir() && !$path->isLink()) {
+                rmdir($path->getPathname());
+            } else {
+                unlink($path->getPathname());
+            }
+        }
+
+        rmdir($directory);
     }
 
-    rmdir($directory);
-  }
-
-  /**
-   * @param string $xpi        The path to the .xpi extension.
-   * @param string $target_dir The path to the unzip directory.
-   *
-   * @return FirefoxProfile
-   * @throws \Exception
-   */
-  private function extractTo($xpi, $target_dir) {
-    $zip = new ZipArchive();
-    if (file_exists($xpi)) {
-      if ($zip->open($xpi)) {
-        $zip->extractTo($target_dir);
-        $zip->close();
-      } else {
-        throw new \Exception("Failed to open the firefox extension. '$xpi'");
-      }
-    } else {
-      throw new \Exception("Firefox extension doesn't exist. '$xpi'");
+    /**
+     * @param string $xpi The path to the .xpi extension.
+     * @param string $target_dir The path to the unzip directory.
+     *
+     * @throws \Exception
+     * @return FirefoxProfile
+     */
+    private function extractTo($xpi, $target_dir)
+    {
+        $zip = new ZipArchive();
+        if (file_exists($xpi)) {
+            if ($zip->open($xpi)) {
+                $zip->extractTo($target_dir);
+                $zip->close();
+            } else {
+                throw new \Exception("Failed to open the firefox extension. '$xpi'");
+            }
+        } else {
+            throw new \Exception("Firefox extension doesn't exist. '$xpi'");
+        }
+
+        return $this;
     }
-    return $this;
-  }
 }
diff --git a/lib/Interactions/Internal/WebDriverButtonReleaseAction.php b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
index a63570ae6..5df3cb6db 100644
--- a/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
+++ b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
@@ -20,11 +20,10 @@
 /**
  * Move to the location and then release the mouse key.
  */
-class WebDriverButtonReleaseAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->mouseUp($this->getActionLocation());
-  }
+class WebDriverButtonReleaseAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->mouseUp($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverClickAction.php b/lib/Interactions/Internal/WebDriverClickAction.php
index f110d34bd..cf5bb9e68 100644
--- a/lib/Interactions/Internal/WebDriverClickAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverClickAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->click($this->getActionLocation());
-  }
+class WebDriverClickAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->click($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverClickAndHoldAction.php b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
index 264d1503f..8f1907d84 100644
--- a/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
@@ -20,11 +20,10 @@
 /**
  * Move the the location, click and hold.
  */
-class WebDriverClickAndHoldAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->mouseDown($this->getActionLocation());
-  }
+class WebDriverClickAndHoldAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->mouseDown($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverContextClickAction.php b/lib/Interactions/Internal/WebDriverContextClickAction.php
index d431173e9..175c60e3e 100644
--- a/lib/Interactions/Internal/WebDriverContextClickAction.php
+++ b/lib/Interactions/Internal/WebDriverContextClickAction.php
@@ -20,11 +20,10 @@
 /**
  * You can call it 'Right Click' if you like.
  */
-class WebDriverContextClickAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->contextClick($this->getActionLocation());
-  }
+class WebDriverContextClickAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->contextClick($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
index 89aae19bb..ca7069cb5 100644
--- a/lib/Interactions/Internal/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -22,54 +22,53 @@
 /**
  * Interface representing basic mouse operations.
  */
-class WebDriverCoordinates {
+class WebDriverCoordinates
+{
+    private $onScreen;
+    private $inViewPort;
+    private $onPage;
+    private $auxiliary;
 
-  private
-    $onScreen,
-    $inViewPort,
-    $onPage,
-    $auxiliary;
+    public function __construct($on_screen, Closure $in_view_port, Closure $on_page, $auxiliary)
+    {
+        $this->onScreen = $on_screen;
+        $this->inViewPort = $in_view_port;
+        $this->onPage = $on_page;
+        $this->auxiliary = $auxiliary;
+    }
 
-  public function __construct(
-      $on_screen,
-      Closure $in_view_port,
-      Closure $on_page,
-      $auxiliary) {
+    /**
+     * @throws UnsupportedOperationException
+     * @return WebDriverPoint
+     */
+    public function onScreen()
+    {
+        throw new UnsupportedOperationException(
+            'onScreen is planned but not yet supported by Selenium'
+        );
+    }
 
-    $this->onScreen = $on_screen;
-    $this->inViewPort = $in_view_port;
-    $this->onPage = $on_page;
-    $this->auxiliary = $auxiliary;
-  }
+    /**
+     * @return WebDriverPoint
+     */
+    public function inViewPort()
+    {
+        return call_user_func($this->inViewPort);
+    }
 
-  /**
-   * @return WebDriverPoint
-   * @throws UnsupportedOperationException
-   */
-  public function onScreen() {
-    throw new UnsupportedOperationException(
-      'onScreen is planned but not yet supported by Selenium'
-    );
-  }
+    /**
+     * @return WebDriverPoint
+     */
+    public function onPage()
+    {
+        return call_user_func($this->onPage);
+    }
 
-  /**
-   * @return WebDriverPoint
-   */
-  public function inViewPort() {
-    return call_user_func($this->inViewPort);
-  }
-
-  /**
-   * @return WebDriverPoint
-   */
-  public function onPage() {
-    return call_user_func($this->onPage);
-  }
-
-  /**
-   * @return Object The attached object.
-   */
-  public function getAuxiliary() {
-    return $this->auxiliary;
-  }
+    /**
+     * @return object The attached object.
+     */
+    public function getAuxiliary()
+    {
+        return $this->auxiliary;
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverDoubleClickAction.php b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
index 218a05b5e..46c197bbb 100644
--- a/lib/Interactions/Internal/WebDriverDoubleClickAction.php
+++ b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverDoubleClickAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->doubleClick($this->getActionLocation());
-  }
+class WebDriverDoubleClickAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->doubleClick($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverKeyDownAction.php b/lib/Interactions/Internal/WebDriverKeyDownAction.php
index 29350e484..bb3820ed3 100644
--- a/lib/Interactions/Internal/WebDriverKeyDownAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyDownAction.php
@@ -17,12 +17,11 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverKeyDownAction
-    extends WebDriverSingleKeyAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->focusOnElement();
-    $this->keyboard->pressKey($this->key);
-  }
+class WebDriverKeyDownAction extends WebDriverSingleKeyAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->focusOnElement();
+        $this->keyboard->pressKey($this->key);
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverKeyUpAction.php b/lib/Interactions/Internal/WebDriverKeyUpAction.php
index 9b89747eb..b675025e6 100644
--- a/lib/Interactions/Internal/WebDriverKeyUpAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyUpAction.php
@@ -17,12 +17,11 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverKeyUpAction
-    extends WebDriverSingleKeyAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->focusOnElement();
-    $this->keyboard->releaseKey($this->key);
-  }
+class WebDriverKeyUpAction extends WebDriverSingleKeyAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->focusOnElement();
+        $this->keyboard->releaseKey($this->key);
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index 77892cc25..b2f062750 100644
--- a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -16,38 +16,37 @@
 namespace Facebook\WebDriver\Interactions\Internal;
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
-use Facebook\WebDriver\WebDriverMouse;
 use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverMouse;
 
 /**
  * Base class for all keyboard-related actions.
  */
-abstract class WebDriverKeysRelatedAction {
+abstract class WebDriverKeysRelatedAction
+{
+    protected $keyboard;
+    protected $mouse;
+    protected $locationProvider;
 
-  protected $keyboard;
-  protected $mouse;
-  protected $locationProvider;
-
-  /**
-   * @param WebDriverKeyboard $keyboard
-   * @param WebDriverMouse $mouse
-   * @param WebDriverLocatable $location_provider
-   */
-  public function __construct(
-      WebDriverKeyboard $keyboard,
-      WebDriverMouse $mouse,
-      WebDriverLocatable $location_provider = null) {
-    $this->keyboard = $keyboard;
-    $this->mouse = $mouse;
-    $this->locationProvider = $location_provider;
-  }
+    /**
+     * @param WebDriverKeyboard $keyboard
+     * @param WebDriverMouse $mouse
+     * @param WebDriverLocatable $location_provider
+     */
+    public function __construct(
+        WebDriverKeyboard $keyboard,
+        WebDriverMouse $mouse,
+        WebDriverLocatable $location_provider = null
+    ) {
+        $this->keyboard = $keyboard;
+        $this->mouse = $mouse;
+        $this->locationProvider = $location_provider;
+    }
 
-  /**
-   * @return void
-   */
-  protected function focusOnElement() {
-    if ($this->locationProvider) {
-      $this->mouse->click($this->locationProvider->getCoordinates());
+    protected function focusOnElement()
+    {
+        if ($this->locationProvider) {
+            $this->mouse->click($this->locationProvider->getCoordinates());
+        }
     }
-  }
 }
diff --git a/lib/Interactions/Internal/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
index f6a115f43..8a13d86a7 100644
--- a/lib/Interactions/Internal/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -15,46 +15,43 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-use Facebook\WebDriver\WebDriverMouse;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverMouse;
 
 /**
  * Base class for all mouse-related actions.
  */
-class WebDriverMouseAction {
-
-  /**
-   * @var WebDriverMouse
-   */
-  protected $mouse;
-
-  /**
-   * @var WebDriverLocatable
-   */
-  protected $locationProvider;
+class WebDriverMouseAction
+{
+    /**
+     * @var WebDriverMouse
+     */
+    protected $mouse;
+    /**
+     * @var WebDriverLocatable
+     */
+    protected $locationProvider;
+
+    public function __construct(WebDriverMouse $mouse, WebDriverLocatable $location_provider = null)
+    {
+        $this->mouse = $mouse;
+        $this->locationProvider = $location_provider;
+    }
 
-  public function __construct(
-      WebDriverMouse $mouse,
-      WebDriverLocatable $location_provider = null) {
-    $this->mouse = $mouse;
-    $this->locationProvider = $location_provider;
-  }
+    /**
+     * @return null|WebDriverCoordinates
+     */
+    protected function getActionLocation()
+    {
+        if ($this->locationProvider !== null) {
+            return $this->locationProvider->getCoordinates();
+        }
 
-  /**
-   * @return null|WebDriverCoordinates
-   */
-  protected function getActionLocation() {
-    if ($this->locationProvider !== null) {
-      return $this->locationProvider->getCoordinates();
+        return null;
     }
 
-    return null;
-  }
-
-  /**
-   * @return void
-   */
-  protected function moveToLocation() {
-    $this->mouse->mouseMove($this->locationProvider);
-  }
+    protected function moveToLocation()
+    {
+        $this->mouse->mouseMove($this->locationProvider);
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverMouseMoveAction.php b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
index d229904fc..87c6d7cbb 100644
--- a/lib/Interactions/Internal/WebDriverMouseMoveAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverMouseMoveAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  public function perform() {
-    $this->mouse->mouseMove($this->getActionLocation());
-  }
+class WebDriverMouseMoveAction extends WebDriverMouseAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->mouse->mouseMove($this->getActionLocation());
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index f1e0270f8..7fffa0189 100644
--- a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -15,30 +15,32 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverMoveToOffsetAction
-    extends WebDriverMouseAction
-    implements WebDriverAction {
-
-  private $xOffset, $yOffset;
+class WebDriverMoveToOffsetAction extends WebDriverMouseAction implements WebDriverAction
+{
+    private $xOffset;
+    private $yOffset;
 
-  public function __construct(WebDriverMouse $mouse,
-                              WebDriverLocatable $location_provider = null,
-                              $x_offset = null,
-                              $y_offset = null) {
-    parent::__construct($mouse, $location_provider);
-    $this->xOffset = $x_offset;
-    $this->yOffset = $y_offset;
-  }
+    public function __construct(
+        WebDriverMouse $mouse,
+        WebDriverLocatable $location_provider = null,
+        $x_offset = null,
+        $y_offset = null
+    ) {
+        parent::__construct($mouse, $location_provider);
+        $this->xOffset = $x_offset;
+        $this->yOffset = $y_offset;
+    }
 
-  public function perform() {
-    $this->mouse->mouseMove(
-      $this->getActionLocation(),
-      $this->xOffset,
-      $this->yOffset
-    );
-  }
+    public function perform()
+    {
+        $this->mouse->mouseMove(
+            $this->getActionLocation(),
+            $this->xOffset,
+            $this->yOffset
+        );
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
index 2c9512dd3..14836be38 100644
--- a/lib/Interactions/Internal/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -15,34 +15,34 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
+use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverKeyboard;
-use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverSendKeysAction
-    extends WebDriverKeysRelatedAction
-    implements WebDriverAction {
-
-  private $keys;
+class WebDriverSendKeysAction extends WebDriverKeysRelatedAction implements WebDriverAction
+{
+    private $keys;
 
-  /**
-   * @param WebDriverKeyboard $keyboard
-   * @param WebDriverMouse $mouse
-   * @param WebDriverLocatable $location_provider
-   * @param string $keys
-   */
-  public function __construct(
-      WebDriverKeyboard $keyboard,
-      WebDriverMouse $mouse,
-      WebDriverLocatable $location_provider = null,
-      $keys = null) {
-    parent::__construct($keyboard, $mouse, $location_provider);
-    $this->keys = $keys;
-  }
+    /**
+     * @param WebDriverKeyboard $keyboard
+     * @param WebDriverMouse $mouse
+     * @param WebDriverLocatable $location_provider
+     * @param string $keys
+     */
+    public function __construct(
+        WebDriverKeyboard $keyboard,
+        WebDriverMouse $mouse,
+        WebDriverLocatable $location_provider = null,
+        $keys = null
+    ) {
+        parent::__construct($keyboard, $mouse, $location_provider);
+        $this->keys = $keys;
+    }
 
-  public function perform() {
-    $this->focusOnElement();
-    $this->keyboard->sendKeys($this->keys);
-  }
+    public function perform()
+    {
+        $this->focusOnElement();
+        $this->keyboard->sendKeys($this->keys);
+    }
 }
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 86cd74936..174304d15 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -15,23 +15,22 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
+use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverKeyboard;
-use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-abstract class WebDriverSingleKeyAction
-    extends WebDriverKeysRelatedAction
-    implements WebDriverAction {
-
-  protected $key;
+abstract class WebDriverSingleKeyAction extends WebDriverKeysRelatedAction implements WebDriverAction
+{
+    protected $key;
 
-  public function __construct(
-      WebDriverKeyboard $keyboard,
-      WebDriverMouse $mouse,
-      WebDriverLocatable $location_provider = null,
-      $key = null) {
-    parent::__construct($keyboard, $mouse, $location_provider);
-    $this->key = $key;
-  }
+    public function __construct(
+        WebDriverKeyboard $keyboard,
+        WebDriverMouse $mouse,
+        WebDriverLocatable $location_provider = null,
+        $key = null
+    ) {
+        parent::__construct($keyboard, $mouse, $location_provider);
+        $this->key = $key;
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverDoubleTapAction.php b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
index 92ccfa222..47664fe23 100644
--- a/lib/Interactions/Touch/WebDriverDoubleTapAction.php
+++ b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverDoubleTapAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
-
-  public function perform() {
-    $this->touchScreen->doubleTap($this->locationProvider);
-  }
+class WebDriverDoubleTapAction extends WebDriverTouchAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->touchScreen->doubleTap($this->locationProvider);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
index eb946008f..46224aea2 100644
--- a/lib/Interactions/Touch/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -17,25 +17,25 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverDownAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverDownAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
 
-  private $x;
-  private $y;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(WebDriverTouchScreen $touch_screen, $x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen);
-  }
-
-  public function perform() {
-    $this->touchScreen->down($this->x, $this->y);
-  }
+    public function perform()
+    {
+        $this->touchScreen->down($this->x, $this->y);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
index 575c3eb4d..48e65dc95 100644
--- a/lib/Interactions/Touch/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -17,22 +17,22 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverFlickAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverFlickAction extends WebDriverTouchAction implements WebDriverAction
+{
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(WebDriverTouchScreen $touch_screen, $x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen);
-  }
-
-  public function perform() {
-    $this->touchScreen->flick($this->x, $this->y);
-  }
+    public function perform()
+    {
+        $this->touchScreen->flick($this->x, $this->y);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index afd13ab8c..d91e84898 100644
--- a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -18,37 +18,39 @@
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverElement;
 
-class WebDriverFlickFromElementAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverFlickFromElementAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
+    private $speed;
 
-  private $x;
-  private $y;
-  private $speed;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param WebDriverElement $element
+     * @param int $x
+     * @param int $y
+     * @param int $speed
+     */
+    public function __construct(
+        WebDriverTouchScreen $touch_screen,
+        WebDriverElement $element,
+        $x,
+        $y,
+        $speed
+    ) {
+        $this->x = $x;
+        $this->y = $y;
+        $this->speed = $speed;
+        parent::__construct($touch_screen, $element);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param WebDriverElement $element
-   * @param int $x
-   * @param int $y
-   * @param int $speed
-   */
-  public function __construct(
-    WebDriverTouchScreen $touch_screen,
-    WebDriverElement $element, $x, $y, $speed
-  ) {
-    $this->x = $x;
-    $this->y = $y;
-    $this->speed = $speed;
-    parent::__construct($touch_screen, $element);
-  }
-
-  public function perform() {
-    $this->touchScreen->flickFromElement(
-      $this->locationProvider,
-      $this->x,
-      $this->y,
-      $this->speed
-    );
-  }
+    public function perform()
+    {
+        $this->touchScreen->flickFromElement(
+            $this->locationProvider,
+            $this->x,
+            $this->y,
+            $this->speed
+        );
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverLongPressAction.php b/lib/Interactions/Touch/WebDriverLongPressAction.php
index c46770d86..bf6e8bf49 100644
--- a/lib/Interactions/Touch/WebDriverLongPressAction.php
+++ b/lib/Interactions/Touch/WebDriverLongPressAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverLongPressAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
-
-  public function perform() {
-    $this->touchScreen->longPress($this->locationProvider);
-  }
+class WebDriverLongPressAction extends WebDriverTouchAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->touchScreen->longPress($this->locationProvider);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverMoveAction.php b/lib/Interactions/Touch/WebDriverMoveAction.php
index 330783271..bb2a4bab1 100644
--- a/lib/Interactions/Touch/WebDriverMoveAction.php
+++ b/lib/Interactions/Touch/WebDriverMoveAction.php
@@ -17,25 +17,25 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverMoveAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverMoveAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
 
-  private $x;
-  private $y;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(WebDriverTouchScreen $touch_screen, $x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen);
-  }
-
-  public function perform() {
-    $this->touchScreen->move($this->x, $this->y);
-  }
+    public function perform()
+    {
+        $this->touchScreen->move($this->x, $this->y);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverScrollAction.php b/lib/Interactions/Touch/WebDriverScrollAction.php
index 8dc1f14b7..0bb70a8e5 100644
--- a/lib/Interactions/Touch/WebDriverScrollAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollAction.php
@@ -17,25 +17,25 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverScrollAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverScrollAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
 
-  private $x;
-  private $y;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(WebDriverTouchScreen $touch_screen, $x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen);
-  }
-
-  public function perform() {
-    $this->touchScreen->scroll($this->x, $this->y);
-  }
+    public function perform()
+    {
+        $this->touchScreen->scroll($this->x, $this->y);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
index df31f13b0..073244480 100644
--- a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
@@ -18,32 +18,34 @@
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverElement;
 
-class WebDriverScrollFromElementAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverScrollFromElementAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
 
-  private $x;
-  private $y;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param WebDriverElement $element
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(
+        WebDriverTouchScreen $touch_screen,
+        WebDriverElement $element,
+        $x,
+        $y
+    ) {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen, $element);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param WebDriverElement $element
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(
-      WebDriverTouchScreen $touch_screen, WebDriverElement $element, $x, $y
-  ) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen, $element);
-  }
-
-  public function perform() {
-    $this->touchScreen->scrollFromElement(
-      $this->locationProvider,
-      $this->x,
-      $this->y
-    );
-  }
+    public function perform()
+    {
+        $this->touchScreen->scrollFromElement(
+            $this->locationProvider,
+            $this->x,
+            $this->y
+        );
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverTapAction.php b/lib/Interactions/Touch/WebDriverTapAction.php
index 835acc848..31ccf5678 100644
--- a/lib/Interactions/Touch/WebDriverTapAction.php
+++ b/lib/Interactions/Touch/WebDriverTapAction.php
@@ -17,11 +17,10 @@
 
 use Facebook\WebDriver\WebDriverAction;
 
-class WebDriverTapAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
-
-  public function perform() {
-    $this->touchScreen->tap($this->locationProvider);
-  }
+class WebDriverTapAction extends WebDriverTouchAction implements WebDriverAction
+{
+    public function perform()
+    {
+        $this->touchScreen->tap($this->locationProvider);
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
index e267f1ab3..dd09e6499 100644
--- a/lib/Interactions/Touch/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -15,42 +15,41 @@
 
 namespace Facebook\WebDriver\Interactions\Touch;
 
-use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
+use Facebook\WebDriver\Internal\WebDriverLocatable;
 
 /**
  * Base class for all touch-related actions.
  */
-abstract class WebDriverTouchAction {
-
-  /**
-   * @var WebDriverTouchScreen
-   */
-  protected $touchScreen;
-
-  /**
-   * @var WebDriverLocatable
-   */
-  protected $locationProvider;
-
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param WebDriverLocatable $location_provider
-   */
-  public function __construct(
-    WebDriverTouchScreen $touch_screen,
-    WebDriverLocatable $location_provider = null
-  ) {
-    $this->touchScreen = $touch_screen;
-    $this->locationProvider = $location_provider;
-  }
-
-  /**
-   * @return null|WebDriverCoordinates
-   */
-  protected function getActionLocation() {
-    return $this->locationProvider !== null
-      ? $this->locationProvider->getCoordinates() : null;
-  }
-
+abstract class WebDriverTouchAction
+{
+    /**
+     * @var WebDriverTouchScreen
+     */
+    protected $touchScreen;
+    /**
+     * @var WebDriverLocatable
+     */
+    protected $locationProvider;
+
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param WebDriverLocatable $location_provider
+     */
+    public function __construct(
+        WebDriverTouchScreen $touch_screen,
+        WebDriverLocatable $location_provider = null
+    ) {
+        $this->touchScreen = $touch_screen;
+        $this->locationProvider = $location_provider;
+    }
+
+    /**
+     * @return null|WebDriverCoordinates
+     */
+    protected function getActionLocation()
+    {
+        return $this->locationProvider !== null
+            ? $this->locationProvider->getCoordinates() : null;
+    }
 }
diff --git a/lib/Interactions/Touch/WebDriverTouchScreen.php b/lib/Interactions/Touch/WebDriverTouchScreen.php
index cb753cd0d..4bb6f1100 100644
--- a/lib/Interactions/Touch/WebDriverTouchScreen.php
+++ b/lib/Interactions/Touch/WebDriverTouchScreen.php
@@ -20,103 +20,108 @@
 /**
  * Interface representing touch screen operations.
  */
-interface WebDriverTouchScreen {
+interface WebDriverTouchScreen
+{
+    /**
+     * Single tap on the touch enabled device.
+     *
+     * @param WebDriverElement $element
+     * @return $this
+     */
+    public function tap(WebDriverElement $element);
 
-  /**
-   * Single tap on the touch enabled device.
-   *
-   * @param WebDriverElement $element
-   * @return $this
-   */
-  public function tap(WebDriverElement $element);
+    /**
+     * Double tap on the touch screen using finger motion events.
+     *
+     * @param WebDriverElement $element
+     * @return $this
+     */
+    public function doubleTap(WebDriverElement $element);
 
-  /**
-   * Double tap on the touch screen using finger motion events.
-   *
-   * @param WebDriverElement $element
-   * @return $this
-   */
-  public function doubleTap(WebDriverElement $element);
+    /**
+     * Finger down on the screen.
+     *
+     * @param int $x
+     * @param int $y
+     * @return $this
+     */
+    public function down($x, $y);
 
-  /**
-   * Finger down on the screen.
-   *
-   * @param int $x
-   * @param int $y
-   * @return $this
-   */
-  public function down($x, $y);
+    /**
+     * Flick on the touch screen using finger motion events. Use this flick
+     * command if you don't care where the flick starts on the screen.
+     *
+     * @param int $xspeed
+     * @param int $yspeed
+     * @return $this
+     */
+    public function flick($xspeed, $yspeed);
 
-  /**
-   * Flick on the touch screen using finger motion events. Use this flick
-   * command if you don't care where the flick starts on the screen.
-   *
-   * @param int $xspeed
-   * @param int $yspeed
-   * @return $this
-   */
-  public function flick($xspeed, $yspeed);
+    /**
+     * Flick on the touch screen using finger motion events.
+     * This flickcommand starts at a particular screen location.
+     *
+     * @param WebDriverElement $element
+     * @param int $xoffset
+     * @param int $yoffset
+     * @param int $speed
+     * @return $this
+     */
+    public function flickFromElement(
+        WebDriverElement $element,
+        $xoffset,
+        $yoffset,
+        $speed
+    );
 
-  /**
-   * Flick on the touch screen using finger motion events.
-   * This flickcommand starts at a particular screen location.
-   *
-   * @param WebDriverElement $element
-   * @param int              $xoffset
-   * @param int              $yoffset
-   * @param int              $speed
-   * @return $this
-   */
-  public function flickFromElement(
-    WebDriverElement $element, $xoffset, $yoffset, $speed);
+    /**
+     * Long press on the touch screen using finger motion events.
+     *
+     * @param WebDriverElement $element
+     * @return $this
+     */
+    public function longPress(WebDriverElement $element);
 
-  /**
-   * Long press on the touch screen using finger motion events.
-   *
-   * @param WebDriverElement $element
-   * @return $this
-   */
-  public function longPress(WebDriverElement $element);
+    /**
+     * Finger move on the screen.
+     *
+     * @param int $x
+     * @param int $y
+     * @return $this
+     */
+    public function move($x, $y);
 
-  /**
-   * Finger move on the screen.
-   *
-   * @param int $x
-   * @param int $y
-   * @return $this
-   */
-  public function move($x, $y);
+    /**
+     * Scroll on the touch screen using finger based motion events. Use this
+     * command if you don't care where the scroll starts on the screen.
+     *
+     * @param int $xoffset
+     * @param int $yoffset
+     * @return $this
+     */
+    public function scroll($xoffset, $yoffset);
 
+    /**
+     * Scroll on the touch screen using finger based motion events. Use this
+     * command to start scrolling at a particular screen location.
+     *
+     * @param WebDriverElement $element
+     * @param int $xoffset
+     * @param int $yoffset
+     * @return $this
+     */
+    public function scrollFromElement(
+        WebDriverElement $element,
+        $xoffset,
+        $yoffset
+    );
 
-  /**
-   * Scroll on the touch screen using finger based motion events. Use this
-   * command if you don't care where the scroll starts on the screen.
-   *
-   * @param int $xoffset
-   * @param int $yoffset
-   * @return $this
-   */
-  public function scroll($xoffset, $yoffset);
-
-  /**
-   * Scroll on the touch screen using finger based motion events. Use this
-   * command to start scrolling at a particular screen location.
-   *
-   * @param WebDriverElement $element
-   * @param int              $xoffset
-   * @param int              $yoffset
-   * @return $this
-   */
-  public function scrollFromElement(
-    WebDriverElement $element, $xoffset, $yoffset);
-
-  /**
-   * Finger up on the screen.
-   *
-   * @param int $x
-   * @param int $y
-   * @return $this
-   */
-  public function up($x, $y);
-
+    /**
+     * Finger up on the screen.
+     *
+     * @param int $x
+     * @param int $y
+     * @return $this
+     */
+    public function up($x, $y);
 }
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 3e11b3c0a..860cf8d5a 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -15,237 +15,264 @@
 
 namespace Facebook\WebDriver\Interactions;
 
-use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
-use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction;
-use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
-use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverClickAction;
-use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction;
 use Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction;
-use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction;
+use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
 use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverElement;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
  */
-class WebDriverActions {
-
-  protected $driver;
-  protected $keyboard;
-  protected $mouse;
-  protected $action;
-
-  public function __construct(WebDriver $driver) {
-    $this->driver = $driver;
-    $this->keyboard = $driver->getKeyboard();
-    $this->mouse = $driver->getMouse();
-    $this->action = new WebDriverCompositeAction();
-  }
-
-  /**
-   * A convenience method for performing the actions without calling build().
-   * @return void
-   */
-  public function perform() {
-    $this->action->perform();
-  }
-
-  /**
-   * Mouse click.
-   * If $element is provided, move to the middle of the element first.
-   *
-   * @param WebDriverElement $element
-   * @return WebDriverActions
-   */
-  public function click(WebDriverElement $element = null) {
-    $this->action->addAction(
-      new WebDriverClickAction($this->mouse, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * Mouse click and hold.
-   * If $element is provided, move to the middle of the element first.
-   *
-   * @param WebDriverElement $element
-   * @return WebDriverActions
-   */
-  public function clickAndHold(WebDriverElement $element = null) {
-    $this->action->addAction(
-      new WebDriverClickAndHoldAction($this->mouse, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * Context-click (right click).
-   * If $element is provided, move to the middle of the element first.
-   *
-   * @param WebDriverElement $element
-   * @return WebDriverActions
-   */
-  public function contextClick(WebDriverElement $element = null) {
-    $this->action->addAction(
-      new WebDriverContextClickAction($this->mouse, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * Double click.
-   * If $element is provided, move to the middle of the element first.
-   *
-   * @param WebDriverElement $element
-   * @return WebDriverActions
-   */
-  public function doubleClick(WebDriverElement $element = null) {
-    $this->action->addAction(
-      new WebDriverDoubleClickAction($this->mouse, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * Drag and drop from $source to $target.
-   *
-   * @param WebDriverElement $source
-   * @param WebDriverElement $target
-   * @return WebDriverActions
-   */
-  public function dragAndDrop(WebDriverElement $source,
-                              WebDriverElement $target) {
-    $this->action->addAction(
-      new WebDriverClickAndHoldAction($this->mouse, $source)
-    );
-    $this->action->addAction(
-      new WebDriverMouseMoveAction($this->mouse, $target)
-    );
-    $this->action->addAction(
-      new WebDriverButtonReleaseAction($this->mouse, $target)
-    );
-    return $this;
-  }
-
-  /**
-   * Drag $source and drop by offset ($x_offset, $y_offset).
-   *
-   * @param WebDriverElement $source
-   * @param int $x_offset
-   * @param int $y_offset
-   * @return WebDriverActions
-   */
-  public function dragAndDropBy(WebDriverElement $source,
-                                $x_offset,
-                                $y_offset) {
-    $this->action->addAction(
-      new WebDriverClickAndHoldAction($this->mouse, $source)
-    );
-    $this->action->addAction(
-      new WebDriverMoveToOffsetAction($this->mouse, null, $x_offset, $y_offset)
-    );
-    $this->action->addAction(
-      new WebDriverButtonReleaseAction($this->mouse, null)
-    );
-    return $this;
-  }
-
-  /**
-   * Mouse move by offset.
-   *
-   * @param int $x_offset
-   * @param int $y_offset
-   * @return WebDriverActions
-   */
-  public function moveByOffset($x_offset, $y_offset) {
-    $this->action->addAction(
-      new WebDriverMoveToOffsetAction($this->mouse, null, $x_offset, $y_offset)
-    );
-    return $this;
-  }
-
-  /**
-   * Move to the middle of the given WebDriverElement.
-   * Extra shift, calculated from the top-left corner of the element, can be set by passing $x_offset and $y_offset parameters. 
-   *
-   * @param WebDriverElement $element
-   * @param int $x_offset
-   * @param int $y_offset
-   * @return WebDriverActions
-   */
-  public function moveToElement(WebDriverElement $element,
-                                $x_offset = null,
-                                $y_offset = null) {
-    $this->action->addAction(new WebDriverMoveToOffsetAction(
-      $this->mouse, $element, $x_offset, $y_offset
-    ));
-    return $this;
-  }
-
-  /**
-   * Release the mouse button.
-   * If $element is provided, move to the middle of the element first.
-   *
-   * @param WebDriverElement $element
-   * @return WebDriverActions
-   */
-  public function release(WebDriverElement $element = null) {
-    $this->action->addAction(
-      new WebDriverButtonReleaseAction($this->mouse, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * Press a key on keyboard.
-   * If $element is provided, focus on that element first.
-   *
-   * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-   * @param WebDriverElement $element
-   * @param string $key
-   * @return WebDriverActions
-   */
-  public function keyDown(WebDriverElement $element = null, $key = null) {
-    $this->action->addAction(
-      new WebDriverKeyDownAction($this->keyboard, $this->mouse, $element, $key)
-    );
-    return $this;
-  }
-
-  /**
-   * Release a key on keyboard.
-   * If $element is provided, focus on that element first.
-   *
-   * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-   * @param WebDriverElement $element
-   * @param string $key
-   * @return WebDriverActions
-   */
-  public function keyUp(WebDriverElement $element = null, $key = null) {
-    $this->action->addAction(
-      new WebDriverKeyUpAction($this->keyboard, $this->mouse, $element, $key)
-    );
-    return $this;
-  }
-
-  /**
-   * Send keys by keyboard.
-   * If $element is provided, focus on that element first.
-   *
-   * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-   * @param WebDriverElement $element
-   * @param string $keys
-   * @return WebDriverActions
-   */
-  public function sendKeys(WebDriverElement $element = null, $keys = null) {
-    $this->action->addAction(
-      new WebDriverSendKeysAction(
-        $this->keyboard, $this->mouse, $element, $keys
-      )
-    );
-    return $this;
-  }
+class WebDriverActions
+{
+    protected $driver;
+    protected $keyboard;
+    protected $mouse;
+    protected $action;
+
+    public function __construct(WebDriver $driver)
+    {
+        $this->driver = $driver;
+        $this->keyboard = $driver->getKeyboard();
+        $this->mouse = $driver->getMouse();
+        $this->action = new WebDriverCompositeAction();
+    }
+
+    /**
+     * A convenience method for performing the actions without calling build().
+     */
+    public function perform()
+    {
+        $this->action->perform();
+    }
+
+    /**
+     * Mouse click.
+     * If $element is provided, move to the middle of the element first.
+     *
+     * @param WebDriverElement $element
+     * @return WebDriverActions
+     */
+    public function click(WebDriverElement $element = null)
+    {
+        $this->action->addAction(
+            new WebDriverClickAction($this->mouse, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Mouse click and hold.
+     * If $element is provided, move to the middle of the element first.
+     *
+     * @param WebDriverElement $element
+     * @return WebDriverActions
+     */
+    public function clickAndHold(WebDriverElement $element = null)
+    {
+        $this->action->addAction(
+            new WebDriverClickAndHoldAction($this->mouse, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Context-click (right click).
+     * If $element is provided, move to the middle of the element first.
+     *
+     * @param WebDriverElement $element
+     * @return WebDriverActions
+     */
+    public function contextClick(WebDriverElement $element = null)
+    {
+        $this->action->addAction(
+            new WebDriverContextClickAction($this->mouse, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Double click.
+     * If $element is provided, move to the middle of the element first.
+     *
+     * @param WebDriverElement $element
+     * @return WebDriverActions
+     */
+    public function doubleClick(WebDriverElement $element = null)
+    {
+        $this->action->addAction(
+            new WebDriverDoubleClickAction($this->mouse, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Drag and drop from $source to $target.
+     *
+     * @param WebDriverElement $source
+     * @param WebDriverElement $target
+     * @return WebDriverActions
+     */
+    public function dragAndDrop(WebDriverElement $source, WebDriverElement $target)
+    {
+        $this->action->addAction(
+            new WebDriverClickAndHoldAction($this->mouse, $source)
+        );
+        $this->action->addAction(
+            new WebDriverMouseMoveAction($this->mouse, $target)
+        );
+        $this->action->addAction(
+            new WebDriverButtonReleaseAction($this->mouse, $target)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Drag $source and drop by offset ($x_offset, $y_offset).
+     *
+     * @param WebDriverElement $source
+     * @param int $x_offset
+     * @param int $y_offset
+     * @return WebDriverActions
+     */
+    public function dragAndDropBy(WebDriverElement $source, $x_offset, $y_offset)
+    {
+        $this->action->addAction(
+            new WebDriverClickAndHoldAction($this->mouse, $source)
+        );
+        $this->action->addAction(
+            new WebDriverMoveToOffsetAction($this->mouse, null, $x_offset, $y_offset)
+        );
+        $this->action->addAction(
+            new WebDriverButtonReleaseAction($this->mouse, null)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Mouse move by offset.
+     *
+     * @param int $x_offset
+     * @param int $y_offset
+     * @return WebDriverActions
+     */
+    public function moveByOffset($x_offset, $y_offset)
+    {
+        $this->action->addAction(
+            new WebDriverMoveToOffsetAction($this->mouse, null, $x_offset, $y_offset)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Move to the middle of the given WebDriverElement.
+     * Extra shift, calculated from the top-left corner of the element, can be set by passing $x_offset and $y_offset
+     * parameters.
+     *
+     * @param WebDriverElement $element
+     * @param int $x_offset
+     * @param int $y_offset
+     * @return WebDriverActions
+     */
+    public function moveToElement(WebDriverElement $element, $x_offset = null, $y_offset = null)
+    {
+        $this->action->addAction(new WebDriverMoveToOffsetAction(
+            $this->mouse,
+            $element,
+            $x_offset,
+            $y_offset
+        ));
+
+        return $this;
+    }
+
+    /**
+     * Release the mouse button.
+     * If $element is provided, move to the middle of the element first.
+     *
+     * @param WebDriverElement $element
+     * @return WebDriverActions
+     */
+    public function release(WebDriverElement $element = null)
+    {
+        $this->action->addAction(
+            new WebDriverButtonReleaseAction($this->mouse, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Press a key on keyboard.
+     * If $element is provided, focus on that element first.
+     *
+     * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+     * @param WebDriverElement $element
+     * @param string $key
+     * @return WebDriverActions
+     */
+    public function keyDown(WebDriverElement $element = null, $key = null)
+    {
+        $this->action->addAction(
+            new WebDriverKeyDownAction($this->keyboard, $this->mouse, $element, $key)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Release a key on keyboard.
+     * If $element is provided, focus on that element first.
+     *
+     * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+     * @param WebDriverElement $element
+     * @param string $key
+     * @return WebDriverActions
+     */
+    public function keyUp(WebDriverElement $element = null, $key = null)
+    {
+        $this->action->addAction(
+            new WebDriverKeyUpAction($this->keyboard, $this->mouse, $element, $key)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Send keys by keyboard.
+     * If $element is provided, focus on that element first.
+     *
+     * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
+     * @param WebDriverElement $element
+     * @param string $keys
+     * @return WebDriverActions
+     */
+    public function sendKeys(WebDriverElement $element = null, $keys = null)
+    {
+        $this->action->addAction(
+            new WebDriverSendKeysAction(
+                $this->keyboard,
+                $this->mouse,
+                $element,
+                $keys
+            )
+        );
+
+        return $this;
+    }
 }
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index 63d9863d7..f17cc4588 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -20,36 +20,40 @@
 /**
  * An action for aggregating actions and triggering all of them afterwards.
  */
-class WebDriverCompositeAction implements WebDriverAction {
+class WebDriverCompositeAction implements WebDriverAction
+{
+    private $actions = array();
 
-  private $actions = array();
+    /**
+     * Add an WebDriverAction to the sequence.
+     *
+     * @param WebDriverAction $action
+     * @return WebDriverCompositeAction The current instance.
+     */
+    public function addAction(WebDriverAction $action)
+    {
+        $this->actions[] = $action;
 
-  /**
-   * Add an WebDriverAction to the sequence.
-   *
-   * @param WebDriverAction $action
-   * @return WebDriverCompositeAction The current instance.
-   */
-  public function addAction(WebDriverAction $action) {
-    $this->actions[] = $action;
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Get the number of actions in the sequence.
-   *
-   * @return int The number of actions.
-   */
-  public function getNumberOfActions() {
-    return count($this->actions);
-  }
+    /**
+     * Get the number of actions in the sequence.
+     *
+     * @return int The number of actions.
+     */
+    public function getNumberOfActions()
+    {
+        return count($this->actions);
+    }
 
-  /**
-   * Perform the seqeunce of actions.
-   */
-  public function perform() {
-    foreach ($this->actions as $action) {
-      $action->perform();
+    /**
+     * Perform the seqeunce of actions.
+     */
+    public function perform()
+    {
+        foreach ($this->actions as $action) {
+            $action->perform();
+        }
     }
-  }
 }
diff --git a/lib/Interactions/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
index ec77242fc..d8cf05f4b 100644
--- a/lib/Interactions/WebDriverTouchActions.php
+++ b/lib/Interactions/WebDriverTouchActions.php
@@ -15,155 +15,179 @@
 
 namespace Facebook\WebDriver\Interactions;
 
-use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
 use Facebook\WebDriver\Interactions\Touch\WebDriverDoubleTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverDownAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverFlickAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverFlickFromElementAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverLongPressAction;
-use Facebook\WebDriver\Interactions\Touch\WebDriverTapAction;
-use Facebook\WebDriver\Interactions\Touch\WebDriverScrollFromElementAction;
-use Facebook\WebDriver\Interactions\Touch\WebDriverDownAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverMoveAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverScrollAction;
-use Facebook\WebDriver\WebDriverUpAction;
-use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\Interactions\Touch\WebDriverScrollFromElementAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTapAction;
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
 use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverUpAction;
 
 /**
  * WebDriver action builder for touch events
  */
-class WebDriverTouchActions extends WebDriverActions {
-
-  /**
-   * @var WebDriverTouchScreen
-   */
-  protected $touchScreen;
-
-  public function __construct(WebDriver $driver) {
-    parent::__construct($driver);
-    $this->touchScreen = $driver->getTouch();
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @return WebDriverTouchActions
-   */
-  public function tap(WebDriverElement $element) {
-    $this->action->addAction(
-      new WebDriverTapAction($this->touchScreen, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function down($x, $y) {
-    $this->action->addAction(
-      new WebDriverDownAction($this->touchScreen, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function up($x, $y) {
-    $this->action->addAction(
-      new WebDriverUpAction($this->touchScreen, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function move($x, $y) {
-    $this->action->addAction(
-      new WebDriverMoveAction($this->touchScreen, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function scroll($x, $y) {
-    $this->action->addAction(
-      new WebDriverScrollAction($this->touchScreen, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function scrollFromElement(WebDriverElement $element, $x, $y) {
-    $this->action->addAction(
-      new WebDriverScrollFromElementAction($this->touchScreen, $element, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @return WebDriverTouchActions
-   */
-  public function doubleTap(WebDriverElement $element) {
-    $this->action->addAction(
-      new WebDriverDoubleTapAction($this->touchScreen, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @return WebDriverTouchActions
-   */
-  public function longPress(WebDriverElement $element) {
-    $this->action->addAction(
-      new WebDriverLongPressAction($this->touchScreen, $element)
-    );
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   * @return WebDriverTouchActions
-   */
-  public function flick($x, $y) {
-    $this->action->addAction(
-      new WebDriverFlickAction($this->touchScreen, $x, $y)
-    );
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @param int $x
-   * @param int $y
-   * @param int $speed
-   * @return WebDriverTouchActions
-   */
-  public function flickFromElement(WebDriverElement $element, $x, $y, $speed) {
-    $this->action->addAction(
-      new WebDriverFlickFromElementAction(
-        $this->touchScreen, $element, $x, $y, $speed
-      )
-    );
-    return $this;
-  }
-
+class WebDriverTouchActions extends WebDriverActions
+{
+    /**
+     * @var WebDriverTouchScreen
+     */
+    protected $touchScreen;
+
+    public function __construct(WebDriver $driver)
+    {
+        parent::__construct($driver);
+        $this->touchScreen = $driver->getTouch();
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @return WebDriverTouchActions
+     */
+    public function tap(WebDriverElement $element)
+    {
+        $this->action->addAction(
+            new WebDriverTapAction($this->touchScreen, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function down($x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverDownAction($this->touchScreen, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function up($x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverUpAction($this->touchScreen, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function move($x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverMoveAction($this->touchScreen, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function scroll($x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverScrollAction($this->touchScreen, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function scrollFromElement(WebDriverElement $element, $x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverScrollFromElementAction($this->touchScreen, $element, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @return WebDriverTouchActions
+     */
+    public function doubleTap(WebDriverElement $element)
+    {
+        $this->action->addAction(
+            new WebDriverDoubleTapAction($this->touchScreen, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @return WebDriverTouchActions
+     */
+    public function longPress(WebDriverElement $element)
+    {
+        $this->action->addAction(
+            new WebDriverLongPressAction($this->touchScreen, $element)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     * @return WebDriverTouchActions
+     */
+    public function flick($x, $y)
+    {
+        $this->action->addAction(
+            new WebDriverFlickAction($this->touchScreen, $x, $y)
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @param int $x
+     * @param int $y
+     * @param int $speed
+     * @return WebDriverTouchActions
+     */
+    public function flickFromElement(WebDriverElement $element, $x, $y, $speed)
+    {
+        $this->action->addAction(
+            new WebDriverFlickFromElementAction(
+                $this->touchScreen,
+                $element,
+                $x,
+                $y,
+                $speed
+            )
+        );
+
+        return $this;
+    }
 }
diff --git a/lib/Internal/WebDriverLocatable.php b/lib/Internal/WebDriverLocatable.php
index 1523c35c0..e40c36b57 100644
--- a/lib/Internal/WebDriverLocatable.php
+++ b/lib/Internal/WebDriverLocatable.php
@@ -18,12 +18,12 @@
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 
 /**
- * interface representing basic mouse operations.
+ * Interface representing basic mouse operations.
  */
-interface WebDriverLocatable {
-
-  /**
-   * @return WebDriverCoordinates
-   */
-  public function getCoordinates();
+interface WebDriverLocatable
+{
+    /**
+     * @return WebDriverCoordinates
+     */
+    public function getCoordinates();
 }
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 3e0db1302..61aa21b0e 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -18,32 +18,31 @@
 /**
  * WebDriver interface implemented by drivers that support JavaScript.
  */
-interface JavaScriptExecutor {
-
-  /**
-   * Inject a snippet of JavaScript into the page for execution in the context
-   * of the currently selected frame. The executed script is assumed to be
-   * synchronous and the result of evaluating the script will be returned.
-   *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The return value of the script.
-   */
-  public function executeScript($script, array $arguments = array());
-
-  /**
-   * Inject a snippet of JavaScript into the page for asynchronous execution in
-   * the context of the currently selected frame.
-   *
-   * The driver will pass a callback as the last argument to the snippet, and
-   * block until the callback is invoked.
-   *
-   * @see WebDriverExecuteAsyncScriptTestCase
-   *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The value passed by the script to the callback.
-   */
-  public function executeAsyncScript($script, array $arguments = array());
+interface JavaScriptExecutor
+{
+    /**
+     * Inject a snippet of JavaScript into the page for execution in the context
+     * of the currently selected frame. The executed script is assumed to be
+     * synchronous and the result of evaluating the script will be returned.
+     *
+     * @param string $script The script to inject.
+     * @param array $arguments The arguments of the script.
+     * @return mixed The return value of the script.
+     */
+    public function executeScript($script, array $arguments = array());
 
+    /**
+     * Inject a snippet of JavaScript into the page for asynchronous execution in
+     * the context of the currently selected frame.
+     *
+     * The driver will pass a callback as the last argument to the snippet, and
+     * block until the callback is invoked.
+     *
+     * @see WebDriverExecuteAsyncScriptTestCase
+     *
+     * @param string $script The script to inject.
+     * @param array $arguments The arguments of the script.
+     * @return mixed The value passed by the script to the callback.
+     */
+    public function executeAsyncScript($script, array $arguments = array());
 }
diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index b41d68c25..3a5d76316 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -18,64 +18,68 @@
 use Exception;
 use Facebook\WebDriver\Exception\TimeOutException;
 
-class URLChecker {
+class URLChecker
+{
+    const POLL_INTERVAL_MS = 500;
+    const CONNECT_TIMEOUT_MS = 500;
 
-  const POLL_INTERVAL_MS = 500;
-  const CONNECT_TIMEOUT_MS = 500;
+    public function waitUntilAvailable($timeout_in_ms, $url)
+    {
+        $end = microtime(true) + $timeout_in_ms / 1000;
 
-  public function waitUntilAvailable($timeout_in_ms, $url) {
-    $end = microtime(true) + $timeout_in_ms / 1000;
+        while ($end > microtime(true)) {
+            if ($this->getHTTPResponseCode($timeout_in_ms, $url) === 200) {
+                return $this;
+            }
+            usleep(self::POLL_INTERVAL_MS);
+        }
 
-    while ($end > microtime(true)) {
-      if ($this->getHTTPResponseCode($timeout_in_ms, $url) === 200) {
-        return $this;
-      }
-      usleep(self::POLL_INTERVAL_MS);
+        throw new TimeOutException(sprintf(
+            'Timed out waiting for %s to become available after %d ms.',
+            $url,
+            $timeout_in_ms
+        ));
     }
 
-    throw new TimeOutException(sprintf(
-      "Timed out waiting for %s to become available after %d ms.",
-      $url,
-      $timeout_in_ms
-    ));
-  }
+    public function waitUntilUnavailable($timeout_in_ms, $url)
+    {
+        $end = microtime(true) + $timeout_in_ms / 1000;
 
-  public function waitUntilUnavailable($timeout_in_ms, $url) {
-    $end = microtime(true) + $timeout_in_ms / 1000;
+        while ($end > microtime(true)) {
+            if ($this->getHTTPResponseCode($timeout_in_ms, $url) !== 200) {
+                return $this;
+            }
+            usleep(self::POLL_INTERVAL_MS);
+        }
 
-    while ($end > microtime(true)) {
-      if ($this->getHTTPResponseCode($timeout_in_ms, $url) !== 200) {
-        return $this;
-      }
-      usleep(self::POLL_INTERVAL_MS);
+        throw new TimeOutException(sprintf(
+            'Timed out waiting for %s to become unavailable after %d ms.',
+            $url,
+            $timeout_in_ms
+        ));
     }
 
-    throw new TimeOutException(sprintf(
-      "Timed out waiting for %s to become unavailable after %d ms.",
-      $url,
-      $timeout_in_ms
-    ));
-  }
+    private function getHTTPResponseCode($timeout_in_ms, $url)
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
+        // There is a PHP bug in some versions which didn't define the constant.
+        curl_setopt(
+            $ch,
+            156, // CURLOPT_CONNECTTIMEOUT_MS
+            self::CONNECT_TIMEOUT_MS
+        );
+        $code = null;
+        try {
+            curl_exec($ch);
+            $info = curl_getinfo($ch);
+            $code = $info['http_code'];
+        } catch (Exception $e) {
+        }
+        curl_close($ch);
 
-  private function getHTTPResponseCode($timeout_in_ms, $url) {
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
-    // There is a PHP bug in some versions which didn't define the constant.
-    curl_setopt(
-      $ch,
-      156, // CURLOPT_CONNECTTIMEOUT_MS
-      self::CONNECT_TIMEOUT_MS
-    );
-    $code = null;
-    try {
-      curl_exec($ch);
-      $info = curl_getinfo($ch);
-      $code = $info['http_code'];
-    } catch (Exception $e) {
+        return $code;
     }
-    curl_close($ch);
-    return $code;
-  }
 }
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index ef732ec53..8e30aae14 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -23,271 +23,306 @@
 use Facebook\WebDriver\WebDriverCapabilities;
 use Facebook\WebDriver\WebDriverPlatform;
 
-class DesiredCapabilities implements WebDriverCapabilities {
-
-  private $capabilities;
-
-  public function __construct(array $capabilities = array()) {
-    $this->capabilities = $capabilities;
-  }
-
-  /**
-   * @return string The name of the browser.
-   */
-  public function getBrowserName() {
-    return $this->get(WebDriverCapabilityType::BROWSER_NAME, '');
-  }
-
-  /**
-   * @param string $browser_name
-   * @return DesiredCapabilities
-   */
-  public function setBrowserName($browser_name) {
-    $this->set(WebDriverCapabilityType::BROWSER_NAME, $browser_name);
-    return $this;
-  }
-
-  /**
-   * @return string The version of the browser.
-   */
-  public function getVersion() {
-    return $this->get(WebDriverCapabilityType::VERSION, '');
-  }
-
-  /**
-   * @param string $version
-   * @return DesiredCapabilities
-   */
-  public function setVersion($version) {
-    $this->set(WebDriverCapabilityType::VERSION, $version);
-    return $this;
-  }
-
-  /**
-   * @param string $name
-   * @return mixed The value of a capability.
-   */
-  public function getCapability($name) {
-    return $this->get($name);
-  }
-
-  /**
-   * @param string $name
-   * @param mixed $value
-   * @return DesiredCapabilities
-   */
-  public function setCapability($name, $value) {
-    $this->set($name, $value);
-    return $this;
-  }
-
-  /**
-   * @return string The name of the platform.
-   */
-  public function getPlatform() {
-    return $this->get(WebDriverCapabilityType::PLATFORM, '');
-  }
-
-  /**
-   * @param string $platform
-   * @return DesiredCapabilities
-   */
-  public function setPlatform($platform) {
-    $this->set(WebDriverCapabilityType::PLATFORM, $platform);
-    return $this;
-  }
-
-  /**
-   * @param string $capability_name
-   * @return bool Whether the value is not null and not false.
-   */
-  public function is($capability_name) {
-    return (bool) $this->get($capability_name);
-  }
-
-  /**
-   * @return bool Whether javascript is enabled.
-   */
-  public function isJavascriptEnabled() {
-    return $this->get(WebDriverCapabilityType::JAVASCRIPT_ENABLED, false);
-  }
-
-  /**
-   * This is a htmlUnit-only option.
-   *
-   * @param bool $enabled
-   * @throws Exception
-   * @return DesiredCapabilities
-   * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
-   */
-  public function setJavascriptEnabled($enabled) {
-    $browser = $this->getBrowserName();
-    if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
-      throw new Exception(
-        'isJavascriptEnable() is a htmlunit-only option. '.
-        'See https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities.'
-      );
+class DesiredCapabilities implements WebDriverCapabilities
+{
+    private $capabilities;
+
+    public function __construct(array $capabilities = array())
+    {
+        $this->capabilities = $capabilities;
+    }
+
+    /**
+     * @return string The name of the browser.
+     */
+    public function getBrowserName()
+    {
+        return $this->get(WebDriverCapabilityType::BROWSER_NAME, '');
+    }
+
+    /**
+     * @param string $browser_name
+     * @return DesiredCapabilities
+     */
+    public function setBrowserName($browser_name)
+    {
+        $this->set(WebDriverCapabilityType::BROWSER_NAME, $browser_name);
+
+        return $this;
+    }
+
+    /**
+     * @return string The version of the browser.
+     */
+    public function getVersion()
+    {
+        return $this->get(WebDriverCapabilityType::VERSION, '');
+    }
+
+    /**
+     * @param string $version
+     * @return DesiredCapabilities
+     */
+    public function setVersion($version)
+    {
+        $this->set(WebDriverCapabilityType::VERSION, $version);
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @return mixed The value of a capability.
+     */
+    public function getCapability($name)
+    {
+        return $this->get($name);
     }
 
-    $this->set(WebDriverCapabilityType::JAVASCRIPT_ENABLED, $enabled);
-    return $this;
-  }
-
-  /**
-   * @return array
-   */
-  public function toArray() {
-    if (isset($this->capabilities[ChromeOptions::CAPABILITY]) &&
-      $this->capabilities[ChromeOptions::CAPABILITY] instanceof ChromeOptions) {
-      $this->capabilities[ChromeOptions::CAPABILITY] =
-        $this->capabilities[ChromeOptions::CAPABILITY]->toArray();
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return DesiredCapabilities
+     */
+    public function setCapability($name, $value)
+    {
+        $this->set($name, $value);
+
+        return $this;
+    }
+
+    /**
+     * @return string The name of the platform.
+     */
+    public function getPlatform()
+    {
+        return $this->get(WebDriverCapabilityType::PLATFORM, '');
     }
 
-    if (isset($this->capabilities[FirefoxDriver::PROFILE]) &&
-      $this->capabilities[FirefoxDriver::PROFILE] instanceof FirefoxProfile) {
-      $this->capabilities[FirefoxDriver::PROFILE] =
-        $this->capabilities[FirefoxDriver::PROFILE]->encode();
+    /**
+     * @param string $platform
+     * @return DesiredCapabilities
+     */
+    public function setPlatform($platform)
+    {
+        $this->set(WebDriverCapabilityType::PLATFORM, $platform);
+
+        return $this;
     }
 
-    return $this->capabilities;
-  }
-
-  /**
-   * @param string $key
-   * @param mixed $value
-   * @return DesiredCapabilities
-   */
-  private function set($key, $value) {
-    $this->capabilities[$key] = $value;
-    return $this;
-  }
-
-  /**
-   * @param string $key
-   * @param mixed $default
-   * @return mixed
-   */
-  private function get($key, $default = null) {
-    return isset($this->capabilities[$key])
-           ? $this->capabilities[$key]
-           : $default;
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function android() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANDROID,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function chrome() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function firefox() {
-    $caps = new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-
-    // disable the "Reader View" help tooltip, which can hide elements in the window.document
-    $profile = new FirefoxProfile();
-    $profile->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
-    $caps->setCapability(FirefoxDriver::PROFILE, $profile);
-
-    return $caps;
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function htmlUnit() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function htmlUnitWithJS() {
-    $caps = new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-    return $caps->setJavascriptEnabled(true);
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function internetExplorer() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function iphone() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function ipad() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function opera() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function safari() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-  }
-
-  /**
-   * @return DesiredCapabilities
-   */
-  public static function phantomjs() {
-    return new DesiredCapabilities(array(
-      WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
-      WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-    ));
-  }
+    /**
+     * @param string $capability_name
+     * @return bool Whether the value is not null and not false.
+     */
+    public function is($capability_name)
+    {
+        return (bool) $this->get($capability_name);
+    }
+
+    /**
+     * @return bool Whether javascript is enabled.
+     */
+    public function isJavascriptEnabled()
+    {
+        return $this->get(WebDriverCapabilityType::JAVASCRIPT_ENABLED, false);
+    }
+
+    /**
+     * This is a htmlUnit-only option.
+     *
+     * @param bool $enabled
+     * @throws Exception
+     * @return DesiredCapabilities
+     * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
+     */
+    public function setJavascriptEnabled($enabled)
+    {
+        $browser = $this->getBrowserName();
+        if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
+            throw new Exception(
+                'isJavascriptEnable() is a htmlunit-only option. ' .
+                'See https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities.'
+            );
+        }
+
+        $this->set(WebDriverCapabilityType::JAVASCRIPT_ENABLED, $enabled);
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        if (isset($this->capabilities[ChromeOptions::CAPABILITY]) &&
+            $this->capabilities[ChromeOptions::CAPABILITY] instanceof ChromeOptions
+        ) {
+            $this->capabilities[ChromeOptions::CAPABILITY] =
+                $this->capabilities[ChromeOptions::CAPABILITY]->toArray();
+        }
+
+        if (isset($this->capabilities[FirefoxDriver::PROFILE]) &&
+            $this->capabilities[FirefoxDriver::PROFILE] instanceof FirefoxProfile
+        ) {
+            $this->capabilities[FirefoxDriver::PROFILE] =
+                $this->capabilities[FirefoxDriver::PROFILE]->encode();
+        }
+
+        return $this->capabilities;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return DesiredCapabilities
+     */
+    private function set($key, $value)
+    {
+        $this->capabilities[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    private function get($key, $default = null)
+    {
+        return isset($this->capabilities[$key])
+            ? $this->capabilities[$key]
+            : $default;
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function android()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANDROID,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function chrome()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function firefox()
+    {
+        $caps = new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+
+        // disable the "Reader View" help tooltip, which can hide elements in the window.document
+        $profile = new FirefoxProfile();
+        $profile->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
+        $caps->setCapability(FirefoxDriver::PROFILE, $profile);
+
+        return $caps;
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function htmlUnit()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function htmlUnitWithJS()
+    {
+        $caps = new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+
+        return $caps->setJavascriptEnabled(true);
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function internetExplorer()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function iphone()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function ipad()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function opera()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function safari()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+    }
+
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function phantomjs()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+        ));
+    }
 }
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 18e9fb37b..e2ce958b5 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -18,154 +18,129 @@
 /**
  * This list of command defined in the WebDriver json wire protocol.
  */
-class DriverCommand {
-  const GET_ALL_SESSIONS = "getAllSessions";
-  const GET_CAPABILITIES = "getCapabilities";
-  const NEW_SESSION = "newSession";
-
-  const STATUS = "status";
-
-  const CLOSE = "close";
-  const QUIT = "quit";
-
-  const GET = "get";
-  const GO_BACK = "goBack";
-  const GO_FORWARD = "goForward";
-  const REFRESH = "refresh";
-
-  const ADD_COOKIE = "addCookie";
-  const GET_ALL_COOKIES = "getCookies";
-  const DELETE_COOKIE = "deleteCookie";
-  const DELETE_ALL_COOKIES = "deleteAllCookies";
-
-  const FIND_ELEMENT = "findElement";
-  const FIND_ELEMENTS = "findElements";
-  const FIND_CHILD_ELEMENT = "findChildElement";
-  const FIND_CHILD_ELEMENTS = "findChildElements";
-
-  const CLEAR_ELEMENT = "clearElement";
-  const CLICK_ELEMENT = "clickElement";
-  const SEND_KEYS_TO_ELEMENT = "sendKeysToElement";
-  const SEND_KEYS_TO_ACTIVE_ELEMENT = "sendKeysToActiveElement";
-  const SUBMIT_ELEMENT = "submitElement";
-  const UPLOAD_FILE = "uploadFile";
-
-  const GET_CURRENT_WINDOW_HANDLE = "getCurrentWindowHandle";
-  const GET_WINDOW_HANDLES = "getWindowHandles";
-
-  const GET_CURRENT_CONTEXT_HANDLE = "getCurrentContextHandle";
-  const GET_CONTEXT_HANDLES = "getContextHandles";
-
-  // Switching between to window/frame/iframe
-  const SWITCH_TO_WINDOW = "switchToWindow";
-  const SWITCH_TO_CONTEXT = "switchToContext";
-  const SWITCH_TO_FRAME = "switchToFrame";
-  const SWITCH_TO_PARENT_FRAME = "switchToParentFrame";
-  const GET_ACTIVE_ELEMENT = "getActiveElement";
-
-  // Information of the page
-  const GET_CURRENT_URL = "getCurrentUrl";
-  const GET_PAGE_SOURCE = "getPageSource";
-  const GET_TITLE = "getTitle";
-
-  // Javascript API
-  const EXECUTE_SCRIPT = "executeScript";
-  const EXECUTE_ASYNC_SCRIPT = "executeAsyncScript";
-
-  // API getting information from an element.
-  const GET_ELEMENT_TEXT = "getElementText";
-  const GET_ELEMENT_TAG_NAME = "getElementTagName";
-  const IS_ELEMENT_SELECTED = "isElementSelected";
-  const IS_ELEMENT_ENABLED = "isElementEnabled";
-  const IS_ELEMENT_DISPLAYED = "isElementDisplayed";
-  const GET_ELEMENT_LOCATION = "getElementLocation";
-  const GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW =
-    "getElementLocationOnceScrolledIntoView";
-  const GET_ELEMENT_SIZE = "getElementSize";
-  const GET_ELEMENT_ATTRIBUTE = "getElementAttribute";
-  const GET_ELEMENT_VALUE_OF_CSS_PROPERTY = "getElementValueOfCssProperty";
-  const ELEMENT_EQUALS = "elementEquals";
-
-  const SCREENSHOT = "screenshot";
-
-  // Alert API
-  const ACCEPT_ALERT = "acceptAlert";
-  const DISMISS_ALERT = "dismissAlert";
-  const GET_ALERT_TEXT = "getAlertText";
-  const SET_ALERT_VALUE = "setAlertValue";
-
-  // Timeout API
-  const SET_TIMEOUT = "setTimeout";
-  const IMPLICITLY_WAIT = "implicitlyWait";
-  const SET_SCRIPT_TIMEOUT = "setScriptTimeout";
-
-  const EXECUTE_SQL = "executeSQL";
-  const GET_LOCATION = "getLocation";
-  const SET_LOCATION = "setLocation";
-  const GET_APP_CACHE = "getAppCache";
-  const GET_APP_CACHE_STATUS = "getStatus";
-  const CLEAR_APP_CACHE = "clearAppCache";
-  const IS_BROWSER_ONLINE = "isBrowserOnline";
-  const SET_BROWSER_ONLINE = "setBrowserOnline";
-
-  const GET_LOCAL_STORAGE_ITEM = "getLocalStorageItem";
-  const GET_LOCAL_STORAGE_KEYS = "getLocalStorageKeys";
-  const SET_LOCAL_STORAGE_ITEM = "setLocalStorageItem";
-  const REMOVE_LOCAL_STORAGE_ITEM = "removeLocalStorageItem";
-  const CLEAR_LOCAL_STORAGE = "clearLocalStorage";
-  const GET_LOCAL_STORAGE_SIZE = "getLocalStorageSize";
-
-  const GET_SESSION_STORAGE_ITEM = "getSessionStorageItem";
-  const GET_SESSION_STORAGE_KEYS = "getSessionStorageKey";
-  const SET_SESSION_STORAGE_ITEM = "setSessionStorageItem";
-  const REMOVE_SESSION_STORAGE_ITEM = "removeSessionStorageItem";
-  const CLEAR_SESSION_STORAGE = "clearSessionStorage";
-  const GET_SESSION_STORAGE_SIZE = "getSessionStorageSize";
-
-  const SET_SCREEN_ORIENTATION = "setScreenOrientation";
-  const GET_SCREEN_ORIENTATION = "getScreenOrientation";
-
-  // These belong to the Advanced user interactions - an element is optional for these commands.
-  const CLICK = "mouseClick";
-  const DOUBLE_CLICK = "mouseDoubleClick";
-  const MOUSE_DOWN = "mouseButtonDown";
-  const MOUSE_UP = "mouseButtonUp";
-  const MOVE_TO = "mouseMoveTo";
-
-  // Those allow interactions with the Input Methods installed on the system.
-  const IME_GET_AVAILABLE_ENGINES = "imeGetAvailableEngines";
-  const IME_GET_ACTIVE_ENGINE = "imeGetActiveEngine";
-  const IME_IS_ACTIVATED = "imeIsActivated";
-  const IME_DEACTIVATE = "imeDeactivate";
-  const IME_ACTIVATE_ENGINE = "imeActivateEngine";
-
-  // These belong to the Advanced Touch API
-  const TOUCH_SINGLE_TAP = "touchSingleTap";
-  const TOUCH_DOWN = "touchDown";
-  const TOUCH_UP = "touchUp";
-  const TOUCH_MOVE = "touchMove";
-  const TOUCH_SCROLL = "touchScroll";
-  const TOUCH_DOUBLE_TAP = "touchDoubleTap";
-  const TOUCH_LONG_PRESS = "touchLongPress";
-  const TOUCH_FLICK = "touchFlick";
-
-  // Window API (beta)
-  const SET_WINDOW_SIZE = "setWindowSize";
-  const SET_WINDOW_POSITION = "setWindowPosition";
-  const GET_WINDOW_SIZE = "getWindowSize";
-  const GET_WINDOW_POSITION = "getWindowPosition";
-  const MAXIMIZE_WINDOW = "maximizeWindow";
-
-  // Logging API
-  const GET_AVAILABLE_LOG_TYPES = "getAvailableLogTypes";
-  const GET_LOG = "getLog";
-  const GET_SESSION_LOGS = "getSessionLogs";
-
-  // Mobile API
-  const GET_NETWORK_CONNECTION = "getNetworkConnection";
-  const SET_NETWORK_CONNECTION = "setNetworkConnection";
-
-  private function __construct()
-  {
-  }
+class DriverCommand
+{
+    const GET_ALL_SESSIONS = 'getAllSessions';
+    const GET_CAPABILITIES = 'getCapabilities';
+    const NEW_SESSION = 'newSession';
+    const STATUS = 'status';
+    const CLOSE = 'close';
+    const QUIT = 'quit';
+    const GET = 'get';
+    const GO_BACK = 'goBack';
+    const GO_FORWARD = 'goForward';
+    const REFRESH = 'refresh';
+    const ADD_COOKIE = 'addCookie';
+    const GET_ALL_COOKIES = 'getCookies';
+    const DELETE_COOKIE = 'deleteCookie';
+    const DELETE_ALL_COOKIES = 'deleteAllCookies';
+    const FIND_ELEMENT = 'findElement';
+    const FIND_ELEMENTS = 'findElements';
+    const FIND_CHILD_ELEMENT = 'findChildElement';
+    const FIND_CHILD_ELEMENTS = 'findChildElements';
+    const CLEAR_ELEMENT = 'clearElement';
+    const CLICK_ELEMENT = 'clickElement';
+    const SEND_KEYS_TO_ELEMENT = 'sendKeysToElement';
+    const SEND_KEYS_TO_ACTIVE_ELEMENT = 'sendKeysToActiveElement';
+    const SUBMIT_ELEMENT = 'submitElement';
+    const UPLOAD_FILE = 'uploadFile';
+    const GET_CURRENT_WINDOW_HANDLE = 'getCurrentWindowHandle';
+    const GET_WINDOW_HANDLES = 'getWindowHandles';
+    const GET_CURRENT_CONTEXT_HANDLE = 'getCurrentContextHandle';
+    const GET_CONTEXT_HANDLES = 'getContextHandles';
+    // Switching between to window/frame/iframe
+    const SWITCH_TO_WINDOW = 'switchToWindow';
+    const SWITCH_TO_CONTEXT = 'switchToContext';
+    const SWITCH_TO_FRAME = 'switchToFrame';
+    const SWITCH_TO_PARENT_FRAME = 'switchToParentFrame';
+    const GET_ACTIVE_ELEMENT = 'getActiveElement';
+    // Information of the page
+    const GET_CURRENT_URL = 'getCurrentUrl';
+    const GET_PAGE_SOURCE = 'getPageSource';
+    const GET_TITLE = 'getTitle';
+    // Javascript API
+    const EXECUTE_SCRIPT = 'executeScript';
+    const EXECUTE_ASYNC_SCRIPT = 'executeAsyncScript';
+    // API getting information from an element.
+    const GET_ELEMENT_TEXT = 'getElementText';
+    const GET_ELEMENT_TAG_NAME = 'getElementTagName';
+    const IS_ELEMENT_SELECTED = 'isElementSelected';
+    const IS_ELEMENT_ENABLED = 'isElementEnabled';
+    const IS_ELEMENT_DISPLAYED = 'isElementDisplayed';
+    const GET_ELEMENT_LOCATION = 'getElementLocation';
+    const GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW = 'getElementLocationOnceScrolledIntoView';
+    const GET_ELEMENT_SIZE = 'getElementSize';
+    const GET_ELEMENT_ATTRIBUTE = 'getElementAttribute';
+    const GET_ELEMENT_VALUE_OF_CSS_PROPERTY = 'getElementValueOfCssProperty';
+    const ELEMENT_EQUALS = 'elementEquals';
+    const SCREENSHOT = 'screenshot';
+    // Alert API
+    const ACCEPT_ALERT = 'acceptAlert';
+    const DISMISS_ALERT = 'dismissAlert';
+    const GET_ALERT_TEXT = 'getAlertText';
+    const SET_ALERT_VALUE = 'setAlertValue';
+    // Timeout API
+    const SET_TIMEOUT = 'setTimeout';
+    const IMPLICITLY_WAIT = 'implicitlyWait';
+    const SET_SCRIPT_TIMEOUT = 'setScriptTimeout';
+    const EXECUTE_SQL = 'executeSQL';
+    const GET_LOCATION = 'getLocation';
+    const SET_LOCATION = 'setLocation';
+    const GET_APP_CACHE = 'getAppCache';
+    const GET_APP_CACHE_STATUS = 'getStatus';
+    const CLEAR_APP_CACHE = 'clearAppCache';
+    const IS_BROWSER_ONLINE = 'isBrowserOnline';
+    const SET_BROWSER_ONLINE = 'setBrowserOnline';
+    const GET_LOCAL_STORAGE_ITEM = 'getLocalStorageItem';
+    const GET_LOCAL_STORAGE_KEYS = 'getLocalStorageKeys';
+    const SET_LOCAL_STORAGE_ITEM = 'setLocalStorageItem';
+    const REMOVE_LOCAL_STORAGE_ITEM = 'removeLocalStorageItem';
+    const CLEAR_LOCAL_STORAGE = 'clearLocalStorage';
+    const GET_LOCAL_STORAGE_SIZE = 'getLocalStorageSize';
+    const GET_SESSION_STORAGE_ITEM = 'getSessionStorageItem';
+    const GET_SESSION_STORAGE_KEYS = 'getSessionStorageKey';
+    const SET_SESSION_STORAGE_ITEM = 'setSessionStorageItem';
+    const REMOVE_SESSION_STORAGE_ITEM = 'removeSessionStorageItem';
+    const CLEAR_SESSION_STORAGE = 'clearSessionStorage';
+    const GET_SESSION_STORAGE_SIZE = 'getSessionStorageSize';
+    const SET_SCREEN_ORIENTATION = 'setScreenOrientation';
+    const GET_SCREEN_ORIENTATION = 'getScreenOrientation';
+    // These belong to the Advanced user interactions - an element is optional for these commands.
+    const CLICK = 'mouseClick';
+    const DOUBLE_CLICK = 'mouseDoubleClick';
+    const MOUSE_DOWN = 'mouseButtonDown';
+    const MOUSE_UP = 'mouseButtonUp';
+    const MOVE_TO = 'mouseMoveTo';
+    // Those allow interactions with the Input Methods installed on the system.
+    const IME_GET_AVAILABLE_ENGINES = 'imeGetAvailableEngines';
+    const IME_GET_ACTIVE_ENGINE = 'imeGetActiveEngine';
+    const IME_IS_ACTIVATED = 'imeIsActivated';
+    const IME_DEACTIVATE = 'imeDeactivate';
+    const IME_ACTIVATE_ENGINE = 'imeActivateEngine';
+    // These belong to the Advanced Touch API
+    const TOUCH_SINGLE_TAP = 'touchSingleTap';
+    const TOUCH_DOWN = 'touchDown';
+    const TOUCH_UP = 'touchUp';
+    const TOUCH_MOVE = 'touchMove';
+    const TOUCH_SCROLL = 'touchScroll';
+    const TOUCH_DOUBLE_TAP = 'touchDoubleTap';
+    const TOUCH_LONG_PRESS = 'touchLongPress';
+    const TOUCH_FLICK = 'touchFlick';
+    // Window API (beta)
+    const SET_WINDOW_SIZE = 'setWindowSize';
+    const SET_WINDOW_POSITION = 'setWindowPosition';
+    const GET_WINDOW_SIZE = 'getWindowSize';
+    const GET_WINDOW_POSITION = 'getWindowPosition';
+    const MAXIMIZE_WINDOW = 'maximizeWindow';
+    // Logging API
+    const GET_AVAILABLE_LOG_TYPES = 'getAvailableLogTypes';
+    const GET_LOG = 'getLog';
+    const GET_SESSION_LOGS = 'getSessionLogs';
+    // Mobile API
+    const GET_NETWORK_CONNECTION = 'getNetworkConnection';
+    const SET_NETWORK_CONNECTION = 'setNetworkConnection';
+
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/Remote/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
index ff13c58fe..38ad319e7 100644
--- a/lib/Remote/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -15,12 +15,12 @@
 
 namespace Facebook\WebDriver\Remote;
 
-interface ExecuteMethod {
-
-  /**
-   * @param string $command_name
-   * @param array $parameters
-   * @return WebDriverResponse
-   */
-  public function execute($command_name, array $parameters = array());
+interface ExecuteMethod
+{
+    /**
+     * @param string $command_name
+     * @param array $parameters
+     * @return WebDriverResponse
+     */
+    public function execute($command_name, array $parameters = array());
 }
diff --git a/lib/Remote/FileDetector.php b/lib/Remote/FileDetector.php
index a6e52f48d..483df049c 100644
--- a/lib/Remote/FileDetector.php
+++ b/lib/Remote/FileDetector.php
@@ -15,15 +15,15 @@
 
 namespace Facebook\WebDriver\Remote;
 
-interface FileDetector {
-
-  /**
-   * Try to detect whether the given $file is a file or not. Return the path
-   * of the file. Otherwise, return null.
-   *
-   * @param string $file
-   *
-   * @return null|string The path of the file.
-   */
-  public function getLocalFile($file);
+interface FileDetector
+{
+    /**
+     * Try to detect whether the given $file is a file or not. Return the path
+     * of the file. Otherwise, return null.
+     *
+     * @param string $file
+     *
+     * @return null|string The path of the file.
+     */
+    public function getLocalFile($file);
 }
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index ebd47357e..37670610d 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -15,287 +15,355 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use BadMethodCallException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\WebDriverCommandExecutor;
 use InvalidArgumentException;
-use BadMethodCallException;
 
 /**
  * Command executor talking to the standalone server via HTTP.
  */
-class HttpCommandExecutor implements WebDriverCommandExecutor {
+class HttpCommandExecutor implements WebDriverCommandExecutor
+{
+    /**
+     * @see
+     *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
+     */
+    protected static $commands = array(
+        DriverCommand::ACCEPT_ALERT => array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
+        DriverCommand::ADD_COOKIE => array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
+        DriverCommand::CLEAR_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
+        DriverCommand::CLICK_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'),
+        DriverCommand::CLOSE => array('method' => 'DELETE', 'url' => '/session/:sessionId/window'),
+        DriverCommand::DELETE_ALL_COOKIES => array('method' => 'DELETE', 'url' => '/session/:sessionId/cookie'),
+        DriverCommand::DELETE_COOKIE => array('method' => 'DELETE', 'url' => '/session/:sessionId/cookie/:name'),
+        DriverCommand::DISMISS_ALERT => array('method' => 'POST', 'url' => '/session/:sessionId/dismiss_alert'),
+        DriverCommand::ELEMENT_EQUALS => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/equals/:other',
+        ),
+        DriverCommand::FIND_CHILD_ELEMENT => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/element/:id/element',
+        ),
+        DriverCommand::FIND_CHILD_ELEMENTS => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/element/:id/elements',
+        ),
+        DriverCommand::EXECUTE_SCRIPT => array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
+        DriverCommand::FIND_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element'),
+        DriverCommand::FIND_ELEMENTS => array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
+        DriverCommand::SWITCH_TO_FRAME => array('method' => 'POST', 'url' => '/session/:sessionId/frame'),
+        DriverCommand::SWITCH_TO_WINDOW => array('method' => 'POST', 'url' => '/session/:sessionId/window'),
+        DriverCommand::GET => array('method' => 'POST', 'url' => '/session/:sessionId/url'),
+        DriverCommand::GET_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
+        DriverCommand::GET_ALERT_TEXT => array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
+        DriverCommand::GET_ALL_COOKIES => array('method' => 'GET', 'url' => '/session/:sessionId/cookie'),
+        DriverCommand::GET_ALL_SESSIONS => array('method' => 'GET', 'url' => '/sessions'),
+        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
+        DriverCommand::GET_CURRENT_URL => array('method' => 'GET', 'url' => '/session/:sessionId/url'),
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/window_handle',
+        ),
+        DriverCommand::GET_ELEMENT_ATTRIBUTE => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/attribute/:name',
+        ),
+        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/css/:propertyName',
+        ),
+        DriverCommand::GET_ELEMENT_LOCATION => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/location',
+        ),
+        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/location_in_view',
+        ),
+        DriverCommand::GET_ELEMENT_SIZE => array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/size'),
+        DriverCommand::GET_ELEMENT_TAG_NAME => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/name',
+        ),
+        DriverCommand::GET_ELEMENT_TEXT => array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/text'),
+        DriverCommand::GET_LOG => array('method' => 'POST', 'url' => '/session/:sessionId/log'),
+        DriverCommand::GET_PAGE_SOURCE => array('method' => 'GET', 'url' => '/session/:sessionId/source'),
+        DriverCommand::GET_SCREEN_ORIENTATION => array('method' => 'GET', 'url' => '/session/:sessionId/orientation'),
+        DriverCommand::GET_CAPABILITIES => array('method' => 'GET', 'url' => '/session/:sessionId'),
+        DriverCommand::GET_TITLE => array('method' => 'GET', 'url' => '/session/:sessionId/title'),
+        DriverCommand::GET_WINDOW_HANDLES => array('method' => 'GET', 'url' => '/session/:sessionId/window_handles'),
+        DriverCommand::GET_WINDOW_POSITION => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/window/:windowHandle/position',
+        ),
+        DriverCommand::GET_WINDOW_SIZE => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/window/:windowHandle/size',
+        ),
+        DriverCommand::GO_BACK => array('method' => 'POST', 'url' => '/session/:sessionId/back'),
+        DriverCommand::GO_FORWARD => array('method' => 'POST', 'url' => '/session/:sessionId/forward'),
+        DriverCommand::IS_ELEMENT_DISPLAYED => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/displayed',
+        ),
+        DriverCommand::IS_ELEMENT_ENABLED => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/enabled',
+        ),
+        DriverCommand::IS_ELEMENT_SELECTED => array(
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/selected',
+        ),
+        DriverCommand::MAXIMIZE_WINDOW => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/window/:windowHandle/maximize',
+        ),
+        DriverCommand::MOUSE_DOWN => array('method' => 'POST', 'url' => '/session/:sessionId/buttondown'),
+        DriverCommand::MOUSE_UP => array('method' => 'POST', 'url' => '/session/:sessionId/buttonup'),
+        DriverCommand::CLICK => array('method' => 'POST', 'url' => '/session/:sessionId/click'),
+        DriverCommand::DOUBLE_CLICK => array('method' => 'POST', 'url' => '/session/:sessionId/doubleclick'),
+        DriverCommand::MOVE_TO => array('method' => 'POST', 'url' => '/session/:sessionId/moveto'),
+        DriverCommand::NEW_SESSION => array('method' => 'POST', 'url' => '/session'),
+        DriverCommand::QUIT => array('method' => 'DELETE', 'url' => '/session/:sessionId'),
+        DriverCommand::REFRESH => array('method' => 'POST', 'url' => '/session/:sessionId/refresh'),
+        DriverCommand::UPLOAD_FILE => array('method' => 'POST', 'url' => '/session/:sessionId/file'), // undocumented
+        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
+        DriverCommand::SET_ALERT_VALUE => array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
+        DriverCommand::SEND_KEYS_TO_ELEMENT => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/element/:id/value',
+        ),
+        DriverCommand::IMPLICITLY_WAIT => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/timeouts/implicit_wait',
+        ),
+        DriverCommand::SET_SCREEN_ORIENTATION => array('method' => 'POST', 'url' => '/session/:sessionId/orientation'),
+        DriverCommand::SET_TIMEOUT => array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
+        DriverCommand::SET_SCRIPT_TIMEOUT => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/timeouts/async_script',
+        ),
+        DriverCommand::SET_WINDOW_POSITION => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/window/:windowHandle/position',
+        ),
+        DriverCommand::SET_WINDOW_SIZE => array(
+            'method' => 'POST',
+            'url' => '/session/:sessionId/window/:windowHandle/size',
+        ),
+        DriverCommand::SUBMIT_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'),
+        DriverCommand::SCREENSHOT => array('method' => 'GET', 'url' => '/session/:sessionId/screenshot'),
+        DriverCommand::TOUCH_SINGLE_TAP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/click'),
+        DriverCommand::TOUCH_DOWN => array('method' => 'POST', 'url' => '/session/:sessionId/touch/down'),
+        DriverCommand::TOUCH_DOUBLE_TAP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'),
+        DriverCommand::TOUCH_FLICK => array('method' => 'POST', 'url' => '/session/:sessionId/touch/flick'),
+        DriverCommand::TOUCH_LONG_PRESS => array('method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'),
+        DriverCommand::TOUCH_MOVE => array('method' => 'POST', 'url' => '/session/:sessionId/touch/move'),
+        DriverCommand::TOUCH_SCROLL => array('method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'),
+        DriverCommand::TOUCH_UP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
+    );
+    /**
+     * @var string
+     */
+    protected $url;
+    /**
+     * @var resource
+     */
+    protected $curl;
 
-  /**
-   * @see
-   *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
-   */
-  protected static $commands = array(
-    DriverCommand::ACCEPT_ALERT =>            array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
-    DriverCommand::ADD_COOKIE =>              array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
-    DriverCommand::CLEAR_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
-    DriverCommand::CLICK_ELEMENT =>           array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'),
-    DriverCommand::CLOSE =>                   array('method' => 'DELETE', 'url' => '/session/:sessionId/window'),
-    DriverCommand::DELETE_ALL_COOKIES =>      array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie'),
-    DriverCommand::DELETE_COOKIE =>           array('method' => 'DELETE',  'url' => '/session/:sessionId/cookie/:name'),
-    DriverCommand::DISMISS_ALERT =>           array('method' => 'POST',   'url' => '/session/:sessionId/dismiss_alert'),
-    DriverCommand::ELEMENT_EQUALS =>          array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/equals/:other'),
-    DriverCommand::FIND_CHILD_ELEMENT =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/element'),
-    DriverCommand::FIND_CHILD_ELEMENTS =>     array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/elements'),
-    DriverCommand::EXECUTE_SCRIPT =>          array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
-    DriverCommand::EXECUTE_ASYNC_SCRIPT =>    array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
-    DriverCommand::FIND_ELEMENT =>            array('method' => 'POST', 'url' => '/session/:sessionId/element'),
-    DriverCommand::FIND_ELEMENTS =>           array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
-    DriverCommand::SWITCH_TO_FRAME =>         array('method' => 'POST',  'url' => '/session/:sessionId/frame'),
-    DriverCommand::SWITCH_TO_WINDOW =>        array('method' => 'POST',  'url' => '/session/:sessionId/window'),
-    DriverCommand::GET =>                     array('method' => 'POST', 'url' => '/session/:sessionId/url'),
-    DriverCommand::GET_ACTIVE_ELEMENT =>      array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
-    DriverCommand::GET_ALERT_TEXT =>          array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
-    DriverCommand::GET_ALL_COOKIES =>         array('method' => 'GET',  'url' => '/session/:sessionId/cookie'),
-    DriverCommand::GET_ALL_SESSIONS =>        array('method' => 'GET', 'url' => '/sessions'),
-    DriverCommand::GET_AVAILABLE_LOG_TYPES => array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
-    DriverCommand::GET_CURRENT_URL =>         array('method' => 'GET',  'url' => '/session/:sessionId/url'),
-    DriverCommand::GET_CURRENT_WINDOW_HANDLE => array('method' => 'GET',  'url' => '/session/:sessionId/window_handle'),
-    DriverCommand::GET_ELEMENT_ATTRIBUTE =>   array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/attribute/:name'),
-    DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY =>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/css/:propertyName'),
-    DriverCommand::GET_ELEMENT_LOCATION =>    array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location'),
-    DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/location_in_view'),
-    DriverCommand::GET_ELEMENT_SIZE =>        array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/size'),
-    DriverCommand::GET_ELEMENT_TAG_NAME =>    array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/name'),
-    DriverCommand::GET_ELEMENT_TEXT =>        array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/text'),
-    DriverCommand::GET_LOG =>                 array('method' => 'POST', 'url' => '/session/:sessionId/log'),
-    DriverCommand::GET_PAGE_SOURCE =>         array('method' => 'GET',  'url' => '/session/:sessionId/source'),
-    DriverCommand::GET_SCREEN_ORIENTATION =>  array('method' => 'GET',  'url' => '/session/:sessionId/orientation'),
-    DriverCommand::GET_CAPABILITIES =>        array('method' => 'GET',  'url' => '/session/:sessionId'),
-    DriverCommand::GET_TITLE =>               array('method' => 'GET',  'url' => '/session/:sessionId/title'),
-    DriverCommand::GET_WINDOW_HANDLES =>      array('method' => 'GET',  'url' => '/session/:sessionId/window_handles'),
-    DriverCommand::GET_WINDOW_POSITION =>     array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/position'),
-    DriverCommand::GET_WINDOW_SIZE =>         array('method' => 'GET',  'url' => '/session/:sessionId/window/:windowHandle/size'),
-    DriverCommand::GO_BACK =>                 array('method' => 'POST',  'url' => '/session/:sessionId/back'),
-    DriverCommand::GO_FORWARD =>              array('method' => 'POST',  'url' => '/session/:sessionId/forward'),
-    DriverCommand::IS_ELEMENT_DISPLAYED=>     array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/displayed'),
-    DriverCommand::IS_ELEMENT_ENABLED=>       array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/enabled'),
-    DriverCommand::IS_ELEMENT_SELECTED=>      array('method' => 'GET',  'url' => '/session/:sessionId/element/:id/selected'),
-    DriverCommand::MAXIMIZE_WINDOW =>         array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/maximize'),
-    DriverCommand::MOUSE_DOWN =>              array('method' => 'POST', 'url' => '/session/:sessionId/buttondown'),
-    DriverCommand::MOUSE_UP =>                array('method' => 'POST', 'url' => '/session/:sessionId/buttonup'),
-    DriverCommand::CLICK =>                   array('method' => 'POST', 'url' => '/session/:sessionId/click'),
-    DriverCommand::DOUBLE_CLICK =>            array('method' => 'POST', 'url' => '/session/:sessionId/doubleclick'),
-    DriverCommand::MOVE_TO =>                 array('method' => 'POST', 'url' => '/session/:sessionId/moveto'),
-    DriverCommand::NEW_SESSION =>             array('method' => 'POST', 'url' => '/session'),
-    DriverCommand::QUIT =>                    array('method' => 'DELETE', 'url' => '/session/:sessionId'),
-    DriverCommand::REFRESH =>                 array('method' => 'POST', 'url' => '/session/:sessionId/refresh'),
-    DriverCommand::UPLOAD_FILE =>             array('method' => 'POST', 'url' => '/session/:sessionId/file'), // undocumented
-    DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
-    DriverCommand::SET_ALERT_VALUE =>         array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
-    DriverCommand::SEND_KEYS_TO_ELEMENT =>    array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/value'),
-    DriverCommand::IMPLICITLY_WAIT =>         array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/implicit_wait'),
-    DriverCommand::SET_SCREEN_ORIENTATION =>  array('method' => 'POST', 'url' => '/session/:sessionId/orientation'),
-    DriverCommand::SET_TIMEOUT =>             array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
-    DriverCommand::SET_SCRIPT_TIMEOUT =>      array('method' => 'POST', 'url' => '/session/:sessionId/timeouts/async_script'),
-    DriverCommand::SET_WINDOW_POSITION =>     array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/position'),
-    DriverCommand::SET_WINDOW_SIZE =>         array('method' => 'POST', 'url' => '/session/:sessionId/window/:windowHandle/size'),
-    DriverCommand::SUBMIT_ELEMENT =>          array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'),
-    DriverCommand::SCREENSHOT =>              array('method' => 'GET',  'url' => '/session/:sessionId/screenshot'),
-    DriverCommand::TOUCH_SINGLE_TAP =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/click'),
-    DriverCommand::TOUCH_DOWN =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/down'),
-    DriverCommand::TOUCH_DOUBLE_TAP =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'),
-    DriverCommand::TOUCH_FLICK =>             array('method' => 'POST', 'url' => '/session/:sessionId/touch/flick'),
-    DriverCommand::TOUCH_LONG_PRESS =>        array('method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'),
-    DriverCommand::TOUCH_MOVE =>              array('method' => 'POST', 'url' => '/session/:sessionId/touch/move'),
-    DriverCommand::TOUCH_SCROLL =>            array('method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'),
-    DriverCommand::TOUCH_UP =>                array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
-  );
+    /**
+     * @param string $url
+     * @param string|null $http_proxy
+     * @param int|null $http_proxy_port
+     */
+    public function __construct($url, $http_proxy = null, $http_proxy_port = null)
+    {
+        $this->url = $url;
+        $this->curl = curl_init();
 
-  /**
-   * @var string
-   */
-  protected $url;
-  /**
-   * @var resource
-   */
-  protected $curl;
+        if (!empty($http_proxy)) {
+            curl_setopt($this->curl, CURLOPT_PROXY, $http_proxy);
+            if (!empty($http_proxy_port)) {
+                curl_setopt($this->curl, CURLOPT_PROXYPORT, $http_proxy_port);
+            }
+        }
 
-  /**
-   * @param string $url
-   * @param string|null $http_proxy
-   * @param int|null $http_proxy_port
-   */
-  public function __construct($url, $http_proxy = null, $http_proxy_port = null) {
-    $this->url = $url;
-    $this->curl = curl_init();
+        // Get credentials from $url (if any)
+        $matches = null;
+        if (preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches)) {
+            $this->url = $matches[1] . $matches[4];
+            $auth_creds = $matches[2] . ':' . $matches[3];
+            curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+            curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
+        }
 
-    if (!empty($http_proxy)) {
-      curl_setopt($this->curl, CURLOPT_PROXY, $http_proxy);
-      if (!empty($http_proxy_port)) {
-        curl_setopt($this->curl, CURLOPT_PROXYPORT, $http_proxy_port);
-      }
+        curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
+        curl_setopt(
+            $this->curl,
+            CURLOPT_HTTPHEADER,
+            array(
+                'Content-Type: application/json;charset=UTF-8',
+                'Accept: application/json',
+            )
+        );
+        $this->setRequestTimeout(30000);
+        $this->setConnectionTimeout(30000);
     }
 
-    // Get credentials from $url (if any)
-    $matches = null;
-    if (preg_match("/^(https?:\/\/)(.*):(.*)@(.*?)/U", $url, $matches)) {
-      $this->url = $matches[1].$matches[4];
-      $auth_creds = $matches[2].":".$matches[3];
-      curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-      curl_setopt($this->curl, CURLOPT_USERPWD, $auth_creds);
+    /**
+     * Set timeout for the connect phase
+     *
+     * @param int $timeout_in_ms Timeout in milliseconds
+     * @return HttpCommandExecutor
+     */
+    public function setConnectionTimeout($timeout_in_ms)
+    {
+        // There is a PHP bug in some versions which didn't define the constant.
+        curl_setopt(
+            $this->curl,
+            /* CURLOPT_CONNECTTIMEOUT_MS */
+            156,
+            $timeout_in_ms
+        );
+
+        return $this;
     }
 
-    curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
-    curl_setopt(
-      $this->curl,
-      CURLOPT_HTTPHEADER,
-      array(
-        'Content-Type: application/json;charset=UTF-8',
-        'Accept: application/json',
-      )
-    );
-    $this->setRequestTimeout(30000);
-    $this->setConnectionTimeout(30000);
-  }
+    /**
+     * Set the maximum time of a request
+     *
+     * @param int $timeout_in_ms Timeout in milliseconds
+     * @return HttpCommandExecutor
+     */
+    public function setRequestTimeout($timeout_in_ms)
+    {
+        // There is a PHP bug in some versions (at least for PHP 5.3.3) which
+        // didn't define the constant.
+        curl_setopt(
+            $this->curl,
+            /* CURLOPT_TIMEOUT_MS */
+            155,
+            $timeout_in_ms
+        );
 
-  /**
-   * Set timeout for the connect phase
-   *
-   * @param int $timeout_in_ms Timeout in milliseconds
-   * @return HttpCommandExecutor
-   */
-  public function setConnectionTimeout($timeout_in_ms) {
-    // There is a PHP bug in some versions which didn't define the constant.
-    curl_setopt(
-      $this->curl,
-      /* CURLOPT_CONNECTTIMEOUT_MS */ 156,
-      $timeout_in_ms
-    );
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Set the maximum time of a request
-   *
-   * @param int $timeout_in_ms Timeout in milliseconds
-   * @return HttpCommandExecutor
-   */
-  public function setRequestTimeout($timeout_in_ms) {
-    // There is a PHP bug in some versions (at least for PHP 5.3.3) which
-    // didn't define the constant.
-    curl_setopt(
-      $this->curl,
-      /* CURLOPT_TIMEOUT_MS */ 155,
-      $timeout_in_ms
-    );
-    return $this;
-  }
+    /**
+     * @param WebDriverCommand $command
+     *
+     * @throws WebDriverException
+     * @return mixed
+     */
+    public function execute(WebDriverCommand $command)
+    {
+        if (!isset(self::$commands[$command->getName()])) {
+            throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
+        }
 
-  /**
-   * @param WebDriverCommand $command
-   *
-   * @return mixed
-   *
-   * @throws WebDriverException
-   */
-  public function execute(WebDriverCommand $command) {
-    if (!isset(self::$commands[$command->getName()])) {
-      throw new InvalidArgumentException(
-        $command->getName()." is not a valid command."
-      );
-    }
-    $raw = self::$commands[$command->getName()];
-    $http_method = $raw['method'];
-    $url = $raw['url'];
-    $url = str_replace(':sessionId', $command->getSessionID(), $url);
-    $params = $command->getParameters();
-    foreach ($params as $name => $value) {
-      if ($name[0] === ':') {
-        $url = str_replace($name, $value, $url);
-        if ($http_method != 'POST') {
-          unset($params[$name]);
+        $raw = self::$commands[$command->getName()];
+        $http_method = $raw['method'];
+        $url = $raw['url'];
+        $url = str_replace(':sessionId', $command->getSessionID(), $url);
+        $params = $command->getParameters();
+        foreach ($params as $name => $value) {
+            if ($name[0] === ':') {
+                $url = str_replace($name, $value, $url);
+                if ($http_method != 'POST') {
+                    unset($params[$name]);
+                }
+            }
         }
-      }
-    }
 
-    if ($params && is_array($params) && $http_method !== 'POST') {
-      throw new BadMethodCallException(sprintf(
-        'The http method called for %s is %s but it has to be POST' .
-        ' if you want to pass the JSON params %s',
-        $url,
-        $http_method,
-        json_encode($params)
-      ));
-    }
+        if ($params && is_array($params) && $http_method !== 'POST') {
+            throw new BadMethodCallException(sprintf(
+                'The http method called for %s is %s but it has to be POST' .
+                ' if you want to pass the JSON params %s',
+                $url,
+                $http_method,
+                json_encode($params)
+            ));
+        }
 
-    curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
+        curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
 
-    // https://github.com/facebook/php-webdriver/issues/173
-    if ($command->getName() === DriverCommand::NEW_SESSION) {
-      curl_setopt($this->curl, CURLOPT_POST, 1);
-    } else {
-      curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
-    }
+        // https://github.com/facebook/php-webdriver/issues/173
+        if ($command->getName() === DriverCommand::NEW_SESSION) {
+            curl_setopt($this->curl, CURLOPT_POST, 1);
+        } else {
+            curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
+        }
 
-    $encoded_params = null;
+        $encoded_params = null;
 
-    if ($http_method === 'POST' && $params && is_array($params)) {
-      $encoded_params = json_encode($params);
-    }
+        if ($http_method === 'POST' && $params && is_array($params)) {
+            $encoded_params = json_encode($params);
+        }
 
-    curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
+        curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
 
-    $raw_results = trim(curl_exec($this->curl));
+        $raw_results = trim(curl_exec($this->curl));
 
-    if ($error = curl_error($this->curl)) {
-      $msg = sprintf(
-        'Curl error thrown for http %s to %s',
-        $http_method,
-        $url);
-      if ($params && is_array($params)) {
-        $msg .= sprintf(' with params: %s', json_encode($params));
-      }
-      WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
-    }
+        if ($error = curl_error($this->curl)) {
+            $msg = sprintf(
+                'Curl error thrown for http %s to %s',
+                $http_method,
+                $url
+            );
+            if ($params && is_array($params)) {
+                $msg .= sprintf(' with params: %s', json_encode($params));
+            }
+            WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
+        }
 
-    $results = json_decode($raw_results, true);
+        $results = json_decode($raw_results, true);
 
-    if ($results === null && json_last_error() !== JSON_ERROR_NONE) {
-      throw new WebDriverException(
-        sprintf(
-          "JSON decoding of remote response failed.\n".
-          "Error code: %d\n".
-          "The response: '%s'\n",
-          json_last_error(),
-          $raw_results
-        )
-      );
-    }
+        if ($results === null && json_last_error() !== JSON_ERROR_NONE) {
+            throw new WebDriverException(
+                sprintf(
+                    "JSON decoding of remote response failed.\n" .
+                    "Error code: %d\n" .
+                    "The response: '%s'\n",
+                    json_last_error(),
+                    $raw_results
+                )
+            );
+        }
 
-    $value = null;
-    if (is_array($results) && array_key_exists('value', $results)) {
-      $value = $results['value'];
-    }
+        $value = null;
+        if (is_array($results) && array_key_exists('value', $results)) {
+            $value = $results['value'];
+        }
 
-    $message = null;
-    if (is_array($value) && array_key_exists('message', $value)) {
-      $message = $value['message'];
-    }
+        $message = null;
+        if (is_array($value) && array_key_exists('message', $value)) {
+            $message = $value['message'];
+        }
 
-    $sessionId = null;
-    if (is_array($results) && array_key_exists('sessionId', $results)) {
-      $sessionId = $results['sessionId'];
-    }
+        $sessionId = null;
+        if (is_array($results) && array_key_exists('sessionId', $results)) {
+            $sessionId = $results['sessionId'];
+        }
+
+        $status = isset($results['status']) ? $results['status'] : 0;
+        WebDriverException::throwException($status, $message, $results);
 
-    $status = isset($results['status']) ? $results['status'] : 0;
-    WebDriverException::throwException($status, $message, $results);
+        $response = new WebDriverResponse($sessionId);
 
-    $response = new WebDriverResponse($sessionId);
-    return $response
-      ->setStatus($status)
-      ->setValue($value);
-  }
+        return $response
+            ->setStatus($status)
+            ->setValue($value);
+    }
 
-  /**
-   * @return string
-   */
-  public function getAddressOfRemoteServer() {
-    return $this->url;
-  }
+    /**
+     * @return string
+     */
+    public function getAddressOfRemoteServer()
+    {
+        return $this->url;
+    }
 }
diff --git a/lib/Remote/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
index 1308ed6a1..07f996cf0 100644
--- a/lib/Remote/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -15,16 +15,19 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class LocalFileDetector implements FileDetector {
+class LocalFileDetector implements FileDetector
+{
     /**
      * @param string $file
      *
      * @return null|string
      */
-    public function getLocalFile($file) {
-    if (is_file($file)) {
-      return $file;
+    public function getLocalFile($file)
+    {
+        if (is_file($file)) {
+            return $file;
+        }
+
+        return null;
     }
-    return null;
-  }
 }
diff --git a/lib/Remote/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
index e0ded1032..5a995215e 100644
--- a/lib/Remote/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -15,26 +15,25 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class RemoteExecuteMethod implements ExecuteMethod {
+class RemoteExecuteMethod implements ExecuteMethod
+{
+    private $driver;
 
-  private $driver;
+    /**
+     * @param RemoteWebDriver $driver
+     */
+    public function __construct(RemoteWebDriver $driver)
+    {
+        $this->driver = $driver;
+    }
 
-  /**
-   * @param RemoteWebDriver $driver
-   */
-  public function __construct(RemoteWebDriver $driver) {
-    $this->driver = $driver;
-  }
-
-  /**
-   * @param string $command_name
-   * @param array $parameters
-   * @return mixed
-   */
-  public function execute(
-    $command_name,
-    array $parameters = array()
-  ) {
-    return $this->driver->execute($command_name, $parameters);
-  }
+    /**
+     * @param string $command_name
+     * @param array $parameters
+     * @return mixed
+     */
+    public function execute($command_name, array $parameters = array())
+    {
+        return $this->driver->execute($command_name, $parameters);
+    }
 }
diff --git a/lib/Remote/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
index 2b297d1d9..7b2e114a2 100644
--- a/lib/Remote/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -15,63 +15,70 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\WebDriverKeys;
 use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverKeys;
 
 /**
  * Execute keyboard commands for RemoteWebDriver.
  */
-class RemoteKeyboard implements WebDriverKeyboard {
+class RemoteKeyboard implements WebDriverKeyboard
+{
+    /**
+     * @var RemoteExecuteMethod
+     */
+    private $executor;
+
+    /**
+     * @param RemoteExecuteMethod $executor
+     */
+    public function __construct(RemoteExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * Send keys to active element
+     * @param string|array $keys
+     * @return $this
+     */
+    public function sendKeys($keys)
+    {
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
+            'value' => WebDriverKeys::encode($keys),
+        ));
 
-  /**
-   * @var RemoteExecuteMethod
-   */
-  private $executor;
+        return $this;
+    }
 
-  /**
-   * @param RemoteExecuteMethod $executor
-   */
-  public function __construct(RemoteExecuteMethod $executor) {
-    $this->executor = $executor;
-  }
+    /**
+     * Press a modifier key
+     *
+     * @see WebDriverKeys
+     * @param string $key
+     * @return $this
+     */
+    public function pressKey($key)
+    {
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
+            'value' => array((string) $key),
+        ));
 
-  /**
-   * Send keys to active element
-   * @param string|array $keys
-   * @return $this
-   */
-  public function sendKeys($keys) {
-    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
-      'value' => WebDriverKeys::encode($keys),
-    ));
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Press a modifier key
-   *
-   * @see WebDriverKeys
-   * @param string $key
-   * @return $this
-   */
-  public function pressKey($key) {
-    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
-      'value' => array((string)$key),
-    ));
-    return $this;
-  }
+    /**
+     * Release a modifier key
+     *
+     * @see WebDriverKeys
+     * @param string $key
+     * @return $this
+     */
+    public function releaseKey($key)
+    {
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
+            'value' => array((string) $key),
+        ));
 
-  /**
-   * Release a modifier key
-   *
-   * @see WebDriverKeys
-   * @param string $key
-   * @return $this
-   */
-  public function releaseKey($key) {
-    $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
-      'value' => array((string)$key),
-    ));
-    return $this;
-  }
+        return $this;
+    }
 }
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index c2e0d2263..00a4ef7b6 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -21,110 +21,124 @@
 /**
  * Execute mouse commands for RemoteWebDriver.
  */
-class RemoteMouse implements WebDriverMouse {
-
-  /**
-   * @var RemoteExecuteMethod
-   */
-  private $executor;
-
-  /**
-   * @param RemoteExecuteMethod $executor
-   */
-  public function __construct(RemoteExecuteMethod $executor) {
-      $this->executor = $executor;
-  }
-
-  /**
-   * @param null|WebDriverCoordinates $where
-   *
-   * @return RemoteMouse
-   */
-  public function click(WebDriverCoordinates $where = null) {
-    $this->moveIfNeeded($where);
-    $this->executor->execute(DriverCommand::CLICK, array(
-      'button' => 0,
-    ));
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   *
-   * @return RemoteMouse
-   */
-  public function contextClick(WebDriverCoordinates $where = null) {
-    $this->moveIfNeeded($where);
-    $this->executor->execute(DriverCommand::CLICK, array(
-      'button' => 2,
-    ));
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   *
-   * @return RemoteMouse
-   */
-  public function doubleClick(WebDriverCoordinates $where = null) {
-    $this->moveIfNeeded($where);
-    $this->executor->execute(DriverCommand::DOUBLE_CLICK);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   *
-   * @return RemoteMouse
-   */
-  public function mouseDown(WebDriverCoordinates $where = null) {
-    $this->moveIfNeeded($where);
-    $this->executor->execute(DriverCommand::MOUSE_DOWN);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   * @param int|null $x_offset
-   * @param int|null $y_offset
-   *
-   * @return RemoteMouse
-   */
-  public function mouseMove(WebDriverCoordinates $where = null,
-                            $x_offset = null,
-                            $y_offset = null) {
-    $params = array();
-    if ($where !== null) {
-      $params['element'] = $where->getAuxiliary();
+class RemoteMouse implements WebDriverMouse
+{
+    /**
+     * @var RemoteExecuteMethod
+     */
+    private $executor;
+
+    /**
+     * @param RemoteExecuteMethod $executor
+     */
+    public function __construct(RemoteExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * @param null|WebDriverCoordinates $where
+     *
+     * @return RemoteMouse
+     */
+    public function click(WebDriverCoordinates $where = null)
+    {
+        $this->moveIfNeeded($where);
+        $this->executor->execute(DriverCommand::CLICK, array(
+            'button' => 0,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverCoordinates $where
+     *
+     * @return RemoteMouse
+     */
+    public function contextClick(WebDriverCoordinates $where = null)
+    {
+        $this->moveIfNeeded($where);
+        $this->executor->execute(DriverCommand::CLICK, array(
+            'button' => 2,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverCoordinates $where
+     *
+     * @return RemoteMouse
+     */
+    public function doubleClick(WebDriverCoordinates $where = null)
+    {
+        $this->moveIfNeeded($where);
+        $this->executor->execute(DriverCommand::DOUBLE_CLICK);
+
+        return $this;
     }
-    if ($x_offset !== null) {
-      $params['xoffset'] = $x_offset;
+
+    /**
+     * @param WebDriverCoordinates $where
+     *
+     * @return RemoteMouse
+     */
+    public function mouseDown(WebDriverCoordinates $where = null)
+    {
+        $this->moveIfNeeded($where);
+        $this->executor->execute(DriverCommand::MOUSE_DOWN);
+
+        return $this;
     }
-    if ($y_offset !== null) {
-      $params['yoffset'] = $y_offset;
+
+    /**
+     * @param WebDriverCoordinates $where
+     * @param int|null $x_offset
+     * @param int|null $y_offset
+     *
+     * @return RemoteMouse
+     */
+    public function mouseMove(
+        WebDriverCoordinates $where = null,
+        $x_offset = null,
+        $y_offset = null
+    ) {
+        $params = array();
+        if ($where !== null) {
+            $params['element'] = $where->getAuxiliary();
+        }
+        if ($x_offset !== null) {
+            $params['xoffset'] = $x_offset;
+        }
+        if ($y_offset !== null) {
+            $params['yoffset'] = $y_offset;
+        }
+        $this->executor->execute(DriverCommand::MOVE_TO, $params);
+
+        return $this;
     }
-    $this->executor->execute(DriverCommand::MOVE_TO, $params);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   *
-   * @return RemoteMouse
-   */
-  public function mouseUp(WebDriverCoordinates $where = null) {
-    $this->moveIfNeeded($where);
-    $this->executor->execute(DriverCommand::MOUSE_UP);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverCoordinates $where
-   * @return void
-   */
-  protected function moveIfNeeded(WebDriverCoordinates $where = null) {
-    if ($where) {
-      $this->mouseMove($where);
+
+    /**
+     * @param WebDriverCoordinates $where
+     *
+     * @return RemoteMouse
+     */
+    public function mouseUp(WebDriverCoordinates $where = null)
+    {
+        $this->moveIfNeeded($where);
+        $this->executor->execute(DriverCommand::MOUSE_UP);
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverCoordinates $where
+     */
+    protected function moveIfNeeded(WebDriverCoordinates $where = null)
+    {
+        if ($where) {
+            $this->mouseMove($where);
+        }
     }
-  }
 }
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index e2f5a0aea..67d2ad7cd 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -15,90 +15,97 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\WebDriverTargetLocator;
-use Facebook\WebDriver\WebDriverElement;
-use Facebook\WebDriver\WebDriverAlert;
 use Facebook\WebDriver\WebDriver;
+use Facebook\WebDriver\WebDriverAlert;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverTargetLocator;
 
 /**
  * Used to locate a given frame or window for RemoteWebDriver.
  */
-class RemoteTargetLocator implements WebDriverTargetLocator {
+class RemoteTargetLocator implements WebDriverTargetLocator
+{
+    protected $executor;
+    protected $driver;
 
-  protected $executor;
-  protected $driver;
+    public function __construct($executor, $driver)
+    {
+        $this->executor = $executor;
+        $this->driver = $driver;
+    }
 
-  public function __construct($executor, $driver) {
-    $this->executor = $executor;
-    $this->driver = $driver;
-  }
+    /**
+     * Switch to the main document if the page contains iframes. Otherwise, switch
+     * to the first frame on the page.
+     *
+     * @return WebDriver The driver focused on the top window or the first frame.
+     */
+    public function defaultContent()
+    {
+        $params = array('id' => null);
+        $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
-  /**
-   * Switch to the main document if the page contains iframes. Otherwise, switch
-   * to the first frame on the page.
-   *
-   * @return WebDriver The driver focused on the top window or the first frame.
-   */
-  public function defaultContent() {
-    $params = array('id' => null);
-    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
+        return $this->driver;
+    }
 
-    return $this->driver;
-  }
+    /**
+     * Switch to the iframe by its id or name.
+     *
+     * @param WebDriverElement|string $frame The WebDriverElement,
+     * the id or the name of the frame.
+     * @return WebDriver The driver focused on the given frame.
+     */
+    public function frame($frame)
+    {
+        if ($frame instanceof WebDriverElement) {
+            $id = array('ELEMENT' => $frame->getID());
+        } else {
+            $id = (string) $frame;
+        }
 
-  /**
-   * Switch to the iframe by its id or name.
-   *
-   * @param WebDriverElement|string $frame The WebDriverElement,
-                                           the id or the name of the frame.
-   * @return WebDriver The driver focused on the given frame.
-   */
-  public function frame($frame) {
-    if ($frame instanceof WebDriverElement) {
-      $id = array('ELEMENT' => $frame->getID());
-    } else {
-      $id = (string)$frame;
-    }
+        $params = array('id' => $id);
+        $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
-    $params = array('id' => $id);
-    $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
+        return $this->driver;
+    }
 
-    return $this->driver;
-  }
+    /**
+     * Switch the focus to another window by its handle.
+     *
+     * @param string $handle The handle of the window to be focused on.
+     * @return WebDriver Tge driver focused on the given window.
+     * @see WebDriver::getWindowHandles
+     */
+    public function window($handle)
+    {
+        $params = array('name' => (string) $handle);
+        $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
 
-  /**
-   * Switch the focus to another window by its handle.
-   *
-   * @param string $handle The handle of the window to be focused on.
-   * @return WebDriver Tge driver focused on the given window.
-   * @see WebDriver::getWindowHandles
-   */
-  public function window($handle) {
-    $params = array('name' => (string)$handle);
-    $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
+        return $this->driver;
+    }
 
-    return $this->driver;
-  }
+    /**
+     * Switch to the currently active modal dialog for this particular driver
+     * instance.
+     *
+     * @return WebDriverAlert
+     */
+    public function alert()
+    {
+        return new WebDriverAlert($this->executor);
+    }
 
-  /**
-   * Switch to the currently active modal dialog for this particular driver
-   * instance.
-   *
-   * @return WebDriverAlert
-   */
-  public function alert() {
-    return new WebDriverAlert($this->executor);
-  }
+    /**
+     * Switches to the element that currently has focus within the document
+     * currently "switched to", or the body element if this cannot be detected.
+     *
+     * @return RemoteWebElement
+     */
+    public function activeElement()
+    {
+        $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT);
+        $method = new RemoteExecuteMethod($this->driver);
 
-  /**
-   * Switches to the element that currently has focus within the document
-   * currently "switched to", or the body element if this cannot be detected.
-   *
-   * @return RemoteWebElement
-   */
-  public function activeElement() {
-    $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT);
-    $method = new RemoteExecuteMethod($this->driver);
-    return new RemoteWebElement($method, $response['ELEMENT']);
-  }
+        return new RemoteWebElement($method, $response['ELEMENT']);
+    }
 }
diff --git a/lib/Remote/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
index 7929d5db3..a052a6063 100644
--- a/lib/Remote/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -21,177 +21,181 @@
 /**
  * Execute touch commands for RemoteWebDriver.
  */
-class RemoteTouchScreen implements WebDriverTouchScreen {
-
-  /**
-   * @var RemoteExecuteMethod
-   */
-  private $executor;
-
-  /**
-   * @param RemoteExecuteMethod $executor
-   */
-  public function __construct(RemoteExecuteMethod $executor) {
-      $this->executor = $executor;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function tap(WebDriverElement $element) {
-    $this->executor->execute(
-      DriverCommand::TOUCH_SINGLE_TAP,
-      array('element' => $element->getID())
-    );
-
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function doubleTap(WebDriverElement $element) {
-    $this->executor->execute(
-      DriverCommand::TOUCH_DOUBLE_TAP,
-      array('element' => $element->getID())
-    );
-
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function down($x, $y) {
-    $this->executor->execute(DriverCommand::TOUCH_DOWN, array(
-      'x' => $x,
-      'y' => $y,
-    ));
-
-    return $this;
-  }
-
-
-  /**
-   * @param int $xspeed
-   * @param int $yspeed
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function flick($xspeed, $yspeed) {
-    $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
-      'xspeed' => $xspeed,
-      'yspeed' => $yspeed,
-    ));
-
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @param int $xoffset
-   * @param int $yoffset
-   * @param int $speed
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function flickFromElement(
-    WebDriverElement $element, $xoffset, $yoffset, $speed
-  ) {
-    $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
-      'xoffset' => $xoffset,
-      'yoffset' => $yoffset,
-      'element' => $element->getID(),
-      'speed'   => $speed,
-    ));
-
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function longPress(WebDriverElement $element) {
-    $this->executor->execute(
-      DriverCommand::TOUCH_LONG_PRESS,
-      array('element' => $element->getID())
-    );
-
-    return $this;
-  }
-
-  /**
-   * @param int $x
-   * @param int $y
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function move($x, $y) {
-    $this->executor->execute(DriverCommand::TOUCH_MOVE, array(
-      'x' => $x,
-      'y' => $y,
-    ));
-
-    return $this;
-  }
-
-  /**
-   * @param int $xoffset
-   * @param int $yoffset
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function scroll($xoffset, $yoffset) {
-    $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
-      'xoffset' => $xoffset,
-      'yoffset' => $yoffset,
-    ));
-
-    return $this;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @param int $xoffset
-   * @param int $yoffset
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function scrollFromElement(
-    WebDriverElement $element, $xoffset, $yoffset
-  ) {
-    $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
-      'element' => $element->getID(),
-      'xoffset' => $xoffset,
-      'yoffset' => $yoffset,
-    ));
-
-    return $this;
-  }
-
-
-  /**
-   * @param int $x
-   * @param int $y
-   *
-   * @return RemoteTouchScreen The instance.
-   */
-  public function up($x, $y) {
-    $this->executor->execute(DriverCommand::TOUCH_UP, array(
-      'x' => $x,
-      'y' => $y,
-    ));
-
-    return $this;
-  }
-
+class RemoteTouchScreen implements WebDriverTouchScreen
+{
+    /**
+     * @var RemoteExecuteMethod
+     */
+    private $executor;
+
+    /**
+     * @param RemoteExecuteMethod $executor
+     */
+    public function __construct(RemoteExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function tap(WebDriverElement $element)
+    {
+        $this->executor->execute(
+            DriverCommand::TOUCH_SINGLE_TAP,
+            array('element' => $element->getID())
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function doubleTap(WebDriverElement $element)
+    {
+        $this->executor->execute(
+            DriverCommand::TOUCH_DOUBLE_TAP,
+            array('element' => $element->getID())
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function down($x, $y)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_DOWN, array(
+            'x' => $x,
+            'y' => $y,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param int $xspeed
+     * @param int $yspeed
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function flick($xspeed, $yspeed)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
+            'xspeed' => $xspeed,
+            'yspeed' => $yspeed,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @param int $xoffset
+     * @param int $yoffset
+     * @param int $speed
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function flickFromElement(WebDriverElement $element, $xoffset, $yoffset, $speed)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
+            'xoffset' => $xoffset,
+            'yoffset' => $yoffset,
+            'element' => $element->getID(),
+            'speed' => $speed,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function longPress(WebDriverElement $element)
+    {
+        $this->executor->execute(
+            DriverCommand::TOUCH_LONG_PRESS,
+            array('element' => $element->getID())
+        );
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function move($x, $y)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_MOVE, array(
+            'x' => $x,
+            'y' => $y,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param int $xoffset
+     * @param int $yoffset
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function scroll($xoffset, $yoffset)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
+            'xoffset' => $xoffset,
+            'yoffset' => $yoffset,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @param int $xoffset
+     * @param int $yoffset
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function scrollFromElement(WebDriverElement $element, $xoffset, $yoffset)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
+            'element' => $element->getID(),
+            'xoffset' => $xoffset,
+            'yoffset' => $yoffset,
+        ));
+
+        return $this;
+    }
+
+    /**
+     * @param int $x
+     * @param int $y
+     *
+     * @return RemoteTouchScreen The instance.
+     */
+    public function up($x, $y)
+    {
+        $this->executor->execute(DriverCommand::TOUCH_UP, array(
+            'x' => $x,
+            'y' => $y,
+        ));
+
+        return $this;
+    }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 8fb7003c1..4f885bc43 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -25,155 +25,162 @@
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
 
-class RemoteWebDriver implements WebDriver, JavaScriptExecutor {
-  /**
-   * @var HttpCommandExecutor
-   */
-  protected $executor;
-  /**
-   * @var string
-   */
-  protected $sessionID;
-  /**
-   * @var RemoteMouse
-   */
-  protected $mouse;
-  /**
-   * @var RemoteKeyboard
-   */
-  protected $keyboard;
-  /**
-   * @var RemoteTouchScreen
-   */
-  protected $touch;
-  /**
-   * @var RemoteExecuteMethod
-   */
-  protected $executeMethod;
-
-  protected function __construct() {}
-
-  /**
-   * Construct the RemoteWebDriver by a desired capabilities.
-   *
-   * @param string $url The url of the remote server
-   * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
-   * @param int|null $connection_timeout_in_ms
-   * @param int|null $request_timeout_in_ms
-   * @param string|null $http_proxy The proxy to tunnel requests through
-   * @param int|null $http_proxy_port
-   * @return RemoteWebDriver
-   */
-  public static function create(
-    $url = 'http://localhost:4444/wd/hub',
-    $desired_capabilities = null,
-    $connection_timeout_in_ms = null,
-    $request_timeout_in_ms = null,
-    $http_proxy = null,
-    $http_proxy_port = null
-  ) {
-    $url = preg_replace('#/+$#', '', $url);
-
-    // Passing DesiredCapabilities as $desired_capabilities is encouraged but
-    // array is also accepted for legacy reason.
-    if ($desired_capabilities instanceof DesiredCapabilities) {
-      $desired_capabilities = $desired_capabilities->toArray();
-    }
-
-    $executor = new HttpCommandExecutor($url, $http_proxy, $http_proxy_port);
-    if ($connection_timeout_in_ms !== null) {
-      $executor->setConnectionTimeout($connection_timeout_in_ms);
-    }
-    if ($request_timeout_in_ms !== null) {
-      $executor->setRequestTimeout($request_timeout_in_ms);
-    }
-
-    $command = new WebDriverCommand(
-      null,
-      DriverCommand::NEW_SESSION,
-      array('desiredCapabilities' => $desired_capabilities)
-    );
-
-    $response = $executor->execute($command);
-
-    $driver = new static();
-    $driver->setSessionID($response->getSessionID())
-           ->setCommandExecutor($executor);
-    return $driver;
-  }
-
-  /**
-   * [Experimental] Construct the RemoteWebDriver by an existing session.
-   *
-   * This constructor can boost the performance a lot by reusing the same
-   * browser for the whole test suite. You do not have to pass the desired
-   * capabilities because the session was created before.
-   *
-   * @param string $url The url of the remote server
-   * @param string $session_id The existing session id
-   * @return RemoteWebDriver
-   */
-  public static function createBySessionID(
-    $session_id,
-    $url = 'http://localhost:4444/wd/hub'
-  ) {
-    $driver = new static();
-    $driver->setSessionID($session_id)
-           ->setCommandExecutor(new HttpCommandExecutor($url));
-    return $driver;
-  }
-
-  /**
-   * Close the current window.
-   *
-   * @return RemoteWebDriver The current instance.
-   */
-  public function close() {
-    $this->execute(DriverCommand::CLOSE, array());
-
-    return $this;
-  }
-
-  /**
-   * Find the first WebDriverElement using the given mechanism.
-   *
-   * @param WebDriverBy $by
-   * @return RemoteWebElement NoSuchElementException is thrown in
-   *    HttpCommandExecutor if no element is found.
-   * @see WebDriverBy
-   */
-  public function findElement(WebDriverBy $by) {
-    $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_element = $this->execute(
-      DriverCommand::FIND_ELEMENT,
-      $params
-    );
-
-    return $this->newElement($raw_element['ELEMENT']);
-  }
-
-  /**
-   * Find all WebDriverElements within the current page using the given
-   * mechanism.
-   *
-   * @param WebDriverBy $by
-   * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
-   *    array if nothing matches
-   * @see WebDriverBy
-   */
-  public function findElements(WebDriverBy $by) {
-    $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
-    $raw_elements = $this->execute(
-      DriverCommand::FIND_ELEMENTS,
-      $params
-    );
-
-    $elements = array();
-    foreach ($raw_elements as $raw_element) {
-      $elements[] = $this->newElement($raw_element['ELEMENT']);
-    }
-    return $elements;
-  }
+class RemoteWebDriver implements WebDriver, JavaScriptExecutor
+{
+    /**
+     * @var HttpCommandExecutor
+     */
+    protected $executor;
+    /**
+     * @var string
+     */
+    protected $sessionID;
+    /**
+     * @var RemoteMouse
+     */
+    protected $mouse;
+    /**
+     * @var RemoteKeyboard
+     */
+    protected $keyboard;
+    /**
+     * @var RemoteTouchScreen
+     */
+    protected $touch;
+    /**
+     * @var RemoteExecuteMethod
+     */
+    protected $executeMethod;
+
+    protected function __construct()
+    {
+    }
+
+    /**
+     * Construct the RemoteWebDriver by a desired capabilities.
+     *
+     * @param string $url The url of the remote server
+     * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
+     * @param int|null $connection_timeout_in_ms
+     * @param int|null $request_timeout_in_ms
+     * @param string|null $http_proxy The proxy to tunnel requests through
+     * @param int|null $http_proxy_port
+     * @return RemoteWebDriver
+     */
+    public static function create(
+        $url = 'http://localhost:4444/wd/hub',
+        $desired_capabilities = null,
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null,
+        $http_proxy = null,
+        $http_proxy_port = null
+    ) {
+        $url = preg_replace('#/+$#', '', $url);
+
+        // Passing DesiredCapabilities as $desired_capabilities is encouraged but
+        // array is also accepted for legacy reason.
+        if ($desired_capabilities instanceof DesiredCapabilities) {
+            $desired_capabilities = $desired_capabilities->toArray();
+        }
+
+        $executor = new HttpCommandExecutor($url, $http_proxy, $http_proxy_port);
+        if ($connection_timeout_in_ms !== null) {
+            $executor->setConnectionTimeout($connection_timeout_in_ms);
+        }
+        if ($request_timeout_in_ms !== null) {
+            $executor->setRequestTimeout($request_timeout_in_ms);
+        }
+
+        $command = new WebDriverCommand(
+            null,
+            DriverCommand::NEW_SESSION,
+            array('desiredCapabilities' => $desired_capabilities)
+        );
+
+        $response = $executor->execute($command);
+
+        $driver = new static();
+        $driver->setSessionID($response->getSessionID())
+            ->setCommandExecutor($executor);
+
+        return $driver;
+    }
+
+    /**
+     * [Experimental] Construct the RemoteWebDriver by an existing session.
+     *
+     * This constructor can boost the performance a lot by reusing the same
+     * browser for the whole test suite. You do not have to pass the desired
+     * capabilities because the session was created before.
+     *
+     * @param string $url The url of the remote server
+     * @param string $session_id The existing session id
+     * @return RemoteWebDriver
+     */
+    public static function createBySessionID($session_id, $url = 'http://localhost:4444/wd/hub')
+    {
+        $driver = new static();
+        $driver->setSessionID($session_id)
+            ->setCommandExecutor(new HttpCommandExecutor($url));
+
+        return $driver;
+    }
+
+    /**
+     * Close the current window.
+     *
+     * @return RemoteWebDriver The current instance.
+     */
+    public function close()
+    {
+        $this->execute(DriverCommand::CLOSE, array());
+
+        return $this;
+    }
+
+    /**
+     * Find the first WebDriverElement using the given mechanism.
+     *
+     * @param WebDriverBy $by
+     * @return RemoteWebElement NoSuchElementException is thrown in
+     *    HttpCommandExecutor if no element is found.
+     * @see WebDriverBy
+     */
+    public function findElement(WebDriverBy $by)
+    {
+        $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
+        $raw_element = $this->execute(
+            DriverCommand::FIND_ELEMENT,
+            $params
+        );
+
+        return $this->newElement($raw_element['ELEMENT']);
+    }
+
+    /**
+     * Find all WebDriverElements within the current page using the given
+     * mechanism.
+     *
+     * @param WebDriverBy $by
+     * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
+     *    array if nothing matches
+     * @see WebDriverBy
+     */
+    public function findElements(WebDriverBy $by)
+    {
+        $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
+        $raw_elements = $this->execute(
+            DriverCommand::FIND_ELEMENTS,
+            $params
+        );
+
+        $elements = array();
+        foreach ($raw_elements as $raw_element) {
+            $elements[] = $this->newElement($raw_element['ELEMENT']);
+        }
+
+        return $elements;
+    }
 
     /**
      * Load a new web page in the current browser window.
@@ -182,333 +189,366 @@ public function findElements(WebDriverBy $by) {
      *
      * @return RemoteWebDriver The current instance.
      */
-  public function get($url) {
-    $params = array('url' => (string)$url);
-    $this->execute(DriverCommand::GET, $params);
-
-    return $this;
-  }
-
-  /**
-   * Get a string representing the current URL that the browser is looking at.
-   *
-   * @return string The current URL.
-   */
-  public function getCurrentURL() {
-    return $this->execute(DriverCommand::GET_CURRENT_URL);
-  }
-
-  /**
-   * Get the source of the last loaded page.
-   *
-   * @return string The current page source.
-   */
-  public function getPageSource() {
-    return $this->execute(DriverCommand::GET_PAGE_SOURCE);
-  }
-
-  /**
-   * Get the title of the current page.
-   *
-   * @return string The title of the current page.
-   */
-  public function getTitle() {
-    return $this->execute(DriverCommand::GET_TITLE);
-  }
-
-  /**
-   * Return an opaque handle to this window that uniquely identifies it within
-   * this driver instance.
-   *
-   * @return string The current window handle.
-   */
-  public function getWindowHandle() {
-    return $this->execute(
-      DriverCommand::GET_CURRENT_WINDOW_HANDLE,
-      array()
-    );
-  }
-
-  /**
-   * Get all window handles available to the current session.
-   *
-   * @return array An array of string containing all available window handles.
-   */
-  public function getWindowHandles() {
-    return $this->execute(DriverCommand::GET_WINDOW_HANDLES, array());
-  }
-
-  /**
-   * Quits this driver, closing every associated window.
-   *
-   * @return void
-   */
-  public function quit() {
-    $this->execute(DriverCommand::QUIT);
-    $this->executor = null;
-  }
-
-  /**
-   * Prepare arguments for JavaScript injection
-   *
-   * @param array $arguments
-   * @return array
-   */
-  private function prepareScriptArguments(array $arguments) {
-    $args = array();
-    foreach ($arguments as $key => $value) {
-      if ($value instanceof WebDriverElement) {
-        $args[$key] = array('ELEMENT'=>$value->getID());
-      } else {
-        if (is_array($value)) {
-          $value = $this->prepareScriptArguments($value);
+    public function get($url)
+    {
+        $params = array('url' => (string) $url);
+        $this->execute(DriverCommand::GET, $params);
+
+        return $this;
+    }
+
+    /**
+     * Get a string representing the current URL that the browser is looking at.
+     *
+     * @return string The current URL.
+     */
+    public function getCurrentURL()
+    {
+        return $this->execute(DriverCommand::GET_CURRENT_URL);
+    }
+
+    /**
+     * Get the source of the last loaded page.
+     *
+     * @return string The current page source.
+     */
+    public function getPageSource()
+    {
+        return $this->execute(DriverCommand::GET_PAGE_SOURCE);
+    }
+
+    /**
+     * Get the title of the current page.
+     *
+     * @return string The title of the current page.
+     */
+    public function getTitle()
+    {
+        return $this->execute(DriverCommand::GET_TITLE);
+    }
+
+    /**
+     * Return an opaque handle to this window that uniquely identifies it within
+     * this driver instance.
+     *
+     * @return string The current window handle.
+     */
+    public function getWindowHandle()
+    {
+        return $this->execute(
+            DriverCommand::GET_CURRENT_WINDOW_HANDLE,
+            array()
+        );
+    }
+
+    /**
+     * Get all window handles available to the current session.
+     *
+     * @return array An array of string containing all available window handles.
+     */
+    public function getWindowHandles()
+    {
+        return $this->execute(DriverCommand::GET_WINDOW_HANDLES, array());
+    }
+
+    /**
+     * Quits this driver, closing every associated window.
+     */
+    public function quit()
+    {
+        $this->execute(DriverCommand::QUIT);
+        $this->executor = null;
+    }
+
+    /**
+     * Prepare arguments for JavaScript injection
+     *
+     * @param array $arguments
+     * @return array
+     */
+    private function prepareScriptArguments(array $arguments)
+    {
+        $args = array();
+        foreach ($arguments as $key => $value) {
+            if ($value instanceof WebDriverElement) {
+                $args[$key] = array('ELEMENT' => $value->getID());
+            } else {
+                if (is_array($value)) {
+                    $value = $this->prepareScriptArguments($value);
+                }
+                $args[$key] = $value;
+            }
         }
-        $args[$key] = $value;
-      }
-    }
-    return $args;
-  }
-
-  /**
-   * Inject a snippet of JavaScript into the page for execution in the context
-   * of the currently selected frame. The executed script is assumed to be
-   * synchronous and the result of evaluating the script will be returned.
-   *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The return value of the script.
-   */
-  public function executeScript($script, array $arguments = array()) {
-    $params = array(
-      'script' => $script,
-      'args' => $this->prepareScriptArguments($arguments),
-    );
-    return $this->execute(DriverCommand::EXECUTE_SCRIPT, $params);
-  }
-
-  /**
-   * Inject a snippet of JavaScript into the page for asynchronous execution in
-   * the context of the currently selected frame.
-   *
-   * The driver will pass a callback as the last argument to the snippet, and
-   * block until the callback is invoked.
-   *
-   * @see WebDriverExecuteAsyncScriptTestCase
-   *
-   * @param string $script The script to inject.
-   * @param array $arguments The arguments of the script.
-   * @return mixed The value passed by the script to the callback.
-   */
-  public function executeAsyncScript($script, array $arguments = array()) {
-    $params = array(
-      'script' => $script,
-      'args' => $this->prepareScriptArguments($arguments),
-    );
-    return $this->execute(
-      DriverCommand::EXECUTE_ASYNC_SCRIPT,
-      $params
-    );
-  }
-
-  /**
-   * Take a screenshot of the current page.
-   *
-   * @param string $save_as The path of the screenshot to be saved.
-   * @return string The screenshot in PNG format.
-   */
-  public function takeScreenshot($save_as = null) {
-    $screenshot = base64_decode(
-      $this->execute(DriverCommand::SCREENSHOT)
-    );
-    if ($save_as) {
-      file_put_contents($save_as, $screenshot);
-    }
-    return $screenshot;
-  }
-
-  /**
-   * Construct a new WebDriverWait by the current WebDriver instance.
-   * Sample usage:
-   *
-   *   $driver->wait(20, 1000)->until(
-   *     WebDriverExpectedCondition::titleIs('WebDriver Page')
-   *   );
-   *
-   * @param int $timeout_in_second
-   * @param int $interval_in_millisecond
-   *
-   * @return WebDriverWait
-   */
-  public function wait(
-      $timeout_in_second = 30,
-      $interval_in_millisecond = 250) {
-    return new WebDriverWait(
-      $this, $timeout_in_second, $interval_in_millisecond
-    );
-  }
-
-  /**
-   * An abstraction for managing stuff you would do in a browser menu. For
-   * example, adding and deleting cookies.
-   *
-   * @return WebDriverOptions
-   */
-  public function manage() {
-    return new WebDriverOptions($this->getExecuteMethod());
-  }
-
-  /**
-   * An abstraction allowing the driver to access the browser's history and to
-   * navigate to a given URL.
-   *
-   * @return WebDriverNavigation
-   * @see WebDriverNavigation
-   */
-  public function navigate() {
-    return new WebDriverNavigation($this->getExecuteMethod());
-  }
-
-  /**
-   * Switch to a different window or frame.
-   *
-   * @return RemoteTargetLocator
-   * @see RemoteTargetLocator
-   */
-  public function switchTo() {
-    return new RemoteTargetLocator($this->getExecuteMethod(), $this);
-  }
-
-  /**
-   * @return RemoteMouse
-   */
-  public function getMouse() {
-    if (!$this->mouse) {
-      $this->mouse = new RemoteMouse($this->getExecuteMethod());
-    }
-    return $this->mouse;
-  }
-
-  /**
-   * @return RemoteKeyboard
-   */
-  public function getKeyboard() {
-    if (!$this->keyboard) {
-      $this->keyboard = new RemoteKeyboard($this->getExecuteMethod());
-    }
-    return $this->keyboard;
-  }
-
-  /**
-   * @return RemoteTouchScreen
-   */
-  public function getTouch() {
-    if (!$this->touch) {
-      $this->touch = new RemoteTouchScreen($this->getExecuteMethod());
-    }
-    return $this->touch;
-  }
-
-  protected function getExecuteMethod() {
-    if (!$this->executeMethod) {
-      $this->executeMethod = new RemoteExecuteMethod($this);
-    }
-    return $this->executeMethod;
-  }
-
-  /**
-   * Construct a new action builder.
-   *
-   * @return WebDriverActions
-   */
-  public function action() {
-    return new WebDriverActions($this);
-  }
-
-  /**
-   * Return the WebDriverElement with the given id.
-   *
-   * @param string $id The id of the element to be created.
-   * @return RemoteWebElement
-   */
-  protected function newElement($id) {
-    return new RemoteWebElement($this->getExecuteMethod(), $id);
-  }
-
-  /**
-   * Set the command executor of this RemoteWebdriver
-   *
-   * @param WebDriverCommandExecutor $executor
-   * @return RemoteWebDriver
-   */
-  public function setCommandExecutor(WebDriverCommandExecutor $executor) {
-    $this->executor = $executor;
-    return $this;
-  }
-
-  /**
-   * Set the command executor of this RemoteWebdriver
-   *
-   * @return HttpCommandExecutor
-   */
-  public function getCommandExecutor() {
-    return $this->executor;
-  }
-
-  /**
-   * Set the session id of the RemoteWebDriver.
-   *
-   * @param string $session_id
-   * @return RemoteWebDriver
-   */
-  public function setSessionID($session_id) {
-    $this->sessionID = $session_id;
-    return $this;
-  }
-
-  /**
-   * Get current selenium sessionID
-   *
-   * @return string sessionID
-   */
-  public function getSessionID() {
-    return $this->sessionID;
-  }
-
-  /**
-   * Get all selenium sessions.
-   *
-   * @param string $url The url of the remote server
-   * @param int $timeout_in_ms
-   * @return array
-   */
-  public static function getAllSessions(
-    $url = 'http://localhost:4444/wd/hub',
-    $timeout_in_ms = 30000
-  ) {
-    $executor = new HttpCommandExecutor($url);
-    $executor->setConnectionTimeout($timeout_in_ms);
-
-    $command = new WebDriverCommand(
-      null,
-      DriverCommand::GET_ALL_SESSIONS,
-      array()
-    );
-
-    return $executor->execute($command)->getValue();
-  }
-
-  public function execute($command_name, $params = array()) {
-    $command = new WebDriverCommand(
-      $this->sessionID,
-      $command_name,
-      $params
-    );
-
-	if ($this->executor) {
-		$response = $this->executor->execute($command);
-		return $response->getValue();
-	} else {
-		return null;
-	}
-  }
+
+        return $args;
+    }
+
+    /**
+     * Inject a snippet of JavaScript into the page for execution in the context
+     * of the currently selected frame. The executed script is assumed to be
+     * synchronous and the result of evaluating the script will be returned.
+     *
+     * @param string $script The script to inject.
+     * @param array $arguments The arguments of the script.
+     * @return mixed The return value of the script.
+     */
+    public function executeScript($script, array $arguments = array())
+    {
+        $params = array(
+            'script' => $script,
+            'args' => $this->prepareScriptArguments($arguments),
+        );
+
+        return $this->execute(DriverCommand::EXECUTE_SCRIPT, $params);
+    }
+
+    /**
+     * Inject a snippet of JavaScript into the page for asynchronous execution in
+     * the context of the currently selected frame.
+     *
+     * The driver will pass a callback as the last argument to the snippet, and
+     * block until the callback is invoked.
+     *
+     * @see WebDriverExecuteAsyncScriptTestCase
+     *
+     * @param string $script The script to inject.
+     * @param array $arguments The arguments of the script.
+     * @return mixed The value passed by the script to the callback.
+     */
+    public function executeAsyncScript($script, array $arguments = array())
+    {
+        $params = array(
+            'script' => $script,
+            'args' => $this->prepareScriptArguments($arguments),
+        );
+
+        return $this->execute(
+            DriverCommand::EXECUTE_ASYNC_SCRIPT,
+            $params
+        );
+    }
+
+    /**
+     * Take a screenshot of the current page.
+     *
+     * @param string $save_as The path of the screenshot to be saved.
+     * @return string The screenshot in PNG format.
+     */
+    public function takeScreenshot($save_as = null)
+    {
+        $screenshot = base64_decode(
+            $this->execute(DriverCommand::SCREENSHOT)
+        );
+        if ($save_as) {
+            file_put_contents($save_as, $screenshot);
+        }
+
+        return $screenshot;
+    }
+
+    /**
+     * Construct a new WebDriverWait by the current WebDriver instance.
+     * Sample usage:
+     *
+     *   $driver->wait(20, 1000)->until(
+     *     WebDriverExpectedCondition::titleIs('WebDriver Page')
+     *   );
+     *
+     * @param int $timeout_in_second
+     * @param int $interval_in_millisecond
+     *
+     * @return WebDriverWait
+     */
+    public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
+    {
+        return new WebDriverWait(
+            $this,
+            $timeout_in_second,
+            $interval_in_millisecond
+        );
+    }
+
+    /**
+     * An abstraction for managing stuff you would do in a browser menu. For
+     * example, adding and deleting cookies.
+     *
+     * @return WebDriverOptions
+     */
+    public function manage()
+    {
+        return new WebDriverOptions($this->getExecuteMethod());
+    }
+
+    /**
+     * An abstraction allowing the driver to access the browser's history and to
+     * navigate to a given URL.
+     *
+     * @return WebDriverNavigation
+     * @see WebDriverNavigation
+     */
+    public function navigate()
+    {
+        return new WebDriverNavigation($this->getExecuteMethod());
+    }
+
+    /**
+     * Switch to a different window or frame.
+     *
+     * @return RemoteTargetLocator
+     * @see RemoteTargetLocator
+     */
+    public function switchTo()
+    {
+        return new RemoteTargetLocator($this->getExecuteMethod(), $this);
+    }
+
+    /**
+     * @return RemoteMouse
+     */
+    public function getMouse()
+    {
+        if (!$this->mouse) {
+            $this->mouse = new RemoteMouse($this->getExecuteMethod());
+        }
+
+        return $this->mouse;
+    }
+
+    /**
+     * @return RemoteKeyboard
+     */
+    public function getKeyboard()
+    {
+        if (!$this->keyboard) {
+            $this->keyboard = new RemoteKeyboard($this->getExecuteMethod());
+        }
+
+        return $this->keyboard;
+    }
+
+    /**
+     * @return RemoteTouchScreen
+     */
+    public function getTouch()
+    {
+        if (!$this->touch) {
+            $this->touch = new RemoteTouchScreen($this->getExecuteMethod());
+        }
+
+        return $this->touch;
+    }
+
+    protected function getExecuteMethod()
+    {
+        if (!$this->executeMethod) {
+            $this->executeMethod = new RemoteExecuteMethod($this);
+        }
+
+        return $this->executeMethod;
+    }
+
+    /**
+     * Construct a new action builder.
+     *
+     * @return WebDriverActions
+     */
+    public function action()
+    {
+        return new WebDriverActions($this);
+    }
+
+    /**
+     * Return the WebDriverElement with the given id.
+     *
+     * @param string $id The id of the element to be created.
+     * @return RemoteWebElement
+     */
+    protected function newElement($id)
+    {
+        return new RemoteWebElement($this->getExecuteMethod(), $id);
+    }
+
+    /**
+     * Set the command executor of this RemoteWebdriver
+     *
+     * @param WebDriverCommandExecutor $executor
+     * @return RemoteWebDriver
+     */
+    public function setCommandExecutor(WebDriverCommandExecutor $executor)
+    {
+        $this->executor = $executor;
+
+        return $this;
+    }
+
+    /**
+     * Set the command executor of this RemoteWebdriver
+     *
+     * @return HttpCommandExecutor
+     */
+    public function getCommandExecutor()
+    {
+        return $this->executor;
+    }
+
+    /**
+     * Set the session id of the RemoteWebDriver.
+     *
+     * @param string $session_id
+     * @return RemoteWebDriver
+     */
+    public function setSessionID($session_id)
+    {
+        $this->sessionID = $session_id;
+
+        return $this;
+    }
+
+    /**
+     * Get current selenium sessionID
+     *
+     * @return string sessionID
+     */
+    public function getSessionID()
+    {
+        return $this->sessionID;
+    }
+
+    /**
+     * Get all selenium sessions.
+     *
+     * @param string $url The url of the remote server
+     * @param int $timeout_in_ms
+     * @return array
+     */
+    public static function getAllSessions($url = 'http://localhost:4444/wd/hub', $timeout_in_ms = 30000)
+    {
+        $executor = new HttpCommandExecutor($url);
+        $executor->setConnectionTimeout($timeout_in_ms);
+
+        $command = new WebDriverCommand(
+            null,
+            DriverCommand::GET_ALL_SESSIONS,
+            array()
+        );
+
+        return $executor->execute($command)->getValue();
+    }
+
+    public function execute($command_name, $params = array())
+    {
+        $command = new WebDriverCommand(
+            $this->sessionID,
+            $command_name,
+            $params
+        );
+
+        if ($this->executor) {
+            $response = $this->executor->execute($command);
+
+            return $response->getValue();
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index e9e1ca31e..217356592 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -28,395 +28,429 @@
 /**
  * Represents an HTML element.
  */
-class RemoteWebElement implements WebDriverElement, WebDriverLocatable {
-
-  /**
-   * @var RemoteExecuteMethod
-   */
-  protected $executor;
-  /**
-   * @var string
-   */
-  protected $id;
-  /**
-   * @var UselessFileDetector
-   */
-  protected $fileDetector;
-
-  /**
-   * @param RemoteExecuteMethod $executor
-   * @param string $id
-   */
-  public function __construct(RemoteExecuteMethod $executor, $id) {
-    $this->executor = $executor;
-    $this->id = $id;
-    $this->fileDetector = new UselessFileDetector();
-  }
-
-  /**
-   * If this element is a TEXTAREA or text INPUT element, this will clear the
-   * value.
-   *
-   * @return RemoteWebElement The current instance.
-   */
-  public function clear() {
-    $this->executor->execute(
-      DriverCommand::CLEAR_ELEMENT,
-      array(':id' => $this->id)
-    );
-    return $this;
-  }
-
-  /**
-   * Click this element.
-   *
-   * @return RemoteWebElement The current instance.
-   */
-  public function click() {
-    $this->executor->execute(
-      DriverCommand::CLICK_ELEMENT,
-      array(':id' => $this->id)
-    );
-    return $this;
-  }
-
-  /**
-   * Find the first WebDriverElement within this element using the given
-   * mechanism.
-   *
-   * @param WebDriverBy $by
-   * @return RemoteWebElement NoSuchElementException is thrown in
-   *    HttpCommandExecutor if no element is found.
-   * @see WebDriverBy
-   */
-  public function findElement(WebDriverBy $by) {
-    $params = array(
-      'using' => $by->getMechanism(),
-      'value' => $by->getValue(),
-      ':id'   => $this->id,
-    );
-    $raw_element = $this->executor->execute(
-      DriverCommand::FIND_CHILD_ELEMENT,
-      $params
-    );
-
-    return $this->newElement($raw_element['ELEMENT']);
-  }
-
-  /**
-   * Find all WebDriverElements within this element using the given mechanism.
-   *
-   * @param WebDriverBy $by
-   * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
-   *    array if nothing matches
-   * @see WebDriverBy
-   */
-  public function findElements(WebDriverBy $by) {
-    $params = array(
-      'using' => $by->getMechanism(),
-      'value' => $by->getValue(),
-      ':id'   => $this->id,
-    );
-    $raw_elements = $this->executor->execute(
-      DriverCommand::FIND_CHILD_ELEMENTS,
-      $params
-    );
-
-    $elements = array();
-    foreach ($raw_elements as $raw_element) {
-      $elements[] = $this->newElement($raw_element['ELEMENT']);
+class RemoteWebElement implements WebDriverElement, WebDriverLocatable
+{
+    /**
+     * @var RemoteExecuteMethod
+     */
+    protected $executor;
+    /**
+     * @var string
+     */
+    protected $id;
+    /**
+     * @var UselessFileDetector
+     */
+    protected $fileDetector;
+
+    /**
+     * @param RemoteExecuteMethod $executor
+     * @param string $id
+     */
+    public function __construct(RemoteExecuteMethod $executor, $id)
+    {
+        $this->executor = $executor;
+        $this->id = $id;
+        $this->fileDetector = new UselessFileDetector();
     }
-    return $elements;
-  }
-
-  /**
-   * Get the value of a the given attribute of the element.
-   *
-   * @param string $attribute_name The name of the attribute.
-   * @return string|null The value of the attribute.
-   */
-  public function getAttribute($attribute_name) {
-    $params = array(
-      ':name' => $attribute_name,
-      ':id'   => $this->id,
-    );
-    return $this->executor->execute(
-      DriverCommand::GET_ELEMENT_ATTRIBUTE,
-      $params
-    );
-  }
-
-  /**
-   * Get the value of a given CSS property.
-   *
-   * @param string $css_property_name The name of the CSS property.
-   * @return string The value of the CSS property.
-   */
-  public function getCSSValue($css_property_name) {
-    $params = array(
-      ':propertyName' => $css_property_name,
-      ':id'           => $this->id,
-    );
-    return $this->executor->execute(
-      DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
-      $params
-    );
-  }
-
-  /**
-   * Get the location of element relative to the top-left corner of the page.
-   *
-   * @return WebDriverPoint The location of the element.
-   */
-  public function getLocation() {
-    $location = $this->executor->execute(
-      DriverCommand::GET_ELEMENT_LOCATION,
-      array(':id' => $this->id)
-    );
-    return new WebDriverPoint($location['x'], $location['y']);
-  }
-
-  /**
-   * Try scrolling the element into the view port and return the location of
-   * element relative to the top-left corner of the page afterwards.
-   *
-   * @return WebDriverPoint The location of the element.
-   */
-  public function getLocationOnScreenOnceScrolledIntoView() {
-    $location = $this->executor->execute(
-      DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
-      array(':id' => $this->id)
-    );
-    return new WebDriverPoint($location['x'], $location['y']);
-  }
-
-  /**
-   * @return WebDriverCoordinates
-   */
-  public function getCoordinates() {
-    $element = $this;
-
-    $on_screen = null; // planned but not yet implemented
-    $in_view_port = function () use ($element) {
-      return $element->getLocationOnScreenOnceScrolledIntoView();
-    };
-    $on_page = function () use ($element) {
-      return $element->getLocation();
-    };
-    $auxiliary = $this->getID();
-
-    return new WebDriverCoordinates(
-      $on_screen,
-      $in_view_port,
-      $on_page,
-      $auxiliary
-    );
-  }
-
-  /**
-   * Get the size of element.
-   *
-   * @return WebDriverDimension The dimension of the element.
-   */
-  public function getSize() {
-    $size = $this->executor->execute(
-      DriverCommand::GET_ELEMENT_SIZE,
-      array(':id' => $this->id)
-    );
-    return new WebDriverDimension($size['width'], $size['height']);
-  }
-
-  /**
-   * Get the tag name of this element.
-   *
-   * @return string The tag name.
-   */
-  public function getTagName() {
-    // Force tag name to be lowercase as expected by protocol for Opera driver
-    // until this issue is not resolved :
-    // https://github.com/operasoftware/operadriver/issues/102
-    // Remove it when fixed to be consistent with the protocol.
-    return strtolower($this->executor->execute(
-      DriverCommand::GET_ELEMENT_TAG_NAME,
-      array(':id' => $this->id)
-    ));
-  }
-
-  /**
-   * Get the visible (i.e. not hidden by CSS) innerText of this element,
-   * including sub-elements, without any leading or trailing whitespace.
-   *
-   * @return string The visible innerText of this element.
-   */
-  public function getText() {
-    return $this->executor->execute(
-      DriverCommand::GET_ELEMENT_TEXT,
-      array(':id' => $this->id)
-    );
-  }
-
-  /**
-   * Is this element displayed or not? This method avoids the problem of having
-   * to parse an element's "style" attribute.
-   *
-   * @return bool
-   */
-  public function isDisplayed() {
-    return $this->executor->execute(
-      DriverCommand::IS_ELEMENT_DISPLAYED,
-      array(':id' => $this->id)
-    );
-  }
-
-  /**
-   * Is the element currently enabled or not? This will generally return true
-   * for everything but disabled input elements.
-   *
-   * @return bool
-   */
-  public function isEnabled() {
-    return $this->executor->execute(
-      DriverCommand::IS_ELEMENT_ENABLED,
-      array(':id' => $this->id)
-    );
-  }
-
-  /**
-   * Determine whether or not this element is selected or not.
-   *
-   * @return bool
-   */
-  public function isSelected() {
-    return $this->executor->execute(
-      DriverCommand::IS_ELEMENT_SELECTED,
-      array(':id' => $this->id)
-    );
-  }
-
-  /**
-   * Simulate typing into an element, which may set its value.
-   *
-   * @param mixed $value The data to be typed.
-   * @return RemoteWebElement The current instance.
-   */
-  public function sendKeys($value) {
-    $local_file = $this->fileDetector->getLocalFile($value);
-    if ($local_file === null) {
-      $params = array(
-        'value' => WebDriverKeys::encode($value),
-        ':id'   => $this->id,
-      );
-      $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
-    } else {
-      $remote_path = $this->upload($local_file);
-      $params = array(
-        'value' => WebDriverKeys::encode($remote_path),
-        ':id'   => $this->id,
-      );
-      $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+
+    /**
+     * If this element is a TEXTAREA or text INPUT element, this will clear the
+     * value.
+     *
+     * @return RemoteWebElement The current instance.
+     */
+    public function clear()
+    {
+        $this->executor->execute(
+            DriverCommand::CLEAR_ELEMENT,
+            array(':id' => $this->id)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Click this element.
+     *
+     * @return RemoteWebElement The current instance.
+     */
+    public function click()
+    {
+        $this->executor->execute(
+            DriverCommand::CLICK_ELEMENT,
+            array(':id' => $this->id)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Find the first WebDriverElement within this element using the given
+     * mechanism.
+     *
+     * @param WebDriverBy $by
+     * @return RemoteWebElement NoSuchElementException is thrown in
+     *    HttpCommandExecutor if no element is found.
+     * @see WebDriverBy
+     */
+    public function findElement(WebDriverBy $by)
+    {
+        $params = array(
+            'using' => $by->getMechanism(),
+            'value' => $by->getValue(),
+            ':id' => $this->id,
+        );
+        $raw_element = $this->executor->execute(
+            DriverCommand::FIND_CHILD_ELEMENT,
+            $params
+        );
+
+        return $this->newElement($raw_element['ELEMENT']);
+    }
+
+    /**
+     * Find all WebDriverElements within this element using the given mechanism.
+     *
+     * @param WebDriverBy $by
+     * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
+     *    array if nothing matches
+     * @see WebDriverBy
+     */
+    public function findElements(WebDriverBy $by)
+    {
+        $params = array(
+            'using' => $by->getMechanism(),
+            'value' => $by->getValue(),
+            ':id' => $this->id,
+        );
+        $raw_elements = $this->executor->execute(
+            DriverCommand::FIND_CHILD_ELEMENTS,
+            $params
+        );
+
+        $elements = array();
+        foreach ($raw_elements as $raw_element) {
+            $elements[] = $this->newElement($raw_element['ELEMENT']);
+        }
+
+        return $elements;
+    }
+
+    /**
+     * Get the value of a the given attribute of the element.
+     *
+     * @param string $attribute_name The name of the attribute.
+     * @return string|null The value of the attribute.
+     */
+    public function getAttribute($attribute_name)
+    {
+        $params = array(
+            ':name' => $attribute_name,
+            ':id' => $this->id,
+        );
+
+        return $this->executor->execute(
+            DriverCommand::GET_ELEMENT_ATTRIBUTE,
+            $params
+        );
+    }
+
+    /**
+     * Get the value of a given CSS property.
+     *
+     * @param string $css_property_name The name of the CSS property.
+     * @return string The value of the CSS property.
+     */
+    public function getCSSValue($css_property_name)
+    {
+        $params = array(
+            ':propertyName' => $css_property_name,
+            ':id' => $this->id,
+        );
+
+        return $this->executor->execute(
+            DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
+            $params
+        );
+    }
+
+    /**
+     * Get the location of element relative to the top-left corner of the page.
+     *
+     * @return WebDriverPoint The location of the element.
+     */
+    public function getLocation()
+    {
+        $location = $this->executor->execute(
+            DriverCommand::GET_ELEMENT_LOCATION,
+            array(':id' => $this->id)
+        );
+
+        return new WebDriverPoint($location['x'], $location['y']);
+    }
+
+    /**
+     * Try scrolling the element into the view port and return the location of
+     * element relative to the top-left corner of the page afterwards.
+     *
+     * @return WebDriverPoint The location of the element.
+     */
+    public function getLocationOnScreenOnceScrolledIntoView()
+    {
+        $location = $this->executor->execute(
+            DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
+            array(':id' => $this->id)
+        );
+
+        return new WebDriverPoint($location['x'], $location['y']);
+    }
+
+    /**
+     * @return WebDriverCoordinates
+     */
+    public function getCoordinates()
+    {
+        $element = $this;
+
+        $on_screen = null; // planned but not yet implemented
+        $in_view_port = function () use ($element) {
+            return $element->getLocationOnScreenOnceScrolledIntoView();
+        };
+        $on_page = function () use ($element) {
+            return $element->getLocation();
+        };
+        $auxiliary = $this->getID();
+
+        return new WebDriverCoordinates(
+            $on_screen,
+            $in_view_port,
+            $on_page,
+            $auxiliary
+        );
+    }
+
+    /**
+     * Get the size of element.
+     *
+     * @return WebDriverDimension The dimension of the element.
+     */
+    public function getSize()
+    {
+        $size = $this->executor->execute(
+            DriverCommand::GET_ELEMENT_SIZE,
+            array(':id' => $this->id)
+        );
+
+        return new WebDriverDimension($size['width'], $size['height']);
+    }
+
+    /**
+     * Get the tag name of this element.
+     *
+     * @return string The tag name.
+     */
+    public function getTagName()
+    {
+        // Force tag name to be lowercase as expected by protocol for Opera driver
+        // until this issue is not resolved :
+        // https://github.com/operasoftware/operadriver/issues/102
+        // Remove it when fixed to be consistent with the protocol.
+        return strtolower($this->executor->execute(
+            DriverCommand::GET_ELEMENT_TAG_NAME,
+            array(':id' => $this->id)
+        ));
+    }
+
+    /**
+     * Get the visible (i.e. not hidden by CSS) innerText of this element,
+     * including sub-elements, without any leading or trailing whitespace.
+     *
+     * @return string The visible innerText of this element.
+     */
+    public function getText()
+    {
+        return $this->executor->execute(
+            DriverCommand::GET_ELEMENT_TEXT,
+            array(':id' => $this->id)
+        );
+    }
+
+    /**
+     * Is this element displayed or not? This method avoids the problem of having
+     * to parse an element's "style" attribute.
+     *
+     * @return bool
+     */
+    public function isDisplayed()
+    {
+        return $this->executor->execute(
+            DriverCommand::IS_ELEMENT_DISPLAYED,
+            array(':id' => $this->id)
+        );
+    }
+
+    /**
+     * Is the element currently enabled or not? This will generally return true
+     * for everything but disabled input elements.
+     *
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return $this->executor->execute(
+            DriverCommand::IS_ELEMENT_ENABLED,
+            array(':id' => $this->id)
+        );
+    }
+
+    /**
+     * Determine whether or not this element is selected or not.
+     *
+     * @return bool
+     */
+    public function isSelected()
+    {
+        return $this->executor->execute(
+            DriverCommand::IS_ELEMENT_SELECTED,
+            array(':id' => $this->id)
+        );
+    }
+
+    /**
+     * Simulate typing into an element, which may set its value.
+     *
+     * @param mixed $value The data to be typed.
+     * @return RemoteWebElement The current instance.
+     */
+    public function sendKeys($value)
+    {
+        $local_file = $this->fileDetector->getLocalFile($value);
+        if ($local_file === null) {
+            $params = array(
+                'value' => WebDriverKeys::encode($value),
+                ':id' => $this->id,
+            );
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+        } else {
+            $remote_path = $this->upload($local_file);
+            $params = array(
+                'value' => WebDriverKeys::encode($remote_path),
+                ':id' => $this->id,
+            );
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Upload a local file to the server
+     *
+     * @param string $local_file
+     *
+     * @throws WebDriverException
+     * @return string The remote path of the file.
+     */
+    private function upload($local_file)
+    {
+        if (!is_file($local_file)) {
+            throw new WebDriverException('You may only upload files: ' . $local_file);
+        }
+
+        // Create a temporary file in the system temp directory.
+        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
+        $zip = new ZipArchive();
+        if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
+            return false;
+        }
+        $info = pathinfo($local_file);
+        $file_name = $info['basename'];
+        $zip->addFile($local_file, $file_name);
+        $zip->close();
+        $params = array(
+            'file' => base64_encode(file_get_contents($temp_zip)),
+        );
+        $remote_path = $this->executor->execute(
+            DriverCommand::UPLOAD_FILE,
+            $params
+        );
+        unlink($temp_zip);
+
+        return $remote_path;
+    }
+
+    /**
+     * Set the fileDetector in order to let the RemoteWebElement to know that
+     * you are going to upload a file.
+     *
+     * Basically, if you want WebDriver trying to send a file, set the fileDetector
+     * to be LocalFileDetector. Otherwise, keep it UselessFileDetector.
+     *
+     *   eg. $element->setFileDetector(new LocalFileDetector);
+     *
+     * @param FileDetector $detector
+     * @return RemoteWebElement
+     * @see FileDetector
+     * @see LocalFileDetector
+     * @see UselessFileDetector
+     */
+    public function setFileDetector(FileDetector $detector)
+    {
+        $this->fileDetector = $detector;
+
+        return $this;
     }
-    return $this;
-  }
-
-  /**
-   * Upload a local file to the server
-   *
-   * @param string $local_file
-   *
-   * @throws WebDriverException
-   * @return string The remote path of the file.
-   */
-  private function upload($local_file) {
-    if (!is_file($local_file)) {
-      throw new WebDriverException("You may only upload files: " . $local_file);
+
+    /**
+     * If this current element is a form, or an element within a form, then this
+     * will be submitted to the remote server.
+     *
+     * @return RemoteWebElement The current instance.
+     */
+    public function submit()
+    {
+        $this->executor->execute(
+            DriverCommand::SUBMIT_ELEMENT,
+            array(':id' => $this->id)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get the opaque ID of the element.
+     *
+     * @return string The opaque ID.
+     */
+    public function getID()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Test if two element IDs refer to the same DOM element.
+     *
+     * @param WebDriverElement $other
+     * @return bool
+     */
+    public function equals(WebDriverElement $other)
+    {
+        return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, array(
+            ':id' => $this->id,
+            ':other' => $other->getID(),
+        ));
     }
 
-    // Create a temporary file in the system temp directory.
-    $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
-    $zip = new ZipArchive();
-    if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
-      return false;
+    /**
+     * Return the WebDriverElement with $id
+     *
+     * @param string $id
+     *
+     * @return RemoteWebElement
+     */
+    protected function newElement($id)
+    {
+        return new static($this->executor, $id);
     }
-    $info = pathinfo($local_file);
-    $file_name = $info['basename'];
-    $zip->addFile($local_file, $file_name);
-    $zip->close();
-    $params = array(
-      'file' => base64_encode(file_get_contents($temp_zip)),
-    );
-    $remote_path = $this->executor->execute(
-      DriverCommand::UPLOAD_FILE,
-      $params
-    );
-    unlink($temp_zip);
-    return $remote_path;
-  }
-
-  /**
-   * Set the fileDetector in order to let the RemoteWebElement to know that
-   * you are going to upload a file.
-   *
-   * Basically, if you want WebDriver trying to send a file, set the fileDetector
-   * to be LocalFileDetector. Otherwise, keep it UselessFileDetector.
-   *
-   *   eg. $element->setFileDetector(new LocalFileDetector);
-   *
-   * @param FileDetector $detector
-   * @return RemoteWebElement
-   * @see FileDetector
-   * @see LocalFileDetector
-   * @see UselessFileDetector
-   */
-  public function setFileDetector(FileDetector $detector) {
-    $this->fileDetector = $detector;
-    return $this;
-  }
-
-  /**
-   * If this current element is a form, or an element within a form, then this
-   * will be submitted to the remote server.
-   *
-   * @return RemoteWebElement The current instance.
-   */
-  public function submit() {
-    $this->executor->execute(
-      DriverCommand::SUBMIT_ELEMENT,
-      array(':id' => $this->id)
-    );
-
-    return $this;
-  }
-
-  /**
-   * Get the opaque ID of the element.
-   *
-   * @return string The opaque ID.
-   */
-  public function getID() {
-    return $this->id;
-  }
-
-  /**
-   * Test if two element IDs refer to the same DOM element.
-   *
-   * @param WebDriverElement $other
-   * @return bool
-   */
-  public function equals(WebDriverElement $other) {
-    return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, array(
-      ':id'    => $this->id,
-      ':other' => $other->getID(),
-    ));
-  }
-
-  /**
-   * Return the WebDriverElement with $id
-   *
-   * @param string $id
-   *
-   * @return RemoteWebElement
-   */
-  protected function newElement($id) {
-    return new static($this->executor, $id);
-  }
 }
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 2ac3414f1..59125833b 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -24,42 +24,44 @@
  * A HttpCommandExecutor that talks to a local driver service instead of
  * a remote server.
  */
-class DriverCommandExecutor extends HttpCommandExecutor {
+class DriverCommandExecutor extends HttpCommandExecutor
+{
+    /**
+     * @var DriverService
+     */
+    private $service;
 
-  /**
-   * @var DriverService
-   */
-  private $service;
+    public function __construct(DriverService $service)
+    {
+        parent::__construct($service->getURL());
+        $this->service = $service;
+    }
 
-  public function __construct(DriverService $service) {
-    parent::__construct($service->getURL());
-    $this->service = $service;
-  }
+    /**
+     * @param WebDriverCommand $command
+     *
+     * @throws WebDriverException
+     * @throws \Exception
+     * @return mixed
+     */
+    public function execute(WebDriverCommand $command)
+    {
+        if ($command->getName() === DriverCommand::NEW_SESSION) {
+            $this->service->start();
+        }
 
-  /**
-   * @param WebDriverCommand $command
-   *
-   * @return mixed
-   * @throws WebDriverException
-   * @throws \Exception
-   */
-  public function execute(WebDriverCommand $command) {
-    if ($command->getName() === DriverCommand::NEW_SESSION) {
-      $this->service->start();
-    }
+        try {
+            $value = parent::execute($command);
+            if ($command->getName() === DriverCommand::QUIT) {
+                $this->service->stop();
+            }
 
-    try {
-      $value = parent::execute($command);
-      if ($command->getName() === DriverCommand::QUIT) {
-        $this->service->stop();
-      }
-      return $value;
-    } catch (\Exception $e) {
-      if (!$this->service->isRunning()) {
-        throw new WebDriverException('The driver server has died.');
-      }
-      throw $e;
+            return $value;
+        } catch (\Exception $e) {
+            if (!$this->service->isRunning()) {
+                throw new WebDriverException('The driver server has died.');
+            }
+            throw $e;
+        }
     }
-  }
-
 }
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 8a18e5d5d..82a427a44 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -18,130 +18,132 @@
 use Exception;
 use Facebook\WebDriver\Net\URLChecker;
 
-class DriverService {
-
-  /**
-   * @var string
-   */
-  private $executable;
-
-  /**
-   * @var string
-   */
-  private $url;
-
-  /**
-   * @var array
-   */
-  private $args;
-
-  /**
-   * @var array
-   */
-  private $environment;
-
-  /**
-   * @var resource
-   */
-  private $process;
-
-  /**
-   * @param string $executable
-   * @param int $port The given port the service should use.
-   * @param array $args
-   * @param array|null $environment Use the system environment if it is null
-   */
-  public function __construct(
-    $executable,
-    $port,
-    $args = array(),
-    $environment = null
-  ) {
-    $this->executable = self::checkExecutable($executable);
-    $this->url = sprintf('http://localhost:%d', $port);
-    $this->args = $args;
-    $this->environment = $environment ?: $_ENV;
-  }
-
-  /**
-   * @return string
-   */
-  public function getURL() {
-    return $this->url;
-  }
-
-  /**
-   * @return DriverService
-   */
-  public function start() {
-    if ($this->process !== null) {
-      return $this;
+class DriverService
+{
+    /**
+     * @var string
+     */
+    private $executable;
+
+    /**
+     * @var string
+     */
+    private $url;
+
+    /**
+     * @var array
+     */
+    private $args;
+
+    /**
+     * @var array
+     */
+    private $environment;
+
+    /**
+     * @var resource
+     */
+    private $process;
+
+    /**
+     * @param string $executable
+     * @param int $port The given port the service should use.
+     * @param array $args
+     * @param array|null $environment Use the system environment if it is null
+     */
+    public function __construct($executable, $port, $args = array(), $environment = null)
+    {
+        $this->executable = self::checkExecutable($executable);
+        $this->url = sprintf('http://localhost:%d', $port);
+        $this->args = $args;
+        $this->environment = $environment ?: $_ENV;
     }
 
-    $pipes = array();
-    $this->process = proc_open(
-      sprintf("%s %s", $this->executable, implode(' ', $this->args)),
-      $descriptorspec = array(
-        0 => array('pipe', 'r'), // stdin
-        1 => array('pipe', 'w'), // stdout
-        2 => array('pipe', 'a'), // stderr
-      ),
-      $pipes,
-      null,
-      $this->environment
-    );
-
-    $checker = new URLChecker();
-    $checker->waitUntilAvailable(20 * 1000, $this->url.'/status');
-
-    return $this;
-  }
-
-  /**
-   * @return DriverService
-   */
-  public function stop() {
-    if ($this->process === null) {
-      return $this;
+    /**
+     * @return string
+     */
+    public function getURL()
+    {
+        return $this->url;
     }
 
-    proc_terminate($this->process);
-    $this->process = null;
+    /**
+     * @return DriverService
+     */
+    public function start()
+    {
+        if ($this->process !== null) {
+            return $this;
+        }
+
+        $pipes = array();
+        $this->process = proc_open(
+            sprintf('%s %s', $this->executable, implode(' ', $this->args)),
+            $descriptorspec = array(
+                0 => array('pipe', 'r'), // stdin
+                1 => array('pipe', 'w'), // stdout
+                2 => array('pipe', 'a'), // stderr
+            ),
+            $pipes,
+            null,
+            $this->environment
+        );
+
+        $checker = new URLChecker();
+        $checker->waitUntilAvailable(20 * 1000, $this->url . '/status');
+
+        return $this;
+    }
 
-    $checker = new URLChecker();
-    $checker->waitUntilUnavailable(3 * 1000, $this->url.'/shutdown');
+    /**
+     * @return DriverService
+     */
+    public function stop()
+    {
+        if ($this->process === null) {
+            return $this;
+        }
 
-    return $this;
-  }
+        proc_terminate($this->process);
+        $this->process = null;
 
-  /**
-   * @return bool
-   */
-  public function isRunning() {
-    if ($this->process === null) {
-      return false;
-    }
+        $checker = new URLChecker();
+        $checker->waitUntilUnavailable(3 * 1000, $this->url . '/shutdown');
 
-    $status = proc_get_status($this->process);
-    return $status['running'];
-  }
-
-  /**
-   * Check if the executable is executable.
-   *
-   * @param string $executable
-   * @return string
-   * @throws Exception
-   */
-  protected static function checkExecutable($executable) {
-    if (!is_file($executable)) {
-      throw new Exception("'$executable' is not a file.");
+        return $this;
     }
 
-    if (!is_executable($executable)) {
-      throw new Exception("'$executable' is not executable.");
+    /**
+     * @return bool
+     */
+    public function isRunning()
+    {
+        if ($this->process === null) {
+            return false;
+        }
+
+        $status = proc_get_status($this->process);
+
+        return $status['running'];
     }
 
-    return $executable;
-  }
+    /**
+     * Check if the executable is executable.
+     *
+     * @param string $executable
+     * @throws Exception
+     * @return string
+     */
+    protected static function checkExecutable($executable)
+    {
+        if (!is_file($executable)) {
+            throw new Exception("'$executable' is not a file.");
+        }
+
+        if (!is_executable($executable)) {
+            throw new Exception("'$executable' is not executable.");
+        }
+
+        return $executable;
+    }
 }
diff --git a/lib/Remote/UselessFileDetector.php b/lib/Remote/UselessFileDetector.php
index 9a8090038..f1e71f0c5 100644
--- a/lib/Remote/UselessFileDetector.php
+++ b/lib/Remote/UselessFileDetector.php
@@ -15,13 +15,13 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class UselessFileDetector implements FileDetector {
-  /**
-   * @param string $file
-   *
-   * @return null
-   */
-  public function getLocalFile($file) {
-    return null;
-  }
+class UselessFileDetector implements FileDetector
+{
+    /**
+     * @param string $file
+     */
+    public function getLocalFile($file)
+    {
+        return null;
+    }
 }
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index a9de79143..977662a4a 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -18,31 +18,31 @@
 /**
  * All the browsers supported by selenium
  */
-class WebDriverBrowserType {
-  const FIREFOX = "firefox";
-  const FIREFOX_2 = "firefox2";
-  const FIREFOX_3 = "firefox3";
-  const FIREFOX_PROXY = "firefoxproxy";
-  const FIREFOX_CHROME = "firefoxchrome";
-  const GOOGLECHROME = "googlechrome";
-  const SAFARI = "safari";
-  const OPERA = "opera";
-  const IEXPLORE= "iexplore";
-  const IEXPLORE_PROXY= "iexploreproxy";
-  const SAFARI_PROXY = "safariproxy";
-  const CHROME = "chrome";
-  const KONQUEROR = "konqueror";
-  const MOCK = "mock";
-  const IE_HTA="iehta";
+class WebDriverBrowserType
+{
+    const FIREFOX = 'firefox';
+    const FIREFOX_2 = 'firefox2';
+    const FIREFOX_3 = 'firefox3';
+    const FIREFOX_PROXY = 'firefoxproxy';
+    const FIREFOX_CHROME = 'firefoxchrome';
+    const GOOGLECHROME = 'googlechrome';
+    const SAFARI = 'safari';
+    const OPERA = 'opera';
+    const IEXPLORE = 'iexplore';
+    const IEXPLORE_PROXY = 'iexploreproxy';
+    const SAFARI_PROXY = 'safariproxy';
+    const CHROME = 'chrome';
+    const KONQUEROR = 'konqueror';
+    const MOCK = 'mock';
+    const IE_HTA = 'iehta';
+    const ANDROID = 'android';
+    const HTMLUNIT = 'htmlunit';
+    const IE = 'internet explorer';
+    const IPHONE = 'iphone';
+    const IPAD = 'iPad';
+    const PHANTOMJS = 'phantomjs';
 
-  const ANDROID = "android";
-  const HTMLUNIT = "htmlunit";
-  const IE = "internet explorer";
-  const IPHONE = "iphone";
-  const IPAD = "iPad";
-  const PHANTOMJS = "phantomjs";
-
-  private function __construct()
-  {
-  }
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/Remote/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
index 459952364..131b16561 100644
--- a/lib/Remote/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -18,25 +18,26 @@
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver Wire Protocol.
  */
-class WebDriverCapabilityType {
-  const BROWSER_NAME = 'browserName';
-  const VERSION = 'version';
-  const PLATFORM = 'platform';
-  const JAVASCRIPT_ENABLED = 'javascriptEnabled';
-  const TAKES_SCREENSHOT = 'takesScreenshot';
-  const HANDLES_ALERTS = 'handlesAlerts';
-  const DATABASE_ENABLED = 'databaseEnabled';
-  const LOCATION_CONTEXT_ENABLED = 'locationContextEnabled';
-  const APPLICATION_CACHE_ENABLED = 'applicationCacheEnabled';
-  const BROWSER_CONNECTION_ENABLED = 'browserConnectionEnabled';
-  const CSS_SELECTORS_ENABLED = 'cssSelectorsEnabled';
-  const WEB_STORAGE_ENABLED = 'webStorageEnabled';
-  const ROTATABLE = 'rotatable';
-  const ACCEPT_SSL_CERTS = 'acceptSslCerts';
-  const NATIVE_EVENTS = 'nativeEvents';
-  const PROXY = 'proxy';
+class WebDriverCapabilityType
+{
+    const BROWSER_NAME = 'browserName';
+    const VERSION = 'version';
+    const PLATFORM = 'platform';
+    const JAVASCRIPT_ENABLED = 'javascriptEnabled';
+    const TAKES_SCREENSHOT = 'takesScreenshot';
+    const HANDLES_ALERTS = 'handlesAlerts';
+    const DATABASE_ENABLED = 'databaseEnabled';
+    const LOCATION_CONTEXT_ENABLED = 'locationContextEnabled';
+    const APPLICATION_CACHE_ENABLED = 'applicationCacheEnabled';
+    const BROWSER_CONNECTION_ENABLED = 'browserConnectionEnabled';
+    const CSS_SELECTORS_ENABLED = 'cssSelectorsEnabled';
+    const WEB_STORAGE_ENABLED = 'webStorageEnabled';
+    const ROTATABLE = 'rotatable';
+    const ACCEPT_SSL_CERTS = 'acceptSslCerts';
+    const NATIVE_EVENTS = 'nativeEvents';
+    const PROXY = 'proxy';
 
-  private function __construct()
-  {
-  }
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index cb90d2b64..b801b0645 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -15,43 +15,48 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class WebDriverCommand {
-  /** @var string */
-  private $sessionID;
-  /** @var string */
-  private $name;
-  /** @var array */
-  private $parameters;
+class WebDriverCommand
+{
+    /** @var string */
+    private $sessionID;
+    /** @var string */
+    private $name;
+    /** @var array */
+    private $parameters;
 
-  /**
-   * @param string $session_id
-   * @param string $name Constant from DriverCommand
-   * @param array $parameters Array of
-   */
-  public function __construct($session_id, $name, $parameters) {
-    $this->sessionID = $session_id;
-    $this->name = $name;
-    $this->parameters = $parameters;
-  }
+    /**
+     * @param string $session_id
+     * @param string $name Constant from DriverCommand
+     * @param array $parameters Array of
+     */
+    public function __construct($session_id, $name, $parameters)
+    {
+        $this->sessionID = $session_id;
+        $this->name = $name;
+        $this->parameters = $parameters;
+    }
 
-  /**
-   * @return string
-   */
-  public function getName() {
-    return $this->name;
-  }
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
 
-  /**
-   * @return string
-   */
-  public function getSessionID() {
-    return $this->sessionID;
-  }
+    /**
+     * @return string
+     */
+    public function getSessionID()
+    {
+        return $this->sessionID;
+    }
 
-  /**
-   * @return array
-   */
-  public function getParameters() {
-    return $this->parameters;
-  }
+    /**
+     * @return array
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
 }
diff --git a/lib/Remote/WebDriverResponse.php b/lib/Remote/WebDriverResponse.php
index d3fcdadcb..92ac6f66d 100644
--- a/lib/Remote/WebDriverResponse.php
+++ b/lib/Remote/WebDriverResponse.php
@@ -15,75 +15,83 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class WebDriverResponse {
+class WebDriverResponse
+{
+    /**
+     * @var int
+     */
+    private $status;
+    /**
+     * @var mixed
+     */
+    private $value;
+    /**
+     * @var string
+     */
+    private $sessionID;
 
-  /**
-   * @var int
-   */
-  private $status;
+    /**
+     * @param null|string $session_id
+     */
+    public function __construct($session_id = null)
+    {
+        $this->sessionID = $session_id;
+    }
 
-  /**
-   * @var mixed
-   */
-  private $value;
+    /**
+     * @return null|int
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
 
-  /**
-   * @var string
-   */
-  private $sessionID;
+    /**
+     * @param int $status
+     * @return WebDriverResponse
+     */
+    public function setStatus($status)
+    {
+        $this->status = $status;
 
-  /**
-   * @param null|string $session_id
-   */
-  public function __construct($session_id = null) {
-    $this->sessionID = $session_id;
-  }
+        return $this;
+    }
 
-  /**
-   * @return null|int
-   */
-  public function getStatus() {
-    return $this->status;
-  }
+    /**
+     * @return mixed
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-  /**
-   * @param int $status
-   * @return WebDriverResponse
-   */
-  public function setStatus($status) {
-    $this->status = $status;
-    return $this;
-  }
+    /**
+     * @param mixed $value
+     * @return WebDriverResponse
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
 
-  /**
-   * @return mixed
-   */
-  public function getValue() {
-    return $this->value;
-  }
+        return $this;
+    }
 
-  /**
-   * @param mixed $value
-   * @return WebDriverResponse
-   */
-  public function setValue($value) {
-    $this->value = $value;
-    return $this;
-  }
+    /**
+     * @return null|string
+     */
+    public function getSessionID()
+    {
+        return $this->sessionID;
+    }
 
-  /**
-   * @return null|string
-   */
-  public function getSessionID() {
-    return $this->sessionID;
-  }
+    /**
+     * @param mixed $session_id
+     * @return WebDriverResponse
+     */
+    public function setSessionID($session_id)
+    {
+        $this->sessionID = $session_id;
 
-  /**
-   * @param mixed $session_id
-   * @return WebDriverResponse
-   */
-  public function setSessionID($session_id) {
-    $this->sessionID = $session_id;
-    return $this;
-  }
+        return $this;
+    }
 }
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index ab279cb1d..7ea2242b0 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -27,339 +27,367 @@
 use Facebook\WebDriver\WebDriverTargetLocator;
 use Facebook\WebDriver\WebDriverWait;
 
-class EventFiringWebDriver implements WebDriver, JavaScriptExecutor {
-
-  /**
-   * @var WebDriver
-   */
-  protected $driver;
-
-  /**
-   * @var WebDriverDispatcher
-   */
-  protected $dispatcher;
-
-  /**
-   * @param WebDriver $driver
-   * @param WebDriverDispatcher $dispatcher
-   */
-  public function __construct(WebDriver $driver,
-                              WebDriverDispatcher $dispatcher = null) {
-    $this->dispatcher = $dispatcher ?: new WebDriverDispatcher();
-    if (!$this->dispatcher->getDefaultDriver()) {
-      $this->dispatcher->setDefaultDriver($this);
+class EventFiringWebDriver implements WebDriver, JavaScriptExecutor
+{
+    /**
+     * @var WebDriver
+     */
+    protected $driver;
+
+    /**
+     * @var WebDriverDispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * @param WebDriver $driver
+     * @param WebDriverDispatcher $dispatcher
+     */
+    public function __construct(WebDriver $driver, WebDriverDispatcher $dispatcher = null)
+    {
+        $this->dispatcher = $dispatcher ?: new WebDriverDispatcher();
+        if (!$this->dispatcher->getDefaultDriver()) {
+            $this->dispatcher->setDefaultDriver($this);
+        }
+        $this->driver = $driver;
+
+        return $this;
     }
-    $this->driver = $driver;
-    return $this;
-  }
-
-  /**
-   * @return WebDriverDispatcher
-   */
-  public function getDispatcher() {
-    return $this->dispatcher;
-  }
-
-  /**
-   * @param mixed $method
-   * @return void
-   */
-  protected function dispatch($method) {
-    if (!$this->dispatcher) {
-      return;
+
+    /**
+     * @return WebDriverDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
     }
 
-    $arguments = func_get_args();
-    unset($arguments[0]);
-    $this->dispatcher->dispatch($method, $arguments);
-  }
-
-  /**
-   * @return WebDriver
-   */
-  public function getWebDriver() {
-    return $this->driver;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @return EventFiringWebElement
-   */
-  protected function newElement(WebDriverElement $element) {
-    return new EventFiringWebElement($element, $this->getDispatcher());
-  }
-
-  /**
-   * @param mixed $url
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function get($url) {
-    $this->dispatch('beforeNavigateTo', $url, $this);
-    try {
-      $this->driver->get($url);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
     }
-    $this->dispatch('afterNavigateTo', $url, $this);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverBy $by
-   * @return array
-   * @throws WebDriverException
-   */
-  public function findElements(WebDriverBy $by) {
-    $this->dispatch('beforeFindBy', $by, null, $this);
-    try {
-      $elements = array();
-      foreach ($this->driver->findElements($by) as $element) {
-        $elements[] = $this->newElement($element);
-      }
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @return WebDriver
+     */
+    public function getWebDriver()
+    {
+        return $this->driver;
     }
-    $this->dispatch('afterFindBy', $by, null, $this);
-    return $elements;
-
-  }
-
-  /**
-   * @param WebDriverBy $by
-   * @return EventFiringWebElement
-   * @throws WebDriverException
-   */
-  public function findElement(WebDriverBy $by) {
-    $this->dispatch('beforeFindBy', $by, null, $this);
-    try {
-      $element = $this->newElement($this->driver->findElement($by));
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param WebDriverElement $element
+     * @return EventFiringWebElement
+     */
+    protected function newElement(WebDriverElement $element)
+    {
+        return new EventFiringWebElement($element, $this->getDispatcher());
     }
-    $this->dispatch('afterFindBy', $by, null, $this);
-    return $element;
-  }
-
-  /**
-   * @param       $script
-   * @param array $arguments
-   * @return mixed
-   * @throws WebDriverException
-   */
-  public function executeScript($script, array $arguments = array()) {
-    if (!$this->driver instanceof JavaScriptExecutor) {
-      throw new UnsupportedOperationException(
-        'driver does not implement JavaScriptExecutor'
-      );
+
+    /**
+     * @param mixed $url
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function get($url)
+    {
+        $this->dispatch('beforeNavigateTo', $url, $this);
+        try {
+            $this->driver->get($url);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterNavigateTo', $url, $this);
+
+        return $this;
     }
 
-    $this->dispatch('beforeScript', $script, $this);
-    try {
-      $result = $this->driver->executeScript($script, $arguments);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+    /**
+     * @param WebDriverBy $by
+     * @throws WebDriverException
+     * @return array
+     */
+    public function findElements(WebDriverBy $by)
+    {
+        $this->dispatch('beforeFindBy', $by, null, $this);
+        try {
+            $elements = array();
+            foreach ($this->driver->findElements($by) as $element) {
+                $elements[] = $this->newElement($element);
+            }
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterFindBy', $by, null, $this);
+
+        return $elements;
     }
-    $this->dispatch('afterScript', $script, $this);
-    return $result;
-  }
-
-  /**
-   * @param       $script
-   * @param array $arguments
-   * @return mixed
-   * @throws WebDriverException
-   */
-  public function executeAsyncScript($script, array $arguments = array()) {
-    if (!$this->driver instanceof JavaScriptExecutor) {
-      throw new UnsupportedOperationException(
-        'driver does not implement JavaScriptExecutor'
-      );
+
+    /**
+     * @param WebDriverBy $by
+     * @throws WebDriverException
+     * @return EventFiringWebElement
+     */
+    public function findElement(WebDriverBy $by)
+    {
+        $this->dispatch('beforeFindBy', $by, null, $this);
+        try {
+            $element = $this->newElement($this->driver->findElement($by));
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterFindBy', $by, null, $this);
+
+        return $element;
     }
 
-    $this->dispatch('beforeScript', $script, $this);
-    try {
-      $result = $this->driver->executeAsyncScript($script, $arguments);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+    /**
+     * @param       $script
+     * @param array $arguments
+     * @throws WebDriverException
+     * @return mixed
+     */
+    public function executeScript($script, array $arguments = array())
+    {
+        if (!$this->driver instanceof JavaScriptExecutor) {
+            throw new UnsupportedOperationException(
+                'driver does not implement JavaScriptExecutor'
+            );
+        }
+
+        $this->dispatch('beforeScript', $script, $this);
+        try {
+            $result = $this->driver->executeScript($script, $arguments);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterScript', $script, $this);
+
+        return $result;
     }
-    $this->dispatch('afterScript', $script, $this);
-    return $result;
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function close() {
-    try {
-      $this->driver->close();
-      return $this;
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param       $script
+     * @param array $arguments
+     * @throws WebDriverException
+     * @return mixed
+     */
+    public function executeAsyncScript($script, array $arguments = array())
+    {
+        if (!$this->driver instanceof JavaScriptExecutor) {
+            throw new UnsupportedOperationException(
+                'driver does not implement JavaScriptExecutor'
+            );
+        }
+
+        $this->dispatch('beforeScript', $script, $this);
+        try {
+            $result = $this->driver->executeAsyncScript($script, $arguments);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterScript', $script, $this);
+
+        return $result;
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getCurrentURL() {
-    try {
-      return $this->driver->getCurrentURL();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function close()
+    {
+        try {
+            $this->driver->close();
+
+            return $this;
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getPageSource() {
-    try {
-      return $this->driver->getPageSource();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCurrentURL()
+    {
+        try {
+            return $this->driver->getCurrentURL();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getTitle() {
-    try {
-      return $this->driver->getTitle();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getPageSource()
+    {
+        try {
+            return $this->driver->getPageSource();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getWindowHandle() {
-    try {
-      return $this->driver->getWindowHandle();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getTitle()
+    {
+        try {
+            return $this->driver->getTitle();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return array
-   * @throws WebDriverException
-   */
-  public function getWindowHandles() {
-    try {
-      return $this->driver->getWindowHandles();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getWindowHandle()
+    {
+        try {
+            return $this->driver->getWindowHandle();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @throws WebDriverException
-   */
-  public function quit() {
-    try {
-      $this->driver->quit();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return array
+     */
+    public function getWindowHandles()
+    {
+        try {
+            return $this->driver->getWindowHandles();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @param null|string $save_as
-   * @return string
-   * @throws WebDriverException
-   */
-  public function takeScreenshot($save_as = null) {
-    try {
-      return $this->driver->takeScreenshot($save_as);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     */
+    public function quit()
+    {
+        try {
+            $this->driver->quit();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @param int $timeout_in_second
-   * @param int $interval_in_millisecond
-   * @return WebDriverWait
-   * @throws WebDriverException
-   */
-  public function wait($timeout_in_second = 30,
-                       $interval_in_millisecond = 250) {
-    try {
-      return $this->driver->wait($timeout_in_second, $interval_in_millisecond);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param null|string $save_as
+     * @throws WebDriverException
+     * @return string
+     */
+    public function takeScreenshot($save_as = null)
+    {
+        try {
+            return $this->driver->takeScreenshot($save_as);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return WebDriverOptions
-   * @throws WebDriverException
-   */
-  public function manage() {
-    try {
-      return $this->driver->manage();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param int $timeout_in_second
+     * @param int $interval_in_millisecond
+     * @throws WebDriverException
+     * @return WebDriverWait
+     */
+    public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
+    {
+        try {
+            return $this->driver->wait($timeout_in_second, $interval_in_millisecond);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return EventFiringWebDriverNavigation
-   * @throws WebDriverException
-   */
-  public function navigate() {
-    try {
-      return new EventFiringWebDriverNavigation(
-        $this->driver->navigate(),
-        $this->getDispatcher()
-      );
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverOptions
+     */
+    public function manage()
+    {
+        try {
+            return $this->driver->manage();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return WebDriverTargetLocator
-   * @throws WebDriverException
-   */
-  public function switchTo() {
-    try {
-      return $this->driver->switchTo();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return EventFiringWebDriverNavigation
+     */
+    public function navigate()
+    {
+        try {
+            return new EventFiringWebDriverNavigation(
+                $this->driver->navigate(),
+                $this->getDispatcher()
+            );
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return WebDriverTouchScreen
-   * @throws WebDriverException
-   */
-  public function getTouch() {
-    try {
-      return $this->driver->getTouch();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverTargetLocator
+     */
+    public function switchTo()
+    {
+        try {
+            return $this->driver->switchTo();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  private function dispatchOnException($exception) {
-    $this->dispatch('onException', $exception, $this);
-    throw $exception;
-  }
-
-  public function execute($name, $params) {
-    try {
-      return $this->driver->execute($name, $params);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverTouchScreen
+     */
+    public function getTouch()
+    {
+        try {
+            return $this->driver->getTouch();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+    }
+
+    private function dispatchOnException($exception)
+    {
+        $this->dispatch('onException', $exception, $this);
+        throw $exception;
+    }
+
+    public function execute($name, $params)
+    {
+        try {
+            return $this->driver->execute($name, $params);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
 }
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 56341e2c2..a588d5e17 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -19,138 +19,149 @@
 use Facebook\WebDriver\WebDriverDispatcher;
 use Facebook\WebDriver\WebDriverNavigation;
 
-class EventFiringWebDriverNavigation {
-
-  /**
-   * @var WebDriverNavigation
-   */
-  protected $navigator;
-
-  /**
-   * @var WebDriverDispatcher
-   */
-  protected $dispatcher;
-
-  /**
-   * @param WebDriverNavigation $navigator
-   * @param WebDriverDispatcher $dispatcher
-   */
-  public function __construct(WebDriverNavigation $navigator,
-                              WebDriverDispatcher $dispatcher) {
-    $this->navigator  = $navigator;
-    $this->dispatcher = $dispatcher;
-    return $this;
-  }
-
-  /**
-   * @return WebDriverDispatcher
-   */
-  public function getDispatcher() {
-    return $this->dispatcher;
-  }
-
-  /**
-   * @param mixed $method
-   * @return void
-   */
-  protected function dispatch($method) {
-    if (!$this->dispatcher) {
-      return;
+class EventFiringWebDriverNavigation
+{
+    /**
+     * @var WebDriverNavigation
+     */
+    protected $navigator;
+    /**
+     * @var WebDriverDispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * @param WebDriverNavigation $navigator
+     * @param WebDriverDispatcher $dispatcher
+     */
+    public function __construct(WebDriverNavigation $navigator, WebDriverDispatcher $dispatcher)
+    {
+        $this->navigator = $navigator;
+        $this->dispatcher = $dispatcher;
+
+        return $this;
+    }
+
+    /**
+     * @return WebDriverDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
+    }
+
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
+    }
+
+    /**
+     * @return WebDriverNavigation
+     */
+    public function getNavigator()
+    {
+        return $this->navigator;
     }
 
-    $arguments = func_get_args();
-    unset($arguments[0]);
-    $this->dispatcher->dispatch($method, $arguments);
-  }
-
-  /**
-   * @return WebDriverNavigation
-   */
-  public function getNavigator() {
-    return $this->navigator;
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function back() {
-    $this->dispatch(
-      'beforeNavigateBack',
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    try {
-      $this->navigator->back();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function back()
+    {
+        $this->dispatch(
+            'beforeNavigateBack',
+            $this->getDispatcher()->getDefaultDriver()
+        );
+        try {
+            $this->navigator->back();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch(
+            'afterNavigateBack',
+            $this->getDispatcher()->getDefaultDriver()
+        );
+
+        return $this;
     }
-    $this->dispatch(
-      'afterNavigateBack',
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    return $this;
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function forward() {
-    $this->dispatch(
-      'beforeNavigateForward',
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    try {
-      $this->navigator->forward();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function forward()
+    {
+        $this->dispatch(
+            'beforeNavigateForward',
+            $this->getDispatcher()->getDefaultDriver()
+        );
+        try {
+            $this->navigator->forward();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch(
+            'afterNavigateForward',
+            $this->getDispatcher()->getDefaultDriver()
+        );
+
+        return $this;
     }
-    $this->dispatch(
-      'afterNavigateForward',
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    return $this;
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function refresh() {
-    try {
-      $this->navigator->refresh();
-      return $this;
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function refresh()
+    {
+        try {
+            $this->navigator->refresh();
+
+            return $this;
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @param mixed $url
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function to($url) {
-    $this->dispatch(
-      'beforeNavigateTo',
-      $url,
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    try {
-      $this->navigator->to($url);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param mixed $url
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function to($url)
+    {
+        $this->dispatch(
+            'beforeNavigateTo',
+            $url,
+            $this->getDispatcher()->getDefaultDriver()
+        );
+        try {
+            $this->navigator->to($url);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch(
+            'afterNavigateTo',
+            $url,
+            $this->getDispatcher()->getDefaultDriver()
+        );
+
+        return $this;
+    }
+
+    private function dispatchOnException($exception)
+    {
+        $this->dispatch('onException', $exception);
+        throw $exception;
     }
-    $this->dispatch(
-      'afterNavigateTo',
-      $url,
-      $this->getDispatcher()->getDefaultDriver()
-    );
-    return $this;
-  }
-
-  private function dispatchOnException($exception) {
-    $this->dispatch('onException', $exception);
-    throw $exception;
-  }
 }
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 3025bd8ba..8f6f20d81 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -24,346 +24,370 @@
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverPoint;
 
-class EventFiringWebElement implements WebDriverElement, WebDriverLocatable {
-
-  /**
-   * @var WebDriverElement
-   */
-  protected $element;
-
-  /**
-   * @var WebDriverDispatcher
-   */
-  protected $dispatcher;
-
-  /**
-   * @param WebDriverElement    $element
-   * @param WebDriverDispatcher $dispatcher
-   */
-  public function __construct(WebDriverElement $element,
-                              WebDriverDispatcher $dispatcher) {
-    $this->element = $element;
-    $this->dispatcher = $dispatcher;
-    return $this;
-  }
-
-  /**
-   * @return WebDriverDispatcher
-   */
-  public function getDispatcher() {
-    return $this->dispatcher;
-  }
-
-  /**
-   * @param mixed $method
-   * @return void
-   */
-  protected function dispatch($method) {
-    if (!$this->dispatcher) {
-      return;
+class EventFiringWebElement implements WebDriverElement, WebDriverLocatable
+{
+    /**
+     * @var WebDriverElement
+     */
+    protected $element;
+    /**
+     * @var WebDriverDispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * @param WebDriverElement $element
+     * @param WebDriverDispatcher $dispatcher
+     */
+    public function __construct(WebDriverElement $element, WebDriverDispatcher $dispatcher)
+    {
+        $this->element = $element;
+        $this->dispatcher = $dispatcher;
+
+        return $this;
     }
-    $arguments = func_get_args();
-    unset($arguments[0]);
-    $this->dispatcher->dispatch($method, $arguments);
-  }
-
-  /**
-   * @return WebDriverElement
-   */
-  public function getElement() {
-    return $this->element;
-  }
-
-  /**
-   * @param WebDriverElement $element
-   * @return EventFiringWebElement
-   */
-  protected function newElement(WebDriverElement $element) {
-    return new static($element, $this->getDispatcher());
-  }
-
-  /**
-   * @param mixed $value
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function sendKeys($value) {
-
-    $this->dispatch('beforeChangeValueOf', $this);
-    try {
-      $this->element->sendKeys($value);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @return WebDriverDispatcher
+     */
+    public function getDispatcher()
+    {
+        return $this->dispatcher;
     }
-    $this->dispatch('afterChangeValueOf', $this);
-    return $this;
-
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function click() {
-    $this->dispatch('beforeClickOn', $this);
-    try {
-      $this->element->click();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
     }
-    $this->dispatch('afterClickOn', $this);
-    return $this;
-  }
-
-  /**
-   * @param WebDriverBy $by
-   * @return EventFiringWebElement
-   * @throws WebDriverException
-   */
-  public function findElement(WebDriverBy $by) {
-    $this->dispatch(
-      'beforeFindBy',
-      $by,
-      $this,
-      $this->dispatcher->getDefaultDriver());
-    try {
-      $element = $this->newElement($this->element->findElement($by));
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @return WebDriverElement
+     */
+    public function getElement()
+    {
+        return $this->element;
     }
-    $this->dispatch(
-      'afterFindBy',
-      $by,
-      $this,
-      $this->dispatcher->getDefaultDriver()
-    );
-    return $element;
-  }
-
-  /**
-   * @param WebDriverBy $by
-   * @return array
-   * @throws WebDriverException
-   */
-  public function findElements(WebDriverBy $by) {
-    $this->dispatch(
-      'beforeFindBy',
-      $by,
-      $this,
-      $this->dispatcher->getDefaultDriver()
-    );
-    try {
-      $elements = array();
-      foreach ($this->element->findElements($by) as $element) {
-        $elements[] = $this->newElement($element);
-      }
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param WebDriverElement $element
+     * @return EventFiringWebElement
+     */
+    protected function newElement(WebDriverElement $element)
+    {
+        return new static($element, $this->getDispatcher());
     }
-    $this->dispatch(
-      'afterFindBy',
-      $by,
-      $this,
-      $this->dispatcher->getDefaultDriver()
-    );
-    return $elements;
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function clear() {
-    try {
-      $this->element->clear();
-      return $this;
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param mixed $value
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function sendKeys($value)
+    {
+        $this->dispatch('beforeChangeValueOf', $this);
+        try {
+            $this->element->sendKeys($value);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterChangeValueOf', $this);
+
+        return $this;
     }
-  }
-
-  /**
-   * @param string $attribute_name
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getAttribute($attribute_name) {
-    try {
-      return $this->element->getAttribute($attribute_name);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function click()
+    {
+        $this->dispatch('beforeClickOn', $this);
+        try {
+            $this->element->click();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch('afterClickOn', $this);
+
+        return $this;
     }
-  }
-
-  /**
-   * @param string $css_property_name
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getCSSValue($css_property_name) {
-    try {
-      return $this->element->getCSSValue($css_property_name);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param WebDriverBy $by
+     * @throws WebDriverException
+     * @return EventFiringWebElement
+     */
+    public function findElement(WebDriverBy $by)
+    {
+        $this->dispatch(
+            'beforeFindBy',
+            $by,
+            $this,
+            $this->dispatcher->getDefaultDriver()
+        );
+        try {
+            $element = $this->newElement($this->element->findElement($by));
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch(
+            'afterFindBy',
+            $by,
+            $this,
+            $this->dispatcher->getDefaultDriver()
+        );
+
+        return $element;
     }
-  }
-
-  /**
-   * @return WebDriverPoint
-   * @throws WebDriverException
-   */
-  public function getLocation() {
-    try {
-      return $this->element->getLocation();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param WebDriverBy $by
+     * @throws WebDriverException
+     * @return array
+     */
+    public function findElements(WebDriverBy $by)
+    {
+        $this->dispatch(
+            'beforeFindBy',
+            $by,
+            $this,
+            $this->dispatcher->getDefaultDriver()
+        );
+        try {
+            $elements = array();
+            foreach ($this->element->findElements($by) as $element) {
+                $elements[] = $this->newElement($element);
+            }
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+        $this->dispatch(
+            'afterFindBy',
+            $by,
+            $this,
+            $this->dispatcher->getDefaultDriver()
+        );
+
+        return $elements;
+    }
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function clear()
+    {
+        try {
+            $this->element->clear();
+
+            return $this;
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return WebDriverPoint
-   * @throws WebDriverException
-   */
-  public function getLocationOnScreenOnceScrolledIntoView() {
-    try {
-      return $this->element->getLocationOnScreenOnceScrolledIntoView();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @param string $attribute_name
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getAttribute($attribute_name)
+    {
+        try {
+            return $this->element->getAttribute($attribute_name);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+    }
+
+    /**
+     * @param string $css_property_name
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCSSValue($css_property_name)
+    {
+        try {
+            return $this->element->getCSSValue($css_property_name);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return WebDriverCoordinates
-   */
-  public function getCoordinates() {
-    try {
-      return $this->element->getCoordinates();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverPoint
+     */
+    public function getLocation()
+    {
+        try {
+            return $this->element->getLocation();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-
-  /**
-   * @return WebDriverDimension
-   * @throws WebDriverException
-   */
-  public function getSize() {
-    try {
-      return $this->element->getSize();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverPoint
+     */
+    public function getLocationOnScreenOnceScrolledIntoView()
+    {
+        try {
+            return $this->element->getLocationOnScreenOnceScrolledIntoView();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getTagName() {
-    try {
-      return $this->element->getTagName();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @return WebDriverCoordinates
+     */
+    public function getCoordinates()
+    {
+        try {
+            return $this->element->getCoordinates();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getText() {
-    try {
-      return $this->element->getText();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return WebDriverDimension
+     */
+    public function getSize()
+    {
+        try {
+            return $this->element->getSize();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return bool
-   * @throws WebDriverException
-   */
-  public function isDisplayed() {
-    try {
-      return $this->element->isDisplayed();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getTagName()
+    {
+        try {
+            return $this->element->getTagName();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return bool
-   * @throws WebDriverException
-   */
-  public function isEnabled() {
-    try {
-      return $this->element->isEnabled();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getText()
+    {
+        try {
+            return $this->element->getText();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return bool
-   * @throws WebDriverException
-   */
-  public function isSelected() {
-    try {
-      return $this->element->isSelected();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return bool
+     */
+    public function isDisplayed()
+    {
+        try {
+            return $this->element->isDisplayed();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return $this
-   * @throws WebDriverException
-   */
-  public function submit() {
-    try {
-      $this->element->submit();
-      return $this;
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        try {
+            return $this->element->isEnabled();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-  /**
-   * @return string
-   * @throws WebDriverException
-   */
-  public function getID() {
-    try {
-      return $this->element->getID();
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return bool
+     */
+    public function isSelected()
+    {
+        try {
+            return $this->element->isSelected();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
-
-
-  /**
-   * Test if two element IDs refer to the same DOM element.
-   *
-   * @param WebDriverElement $other
-   * @return bool
-   */
-  public function equals(WebDriverElement $other) {
-    try {
-      return $this->element->equals($other);
-    } catch (WebDriverException $exception) {
-      $this->dispatchOnException($exception);
+
+    /**
+     * @throws WebDriverException
+     * @return $this
+     */
+    public function submit()
+    {
+        try {
+            $this->element->submit();
+
+            return $this;
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
     }
-  }
 
-  private function dispatchOnException($exception) {
-    $this->dispatch(
-      'onException',
-      $exception,
-      $this->dispatcher->getDefaultDriver()
-    );
-    throw $exception;
-  }
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getID()
+    {
+        try {
+            return $this->element->getID();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+    }
 
+    /**
+     * Test if two element IDs refer to the same DOM element.
+     *
+     * @param WebDriverElement $other
+     * @return bool
+     */
+    public function equals(WebDriverElement $other)
+    {
+        try {
+            return $this->element->equals($other);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+        }
+    }
 
+    private function dispatchOnException($exception)
+    {
+        $this->dispatch(
+            'onException',
+            $exception,
+            $this->dispatcher->getDefaultDriver()
+        );
+        throw $exception;
+    }
 }
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index b143583ca..85e8c1931 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -18,119 +18,118 @@
 /**
  * The interface for WebDriver.
  */
-interface WebDriver extends WebDriverSearchContext {
-
-  /**
-   * Close the current window.
-   *
-   * @return WebDriver The current instance.
-   */
-  public function close();
-
-  /**
-   * Load a new web page in the current browser window.
-   *
-   * @param string $url
-   * @return WebDriver The current instance.
-   */
-  public function get($url);
-
-  /**
-   * Get a string representing the current URL that the browser is looking at.
-   *
-   * @return string The current URL.
-   */
-  public function getCurrentURL();
-
-  /**
-   * Get the source of the last loaded page.
-   *
-   * @return string The current page source.
-   */
-  public function getPageSource();
-
-  /**
-   * Get the title of the current page.
-   *
-   * @return string The title of the current page.
-   */
-  public function getTitle();
-
-  /**
-   * Return an opaque handle to this window that uniquely identifies it within
-   * this driver instance.
-   *
-   * @return string The current window handle.
-   */
-  public function getWindowHandle();
-
-  /**
-   * Get all window handles available to the current session.
-   *
-   * @return array An array of string containing all available window handles.
-   */
-  public function getWindowHandles();
-
-  /**
-   * Quits this driver, closing every associated window.
-   *
-   * @return void
-   */
-  public function quit();
-
-  /**
-   * Take a screenshot of the current page.
-   *
-   * @param string $save_as The path of the screenshot to be saved.
-   * @return string The screenshot in PNG format.
-   */
-  public function takeScreenshot($save_as = null);
-
-  /**
-   * Construct a new WebDriverWait by the current WebDriver instance.
-   * Sample usage:
-   *
-   *   $driver->wait(20, 1000)->until(
-   *     WebDriverExpectedCondition::titleIs('WebDriver Page')
-   *   );
-   *
-   * @param int $timeout_in_second
-   * @param int $interval_in_millisecond
-   * @return WebDriverWait
-   */
-  public function wait(
-      $timeout_in_second = 30,
-      $interval_in_millisecond = 250);
-
-  /**
-   * An abstraction for managing stuff you would do in a browser menu. For
-   * example, adding and deleting cookies.
-   *
-   * @return WebDriverOptions
-   */
-  public function manage();
-
-  /**
-   * An abstraction allowing the driver to access the browser's history and to
-   * navigate to a given URL.
-   *
-   * @return WebDriverNavigation
-   * @see WebDriverNavigation
-   */
-  public function navigate();
-
-  /**
-   * Switch to a different window or frame.
-   *
-   * @return WebDriverTargetLocator
-   * @see WebDriverTargetLocator
-   */
-  public function switchTo();
-
-  /**
-   * @param string $name
-   * @param array $params
-   * @return mixed
-   */
-  public function execute($name, $params);
+interface WebDriver extends WebDriverSearchContext
+{
+    /**
+     * Close the current window.
+     *
+     * @return WebDriver The current instance.
+     */
+    public function close();
+
+    /**
+     * Load a new web page in the current browser window.
+     *
+     * @param string $url
+     * @return WebDriver The current instance.
+     */
+    public function get($url);
+
+    /**
+     * Get a string representing the current URL that the browser is looking at.
+     *
+     * @return string The current URL.
+     */
+    public function getCurrentURL();
+
+    /**
+     * Get the source of the last loaded page.
+     *
+     * @return string The current page source.
+     */
+    public function getPageSource();
+
+    /**
+     * Get the title of the current page.
+     *
+     * @return string The title of the current page.
+     */
+    public function getTitle();
+
+    /**
+     * Return an opaque handle to this window that uniquely identifies it within
+     * this driver instance.
+     *
+     * @return string The current window handle.
+     */
+    public function getWindowHandle();
+
+    /**
+     * Get all window handles available to the current session.
+     *
+     * @return array An array of string containing all available window handles.
+     */
+    public function getWindowHandles();
+
+    /**
+     * Quits this driver, closing every associated window.
+     */
+    public function quit();
+
+    /**
+     * Take a screenshot of the current page.
+     *
+     * @param string $save_as The path of the screenshot to be saved.
+     * @return string The screenshot in PNG format.
+     */
+    public function takeScreenshot($save_as = null);
+
+    /**
+     * Construct a new WebDriverWait by the current WebDriver instance.
+     * Sample usage:
+     *
+     *   $driver->wait(20, 1000)->until(
+     *     WebDriverExpectedCondition::titleIs('WebDriver Page')
+     *   );
+     *
+     * @param int $timeout_in_second
+     * @param int $interval_in_millisecond
+     * @return WebDriverWait
+     */
+    public function wait(
+        $timeout_in_second = 30,
+        $interval_in_millisecond = 250
+    );
+
+    /**
+     * An abstraction for managing stuff you would do in a browser menu. For
+     * example, adding and deleting cookies.
+     *
+     * @return WebDriverOptions
+     */
+    public function manage();
+
+    /**
+     * An abstraction allowing the driver to access the browser's history and to
+     * navigate to a given URL.
+     *
+     * @return WebDriverNavigation
+     * @see WebDriverNavigation
+     */
+    public function navigate();
+
+    /**
+     * Switch to a different window or frame.
+     *
+     * @return WebDriverTargetLocator
+     * @see WebDriverTargetLocator
+     */
+    public function switchTo();
+
+    /**
+     * @param string $name
+     * @param array $params
+     * @return mixed
+     */
+    public function execute($name, $params);
 }
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index a5d2d32d8..e73b883ad 100644
--- a/lib/WebDriverAction.php
+++ b/lib/WebDriverAction.php
@@ -18,10 +18,9 @@
 /**
  * Interface representing a single user-interaction action.
  */
-interface WebDriverAction {
-
-  /**
-   * @return void
-   */
-  public function perform();
+interface WebDriverAction
+{
+    /**
+     */
+    public function perform();
 }
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 8bef6d846..4ba9f6168 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -20,55 +20,62 @@
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
-class WebDriverAlert {
+class WebDriverAlert
+{
+    protected $executor;
 
-  protected $executor;
+    public function __construct($executor)
+    {
+        $this->executor = $executor;
+    }
 
-  public function __construct($executor) {
-    $this->executor = $executor;
-  }
+    /**
+     * Accept alert
+     *
+     * @return WebDriverAlert The instance.
+     */
+    public function accept()
+    {
+        $this->executor->execute(DriverCommand::ACCEPT_ALERT);
 
-  /**
-   * Accept alert
-   *
-   * @return WebDriverAlert The instance.
-   */
-  public function accept() {
-    $this->executor->execute(DriverCommand::ACCEPT_ALERT);
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Dismiss alert
-   *
-   * @return WebDriverAlert The instance.
-   */
-  public function dismiss() {
-    $this->executor->execute(DriverCommand::DISMISS_ALERT);
-    return $this;
-  }
+    /**
+     * Dismiss alert
+     *
+     * @return WebDriverAlert The instance.
+     */
+    public function dismiss()
+    {
+        $this->executor->execute(DriverCommand::DISMISS_ALERT);
 
-  /**
-   * Get alert text
-   *
-   * @return string
-   */
-  public function getText() {
-    return $this->executor->execute(DriverCommand::GET_ALERT_TEXT);
-  }
+        return $this;
+    }
 
-  /**
-   * Send keystrokes to javascript prompt() dialog
-   *
-   * @param string $value
-   * @return WebDriverAlert
-   */
-  public function sendKeys($value) {
-    $this->executor->execute(
-      DriverCommand::SET_ALERT_VALUE,
-      array('text' => $value)
-    );
-    return $this;
-  }
+    /**
+     * Get alert text
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->executor->execute(DriverCommand::GET_ALERT_TEXT);
+    }
 
+    /**
+     * Send keystrokes to javascript prompt() dialog
+     *
+     * @param string $value
+     * @return WebDriverAlert
+     */
+    public function sendKeys($value)
+    {
+        $this->executor->execute(
+            DriverCommand::SET_ALERT_VALUE,
+            array('text' => $value)
+        );
+
+        return $this;
+    }
 }
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index c409768a8..92242ae56 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -22,109 +22,120 @@
  *
  * @see WebDriver::findElement, WebDriverElement::findElement
  */
-class WebDriverBy {
+class WebDriverBy
+{
+    private $mechanism;
+    private $value;
 
-  private $mechanism;
-  private $value;
+    protected function __construct($mechanism, $value)
+    {
+        $this->mechanism = $mechanism;
+        $this->value = $value;
+    }
 
-  protected function __construct($mechanism, $value) {
-    $this->mechanism = $mechanism;
-    $this->value = $value;
-  }
+    /**
+     * @return string
+     */
+    public function getMechanism()
+    {
+        return $this->mechanism;
+    }
 
-  /**
-   * @return string
-   */
-  public function getMechanism() {
-    return $this->mechanism;
-  }
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
 
-  /**
-   * @return string
-   */
-  public function getValue() {
-    return $this->value;
-  }
+    /**
+     * Locates elements whose class name contains the search value; compound class
+     * names are not permitted.
+     *
+     * @param string $class_name
+     * @return WebDriverBy
+     */
+    public static function className($class_name)
+    {
+        return new self('class name', $class_name);
+    }
 
-  /**
-   * Locates elements whose class name contains the search value; compound class
-   * names are not permitted.
-   *
-   * @param string $class_name
-   * @return WebDriverBy
-   */
-  public static function className($class_name) {
-    return new WebDriverBy('class name', $class_name);
-  }
+    /**
+     * Locates elements matching a CSS selector.
+     *
+     * @param string $css_selector
+     * @return WebDriverBy
+     */
+    public static function cssSelector($css_selector)
+    {
+        return new self('css selector', $css_selector);
+    }
 
-  /**
-   * Locates elements matching a CSS selector.
-   *
-   * @param string $css_selector
-   * @return WebDriverBy
-   */
-  public static function cssSelector($css_selector) {
-    return new WebDriverBy('css selector', $css_selector);
-  }
+    /**
+     * Locates elements whose ID attribute matches the search value.
+     *
+     * @param string $id
+     * @return WebDriverBy
+     */
+    public static function id($id)
+    {
+        return new self('id', $id);
+    }
 
-  /**
-   * Locates elements whose ID attribute matches the search value.
-   *
-   * @param string $id
-   * @return WebDriverBy
-   */
-  public static function id($id) {
-    return new WebDriverBy('id', $id);
-  }
+    /**
+     * Locates elements whose NAME attribute matches the search value.
+     *
+     * @param string $name
+     * @return WebDriverBy
+     */
+    public static function name($name)
+    {
+        return new self('name', $name);
+    }
 
-  /**
-   * Locates elements whose NAME attribute matches the search value.
-   *
-   * @param string $name
-   * @return WebDriverBy
-   */
-  public static function name($name) {
-    return new WebDriverBy('name', $name);
-  }
+    /**
+     * Locates anchor elements whose visible text matches the search value.
+     *
+     * @param string $link_text
+     * @return WebDriverBy
+     */
+    public static function linkText($link_text)
+    {
+        return new self('link text', $link_text);
+    }
 
-  /**
-   * Locates anchor elements whose visible text matches the search value.
-   *
-   * @param string $link_text
-   * @return WebDriverBy
-   */
-  public static function linkText($link_text) {
-    return new WebDriverBy('link text', $link_text);
-  }
+    /**
+     * Locates anchor elements whose visible text partially matches the search
+     * value.
+     *
+     * @param string $partial_link_text
+     * @return WebDriverBy
+     */
+    public static function partialLinkText($partial_link_text)
+    {
+        return new self('partial link text', $partial_link_text);
+    }
 
-  /**
-   * Locates anchor elements whose visible text partially matches the search
-   * value.
-   *
-   * @param string $partial_link_text
-   * @return WebDriverBy
-   */
-  public static function partialLinkText($partial_link_text) {
-    return new WebDriverBy('partial link text', $partial_link_text);
-  }
+    /**
+     * Locates elements whose tag name matches the search value.
+     *
+     * @param string $tag_name
+     * @return WebDriverBy
+     */
+    public static function tagName($tag_name)
+    {
+        return new self('tag name', $tag_name);
+    }
 
-  /**
-   * Locates elements whose tag name matches the search value.
-   *
-   * @param string $tag_name
-   * @return WebDriverBy
-   */
-  public static function tagName($tag_name) {
-    return new WebDriverBy('tag name', $tag_name);
-  }
-
-  /**
-   * Locates elements matching an XPath expression.
-   *
-   * @param string $xpath
-   * @return WebDriverBy
-   */
-  public static function xpath($xpath) {
-    return new WebDriverBy('xpath', $xpath);
-  }
+    /**
+     * Locates elements matching an XPath expression.
+     *
+     * @param string $xpath
+     * @return WebDriverBy
+     */
+    public static function xpath($xpath)
+    {
+        return new self('xpath', $xpath);
+    }
 }
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 721db82e6..6fce03c08 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -15,37 +15,37 @@
 
 namespace Facebook\WebDriver;
 
-interface WebDriverCapabilities {
-
-  /**
-   * @return string The name of the browser.
-   */
-  public function getBrowserName();
-
-  /**
-   * @param string $name
-   * @return mixed The value of a capability.
-   */
-  public function getCapability($name);
-
-  /**
-   * @return string The name of the platform.
-   */
-  public function getPlatform();
-
-  /**
-   * @return string The version of the browser.
-   */
-  public function getVersion();
-
-  /**
-   * @param string $capability_name
-   * @return bool Whether the value is not null and not false.
-   */
-  public function is($capability_name);
-
-  /**
-   * @return bool Whether javascript is enabled.
-   */
-  public function isJavascriptEnabled();
+interface WebDriverCapabilities
+{
+    /**
+     * @return string The name of the browser.
+     */
+    public function getBrowserName();
+
+    /**
+     * @param string $name
+     * @return mixed The value of a capability.
+     */
+    public function getCapability($name);
+
+    /**
+     * @return string The name of the platform.
+     */
+    public function getPlatform();
+
+    /**
+     * @return string The version of the browser.
+     */
+    public function getVersion();
+
+    /**
+     * @param string $capability_name
+     * @return bool Whether the value is not null and not false.
+     */
+    public function is($capability_name);
+
+    /**
+     * @return bool Whether javascript is enabled.
+     */
+    public function isJavascriptEnabled();
 }
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index d58998f70..00357c6e7 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -20,12 +20,12 @@
 /**
  * Interface for all command executor.
  */
-interface WebDriverCommandExecutor {
-
-  /**
-   * @param WebDriverCommand $command
-   *
-   * @return mixed
-   */
-  public function execute(WebDriverCommand $command);
+interface WebDriverCommandExecutor
+{
+    /**
+     * @param WebDriverCommand $command
+     *
+     * @return mixed
+     */
+    public function execute(WebDriverCommand $command);
 }
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index c66278931..5b274e29a 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -18,42 +18,46 @@
 /**
  * Represent a dimension.
  */
-class WebDriverDimension {
+class WebDriverDimension
+{
+    private $height;
+    private $width;
 
-  private $height, $width;
+    public function __construct($width, $height)
+    {
+        $this->width = $width;
+        $this->height = $height;
+    }
 
-  public function __construct($width, $height) {
-    $this->width = $width;
-    $this->height = $height;
-  }
+    /**
+     * Get the height.
+     *
+     * @return int The height.
+     */
+    public function getHeight()
+    {
+        return $this->height;
+    }
 
-  /**
-   * Get the height.
-   *
-   * @return int The height.
-   */
-  public function getHeight() {
-    return $this->height;
-  }
+    /**
+     * Get the width.
+     *
+     * @return int The width.
+     */
+    public function getWidth()
+    {
+        return $this->width;
+    }
 
-  /**
-   * Get the width.
-   *
-   * @return int The width.
-   */
-  public function getWidth() {
-    return $this->width;
-  }
-
-  /**
-   * Check whether the given dimension is the same as the instance.
-   *
-   * @param WebDriverDimension $dimension The dimension to be compared with.
-   * @return bool Whether the height and the width are the same as the
-   *              instance.
-   */
-  public function equals(WebDriverDimension $dimension) {
-    return $this->height === $dimension->getHeight() &&
-           $this->width === $dimension->getWidth();
-  }
+    /**
+     * Check whether the given dimension is the same as the instance.
+     *
+     * @param WebDriverDimension $dimension The dimension to be compared with.
+     * @return bool Whether the height and the width are the same as the
+     *              instance.
+     */
+    public function equals(WebDriverDimension $dimension)
+    {
+        return $this->height === $dimension->getHeight() && $this->width === $dimension->getWidth();
+    }
 }
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index c8caea4d9..202a3ec93 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -17,68 +17,75 @@
 
 use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
 
-class WebDriverDispatcher {
+class WebDriverDispatcher
+{
+    /**
+     * @var array
+     */
+    protected $listeners = array();
+    /**
+     * @var EventFiringWebDriver
+     */
+    protected $driver = null;
 
-  /**
-   * @var array
-   */
-  protected $listeners = array();
+    /**
+     * this is needed so that EventFiringWebElement can pass the driver to the
+     * exception handling
+     *
+     * @param EventFiringWebDriver $driver
+     * @return $this
+     */
+    public function setDefaultDriver(EventFiringWebDriver $driver)
+    {
+        $this->driver = $driver;
 
-  /**
-   * @var EventFiringWebDriver
-   */
-  protected $driver = null;
-
-  /**
-   * this is needed so that EventFiringWebElement can pass the driver to the
-   * exception handling
-   *
-   * @param EventFiringWebDriver $driver
-   * @return $this
-   */
-  public function setDefaultDriver(EventFiringWebDriver $driver) {
-    $this->driver = $driver;
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * @return null|EventFiringWebDriver
-   */
-  public function getDefaultDriver() {
-    return $this->driver;
-  }
+    /**
+     * @return null|EventFiringWebDriver
+     */
+    public function getDefaultDriver()
+    {
+        return $this->driver;
+    }
 
-  /**
-   * @param WebDriverEventListener $listener
-   * @return $this
-   */
-  public function register(WebDriverEventListener $listener) {
-    $this->listeners[] = $listener;
-    return $this;
-  }
+    /**
+     * @param WebDriverEventListener $listener
+     * @return $this
+     */
+    public function register(WebDriverEventListener $listener)
+    {
+        $this->listeners[] = $listener;
 
-  /**
-   * @param WebDriverEventListener $listener
-   * @return $this
-   */
-  public function unregister(WebDriverEventListener $listener) {
-    $key = array_search($listener, $this->listeners, true);
-    if ($key !== false) {
-      unset($this->listeners[$key]);
+        return $this;
     }
-    return $this;
-  }
 
-  /**
-   * @param mixed $method
-   * @param mixed $arguments
-   * @return $this
-   */
-  public function dispatch($method, $arguments) {
-    foreach ($this->listeners as $listener) {
-      call_user_func_array(array($listener, $method), $arguments);
+    /**
+     * @param WebDriverEventListener $listener
+     * @return $this
+     */
+    public function unregister(WebDriverEventListener $listener)
+    {
+        $key = array_search($listener, $this->listeners, true);
+        if ($key !== false) {
+            unset($this->listeners[$key]);
+        }
+
+        return $this;
     }
-    return $this;
-  }
 
+    /**
+     * @param mixed $method
+     * @param mixed $arguments
+     * @return $this
+     */
+    public function dispatch($method, $arguments)
+    {
+        foreach ($this->listeners as $listener) {
+            call_user_func_array(array($listener, $method), $arguments);
+        }
+
+        return $this;
+    }
 }
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index d49190604..6eb7df5c6 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -18,119 +18,119 @@
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
-interface WebDriverElement extends WebDriverSearchContext {
-
-  /**
-   * If this element is a TEXTAREA or text INPUT element, this will clear the
-   * value.
-   *
-   * @return WebDriverElement The current instance.
-   */
-  public function clear();
-
-  /**
-   * Click this element.
-   *
-   * @return WebDriverElement The current instance.
-   */
-  public function click();
-
-  /**
-   * Get the value of a the given attribute of the element.
-   *
-   * @param string $attribute_name The name of the attribute.
-   * @return string The value of the attribute.
-   */
-  public function getAttribute($attribute_name);
-
-  /**
-   * Get the value of a given CSS property.
-   *
-   * @param string $css_property_name The name of the CSS property.
-   * @return string The value of the CSS property.
-   */
-  public function getCSSValue($css_property_name);
-
-  /**
-   * Get the location of element relative to the top-left corner of the page.
-   *
-   * @return WebDriverPoint The location of the element.
-   */
-  public function getLocation();
-
-  /**
-   * Try scrolling the element into the view port and return the location of
-   * element relative to the top-left corner of the page afterwards.
-   *
-   * @return WebDriverPoint The location of the element.
-   */
-  public function getLocationOnScreenOnceScrolledIntoView();
-
-  /**
-   * Get the size of element.
-   *
-   * @return WebDriverDimension The dimension of the element.
-   */
-  public function getSize();
-
-  /**
-   * Get the tag name of this element.
-   *
-   * @return string The tag name.
-   */
-  public function getTagName();
-
-  /**
-   * Get the visible (i.e. not hidden by CSS) innerText of this element,
-   * including sub-elements, without any leading or trailing whitespace.
-   *
-   * @return string The visible innerText of this element.
-   */
-  public function getText();
-
-  /**
-   * Is this element displayed or not? This method avoids the problem of having
-   * to parse an element's "style" attribute.
-   *
-   * @return bool
-   */
-  public function isDisplayed();
-
-  /**
-   * Is the element currently enabled or not? This will generally return true
-   * for everything but disabled input elements.
-   *
-   * @return bool
-   */
-  public function isEnabled();
-
-  /**
-   * Determine whether or not this element is selected or not.
-   *
-   * @return bool
-   */
-  public function isSelected();
-
-  /**
-   * Simulate typing into an element, which may set its value.
-   *
-   * @param mixed $value The data to be typed.
-   * @return WebDriverElement The current instance.
-   */
-  public function sendKeys($value);
-
-  /**
-   * If this current element is a form, or an element within a form, then this
-   * will be submitted to the remote server.
-   *
-   * @return WebDriverElement The current instance.
-   */
-  public function submit();
-
-  /**
-   * Get the opaque ID of the element.
-   *
-   * @return string The opaque ID.
-   */
-  public function getID();
+interface WebDriverElement extends WebDriverSearchContext
+{
+    /**
+     * If this element is a TEXTAREA or text INPUT element, this will clear the
+     * value.
+     *
+     * @return WebDriverElement The current instance.
+     */
+    public function clear();
+
+    /**
+     * Click this element.
+     *
+     * @return WebDriverElement The current instance.
+     */
+    public function click();
+
+    /**
+     * Get the value of a the given attribute of the element.
+     *
+     * @param string $attribute_name The name of the attribute.
+     * @return string The value of the attribute.
+     */
+    public function getAttribute($attribute_name);
+
+    /**
+     * Get the value of a given CSS property.
+     *
+     * @param string $css_property_name The name of the CSS property.
+     * @return string The value of the CSS property.
+     */
+    public function getCSSValue($css_property_name);
+
+    /**
+     * Get the location of element relative to the top-left corner of the page.
+     *
+     * @return WebDriverPoint The location of the element.
+     */
+    public function getLocation();
+
+    /**
+     * Try scrolling the element into the view port and return the location of
+     * element relative to the top-left corner of the page afterwards.
+     *
+     * @return WebDriverPoint The location of the element.
+     */
+    public function getLocationOnScreenOnceScrolledIntoView();
+
+    /**
+     * Get the size of element.
+     *
+     * @return WebDriverDimension The dimension of the element.
+     */
+    public function getSize();
+
+    /**
+     * Get the tag name of this element.
+     *
+     * @return string The tag name.
+     */
+    public function getTagName();
+
+    /**
+     * Get the visible (i.e. not hidden by CSS) innerText of this element,
+     * including sub-elements, without any leading or trailing whitespace.
+     *
+     * @return string The visible innerText of this element.
+     */
+    public function getText();
+
+    /**
+     * Is this element displayed or not? This method avoids the problem of having
+     * to parse an element's "style" attribute.
+     *
+     * @return bool
+     */
+    public function isDisplayed();
+
+    /**
+     * Is the element currently enabled or not? This will generally return true
+     * for everything but disabled input elements.
+     *
+     * @return bool
+     */
+    public function isEnabled();
+
+    /**
+     * Determine whether or not this element is selected or not.
+     *
+     * @return bool
+     */
+    public function isSelected();
+
+    /**
+     * Simulate typing into an element, which may set its value.
+     *
+     * @param mixed $value The data to be typed.
+     * @return WebDriverElement The current instance.
+     */
+    public function sendKeys($value);
+
+    /**
+     * If this current element is a form, or an element within a form, then this
+     * will be submitted to the remote server.
+     *
+     * @return WebDriverElement The current instance.
+     */
+    public function submit();
+
+    /**
+     * Get the opaque ID of the element.
+     *
+     * @return string The opaque ID.
+     */
+    public function getID();
 }
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index afea9c0fd..074adebf6 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -19,110 +19,89 @@
 use Facebook\WebDriver\Support\Events\EventFiringWebDriver;
 use Facebook\WebDriver\Support\Events\EventFiringWebElement;
 
-interface WebDriverEventListener {
-
-  /**
-   * @param string               $url
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function beforeNavigateTo($url, EventFiringWebDriver $driver);
-
-  /**
-   * @param string               $url
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function afterNavigateTo($url, EventFiringWebDriver $driver);
-
-  /**
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function beforeNavigateBack(EventFiringWebDriver $driver);
-
-  /**
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function afterNavigateBack(EventFiringWebDriver $driver);
-
-  /**
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function beforeNavigateForward(EventFiringWebDriver $driver);
-
-  /**
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function afterNavigateForward(EventFiringWebDriver $driver);
-
-  /**
-   * @param WebDriverBy          $by
-   * @param EventFiringWebElement|null $element
-   * @param EventFiringWebDriver  $driver
-   * @return void
-   */
-  public function beforeFindBy(WebDriverBy $by,
-                               $element,
-                               EventFiringWebDriver $driver);
-
-  /**
-   * @param WebDriverBy           $by
-   * @param EventFiringWebElement|null $element
-   * @param EventFiringWebDriver  $driver
-   * @return void
-   */
-  public function afterFindBy(WebDriverBy $by,
-                              $element,
-                              EventFiringWebDriver $driver);
-
-  /**
-   * @param string               $script
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function beforeScript($script, EventFiringWebDriver $driver);
-
-  /**
-   * @param string               $script
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function afterScript($script, EventFiringWebDriver $driver);
-
-  /**
-   * @param EventFiringWebElement $element
-   * @return void
-   */
-  public function beforeClickOn(EventFiringWebElement $element);
-
-  /**
-   * @param EventFiringWebElement $element
-   * @return void
-   */
-  public function afterClickOn(EventFiringWebElement $element);
-
-  /**
-   * @param EventFiringWebElement $element
-   * @return void
-   */
-  public function beforeChangeValueOf(EventFiringWebElement $element);
-
-  /**
-   * @param EventFiringWebElement $element
-   * @return void
-   */
-  public function afterChangeValueOf(EventFiringWebElement $element);
-
-  /**
-   * @param WebDriverException   $exception
-   * @param EventFiringWebDriver $driver
-   * @return void
-   */
-  public function onException(WebDriverException $exception,
-                              EventFiringWebDriver $driver = null);
-
+interface WebDriverEventListener
+{
+    /**
+     * @param string $url
+     * @param EventFiringWebDriver $driver
+     */
+    public function beforeNavigateTo($url, EventFiringWebDriver $driver);
+
+    /**
+     * @param string $url
+     * @param EventFiringWebDriver $driver
+     */
+    public function afterNavigateTo($url, EventFiringWebDriver $driver);
+
+    /**
+     * @param EventFiringWebDriver $driver
+     */
+    public function beforeNavigateBack(EventFiringWebDriver $driver);
+
+    /**
+     * @param EventFiringWebDriver $driver
+     */
+    public function afterNavigateBack(EventFiringWebDriver $driver);
+
+    /**
+     * @param EventFiringWebDriver $driver
+     */
+    public function beforeNavigateForward(EventFiringWebDriver $driver);
+
+    /**
+     * @param EventFiringWebDriver $driver
+     */
+    public function afterNavigateForward(EventFiringWebDriver $driver);
+
+    /**
+     * @param WebDriverBy $by
+     * @param EventFiringWebElement|null $element
+     * @param EventFiringWebDriver $driver
+     */
+    public function beforeFindBy(WebDriverBy $by, $element, EventFiringWebDriver $driver);
+
+    /**
+     * @param WebDriverBy $by
+     * @param EventFiringWebElement|null $element
+     * @param EventFiringWebDriver $driver
+     */
+    public function afterFindBy(WebDriverBy $by, $element, EventFiringWebDriver $driver);
+
+    /**
+     * @param string $script
+     * @param EventFiringWebDriver $driver
+     */
+    public function beforeScript($script, EventFiringWebDriver $driver);
+
+    /**
+     * @param string $script
+     * @param EventFiringWebDriver $driver
+     */
+    public function afterScript($script, EventFiringWebDriver $driver);
+
+    /**
+     * @param EventFiringWebElement $element
+     */
+    public function beforeClickOn(EventFiringWebElement $element);
+
+    /**
+     * @param EventFiringWebElement $element
+     */
+    public function afterClickOn(EventFiringWebElement $element);
+
+    /**
+     * @param EventFiringWebElement $element
+     */
+    public function beforeChangeValueOf(EventFiringWebElement $element);
+
+    /**
+     * @param EventFiringWebElement $element
+     */
+    public function afterChangeValueOf(EventFiringWebElement $element);
+
+    /**
+     * @param WebDriverException $exception
+     * @param EventFiringWebDriver $driver
+     */
+    public function onException(WebDriverException $exception, EventFiringWebDriver $driver = null);
 }
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 3de9a9731..8c069bd41 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -15,402 +15,427 @@
 
 namespace Facebook\WebDriver;
 
-use Facebook\WebDriver\Exception\StaleElementReferenceException;
-use Facebook\WebDriver\Exception\NoSuchFrameException;
-use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\NoAlertOpenException;
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\NoSuchFrameException;
+use Facebook\WebDriver\Exception\StaleElementReferenceException;
 
 /**
  * Canned ExpectedConditions which are generally useful within webdriver tests.
  *
  * @see WebDriverWait
  */
-class WebDriverExpectedCondition {
-
-  /**
-   * A closure function to be executed by WebDriverWait. It should return
-   * a truthy value, mostly boolean or a WebDriverElement, on success.
-   */
-  private $apply;
-
-  /**
-   * @return (function():T) a closure function to be executed by WebDriverWait
-   */
-  public function getApply() {
-    return $this->apply;
-  }
-
-  protected function __construct($apply) {
-    $this->apply = $apply;
-  }
-
-  /**
-   * An expectation for checking the title of a page.
-   *
-   * @param string $title The expected title, which must be an exact match.
-   * @return bool WebDriverExpectedCondition True when the title matches,
-   *         false otherwise.
-   */
-  public static function titleIs($title) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($title) {
-        return $title === $driver->getTitle();
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking substring of a page Title.
-   *
-   * @param string $title The expected substring of Title.
-   * @return bool WebDriverExpectedCondition True when in title,
-   *         false otherwise.
-   */
-  public static function titleContains($title) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($title) {
-        return strpos($driver->getTitle(), $title) !== false;
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that an element is present on the DOM of a
-   * page. This does not necessarily mean that the element is visible.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @return WebDriverExpectedCondition<WebDriverElement> The element which
-   *         is located.
-   */
-  public static function presenceOfElementLocated(WebDriverBy $by) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by) {
-        return $driver->findElement($by);
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that an element is present on the DOM of a page
-   * and visible. Visibility means that the element is not only displayed but
-   * also has a height and width that is greater than 0.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @return WebDriverExpectedCondition<WebDriverElement> The element which is
-   *         located and visible.
-   */
-  public static function visibilityOfElementLocated(WebDriverBy $by) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by) {
-        try {
-          $element = $driver->findElement($by);
-          return $element->isDisplayed() ? $element : null;
-        } catch (StaleElementReferenceException $e) {
-          return null;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that an element, known to be present on the DOM
-   * of a page, is visible. Visibility means that the element is not only
-   * displayed but also has a height and width that is greater than 0.
-   *
-   * @param WebDriverElement $element The element to be checked.
-   * @return WebDriverExpectedCondition<WebDriverElement> The same
-   *         WebDriverElement once it is visible.
-   */
-  public static function visibilityOf(WebDriverElement $element) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($element) {
-        return $element->isDisplayed() ? $element : null;
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that there is at least one element present on a
-   * web page.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @return WebDriverExpectedCondition<array> An array of WebDriverElements
-   *         once they are located.
-   */
-  public static function presenceOfAllElementsLocatedBy(WebDriverBy $by) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by) {
-        $elements = $driver->findElements($by);
-        return count($elements) > 0 ? $elements : null;
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking if the given text is present in the specified
-   * element.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @param string $text The text to be presented in the element.
-   * @return bool WebDriverExpectedCondition Whether the text is presented.
-   */
-  public static function textToBePresentInElement(
-      WebDriverBy $by, $text) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by, $text) {
-        try {
-          $element_text = $driver->findElement($by)->getText();
-          return strpos($element_text, $text) !== false;
-        } catch (StaleElementReferenceException $e) {
-          return null;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking if the given text is present in the specified
-   * elements value attribute.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @param string $text The text to be presented in the element value.
-   * @return bool WebDriverExpectedCondition Whether the text is presented.
-   */
-  public static function textToBePresentInElementValue(
-      WebDriverBy $by, $text) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by, $text) {
-        try {
-          $element_text = $driver->findElement($by)->getAttribute('value');
-          return strpos($element_text, $text) !== false;
-        } catch (StaleElementReferenceException $e) {
-          return null;
-        }
-      }
-    );
-  }
-
-  /**
-   * Expectation for checking if iFrame exists.
-   * If iFrame exists switches driver's focus to the iFrame
-   *
-   * @param string $frame_locator The locator used to find the iFrame
-   *   expected to be either the id or name value of the i/frame
-   * @return WebDriverExpectedCondition<WebDriver> object focused on new frame
-   *         when frame is found bool false otherwise
-   */
-  public static function frameToBeAvailableAndSwitchToIt($frame_locator) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($frame_locator) {
-        try {
-          return $driver->switchTo()->frame($frame_locator);
-        } catch (NoSuchFrameException $e) {
-          return false;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that an element is either invisible or not
-   * present on the DOM.
-   *
-   * @param WebDriverBy $by The locator used to find the element.
-   * @return bool WebDriverExpectedCondition Whether there is no element
-   *         located.
-   */
-  public static function invisibilityOfElementLocated(WebDriverBy $by) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by) {
-        try {
-          return !($driver->findElement($by)->isDisplayed());
-        } catch (NoSuchElementException $e) {
-          return true;
-        } catch (StaleElementReferenceException $e) {
-          return true;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking that an element with text is either invisible
-   * or not present on the DOM.
-   *
-   * @param WebdriverBy $by The locator used to find the element.
-   * @param string $text The text of the element.
-   * @return bool WebDriverExpectedCondition Whether the text is found in the
-   *         element located.
-   */
-  public static function invisibilityOfElementWithText(
-      WebDriverBy $by, $text) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($by, $text) {
-        try {
-          return !($driver->findElement($by)->getText() === $text);
-        } catch (NoSuchElementException $e) {
-          return true;
-        } catch (StaleElementReferenceException $e) {
-          return true;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking an element is visible and enabled such that you
-   * can click it.
-   *
-   * @param WebDriverBy $by The locator used to find the element
-   * @return WebDriverExpectedCondition<WebDriverElement> The WebDriverElement
-   *         once it is located, visible and clickable
-   */
-  public static function elementToBeClickable(WebDriverBy $by) {
-    $visibility_of_element_located =
-      WebDriverExpectedCondition::visibilityOfElementLocated($by);
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($visibility_of_element_located) {
-        $element = call_user_func(
-          $visibility_of_element_located->getApply(),
-          $driver
+class WebDriverExpectedCondition
+{
+    /**
+     * A closure function to be executed by WebDriverWait. It should return
+     * a truthy value, mostly boolean or a WebDriverElement, on success.
+     */
+    private $apply;
+
+    /**
+     * @return (function():T) a closure function to be executed by WebDriverWait
+     */
+    public function getApply()
+    {
+        return $this->apply;
+    }
+
+    protected function __construct($apply)
+    {
+        $this->apply = $apply;
+    }
+
+    /**
+     * An expectation for checking the title of a page.
+     *
+     * @param string $title The expected title, which must be an exact match.
+     * @return bool WebDriverExpectedCondition True when the title matches,
+     *         false otherwise.
+     */
+    public static function titleIs($title)
+    {
+        return new self(
+            function ($driver) use ($title) {
+                return $title === $driver->getTitle();
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking substring of a page Title.
+     *
+     * @param string $title The expected substring of Title.
+     * @return bool WebDriverExpectedCondition True when in title,
+     *         false otherwise.
+     */
+    public static function titleContains($title)
+    {
+        return new self(
+            function ($driver) use ($title) {
+                return strpos($driver->getTitle(), $title) !== false;
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element is present on the DOM of a
+     * page. This does not necessarily mean that the element is visible.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @return WebDriverExpectedCondition<WebDriverElement> The element which
+     *         is located.
+     */
+    public static function presenceOfElementLocated(WebDriverBy $by)
+    {
+        return new self(
+            function ($driver) use ($by) {
+                return $driver->findElement($by);
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element is present on the DOM of a page
+     * and visible. Visibility means that the element is not only displayed but
+     * also has a height and width that is greater than 0.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @return WebDriverExpectedCondition<WebDriverElement> The element which is
+     *         located and visible.
+     */
+    public static function visibilityOfElementLocated(WebDriverBy $by)
+    {
+        return new self(
+            function ($driver) use ($by) {
+                try {
+                    $element = $driver->findElement($by);
+
+                    return $element->isDisplayed() ? $element : null;
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element, known to be present on the DOM
+     * of a page, is visible. Visibility means that the element is not only
+     * displayed but also has a height and width that is greater than 0.
+     *
+     * @param WebDriverElement $element The element to be checked.
+     * @return WebDriverExpectedCondition<WebDriverElement> The same
+     *         WebDriverElement once it is visible.
+     */
+    public static function visibilityOf(WebDriverElement $element)
+    {
+        return new self(
+            function ($driver) use ($element) {
+                return $element->isDisplayed() ? $element : null;
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that there is at least one element present on a
+     * web page.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @return WebDriverExpectedCondition<array> An array of WebDriverElements
+     *         once they are located.
+     */
+    public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
+    {
+        return new self(
+            function ($driver) use ($by) {
+                $elements = $driver->findElements($by);
+
+                return count($elements) > 0 ? $elements : null;
+            }
         );
-        try {
-          if ($element !== null && $element->isEnabled()) {
-            return $element;
-          } else {
-            return null;
-          }
-        } catch (StaleElementReferenceException $e) {
-          return null;
-        }
-      }
-    );
-  }
-
-  /**
-   * Wait until an element is no longer attached to the DOM.
-   *
-   * @param WebDriverElement $element The element to wait for.
-   * @return bool WebDriverExpectedCondition false if the element is still
-   *         attached to the DOM, true otherwise.
-   */
-  public static function stalenessOf(WebDriverElement $element) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($element) {
-        try {
-          $element->isEnabled();
-          return false;
-        } catch (StaleElementReferenceException $e) {
-          return true;
-        }
-      }
-    );
-  }
-
-  /**
-   * Wrapper for a condition, which allows for elements to update by redrawing.
-   *
-   * This works around the problem of conditions which have two parts: find an
-   * element and then check for some condition on it. For these conditions it is
-   * possible that an element is located and then subsequently it is redrawn on
-   * the client. When this happens a StaleElementReferenceException is thrown
-   * when the second part of the condition is checked.
-   *
-   * @param WebDriverExpectedCondition $condition The condition wrapped.
-   * @return WebDriverExpectedCondition<mixed> The return value of the
-   *         getApply() of the given condition.
-   */
-  public static function refreshed(WebDriverExpectedCondition $condition) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($condition) {
-        try {
-          return call_user_func($condition->getApply(), $driver);
-        } catch (StaleElementReferenceException $e) {
-          return null;
-        }
-      }
-    );
-  }
-
-  /**
-   * An expectation for checking if the given element is selected.
-   *
-   * @param mixed $element_or_by Either the element or the locator.
-   * @return bool WebDriverExpectedCondition whether the element is selected.
-   */
-  public static function elementToBeSelected($element_or_by) {
-    return WebDriverExpectedCondition::elementSelectionStateToBe(
-      $element_or_by,
-      true
-    );
-  }
-
-  /**
-   * An expectation for checking if the given element is selected.
-   *
-   * @param mixed $element_or_by Either the element or the locator.
-   * @param bool $selected The required state.
-   * @return bool WebDriverExpectedCondition Whether the element is selected.
-   */
-  public static function elementSelectionStateToBe(
-      $element_or_by,
-      $selected
-  ) {
-    if ($element_or_by instanceof WebDriverElement) {
-      return new WebDriverExpectedCondition(
-        function ($driver) use ($element_or_by, $selected) {
-          return $element_or_by->isSelected() === $selected;
-        }
-      );
-    } else if ($element_or_by instanceof WebDriverBy) {
-      return new WebDriverExpectedCondition(
-        function ($driver) use ($element_or_by, $selected) {
-          try {
-            $element = $driver->findElement($element_or_by);
-            return $element->isSelected() === $selected;
-          } catch (StaleElementReferenceException $e) {
-            return null;
-          }
-        }
-      );
     }
-  }
-
-  /**
-   * An expectation for whether an alert() box is present.
-   *
-   * @return WebDriverExpectedCondition<?WebDriverAlert> if alert() is present,
-   *         null otherwise.
-   */
-  public static function alertIsPresent() {
-    return new WebDriverExpectedCondition(
-      function ($driver) {
-        try {
-          // Unlike the Java code, we get a WebDriverAlert object regardless
-          // of whether there is an alert.  Calling getText() will throw
-          // an exception if it is not really there.
-          $alert = $driver->switchTo()->alert();
-          $alert->getText();
-          return $alert;
-        } catch (NoAlertOpenException $e) {
-          return null;
+
+    /**
+     * An expectation for checking if the given text is present in the specified
+     * element.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $text The text to be presented in the element.
+     * @return bool WebDriverExpectedCondition Whether the text is presented.
+     */
+    public static function textToBePresentInElement(WebDriverBy $by, $text)
+    {
+        return new self(
+            function ($driver) use ($by, $text) {
+                try {
+                    $element_text = $driver->findElement($by)->getText();
+
+                    return strpos($element_text, $text) !== false;
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking if the given text is present in the specified
+     * elements value attribute.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $text The text to be presented in the element value.
+     * @return bool WebDriverExpectedCondition Whether the text is presented.
+     */
+    public static function textToBePresentInElementValue(WebDriverBy $by, $text)
+    {
+        return new self(
+            function ($driver) use ($by, $text) {
+                try {
+                    $element_text = $driver->findElement($by)->getAttribute('value');
+
+                    return strpos($element_text, $text) !== false;
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * Expectation for checking if iFrame exists.
+     * If iFrame exists switches driver's focus to the iFrame
+     *
+     * @param string $frame_locator The locator used to find the iFrame
+     *   expected to be either the id or name value of the i/frame
+     * @return WebDriverExpectedCondition<WebDriver> object focused on new frame
+     *         when frame is found bool false otherwise
+     */
+    public static function frameToBeAvailableAndSwitchToIt($frame_locator)
+    {
+        return new self(
+            function ($driver) use ($frame_locator) {
+                try {
+                    return $driver->switchTo()->frame($frame_locator);
+                } catch (NoSuchFrameException $e) {
+                    return false;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element is either invisible or not
+     * present on the DOM.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @return bool WebDriverExpectedCondition Whether there is no element
+     *         located.
+     */
+    public static function invisibilityOfElementLocated(WebDriverBy $by)
+    {
+        return new self(
+            function ($driver) use ($by) {
+                try {
+                    return !($driver->findElement($by)->isDisplayed());
+                } catch (NoSuchElementException $e) {
+                    return true;
+                } catch (StaleElementReferenceException $e) {
+                    return true;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element with text is either invisible
+     * or not present on the DOM.
+     *
+     * @param WebdriverBy $by The locator used to find the element.
+     * @param string $text The text of the element.
+     * @return bool WebDriverExpectedCondition Whether the text is found in the
+     *         element located.
+     */
+    public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
+    {
+        return new self(
+            function ($driver) use ($by, $text) {
+                try {
+                    return !($driver->findElement($by)->getText() === $text);
+                } catch (NoSuchElementException $e) {
+                    return true;
+                } catch (StaleElementReferenceException $e) {
+                    return true;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking an element is visible and enabled such that you
+     * can click it.
+     *
+     * @param WebDriverBy $by The locator used to find the element
+     * @return WebDriverExpectedCondition<WebDriverElement> The WebDriverElement
+     *         once it is located, visible and clickable
+     */
+    public static function elementToBeClickable(WebDriverBy $by)
+    {
+        $visibility_of_element_located =
+            self::visibilityOfElementLocated($by);
+
+        return new self(
+            function ($driver) use ($visibility_of_element_located) {
+                $element = call_user_func(
+                    $visibility_of_element_located->getApply(),
+                    $driver
+                );
+                try {
+                    if ($element !== null && $element->isEnabled()) {
+                        return $element;
+                    } else {
+                        return null;
+                    }
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * Wait until an element is no longer attached to the DOM.
+     *
+     * @param WebDriverElement $element The element to wait for.
+     * @return bool WebDriverExpectedCondition false if the element is still
+     *         attached to the DOM, true otherwise.
+     */
+    public static function stalenessOf(WebDriverElement $element)
+    {
+        return new self(
+            function ($driver) use ($element) {
+                try {
+                    $element->isEnabled();
+
+                    return false;
+                } catch (StaleElementReferenceException $e) {
+                    return true;
+                }
+            }
+        );
+    }
+
+    /**
+     * Wrapper for a condition, which allows for elements to update by redrawing.
+     *
+     * This works around the problem of conditions which have two parts: find an
+     * element and then check for some condition on it. For these conditions it is
+     * possible that an element is located and then subsequently it is redrawn on
+     * the client. When this happens a StaleElementReferenceException is thrown
+     * when the second part of the condition is checked.
+     *
+     * @param WebDriverExpectedCondition $condition The condition wrapped.
+     * @return WebDriverExpectedCondition<mixed> The return value of the
+     *         getApply() of the given condition.
+     */
+    public static function refreshed(WebDriverExpectedCondition $condition)
+    {
+        return new self(
+            function ($driver) use ($condition) {
+                try {
+                    return call_user_func($condition->getApply(), $driver);
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking if the given element is selected.
+     *
+     * @param mixed $element_or_by Either the element or the locator.
+     * @return bool WebDriverExpectedCondition whether the element is selected.
+     */
+    public static function elementToBeSelected($element_or_by)
+    {
+        return self::elementSelectionStateToBe(
+            $element_or_by,
+            true
+        );
+    }
+
+    /**
+     * An expectation for checking if the given element is selected.
+     *
+     * @param mixed $element_or_by Either the element or the locator.
+     * @param bool $selected The required state.
+     * @return bool WebDriverExpectedCondition Whether the element is selected.
+     */
+    public static function elementSelectionStateToBe($element_or_by, $selected)
+    {
+        if ($element_or_by instanceof WebDriverElement) {
+            return new self(
+                function ($driver) use ($element_or_by, $selected) {
+                    return $element_or_by->isSelected() === $selected;
+                }
+            );
+        } else {
+            if ($element_or_by instanceof WebDriverBy) {
+                return new self(
+                    function ($driver) use ($element_or_by, $selected) {
+                        try {
+                            $element = $driver->findElement($element_or_by);
+
+                            return $element->isSelected() === $selected;
+                        } catch (StaleElementReferenceException $e) {
+                            return null;
+                        }
+                    }
+                );
+            }
         }
-      }
-    );
-  }
-
-  /**
-   * An expectation with the logical opposite condition of the given condition.
-   *
-   * @param WebDriverExpectedCondition $condition The condition to be negated.
-   * @return mixed The negation of the result of the given condition.
-   */
-  public static function not(WebDriverExpectedCondition $condition) {
-    return new WebDriverExpectedCondition(
-      function ($driver) use ($condition) {
-        $result = call_user_func($condition->getApply(), $driver);
-        return !$result;
-      }
-    );
-  }
+    }
+
+    /**
+     * An expectation for whether an alert() box is present.
+     *
+     * @return WebDriverExpectedCondition<?WebDriverAlert> if alert() is present,
+     *         null otherwise.
+     */
+    public static function alertIsPresent()
+    {
+        return new self(
+            function ($driver) {
+                try {
+                    // Unlike the Java code, we get a WebDriverAlert object regardless
+                    // of whether there is an alert.  Calling getText() will throw
+                    // an exception if it is not really there.
+                    $alert = $driver->switchTo()->alert();
+                    $alert->getText();
+
+                    return $alert;
+                } catch (NoAlertOpenException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation with the logical opposite condition of the given condition.
+     *
+     * @param WebDriverExpectedCondition $condition The condition to be negated.
+     * @return mixed The negation of the result of the given condition.
+     */
+    public static function not(WebDriverExpectedCondition $condition)
+    {
+        return new self(
+            function ($driver) use ($condition) {
+                $result = call_user_func($condition->getApply(), $driver);
+
+                return !$result;
+            }
+        );
+    }
 }
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 76c82dddc..93e42a30a 100644
--- a/lib/WebDriverHasInputDevices.php
+++ b/lib/WebDriverHasInputDevices.php
@@ -18,15 +18,15 @@
 /**
  * Interface implemented by each driver that allows access to the input devices.
  */
-interface WebDriverHasInputDevices {
+interface WebDriverHasInputDevices
+{
+    /**
+     * @return WebDriverKeyBoard
+     */
+    public function getKeyboard();
 
-  /**
-   * @return WebDriverKeyBoard
-   */
-  public function getKeyboard();
-
-  /**
-   * @return WebDriverMouse
-   */
-  public function getMouse();
+    /**
+     * @return WebDriverMouse
+     */
+    public function getMouse();
 }
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index 042e47108..f44582a12 100644
--- a/lib/WebDriverKeyboard.php
+++ b/lib/WebDriverKeyboard.php
@@ -15,31 +15,31 @@
 
 namespace Facebook\WebDriver;
 
-interface WebDriverKeyboard {
+interface WebDriverKeyboard
+{
+    /**
+     * Send a sequence of keys.
+     *
+     * @param string $keys
+     * @return $this
+     */
+    public function sendKeys($keys);
 
-  /**
-   * Send a sequence of keys.
-   *
-   * @param string $keys
-   * @return $this
-   */
-  public function sendKeys($keys);
+    /**
+     * Press a key
+     *
+     * @see WebDriverKeys
+     * @param string $key
+     * @return $this
+     */
+    public function pressKey($key);
 
-  /**
-   * Press a key
-   *
-   * @see WebDriverKeys
-   * @param string $key
-   * @return $this
-   */
-  public function pressKey($key);
-
-  /**
-   * Release a key
-   *
-   * @see WebDriverKeys
-   * @param string $key
-   * @return $this
-   */
-  public function releaseKey($key);
+    /**
+     * Release a key
+     *
+     * @see WebDriverKeys
+     * @param string $key
+     * @return $this
+     */
+    public function releaseKey($key);
 }
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index b946cec9f..ecab819b6 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -19,97 +19,97 @@
  * Representations of pressable keys that aren't text.
  * These are stored in the Unicode PUA (Private Use Area) code points.
  */
-class WebDriverKeys {
+class WebDriverKeys
+{
+    const NULL = "\xEE\x80\x80";
+    const CANCEL = "\xEE\x80\x81";
+    const HELP = "\xEE\x80\x82";
+    const BACKSPACE = "\xEE\x80\x83";
+    const TAB = "\xEE\x80\x84";
+    const CLEAR = "\xEE\x80\x85";
+    const RETURN_KEY = "\xEE\x80\x86"; // php does not allow RETURN
+    const ENTER = "\xEE\x80\x87";
+    const SHIFT = "\xEE\x80\x88";
+    const LEFT_SHIFT = "\xEE\x80\x88";
+    const CONTROL = "\xEE\x80\x89";
+    const LEFT_CONTROL = "\xEE\x80\x89";
+    const ALT = "\xEE\x80\x8A";
+    const LEFT_ALT = "\xEE\x80\x8A";
+    const PAUSE = "\xEE\x80\x8B";
+    const ESCAPE = "\xEE\x80\x8C";
+    const SPACE = "\xEE\x80\x8D";
+    const PAGE_UP = "\xEE\x80\x8E";
+    const PAGE_DOWN = "\xEE\x80\x8F";
+    const END = "\xEE\x80\x90";
+    const HOME = "\xEE\x80\x91";
+    const LEFT = "\xEE\x80\x92";
+    const ARROW_LEFT = "\xEE\x80\x92";
+    const UP = "\xEE\x80\x93";
+    const ARROW_UP = "\xEE\x80\x93";
+    const RIGHT = "\xEE\x80\x94";
+    const ARROW_RIGHT = "\xEE\x80\x94";
+    const DOWN = "\xEE\x80\x95";
+    const ARROW_DOWN = "\xEE\x80\x95";
+    const INSERT = "\xEE\x80\x96";
+    const DELETE = "\xEE\x80\x97";
+    const SEMICOLON = "\xEE\x80\x98";
+    const EQUALS = "\xEE\x80\x99";
+    const NUMPAD0 = "\xEE\x80\x9A";
+    const NUMPAD1 = "\xEE\x80\x9B";
+    const NUMPAD2 = "\xEE\x80\x9C";
+    const NUMPAD3 = "\xEE\x80\x9D";
+    const NUMPAD4 = "\xEE\x80\x9E";
+    const NUMPAD5 = "\xEE\x80\x9F";
+    const NUMPAD6 = "\xEE\x80\xA0";
+    const NUMPAD7 = "\xEE\x80\xA1";
+    const NUMPAD8 = "\xEE\x80\xA2";
+    const NUMPAD9 = "\xEE\x80\xA3";
+    const MULTIPLY = "\xEE\x80\xA4";
+    const ADD = "\xEE\x80\xA5";
+    const SEPARATOR = "\xEE\x80\xA6";
+    const SUBTRACT = "\xEE\x80\xA7";
+    const DECIMAL = "\xEE\x80\xA8";
+    const DIVIDE = "\xEE\x80\xA9";
+    const F1 = "\xEE\x80\xB1";
+    const F2 = "\xEE\x80\xB2";
+    const F3 = "\xEE\x80\xB3";
+    const F4 = "\xEE\x80\xB4";
+    const F5 = "\xEE\x80\xB5";
+    const F6 = "\xEE\x80\xB6";
+    const F7 = "\xEE\x80\xB7";
+    const F8 = "\xEE\x80\xB8";
+    const F9 = "\xEE\x80\xB9";
+    const F10 = "\xEE\x80\xBA";
+    const F11 = "\xEE\x80\xBB";
+    const F12 = "\xEE\x80\xBC";
+    const META = "\xEE\x80\xBD";
+    const COMMAND = "\xEE\x80\xBD"; // ALIAS
+    const ZENKAKU_HANKAKU = "\xEE\x80\xC0";
 
-  const NULL            = "\xEE\x80\x80";
-  const CANCEL          = "\xEE\x80\x81";
-  const HELP            = "\xEE\x80\x82";
-  const BACKSPACE       = "\xEE\x80\x83";
-  const TAB             = "\xEE\x80\x84";
-  const CLEAR           = "\xEE\x80\x85";
-  const RETURN_KEY      = "\xEE\x80\x86"; // php does not allow RETURN
-  const ENTER           = "\xEE\x80\x87";
-  const SHIFT           = "\xEE\x80\x88";
-  const LEFT_SHIFT      = "\xEE\x80\x88";
-  const CONTROL         = "\xEE\x80\x89";
-  const LEFT_CONTROL    = "\xEE\x80\x89";
-  const ALT             = "\xEE\x80\x8A";
-  const LEFT_ALT        = "\xEE\x80\x8A";
-  const PAUSE           = "\xEE\x80\x8B";
-  const ESCAPE          = "\xEE\x80\x8C";
-  const SPACE           = "\xEE\x80\x8D";
-  const PAGE_UP         = "\xEE\x80\x8E";
-  const PAGE_DOWN       = "\xEE\x80\x8F";
-  const END             = "\xEE\x80\x90";
-  const HOME            = "\xEE\x80\x91";
-  const LEFT            = "\xEE\x80\x92";
-  const ARROW_LEFT      = "\xEE\x80\x92";
-  const UP              = "\xEE\x80\x93";
-  const ARROW_UP        = "\xEE\x80\x93";
-  const RIGHT           = "\xEE\x80\x94";
-  const ARROW_RIGHT     = "\xEE\x80\x94";
-  const DOWN            = "\xEE\x80\x95";
-  const ARROW_DOWN      = "\xEE\x80\x95";
-  const INSERT          = "\xEE\x80\x96";
-  const DELETE          = "\xEE\x80\x97";
-  const SEMICOLON       = "\xEE\x80\x98";
-  const EQUALS          = "\xEE\x80\x99";
-  const NUMPAD0         = "\xEE\x80\x9A";
-  const NUMPAD1         = "\xEE\x80\x9B";
-  const NUMPAD2         = "\xEE\x80\x9C";
-  const NUMPAD3         = "\xEE\x80\x9D";
-  const NUMPAD4         = "\xEE\x80\x9E";
-  const NUMPAD5         = "\xEE\x80\x9F";
-  const NUMPAD6         = "\xEE\x80\xA0";
-  const NUMPAD7         = "\xEE\x80\xA1";
-  const NUMPAD8         = "\xEE\x80\xA2";
-  const NUMPAD9         = "\xEE\x80\xA3";
-  const MULTIPLY        = "\xEE\x80\xA4";
-  const ADD             = "\xEE\x80\xA5";
-  const SEPARATOR       = "\xEE\x80\xA6";
-  const SUBTRACT        = "\xEE\x80\xA7";
-  const DECIMAL         = "\xEE\x80\xA8";
-  const DIVIDE          = "\xEE\x80\xA9";
-  const F1              = "\xEE\x80\xB1";
-  const F2              = "\xEE\x80\xB2";
-  const F3              = "\xEE\x80\xB3";
-  const F4              = "\xEE\x80\xB4";
-  const F5              = "\xEE\x80\xB5";
-  const F6              = "\xEE\x80\xB6";
-  const F7              = "\xEE\x80\xB7";
-  const F8              = "\xEE\x80\xB8";
-  const F9              = "\xEE\x80\xB9";
-  const F10             = "\xEE\x80\xBA";
-  const F11             = "\xEE\x80\xBB";
-  const F12             = "\xEE\x80\xBC";
-  const META            = "\xEE\x80\xBD";
-  const COMMAND         = "\xEE\x80\xBD"; // ALIAS
-  const ZENKAKU_HANKAKU = "\xEE\x80\xC0";
+    /**
+     * Encode input of `sendKeys()`.
+     * @param string|array $keys
+     * @return array
+     */
+    public static function encode($keys)
+    {
+        if (is_numeric($keys)) {
+            $keys = '' . $keys;
+        }
 
-  /**
-   * Encode input of `sendKeys()`.
-   * @param string|array $keys
-   * @return array
-   */
-  public static function encode($keys) {
+        if (is_string($keys)) {
+            $keys = array($keys);
+        }
 
-    if (is_numeric($keys)) {
-      $keys = '' . $keys;
-    }
-
-    if (is_string($keys)) {
-      $keys = array($keys);
-    }
+        $encoded = array();
+        foreach ($keys as $key) {
+            if (is_array($key)) {
+                // handle modified keys
+                $key = implode('', $key) . self::NULL;
+            }
+            $encoded[] = (string) $key;
+        }
 
-    $encoded = array();
-    foreach ($keys as $key) {
-      if (is_array($key)) {
-        // handle modified keys
-        $key = implode('', $key).self::NULL;
-      }
-      $encoded[] = (string)$key;
+        return $encoded;
     }
-
-    return $encoded;
-  }
 }
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 847bc2cd0..9fe052119 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -20,45 +20,47 @@
 /**
  * Interface representing basic mouse operations.
  */
-interface WebDriverMouse {
+interface WebDriverMouse
+{
+    /**
+     * @param WebDriverCoordinates $where
+     * @return WebDriverMouse
+     */
+    public function click(WebDriverCoordinates $where);
 
-  /**
-   * @param WebDriverCoordinates $where
-   * @return WebDriverMouse
-   */
-  public function click(WebDriverCoordinates $where);
+    /**
+     * @param WebDriverCoordinates $where
+     * @return WebDriverMouse
+     */
+    public function contextClick(WebDriverCoordinates $where);
 
-  /**
-   * @param WebDriverCoordinates $where
-   * @return WebDriverMouse
-   */
-  public function contextClick(WebDriverCoordinates $where);
+    /**
+     * @param WebDriverCoordinates $where
+     * @return WebDriverMouse
+     */
+    public function doubleClick(WebDriverCoordinates $where);
 
-  /**
-   * @param WebDriverCoordinates $where
-   * @return WebDriverMouse
-   */
-  public function doubleClick(WebDriverCoordinates $where);
+    /**
+     * @param WebDriverCoordinates $where
+     * @return WebDriverMouse
+     */
+    public function mouseDown(WebDriverCoordinates $where);
 
-  /**
-   * @param WebDriverCoordinates $where
-   * @return WebDriverMouse
-   */
-  public function mouseDown(WebDriverCoordinates $where);
+    /**
+     * @param WebDriverCoordinates $where
+     * @param int $x_offset
+     * @param int $y_offset
+     * @return WebDriverMouse
+     */
+    public function mouseMove(
+        WebDriverCoordinates $where,
+        $x_offset = null,
+        $y_offset = null
+    );
 
-  /**
-   * @param WebDriverCoordinates $where
-   * @param int $x_offset
-   * @param int $y_offset
-   * @return WebDriverMouse
-   */
-  public function mouseMove(WebDriverCoordinates $where,
-                            $x_offset = null,
-                            $y_offset = null);
-
-  /**
-   * @param WebDriverCoordinates $where
-   * @return WebDriverMouse
-   */
-  public function mouseUp(WebDriverCoordinates $where);
+    /**
+     * @param WebDriverCoordinates $where
+     * @return WebDriverMouse
+     */
+    public function mouseUp(WebDriverCoordinates $where);
 }
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 8dd382dea..5e06d6257 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -27,53 +27,62 @@
  * FirefoxProfile preferences.
  * https://code.google.com/p/selenium/wiki/DesiredCapabilities#settings
  */
-class WebDriverNavigation {
+class WebDriverNavigation
+{
+    protected $executor;
 
-  protected $executor;
+    public function __construct(ExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
 
-  public function __construct(ExecuteMethod $executor) {
-    $this->executor = $executor;
-  }
+    /**
+     * Move back a single entry in the browser's history, if possible.
+     *
+     * @return WebDriverNavigation The instance.
+     */
+    public function back()
+    {
+        $this->executor->execute(DriverCommand::GO_BACK);
 
-  /**
-   * Move back a single entry in the browser's history, if possible.
-   *
-   * @return WebDriverNavigation The instance.
-   */
-  public function back() {
-    $this->executor->execute(DriverCommand::GO_BACK);
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Move forward a single entry in the browser's history, if possible.
-   *
-   * @return WebDriverNavigation The instance.
-   */
-  public function forward() {
-    $this->executor->execute(DriverCommand::GO_FORWARD);
-    return $this;
-  }
+    /**
+     * Move forward a single entry in the browser's history, if possible.
+     *
+     * @return WebDriverNavigation The instance.
+     */
+    public function forward()
+    {
+        $this->executor->execute(DriverCommand::GO_FORWARD);
 
-  /**
-   * Refresh the current page.
-   *
-   * @return WebDriverNavigation The instance.
-   */
-  public function refresh() {
-    $this->executor->execute(DriverCommand::REFRESH);
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Navigate to the given URL.
-   *
-   * @param string $url
-   * @return WebDriverNavigation The instance.
-   */
-  public function to($url) {
-    $params = array('url' => (string)$url);
-    $this->executor->execute(DriverCommand::GET, $params);
-    return $this;
-  }
+    /**
+     * Refresh the current page.
+     *
+     * @return WebDriverNavigation The instance.
+     */
+    public function refresh()
+    {
+        $this->executor->execute(DriverCommand::REFRESH);
+
+        return $this;
+    }
+
+    /**
+     * Navigate to the given URL.
+     *
+     * @param string $url
+     * @return WebDriverNavigation The instance.
+     */
+    public function to($url)
+    {
+        $params = array('url' => (string) $url);
+        $this->executor->execute(DriverCommand::GET, $params);
+
+        return $this;
+    }
 }
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 9f48b05d1..8b80d3dba 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -22,152 +22,170 @@
 /**
  * Managing stuff you would do in a browser.
  */
-class WebDriverOptions {
-
-  protected $executor;
-
-  public function __construct(ExecuteMethod $executor) {
-    $this->executor = $executor;
-  }
-
-  /**
-   * Add a specific cookie.
-   *
-   * Here are the valid attributes of a cookie array.
-   *  'name'  : string The name of the cookie; may not be null or an empty
-   *                    string.
-   *  'value' : string The cookie value; may not be null.
-   *  'path'  : string The path the cookie is visible to. If left blank or set
-   *                   to null, will be set to "/".
-   *  'domain': string The domain the cookie is visible to. It should be null or
-   *                   the same as the domain of the current URL.
-   *  'secure': bool   Whether this cookie requires a secure connection(https?).
-   *                   It should be null or equal to the security of the current
-   *                   URL.
-   *  'expiry': int    The cookie's expiration date; may be null.
-   *
-   * @param array $cookie An array with key as the attributes mentioned above.
-   * @return WebDriverOptions The current instance.
-   */
-  public function addCookie(array $cookie) {
-    $this->validate($cookie);
-    $this->executor->execute(
-      DriverCommand::ADD_COOKIE,
-      array('cookie' => $cookie)
-    );
-    return $this;
-  }
-
-  /**
-   * Delete all the cookies that are currently visible.
-   *
-   * @return WebDriverOptions The current instance.
-   */
-  public function deleteAllCookies() {
-    $this->executor->execute(DriverCommand::DELETE_ALL_COOKIES);
-    return $this;
-  }
-
-  /**
-   * Delete the cookie with the give name.
-   *
-   * @param string $name
-   * @return WebDriverOptions The current instance.
-   */
-  public function deleteCookieNamed($name) {
-    $this->executor->execute(
-      DriverCommand::DELETE_COOKIE,
-      array(':name' => $name)
-    );
-    return $this;
-  }
-
-  /**
-   * Get the cookie with a given name.
-   *
-   * @param string $name
-   * @return array The cookie, or null if no cookie with the given name is
-   *               presented.
-   */
-  public function getCookieNamed($name) {
-    $cookies = $this->getCookies();
-    foreach ($cookies as $cookie) {
-      if ($cookie['name'] === $name) {
-        return $cookie;
-      }
+class WebDriverOptions
+{
+    protected $executor;
+
+    public function __construct(ExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * Add a specific cookie.
+     *
+     * Here are the valid attributes of a cookie array.
+     *  'name'  : string The name of the cookie; may not be null or an empty
+     *                    string.
+     *  'value' : string The cookie value; may not be null.
+     *  'path'  : string The path the cookie is visible to. If left blank or set
+     *                   to null, will be set to "/".
+     *  'domain': string The domain the cookie is visible to. It should be null or
+     *                   the same as the domain of the current URL.
+     *  'secure': bool   Whether this cookie requires a secure connection(https?).
+     *                   It should be null or equal to the security of the current
+     *                   URL.
+     *  'expiry': int    The cookie's expiration date; may be null.
+     *
+     * @param array $cookie An array with key as the attributes mentioned above.
+     * @return WebDriverOptions The current instance.
+     */
+    public function addCookie(array $cookie)
+    {
+        $this->validate($cookie);
+        $this->executor->execute(
+            DriverCommand::ADD_COOKIE,
+            array('cookie' => $cookie)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Delete all the cookies that are currently visible.
+     *
+     * @return WebDriverOptions The current instance.
+     */
+    public function deleteAllCookies()
+    {
+        $this->executor->execute(DriverCommand::DELETE_ALL_COOKIES);
+
+        return $this;
+    }
+
+    /**
+     * Delete the cookie with the give name.
+     *
+     * @param string $name
+     * @return WebDriverOptions The current instance.
+     */
+    public function deleteCookieNamed($name)
+    {
+        $this->executor->execute(
+            DriverCommand::DELETE_COOKIE,
+            array(':name' => $name)
+        );
+
+        return $this;
     }
-    return null;
-  }
-
-  /**
-   * Get all the cookies for the current domain.
-   *
-   * @return array The array of cookies presented.
-   */
-  public function getCookies() {
-    return $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
-  }
-
-  private function validate(array $cookie) {
-    if (!isset($cookie['name']) ||
-        $cookie['name'] === '' ||
-        strpos($cookie['name'], ';') !== false) {
-      throw new InvalidArgumentException(
-        '"name" should be non-empty and does not contain a ";"');
+
+    /**
+     * Get the cookie with a given name.
+     *
+     * @param string $name
+     * @return array The cookie, or null if no cookie with the given name is
+     *               presented.
+     */
+    public function getCookieNamed($name)
+    {
+        $cookies = $this->getCookies();
+        foreach ($cookies as $cookie) {
+            if ($cookie['name'] === $name) {
+                return $cookie;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Get all the cookies for the current domain.
+     *
+     * @return array The array of cookies presented.
+     */
+    public function getCookies()
+    {
+        return $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
+    }
+
+    private function validate(array $cookie)
+    {
+        if (!isset($cookie['name']) ||
+            $cookie['name'] === '' ||
+            strpos($cookie['name'], ';') !== false
+        ) {
+            throw new InvalidArgumentException(
+                '"name" should be non-empty and does not contain a ";"'
+            );
+        }
+
+        if (!isset($cookie['value'])) {
+            throw new InvalidArgumentException(
+                '"value" is required when setting a cookie.'
+            );
+        }
+
+        if (isset($cookie['domain']) && strpos($cookie['domain'], ':') !== false) {
+            throw new InvalidArgumentException(
+                '"domain" should not contain a port:' . (string) $cookie['domain']
+            );
+        }
+    }
+
+    /**
+     * Return the interface for managing driver timeouts.
+     *
+     * @return WebDriverTimeouts
+     */
+    public function timeouts()
+    {
+        return new WebDriverTimeouts($this->executor);
     }
 
-    if (!isset($cookie['value'])) {
-      throw new InvalidArgumentException(
-        '"value" is required when setting a cookie.');
+    /**
+     * An abstraction allowing the driver to manipulate the browser's window
+     *
+     * @return WebDriverWindow
+     * @see WebDriverWindow
+     */
+    public function window()
+    {
+        return new WebDriverWindow($this->executor);
     }
 
-    if (isset($cookie['domain']) && strpos($cookie['domain'], ':') !== false) {
-      throw new InvalidArgumentException(
-        '"domain" should not contain a port:'.(string)$cookie['domain']);
+    /**
+     * Get the log for a given log type. Log buffer is reset after each request.
+     *
+     * @param string $log_type The log type.
+     * @return array The list of log entries.
+     * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
+     */
+    public function getLog($log_type)
+    {
+        return $this->executor->execute(
+            DriverCommand::GET_LOG,
+            array('type' => $log_type)
+        );
     }
-  }
-
-  /**
-   * Return the interface for managing driver timeouts.
-   *
-   * @return WebDriverTimeouts
-   */
-  public function timeouts() {
-    return new WebDriverTimeouts($this->executor);
-  }
-
-  /**
-   * An abstraction allowing the driver to manipulate the browser's window
-   *
-   * @return WebDriverWindow
-   * @see WebDriverWindow
-   */
-  public function window() {
-    return new WebDriverWindow($this->executor);
-  }
-
-  /**
-   * Get the log for a given log type. Log buffer is reset after each request.
-   *
-   * @param string $log_type The log type.
-   * @return array The list of log entries.
-   * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
-   */
-  public function getLog($log_type) {
-    return $this->executor->execute(
-      DriverCommand::GET_LOG,
-      array('type' => $log_type)
-    );
-  }
-
-  /**
-   * Get available log types.
-   *
-   * @return array The list of available log types.
-   * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
-   */
-  public function getAvailableLogTypes() {
-    return $this->executor->execute(DriverCommand::GET_AVAILABLE_LOG_TYPES);
-  }
 
+    /**
+     * Get available log types.
+     *
+     * @return array The list of available log types.
+     * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
+     */
+    public function getAvailableLogTypes()
+    {
+        return $this->executor->execute(DriverCommand::GET_AVAILABLE_LOG_TYPES);
+    }
 }
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 9dc42fabd..bb1923556 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -18,17 +18,18 @@
 /**
  * The platforms supported by WebDriver.
  */
-class WebDriverPlatform {
-  const ANDROID = 'ANDROID';
-  const ANY = 'ANY';
-  const LINUX = 'LINUX';
-  const MAC = 'MAC';
-  const UNIX = 'UNIX';
-  const VISTA = 'VISTA';
-  const WINDOWS = 'WINDOWS';
-  const XP = 'XP';
+class WebDriverPlatform
+{
+    const ANDROID = 'ANDROID';
+    const ANY = 'ANY';
+    const LINUX = 'LINUX';
+    const MAC = 'MAC';
+    const UNIX = 'UNIX';
+    const VISTA = 'VISTA';
+    const WINDOWS = 'WINDOWS';
+    const XP = 'XP';
 
-  private function __construct()
-  {
-  }
+    private function __construct()
+    {
+    }
 }
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 0653eb988..e12977b22 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -18,67 +18,76 @@
 /**
  * Represent a point.
  */
-class WebDriverPoint {
+class WebDriverPoint
+{
+    private $x;
+    private $y;
 
-  private $x, $y;
+    public function __construct($x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+    }
 
-  public function __construct($x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-  }
+    /**
+     * Get the x-coordinate.
+     *
+     * @return int The x-coordinate of the point.
+     */
+    public function getX()
+    {
+        return $this->x;
+    }
 
-  /**
-   * Get the x-coordinate.
-   *
-   * @return int The x-coordinate of the point.
-   */
-  public function getX() {
-    return $this->x;
-  }
+    /**
+     * Get the y-coordinate.
+     *
+     * @return int The y-coordinate of the point.
+     */
+    public function getY()
+    {
+        return $this->y;
+    }
 
-  /**
-   * Get the y-coordinate.
-   *
-   * @return int The y-coordinate of the point.
-   */
-  public function getY() {
-    return $this->y;
-  }
+    /**
+     * Set the point to a new position.
+     *
+     * @param int $new_x
+     * @param int $new_y
+     * @return WebDriverPoint The same instance with updated coordinates.
+     */
+    public function move($new_x, $new_y)
+    {
+        $this->x = $new_x;
+        $this->y = $new_y;
 
-  /**
-   * Set the point to a new position.
-   *
-   * @param int $new_x
-   * @param int $new_y
-   * @return WebDriverPoint The same instance with updated coordinates.
-   */
-  public function move($new_x, $new_y) {
-    $this->x = $new_x;
-    $this->y = $new_y;
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Move the current by offsets.
-   *
-   * @param int $x_offset
-   * @param int $y_offset
-   * @return WebDriverPoint The same instance with updated coordinates.
-   */
-  public function moveBy($x_offset, $y_offset) {
-    $this->x += $x_offset;
-    $this->y += $y_offset;
-    return $this;
-  }
+    /**
+     * Move the current by offsets.
+     *
+     * @param int $x_offset
+     * @param int $y_offset
+     * @return WebDriverPoint The same instance with updated coordinates.
+     */
+    public function moveBy($x_offset, $y_offset)
+    {
+        $this->x += $x_offset;
+        $this->y += $y_offset;
 
-  /**
-   * Check whether the given point is the same as the instance.
-   *
-   * @param WebDriverPoint $point The point to be compared with.
-   * @return bool Whether the x and y coordinates are the same as the instance.
-   */
-  public function equals(WebDriverPoint $point) {
-    return $this->x === $point->getX() &&
-           $this->y === $point->getY();
-  }
+        return $this;
+    }
+
+    /**
+     * Check whether the given point is the same as the instance.
+     *
+     * @param WebDriverPoint $point The point to be compared with.
+     * @return bool Whether the x and y coordinates are the same as the instance.
+     */
+    public function equals(WebDriverPoint $point)
+    {
+        return $this->x === $point->getX() &&
+        $this->y === $point->getY();
+    }
 }
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index d9cff1038..4d784c682 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -19,26 +19,26 @@
  * The interface for WebDriver and WebDriverElement which is able to search for
  * WebDriverElement inside.
  */
-interface WebDriverSearchContext {
+interface WebDriverSearchContext
+{
+    /**
+     * Find the first WebDriverElement within this element using the given
+     * mechanism.
+     *
+     * @param WebDriverBy $locator
+     * @return WebDriverElement NoSuchElementException is thrown in
+     *    HttpCommandExecutor if no element is found.
+     * @see WebDriverBy
+     */
+    public function findElement(WebDriverBy $locator);
 
-  /**
-   * Find the first WebDriverElement within this element using the given
-   * mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return WebDriverElement NoSuchElementException is thrown in
-   *    HttpCommandExecutor if no element is found.
-   * @see WebDriverBy
-   */
-  public function findElement(WebDriverBy $locator);
-
-  /**
-   * Find all WebDriverElements within this element using the given mechanism.
-   *
-   * @param WebDriverBy $locator
-   * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if
-   *    nothing matches
-   * @see WebDriverBy
-   */
-  public function findElements(WebDriverBy $locator);
+    /**
+     * Find all WebDriverElements within this element using the given mechanism.
+     *
+     * @param WebDriverBy $locator
+     * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if
+     *    nothing matches
+     * @see WebDriverBy
+     */
+    public function findElements(WebDriverBy $locator);
 }
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 20082dd0b..158690b2f 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -15,289 +15,291 @@
 
 namespace Facebook\WebDriver;
 
-use Facebook\WebDriver\Exception\UnexpectedTagNameException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnexpectedTagNameException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
  */
-class WebDriverSelect {
+class WebDriverSelect
+{
+    private $element;
+    private $isMulti;
 
-  private $element;
-  private $isMulti;
+    public function __construct(WebDriverElement $element)
+    {
+        $tag_name = $element->getTagName();
 
-  public function __construct(WebDriverElement $element) {
-    $tag_name = $element->getTagName();
-
-    if ($tag_name !== 'select') {
-      throw new UnexpectedTagNameException('select', $tag_name);
+        if ($tag_name !== 'select') {
+            throw new UnexpectedTagNameException('select', $tag_name);
+        }
+        $this->element = $element;
+        $value = $element->getAttribute('multiple');
+        $this->isMulti = ($value === 'true');
     }
-    $this->element = $element;
-    $value = $element->getAttribute('multiple');
-    $this->isMulti = ($value === 'true');
-  }
 
-  /**
-   * @return bool Whether this select element support selecting multiple
-   *              options. This is done by checking the value of the 'multiple'
-   *              attribute.
-   */
-  public function isMultiple() {
-    return $this->isMulti;
-  }
-
-  /**
-   * @return WebDriverElement[] All options belonging to this select tag.
-   */
-  public function getOptions() {
-    return $this->element->findElements(WebDriverBy::tagName('option'));
-  }
-
-  /**
-   * @return WebDriverElement[] All selected options belonging to this select tag.
-   */
-  public function getAllSelectedOptions() {
-    $selected_options = array();
-    foreach ($this->getOptions() as $option) {
-      if ($option->isSelected()) {
-        $selected_options[] = $option;
-      }
+    /**
+     * @return bool Whether this select element support selecting multiple
+     *              options. This is done by checking the value of the 'multiple'
+     *              attribute.
+     */
+    public function isMultiple()
+    {
+        return $this->isMulti;
     }
-    return $selected_options;
-  }
 
-  /**
-   * @throws NoSuchElementException
-   *
-   * @return WebDriverElement The first selected option in this select tag (or
-   *                          the currently selected option in a normal select)
-   */
-  public function getFirstSelectedOption() {
-    foreach ($this->getOptions() as $option) {
-      if ($option->isSelected()) {
-        return $option;
-      }
+    /**
+     * @return WebDriverElement[] All options belonging to this select tag.
+     */
+    public function getOptions()
+    {
+        return $this->element->findElements(WebDriverBy::tagName('option'));
     }
 
-    throw new NoSuchElementException('No options are selected');
-  }
+    /**
+     * @return WebDriverElement[] All selected options belonging to this select tag.
+     */
+    public function getAllSelectedOptions()
+    {
+        $selected_options = array();
+        foreach ($this->getOptions() as $option) {
+            if ($option->isSelected()) {
+                $selected_options[] = $option;
+            }
+        }
 
-  /**
-   * Deselect all options in multiple select tag.
-   *
-   * @throws UnsupportedOperationException
-   *
-   * @return void
-   */
-  public function deselectAll() {
-    if (!$this->isMultiple()) {
-      throw new UnsupportedOperationException(
-        'You may only deselect all options of a multi-select'
-      );
+        return $selected_options;
     }
 
-    foreach ($this->getOptions() as $option) {
-      if ($option->isSelected()) {
-        $option->click();
-      }
+    /**
+     * @throws NoSuchElementException
+     *
+     * @return WebDriverElement The first selected option in this select tag (or
+     *                          the currently selected option in a normal select)
+     */
+    public function getFirstSelectedOption()
+    {
+        foreach ($this->getOptions() as $option) {
+            if ($option->isSelected()) {
+                return $option;
+            }
+        }
+
+        throw new NoSuchElementException('No options are selected');
     }
-  }
 
-  /**
-   * Select the option at the given index.
-   *
-   * @param int $index The index of the option. (0-based)
-   *
-   * @throws NoSuchElementException
-   *
-   * @return void
-   */
-  public function selectByIndex($index) {
-    $matched = false;
-    foreach ($this->getOptions() as $option) {
-      if ($option->getAttribute('index') === (string)$index) {
-        if (!$option->isSelected()) {
-          $option->click();
-          if (!$this->isMultiple()) {
-            return;
-          }
+    /**
+     * Deselect all options in multiple select tag.
+     *
+     * @throws UnsupportedOperationException
+     */
+    public function deselectAll()
+    {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException(
+                'You may only deselect all options of a multi-select'
+            );
+        }
+
+        foreach ($this->getOptions() as $option) {
+            if ($option->isSelected()) {
+                $option->click();
+            }
         }
-        $matched = true;
-      }
     }
-    if (!$matched) {
-      throw new NoSuchElementException(
-        sprintf('Cannot locate option with index: %d', $index)
-      );
+
+    /**
+     * Select the option at the given index.
+     *
+     * @param int $index The index of the option. (0-based)
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByIndex($index)
+    {
+        $matched = false;
+        foreach ($this->getOptions() as $option) {
+            if ($option->getAttribute('index') === (string) $index) {
+                if (!$option->isSelected()) {
+                    $option->click();
+                    if (!$this->isMultiple()) {
+                        return;
+                    }
+                }
+                $matched = true;
+            }
+        }
+        if (!$matched) {
+            throw new NoSuchElementException(
+                sprintf('Cannot locate option with index: %d', $index)
+            );
+        }
     }
-  }
 
-  /**
-   * Select all options that have value attribute matching the argument. That
-   * is, when given "foo" this would select an option like:
-   *
-   * <option value="foo">Bar</option>;
-   *
-   * @param string $value The value to match against.
-   *
-   * @throws NoSuchElementException
-   *
-   * @return void
-   */
-  public function selectByValue($value) {
-    $matched = false;
-    $xpath = './/option[@value = '.$this->escapeQuotes($value).']';
-    $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+    /**
+     * Select all options that have value attribute matching the argument. That
+     * is, when given "foo" this would select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $value The value to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByValue($value)
+    {
+        $matched = false;
+        $xpath = './/option[@value = ' . $this->escapeQuotes($value) . ']';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
-    foreach ($options as $option) {
-      if (!$option->isSelected()) {
-        $option->click();
-      }
-      if (!$this->isMultiple()) {
-        return;
-      }
-      $matched = true;
-    }
+        foreach ($options as $option) {
+            if (!$option->isSelected()) {
+                $option->click();
+            }
+            if (!$this->isMultiple()) {
+                return;
+            }
+            $matched = true;
+        }
 
-    if (!$matched) {
-      throw new NoSuchElementException(
-        sprintf('Cannot locate option with value: %s', $value)
-      );
+        if (!$matched) {
+            throw new NoSuchElementException(
+                sprintf('Cannot locate option with value: %s', $value)
+            );
+        }
     }
-  }
 
-  /**
-   * Select all options that display text matching the argument. That is, when
-   * given "Bar" this would select an option like:
-   *
-   * <option value="foo">Bar</option>;
-   *
-   * @param string $text The visible text to match against.
-   *
-   * @throws NoSuchElementException
-   *
-   * @return void
-   */
-  public function selectByVisibleText($text) {
-    $matched = false;
-    $xpath = './/option[normalize-space(.) = '.$this->escapeQuotes($text).']';
-    $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+    /**
+     * Select all options that display text matching the argument. That is, when
+     * given "Bar" this would select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $text The visible text to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByVisibleText($text)
+    {
+        $matched = false;
+        $xpath = './/option[normalize-space(.) = ' . $this->escapeQuotes($text) . ']';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
-    foreach ($options as $option) {
-      if (!$option->isSelected()) {
-        $option->click();
-      }
-      if (!$this->isMultiple()) {
-        return;
-      }
-      $matched = true;
-    }
+        foreach ($options as $option) {
+            if (!$option->isSelected()) {
+                $option->click();
+            }
+            if (!$this->isMultiple()) {
+                return;
+            }
+            $matched = true;
+        }
 
-    // Since the mechanism of getting the text in xpath is not the same as
-    // webdriver, use the expensive getText() to check if nothing is matched.
-    if (!$matched) {
-      foreach ($this->getOptions() as $option) {
-        if ($option->getText() === $text) {
-           if (!$option->isSelected()) {
-             $option->click();
-           }
-           if (!$this->isMultiple()) {
-             return;
-           }
-           $matched = true;
+        // Since the mechanism of getting the text in xpath is not the same as
+        // webdriver, use the expensive getText() to check if nothing is matched.
+        if (!$matched) {
+            foreach ($this->getOptions() as $option) {
+                if ($option->getText() === $text) {
+                    if (!$option->isSelected()) {
+                        $option->click();
+                    }
+                    if (!$this->isMultiple()) {
+                        return;
+                    }
+                    $matched = true;
+                }
+            }
         }
-      }
-    }
 
-    if (!$matched) {
-      throw new NoSuchElementException(
-        sprintf('Cannot locate option with text: %s', $text)
-      );
+        if (!$matched) {
+            throw new NoSuchElementException(
+                sprintf('Cannot locate option with text: %s', $text)
+            );
+        }
     }
-  }
 
-  /**
-   * Deselect the option at the given index.
-   *
-   * @param int $index The index of the option. (0-based)
-   * @return void
-   */
-  public function deselectByIndex($index) {
-    foreach ($this->getOptions() as $option) {
-      if ($option->getAttribute('index') === (string)$index &&
-          $option->isSelected()) {
-        $option->click();
-      }
+    /**
+     * Deselect the option at the given index.
+     *
+     * @param int $index The index of the option. (0-based)
+     */
+    public function deselectByIndex($index)
+    {
+        foreach ($this->getOptions() as $option) {
+            if ($option->getAttribute('index') === (string) $index && $option->isSelected()) {
+                $option->click();
+            }
+        }
     }
-  }
 
-  /**
-   * Deselect all options that have value attribute matching the argument. That
-   * is, when given "foo" this would select an option like:
-   *
-   * <option value="foo">Bar</option>;
-   *
-   * @param string $value The value to match against.
-   * @return void
-   */
-  public function deselectByValue($value) {
-    $xpath = './/option[@value = '.$this->escapeQuotes($value).']';
-    $options = $this->element->findElements(WebDriverBy::xpath($xpath));
-    foreach ($options as $option) {
-      if ($option->isSelected()) {
-        $option->click();
-      }
+    /**
+     * Deselect all options that have value attribute matching the argument. That
+     * is, when given "foo" this would select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $value The value to match against.
+     */
+    public function deselectByValue($value)
+    {
+        $xpath = './/option[@value = ' . $this->escapeQuotes($value) . ']';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+        foreach ($options as $option) {
+            if ($option->isSelected()) {
+                $option->click();
+            }
+        }
     }
-  }
 
-  /**
-   * Deselect all options that display text matching the argument. That is, when
-   * given "Bar" this would select an option like:
-   *
-   * <option value="foo">Bar</option>;
-   *
-   * @param string $text The visible text to match against.
-   * @return void
-   */
-  public function deselectByVisibleText($text) {
-    $xpath = './/option[normalize-space(.) = '.$this->escapeQuotes($text).']';
-    $options = $this->element->findElements(WebDriverBy::xpath($xpath));
-    foreach ($options as $option) {
-      if ($option->isSelected()) {
-        $option->click();
-      }
+    /**
+     * Deselect all options that display text matching the argument. That is, when
+     * given "Bar" this would select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $text The visible text to match against.
+     */
+    public function deselectByVisibleText($text)
+    {
+        $xpath = './/option[normalize-space(.) = ' . $this->escapeQuotes($text) . ']';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+        foreach ($options as $option) {
+            if ($option->isSelected()) {
+                $option->click();
+            }
+        }
     }
-  }
 
-  /**
-   * Convert strings with both quotes and ticks into:
-   *   foo'"bar -> concat("foo'", '"', "bar")
-   *
-   * @param string $to_escape The string to be converted.
-   * @return string The escaped string.
-   */
-  protected function escapeQuotes($to_escape) {
-    if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {
-      $substrings = explode('"', $to_escape);
+    /**
+     * Convert strings with both quotes and ticks into:
+     *   foo'"bar -> concat("foo'", '"', "bar")
+     *
+     * @param string $to_escape The string to be converted.
+     * @return string The escaped string.
+     */
+    protected function escapeQuotes($to_escape)
+    {
+        if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {
+            $substrings = explode('"', $to_escape);
 
-      $escaped = "concat(";
-      $first = true;
-      foreach ($substrings as $string) {
-         if (!$first) {
-           $escaped .= ", '\"',";
-           $first = false;
-         }
-         $escaped .= '"' . $string . '"';
-      }
-      return $escaped;
-    }
+            $escaped = 'concat(';
+            $first = true;
+            foreach ($substrings as $string) {
+                if (!$first) {
+                    $escaped .= ", '\"',";
+                    $first = false;
+                }
+                $escaped .= '"' . $string . '"';
+            }
 
-    if (strpos($to_escape, '"') !== false) {
-      return sprintf("'%s'", $to_escape);
-    }
+            return $escaped;
+        }
 
-    return sprintf('"%s"', $to_escape);
-  }
+        if (strpos($to_escape, '"') !== false) {
+            return sprintf("'%s'", $to_escape);
+        }
 
+        return sprintf('"%s"', $to_escape);
+    }
 }
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 86e0939b8..d9fdf5c18 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -18,47 +18,47 @@
 /**
  * Used to locate a given frame or window.
  */
-interface WebDriverTargetLocator {
+interface WebDriverTargetLocator
+{
+    /**
+     * Switch to the main document if the page contains iframes. Otherwise, switch
+     * to the first frame on the page.
+     *
+     * @return WebDriver The driver focused on the top window or the first frame.
+     */
+    public function defaultContent();
 
-  /**
-   * Switch to the main document if the page contains iframes. Otherwise, switch
-   * to the first frame on the page.
-   *
-   * @return WebDriver The driver focused on the top window or the first frame.
-   */
-  public function defaultContent();
+    /**
+     * Switch to the iframe by its id or name.
+     *
+     * @param WebDriverElement|string $frame The WebDriverElement,
+     *                                       the id or the name of the frame.
+     * @return WebDriver The driver focused on the given frame.
+     */
+    public function frame($frame);
 
-  /**
-   * Switch to the iframe by its id or name.
-   *
-   * @param WebDriverElement|string $frame The WebDriverElement,
-   *                                       the id or the name of the frame.
-   * @return WebDriver The driver focused on the given frame.
-   */
-  public function frame($frame);
+    /**
+     * Switch the focus to another window by its handle.
+     *
+     * @param string $handle The handle of the window to be focused on.
+     * @return WebDriver Tge driver focused on the given window.
+     * @see WebDriver::getWindowHandles
+     */
+    public function window($handle);
 
-  /**
-   * Switch the focus to another window by its handle.
-   *
-   * @param string $handle The handle of the window to be focused on.
-   * @return WebDriver Tge driver focused on the given window.
-   * @see WebDriver::getWindowHandles
-   */
-  public function window($handle);
+    /**
+     * Switch to the currently active modal dialog for this particular driver
+     * instance.
+     *
+     * @return WebDriverAlert
+     */
+    public function alert();
 
-  /**
-   * Switch to the currently active modal dialog for this particular driver
-   * instance.
-   *
-   * @return WebDriverAlert
-   */
-  public function alert();
-
-  /**
-   * Switches to the element that currently has focus within the document
-   * currently "switched to", or the body element if this cannot be detected.
-   *
-   * @return WebDriverElement
-   */
-  public function activeElement();
+    /**
+     * Switches to the element that currently has focus within the document
+     * currently "switched to", or the body element if this cannot be detected.
+     *
+     * @return WebDriverElement
+     */
+    public function activeElement();
 }
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 2af6882ec..50b62f24f 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -20,56 +20,63 @@
 /**
  * Managing timeout behavior for WebDriver instances.
  */
-class WebDriverTimeouts {
+class WebDriverTimeouts
+{
+    protected $executor;
 
-  protected $executor;
+    public function __construct($executor)
+    {
+        $this->executor = $executor;
+    }
 
-  public function __construct($executor) {
-    $this->executor = $executor;
-  }
+    /**
+     * Specify the amount of time the driver should wait when searching for an
+     * element if it is not immediately present.
+     *
+     * @param int $seconds Wait time in second.
+     * @return WebDriverTimeouts The current instance.
+     */
+    public function implicitlyWait($seconds)
+    {
+        $this->executor->execute(
+            DriverCommand::IMPLICITLY_WAIT,
+            array('ms' => $seconds * 1000)
+        );
 
-  /**
-   * Specify the amount of time the driver should wait when searching for an
-   * element if it is not immediately present.
-   *
-   * @param int $seconds Wait time in second.
-   * @return WebDriverTimeouts The current instance.
-   */
-  public function implicitlyWait($seconds) {
-    $this->executor->execute(
-      DriverCommand::IMPLICITLY_WAIT,
-      array('ms' => $seconds * 1000)
-    );
-    return $this;
-  }
+        return $this;
+    }
 
-  /**
-   * Set the amount of time to wait for an asynchronous script to finish
-   * execution before throwing an error.
-   *
-   * @param int $seconds Wait time in second.
-   * @return WebDriverTimeouts The current instance.
-   */
-  public function setScriptTimeout($seconds) {
-    $this->executor->execute(
-      DriverCommand::SET_SCRIPT_TIMEOUT,
-      array('ms' => $seconds * 1000)
-    );
-    return $this;
-  }
+    /**
+     * Set the amount of time to wait for an asynchronous script to finish
+     * execution before throwing an error.
+     *
+     * @param int $seconds Wait time in second.
+     * @return WebDriverTimeouts The current instance.
+     */
+    public function setScriptTimeout($seconds)
+    {
+        $this->executor->execute(
+            DriverCommand::SET_SCRIPT_TIMEOUT,
+            array('ms' => $seconds * 1000)
+        );
 
-  /**
-   * Set the amount of time to wait for a page load to complete before throwing
-   * an error.
-   *
-   * @param int $seconds Wait time in second.
-   * @return WebDriverTimeouts The current instance.
-   */
-  public function pageLoadTimeout($seconds) {
-    $this->executor->execute(DriverCommand::SET_TIMEOUT, array(
-      'type' => 'page load',
-      'ms' => $seconds * 1000,
-    ));
-    return $this;
-  }
+        return $this;
+    }
+
+    /**
+     * Set the amount of time to wait for a page load to complete before throwing
+     * an error.
+     *
+     * @param int $seconds Wait time in second.
+     * @return WebDriverTimeouts The current instance.
+     */
+    public function pageLoadTimeout($seconds)
+    {
+        $this->executor->execute(DriverCommand::SET_TIMEOUT, array(
+            'type' => 'page load',
+            'ms' => $seconds * 1000,
+        ));
+
+        return $this;
+    }
 }
diff --git a/lib/WebDriverUpAction.php b/lib/WebDriverUpAction.php
index 2394f41a1..e8a480c9e 100644
--- a/lib/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -18,25 +18,25 @@
 use Facebook\WebDriver\Interactions\Touch\WebDriverTouchAction;
 use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
 
-class WebDriverUpAction
-  extends WebDriverTouchAction
-  implements WebDriverAction {
+class WebDriverUpAction extends WebDriverTouchAction implements WebDriverAction
+{
+    private $x;
+    private $y;
 
-  private $x;
-  private $y;
+    /**
+     * @param WebDriverTouchScreen $touch_screen
+     * @param int $x
+     * @param int $y
+     */
+    public function __construct(WebDriverTouchScreen $touch_screen, $x, $y)
+    {
+        $this->x = $x;
+        $this->y = $y;
+        parent::__construct($touch_screen);
+    }
 
-  /**
-   * @param WebDriverTouchScreen $touch_screen
-   * @param int $x
-   * @param int $y
-   */
-  public function __construct(WebDriverTouchScreen $touch_screen, $x, $y) {
-    $this->x = $x;
-    $this->y = $y;
-    parent::__construct($touch_screen);
-  }
-
-  public function perform() {
-    $this->touchScreen->up($this->x, $this->y);
-  }
+    public function perform()
+    {
+        $this->touchScreen->up($this->x, $this->y);
+    }
 }
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 5cddd29c3..a2297779d 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -24,57 +24,56 @@
  *
  * @see WebDriverExpectedCondition.
  */
-class WebDriverWait {
+class WebDriverWait
+{
+    protected $driver;
+    protected $timeout;
+    protected $interval;
 
-  protected $driver;
-  protected $timeout;
-  protected $interval;
-
-  public function __construct(
-      WebDriver $driver,
-      $timeout_in_second = null,
-      $interval_in_millisecond = null) {
-    $this->driver = $driver;
-    $this->timeout = isset($timeout_in_second) ? $timeout_in_second : 30;
-    $this->interval = $interval_in_millisecond ?: 250;
-  }
-
-  /**
-   * Calls the function provided with the driver as an argument until the return
-   * value is not falsey.
-   *
-   * @param (closure|WebDriverExpectedCondition)
-   * @param string $message
-   *
-   * @return mixed The return value of $func_or_ec
+    public function __construct(WebDriver $driver, $timeout_in_second = null, $interval_in_millisecond = null)
+    {
+        $this->driver = $driver;
+        $this->timeout = isset($timeout_in_second) ? $timeout_in_second : 30;
+        $this->interval = $interval_in_millisecond ?: 250;
+    }
 
-   * @throws NoSuchElementException
-   * @throws TimeOutException
-   * @throws \Exception
-   */
-  public function until($func_or_ec, $message = "") {
-    $end = microtime(true) + $this->timeout;
-    $last_exception = null;
+    /**
+     * Calls the function provided with the driver as an argument until the return
+     * value is not falsey.
+     *
+     * @param (closure|WebDriverExpectedCondition)
+     * @param string $message
+     *
+     * @throws NoSuchElementException
+     * @throws TimeOutException
+     * @throws \Exception
+     * @return mixed The return value of $func_or_ec
+     */
+    public function until($func_or_ec, $message = '')
+    {
+        $end = microtime(true) + $this->timeout;
+        $last_exception = null;
 
-    while ($end > microtime(true)) {
-      try {
-        if ($func_or_ec instanceof WebDriverExpectedCondition) {
-          $ret_val = call_user_func($func_or_ec->getApply(), $this->driver);
-        } else {
-          $ret_val = call_user_func($func_or_ec, $this->driver);
+        while ($end > microtime(true)) {
+            try {
+                if ($func_or_ec instanceof WebDriverExpectedCondition) {
+                    $ret_val = call_user_func($func_or_ec->getApply(), $this->driver);
+                } else {
+                    $ret_val = call_user_func($func_or_ec, $this->driver);
+                }
+                if ($ret_val) {
+                    return $ret_val;
+                }
+            } catch (NoSuchElementException $e) {
+                $last_exception = $e;
+            }
+            usleep($this->interval * 1000);
         }
-        if ($ret_val) {
-          return $ret_val;
+
+        if ($last_exception) {
+            throw $last_exception;
         }
-      } catch (NoSuchElementException $e) {
-        $last_exception = $e;
-      }
-      usleep($this->interval * 1000);
-    }
 
-    if ($last_exception) {
-      throw $last_exception;
+        throw new TimeOutException($message);
     }
-    throw new TimeOutException($message);
-  }
 }
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index dcfa19534..b63a681b3 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -21,128 +21,138 @@
 /**
  * An abstraction allowing the driver to manipulate the browser's window
  */
-class WebDriverWindow {
-
-  protected $executor;
-
-  public function __construct($executor) {
-    $this->executor = $executor;
-  }
-
-  /**
-   * Get the position of the current window, relative to the upper left corner
-   * of the screen.
-   *
-   * @return array The current window position.
-   */
-  public function getPosition() {
-    $position = $this->executor->execute(
-      DriverCommand::GET_WINDOW_POSITION,
-      array(':windowHandle' => 'current')
-    );
-    return new WebDriverPoint(
-      $position['x'],
-      $position['y']
-    );
-  }
-
-  /**
-   * Get the size of the current window. This will return the outer window
-   * dimension, not just the view port.
-   *
-   * @return array The current window size.
-   */
-  public function getSize() {
-    $size = $this->executor->execute(
-      DriverCommand::GET_WINDOW_SIZE,
-      array(':windowHandle' => 'current')
-    );
-    return new WebDriverDimension(
-      $size['width'],
-      $size['height']
-    );
-  }
-
-  /**
-   * Maximizes the current window if it is not already maximized
-   *
-   * @return WebDriverWindow The instance.
-   */
-  public function maximize() {
-    $this->executor->execute(
-      DriverCommand::MAXIMIZE_WINDOW,
-      array(':windowHandle' => 'current')
-    );
-    return $this;
-  }
-
-  /**
-   * Set the size of the current window. This will change the outer window
-   * dimension, not just the view port.
-   *
-   * @param WebDriverDimension $size
-   * @return WebDriverWindow The instance.
-   */
-  public function setSize(WebDriverDimension $size) {
-    $params = array(
-      'width' => $size->getWidth(),
-      'height' => $size->getHeight(),
-      ':windowHandle' => 'current',
-    );
-    $this->executor->execute(DriverCommand::SET_WINDOW_SIZE, $params);
-    return $this;
-  }
-
-  /**
-   * Set the position of the current window. This is relative to the upper left
-   * corner of the screen.
-   *
-   * @param WebDriverPoint $position
-   * @return WebDriverWindow The instance.
-   */
-  public function setPosition(WebDriverPoint $position) {
-    $params = array(
-      'x' => $position->getX(),
-      'y' => $position->getY(),
-      ':windowHandle' => 'current',
-    );
-    $this->executor->execute(DriverCommand::SET_WINDOW_POSITION, $params);
-    return $this;
-  }
-
-  /**
-   * Get the current browser orientation.
-   *
-   * @return string Either LANDSCAPE|PORTRAIT
-   */
-  public function getScreenOrientation() {
-    return $this->executor->execute(DriverCommand::GET_SCREEN_ORIENTATION);
-  }
-
-
-  /**
-   * Set the browser orientation. The orientation should either
-   * LANDSCAPE|PORTRAIT
-   *
-   * @param string $orientation
-   * @return WebDriverWindow The instance.
-   * @throws IndexOutOfBoundsException
-   */
-  public function setScreenOrientation($orientation) {
-    $orientation = strtoupper($orientation);
-    if (!in_array($orientation, array('PORTRAIT', 'LANDSCAPE'))) {
-      throw new IndexOutOfBoundsException(
-        "Orientation must be either PORTRAIT, or LANDSCAPE"
-      );
+class WebDriverWindow
+{
+    protected $executor;
+
+    public function __construct($executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * Get the position of the current window, relative to the upper left corner
+     * of the screen.
+     *
+     * @return array The current window position.
+     */
+    public function getPosition()
+    {
+        $position = $this->executor->execute(
+            DriverCommand::GET_WINDOW_POSITION,
+            array(':windowHandle' => 'current')
+        );
+
+        return new WebDriverPoint(
+            $position['x'],
+            $position['y']
+        );
     }
 
-    $this->executor->execute(
-      DriverCommand::SET_SCREEN_ORIENTATION,
-      array('orientation' => $orientation)
-    );
+    /**
+     * Get the size of the current window. This will return the outer window
+     * dimension, not just the view port.
+     *
+     * @return array The current window size.
+     */
+    public function getSize()
+    {
+        $size = $this->executor->execute(
+            DriverCommand::GET_WINDOW_SIZE,
+            array(':windowHandle' => 'current')
+        );
+
+        return new WebDriverDimension(
+            $size['width'],
+            $size['height']
+        );
+    }
 
-    return $this;
+    /**
+     * Maximizes the current window if it is not already maximized
+     *
+     * @return WebDriverWindow The instance.
+     */
+    public function maximize()
+    {
+        $this->executor->execute(
+            DriverCommand::MAXIMIZE_WINDOW,
+            array(':windowHandle' => 'current')
+        );
+
+        return $this;
+    }
 
-  }
+    /**
+     * Set the size of the current window. This will change the outer window
+     * dimension, not just the view port.
+     *
+     * @param WebDriverDimension $size
+     * @return WebDriverWindow The instance.
+     */
+    public function setSize(WebDriverDimension $size)
+    {
+        $params = array(
+            'width' => $size->getWidth(),
+            'height' => $size->getHeight(),
+            ':windowHandle' => 'current',
+        );
+        $this->executor->execute(DriverCommand::SET_WINDOW_SIZE, $params);
+
+        return $this;
+    }
 
+    /**
+     * Set the position of the current window. This is relative to the upper left
+     * corner of the screen.
+     *
+     * @param WebDriverPoint $position
+     * @return WebDriverWindow The instance.
+     */
+    public function setPosition(WebDriverPoint $position)
+    {
+        $params = array(
+            'x' => $position->getX(),
+            'y' => $position->getY(),
+            ':windowHandle' => 'current',
+        );
+        $this->executor->execute(DriverCommand::SET_WINDOW_POSITION, $params);
+
+        return $this;
+    }
+
+    /**
+     * Get the current browser orientation.
+     *
+     * @return string Either LANDSCAPE|PORTRAIT
+     */
+    public function getScreenOrientation()
+    {
+        return $this->executor->execute(DriverCommand::GET_SCREEN_ORIENTATION);
+    }
+
+    /**
+     * Set the browser orientation. The orientation should either
+     * LANDSCAPE|PORTRAIT
+     *
+     * @param string $orientation
+     * @throws IndexOutOfBoundsException
+     * @return WebDriverWindow The instance.
+     */
+    public function setScreenOrientation($orientation)
+    {
+        $orientation = strtoupper($orientation);
+        if (!in_array($orientation, array('PORTRAIT', 'LANDSCAPE'))) {
+            throw new IndexOutOfBoundsException(
+                'Orientation must be either PORTRAIT, or LANDSCAPE'
+            );
+        }
+
+        $this->executor->execute(
+            DriverCommand::SET_SCREEN_ORIENTATION,
+            array('orientation' => $orientation)
+        );
+
+        return $this;
+    }
 }
diff --git a/tests/functional/BaseTest.php b/tests/functional/BaseTest.php
index 351db6ed2..c9c522651 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/BaseTest.php
@@ -15,85 +15,95 @@
 
 namespace Facebook\WebDriver;
 
-class BaseTest extends WebDriverTestCase {
-  
-  public function testGetTitle() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'php-webdriver test page',
-      $this->driver->getTitle()
-    );
-  }
-  
-  public function testGetText() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Welcome to the facebook/php-webdriver testing page.',
-      $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
-    );
-  }
+class BaseTest extends WebDriverTestCase
+{
+    public function testGetTitle()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'php-webdriver test page',
+            $this->driver->getTitle()
+        );
+    }
 
-  public function testGetById() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Test by ID',
-      $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
-    );
-  }
+    public function testGetText()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Welcome to the facebook/php-webdriver testing page.',
+            $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
+        );
+    }
 
-  public function testGetByClassName() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Test by Class',
-      $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
-    );
-  }
+    public function testGetById()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test by ID',
+            $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
+        );
+    }
 
-  public function testGetByCssSelector() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-     'Test by Class',
-     $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
-    );
-  }
+    public function testGetByClassName()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test by Class',
+            $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
+        );
+    }
 
-  public function testGetByLinkText() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Click here',
-      $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
-    );
-  }
+    public function testGetByCssSelector()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test by Class',
+            $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
+        );
+    }
 
-  public function testGetByName() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Test Value',
-      $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
-    );
-  }
+    public function testGetByLinkText()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Click here',
+            $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
+        );
+    }
 
-  public function testGetByXpath() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Test Value',
-      $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
-    );
-  }
+    public function testGetByName()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test Value',
+            $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
+        );
+    }
 
-  public function testGetByPartialLinkText() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Click here',
-      $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
-    );
-  }
+    public function testGetByXpath()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test Value',
+            $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
+        );
+    }
 
-  public function testGetByTagName() {
-    $this->driver->get($this->getTestPath('index.html'));
-    self::assertEquals(
-      'Test Value',
-      $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
-    );
-  }
+    public function testGetByPartialLinkText()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Click here',
+            $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
+        );
+    }
+
+    public function testGetByTagName()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        self::assertEquals(
+            'Test Value',
+            $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
+        );
+    }
 }
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 0ab233a14..29b878d9f 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -19,28 +19,31 @@
 
 /**
  * An example test case for php-webdriver.
- * 
- * Try running it by 
+ *
+ * Try running it by
  *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
  */
-class FileUploadTest extends WebDriverTestCase {
-  
-  public function testFileUploading() {
-    $this->driver->get($this->getTestPath('upload.html'));
-    $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
-    $file_input->setFileDetector(new LocalFileDetector())
-               ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
-    self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
-  }
+class FileUploadTest extends WebDriverTestCase
+{
+    public function testFileUploading()
+    {
+        $this->driver->get($this->getTestPath('upload.html'));
+        $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
+        $file_input->setFileDetector(new LocalFileDetector())
+            ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
+        self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    }
 
-  public function testUselessFileDetectorSendKeys() {
-    $this->driver->get($this->getTestPath('upload.html'));
-    $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
-    $file_input->sendKeys($this->getFilePath());
-    self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
-  }
-  
-  private function getFilePath() {
-    return __DIR__ . '/files/FileUploadTestCaseFile.txt';
-  }
+    public function testUselessFileDetectorSendKeys()
+    {
+        $this->driver->get($this->getTestPath('upload.html'));
+        $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
+        $file_input->sendKeys($this->getFilePath());
+        self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+    }
+
+    private function getFilePath()
+    {
+        return __DIR__ . '/files/FileUploadTestCaseFile.txt';
+    }
 }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 9be2153d3..fca694854 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -22,35 +22,38 @@
 /**
  * The base class for test cases.
  */
-class WebDriverTestCase extends \PHPUnit_Framework_TestCase {
+class WebDriverTestCase extends \PHPUnit_Framework_TestCase
+{
+    /** @var RemoteWebDriver $driver */
+    protected $driver;
 
-  /** @var RemoteWebDriver $driver */
-  protected $driver;
+    protected function setUp()
+    {
+        $this->driver = RemoteWebDriver::create(
+            'http://localhost:4444/wd/hub',
+            array(
+                WebDriverCapabilityType::BROWSER_NAME
+                //=> WebDriverBrowserType::FIREFOX,
+                => WebDriverBrowserType::HTMLUNIT,
+            )
+        );
+    }
 
-  protected function setUp() {
-    $this->driver = RemoteWebDriver::create(
-      'http://localhost:4444/wd/hub',
-      array(
-        WebDriverCapabilityType::BROWSER_NAME
-          //=> WebDriverBrowserType::FIREFOX,
-          => WebDriverBrowserType::HTMLUNIT,
-      )
-    );
-  }
-  
-  protected function tearDown() {
-    if ($this->driver) {
-      $this->driver->quit();
+    protected function tearDown()
+    {
+        if ($this->driver) {
+            $this->driver->quit();
+        }
     }
-  }
 
-  /**
-   * Get the URL of the test html.
-   *
-   * @param $path
-   * @return string
-   */
-  protected function getTestPath($path) {
-    return 'file:///'.__DIR__.'/html/'.$path;
-  }
+    /**
+     * Get the URL of the test html.
+     *
+     * @param $path
+     * @return string
+     */
+    protected function getTestPath($path)
+    {
+        return 'file:///' . __DIR__ . '/html/' . $path;
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index 58373d9b9..a192190f9 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -18,28 +18,31 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverButtonReleaseAction */
-  private $webDriverButtonReleaseAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
-  private $locationProvider;
+class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverButtonReleaseAction */
+    private $webDriverButtonReleaseAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
-    $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformSendsMouseUpCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverButtonReleaseAction->perform();
-  }
+    public function testPerformSendsMouseUpCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverButtonReleaseAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index c58d507d1..62162c77e 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -18,28 +18,31 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverClickAction */
-  private $webDriverClickAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverClickAction */
+    private $webDriverClickAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
-    $this->webDriverClickAction = new WebDriverClickAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverClickAction = new WebDriverClickAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformSendsClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverClickAction->perform();
-  }
+    public function testPerformSendsClickCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverClickAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index ae046c58e..9dec8b9aa 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -18,28 +18,31 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverClickAndHoldAction */
-  private $webDriverClickAndHoldAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverClickAndHoldAction */
+    private $webDriverClickAndHoldAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
-    $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformSendsMouseDownCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverClickAndHoldAction->perform();
-  }
+    public function testPerformSendsMouseDownCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverClickAndHoldAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index d9b9ef2b8..2c5a92547 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -18,28 +18,31 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverContextClickAction */
-  private $webDriverContextClickAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverContextClickAction */
+    private $webDriverContextClickAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
-    $this->webDriverContextClickAction = new WebDriverContextClickAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverContextClickAction = new WebDriverContextClickAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformSendsContextClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverContextClickAction->perform();
-  }
+    public function testPerformSendsContextClickCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverContextClickAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index d38c7220a..d782edf8c 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -15,26 +15,32 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase {
-  public function testConstruct() {
-    $in_view_port = function() { };
-    $on_page = function() { };
+class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstruct()
+    {
+        $in_view_port = function () {
+        };
+        $on_page = function () {
+        };
 
-    $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
+        $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-    self::assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
-    self::assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
-    self::assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
-    self::assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
-  }
+        self::assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
+        self::assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
+        self::assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
+        self::assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
+    }
 
-  public function testGetAuxiliary()
-  {
-    $in_view_port = function() { };
-    $on_page = function() { };
+    public function testGetAuxiliary()
+    {
+        $in_view_port = function () {
+        };
+        $on_page = function () {
+        };
 
-    $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
+        $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-    self::assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
-  }
+        self::assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index f1c6d3a02..b83115f77 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -18,28 +18,31 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverDoubleClickAction */
-  private $webDriverDoubleClickAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverDoubleClickAction */
+    private $webDriverDoubleClickAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
-    $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformSendsDoubleClickCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverDoubleClickAction->perform();
-  }
+    public function testPerformSendsDoubleClickCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverDoubleClickAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 10a6201e0..e1cb8acbc 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -19,34 +19,37 @@
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverKeyDownAction */
-  private $webDriverKeyDownAction;
-  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverKeyboard;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverKeyDownAction */
+    private $webDriverKeyDownAction;
+    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverKeyboard;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+    public function setUp()
+    {
+        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
-    $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
-      $this->webDriverKeyboard,
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+        $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
+            $this->webDriverKeyboard,
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverKeyboard->expects($this->once())->method('pressKey');
-    $this->webDriverKeyDownAction->perform();
-  }
+    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverKeyboard->expects($this->once())->method('pressKey');
+        $this->webDriverKeyDownAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 75fb1bde9..c21ac24c1 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -19,35 +19,38 @@
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverKeyUpAction */
-  private $webDriverKeyUpAction;
-  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverKeyboard;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverKeyUpAction */
+    private $webDriverKeyUpAction;
+    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverKeyboard;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+    public function setUp()
+    {
+        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
-    $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
-      $this->webDriverKeyboard,
-      $this->webDriverMouse,
-      $this->locationProvider,
-      'a'
-    );
-  }
+        $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
+            $this->webDriverKeyboard,
+            $this->webDriverMouse,
+            $this->locationProvider,
+            'a'
+        );
+    }
 
-  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
-    $this->webDriverKeyUpAction->perform();
-  }
+    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
+        $this->webDriverKeyUpAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 10edb2588..fe3ca9379 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -18,29 +18,32 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverMouseMoveAction */
-  private $webDriverMouseMoveAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverMouseMoveAction */
+    private $webDriverMouseMoveAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
-    $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
-      $this->webDriverMouse,
-      $this->locationProvider
-    );
-  }
+        $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
+            $this->webDriverMouse,
+            $this->locationProvider
+        );
+    }
 
-  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverMouseMoveAction->perform();
-  }
+    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverMouseMoveAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index aeec43a5a..37a2853ba 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -18,33 +18,36 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase {
-  /**
-   * @type WebDriverMoveToOffsetAction
-   */
-  private $webDriverMoveToOffsetAction;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
+class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @type WebDriverMoveToOffsetAction
+     */
+    private $webDriverMoveToOffsetAction;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
 
-  public function setUp() {
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+    public function setUp()
+    {
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
-    $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
-      $this->webDriverMouse,
-      $this->locationProvider,
-      150,
-      200
-    );
-  }
+        $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
+            $this->webDriverMouse,
+            $this->locationProvider,
+            150,
+            200
+        );
+    }
 
-  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverMoveToOffsetAction->perform();
-  }
+    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverMoveToOffsetAction->perform();
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index bf1a5b8a7..82a736dea 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -19,38 +19,41 @@
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
 
-class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase {
-  /** @var WebDriverSendKeysAction */
-  private $webDriverSendKeysAction;
-  /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverKeyboard;
-  /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
-  private $webDriverMouse;
-  /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject  */
-  private $locationProvider;
-  /** @var array */
-  private $keys;
+class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var WebDriverSendKeysAction */
+    private $webDriverSendKeysAction;
+    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverKeyboard;
+    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    private $webDriverMouse;
+    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    private $locationProvider;
+    /** @var array */
+    private $keys;
 
-  public function setUp() {
-    $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-    $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-    $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+    public function setUp()
+    {
+        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
+        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
 
-    $this->keys = array('t', 'e', 's', 't');
-    $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
-      $this->webDriverKeyboard,
-      $this->webDriverMouse,
-      $this->locationProvider,
-      $this->keys
-    );
-  }
+        $this->keys = array('t', 'e', 's', 't');
+        $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
+            $this->webDriverKeyboard,
+            $this->webDriverMouse,
+            $this->locationProvider,
+            $this->keys
+        );
+    }
 
-  public function testPerformFocusesOnElementAndSendPressKeyCommand() {
-    $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
-      ->disableOriginalConstructor()->getMock();
-    $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
-    $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-    $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
-    $this->webDriverSendKeysAction->perform();
-  }
+    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    {
+        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+            ->disableOriginalConstructor()->getMock();
+        $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
+        $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->webDriverSendKeysAction->perform();
+    }
 }
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 7f187f706..54f17a14d 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -22,112 +22,111 @@
 
 class DesiredCapabilitiesTest extends \PHPUnit_Framework_TestCase
 {
-  public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
-  {
-    $capabilities = new DesiredCapabilities(
-      array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY)
-    );
-
-    $this->assertSame('fooVal', $capabilities->getCapability('fooKey'));
-    $this->assertSame('ANY', $capabilities->getPlatform());
-
-    $this->assertSame(
-      array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY),
-      $capabilities->toArray()
-    );
-  }
-
-  public function testShouldInstantiateEmptyInstance()
-  {
-    $capabilities = new DesiredCapabilities();
-
-    $this->assertNull($capabilities->getCapability('foo'));
-    $this->assertSame(array(), $capabilities->toArray());
-  }
-
-  public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
-  {
-    $capabilities = new DesiredCapabilities();
-    // generic capability setter
-    $capabilities->setCapability('custom', 1337);
-    // specific setters
-    $capabilities->setBrowserName(WebDriverBrowserType::CHROME);
-    $capabilities->setPlatform(WebDriverPlatform::LINUX);
-    $capabilities->setVersion(333);
-
-    $this->assertSame(1337, $capabilities->getCapability('custom'));
-    $this->assertSame(WebDriverBrowserType::CHROME, $capabilities->getBrowserName());
-    $this->assertSame(WebDriverPlatform::LINUX, $capabilities->getPlatform());
-    $this->assertSame(333, $capabilities->getVersion());
-  }
-
-  /**
-   * @expectedException \Exception
-   * @expectedExceptionMessage isJavascriptEnable() is a htmlunit-only option
-   */
-  public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
-  {
-    $capabilities = new DesiredCapabilities();
-    $capabilities->setBrowserName(WebDriverBrowserType::FIREFOX);
-    $capabilities->setJavascriptEnabled(false);
-  }
-
-  public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser()
-  {
-    $capabilities = new DesiredCapabilities();
-    $capabilities->setBrowserName(WebDriverBrowserType::HTMLUNIT);
-    $capabilities->setJavascriptEnabled(false);
-
-    $this->assertFalse($capabilities->isJavascriptEnabled());
-  }
-
-  /**
-   * @dataProvider browserCapabilitiesProvider
-   * @param string $setupMethod
-   * @param string $expectedBrowser
-   * @param string $expectedPlatform
-   */
-  public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
-    $setupMethod,
-    $expectedBrowser,
-    $expectedPlatform
-  )
-  {
-    /** @var DesiredCapabilities $capabilities */
-    $capabilities = call_user_func(array('Facebook\WebDriver\Remote\DesiredCapabilities', $setupMethod));
-
-    $this->assertSame($expectedBrowser, $capabilities->getBrowserName());
-    $this->assertSame($expectedPlatform, $capabilities->getPlatform());
-  }
-
-  /**
-   * @return array
-   */
-  public function browserCapabilitiesProvider()
-  {
-    return array(
-      array('android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID),
-      array('chrome', WebDriverBrowserType::CHROME, WebDriverPlatform::ANY),
-      array('firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY),
-      array('htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
-      array('htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
-      array('internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS),
-      array('iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC),
-      array('ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC),
-      array('opera', WebDriverBrowserType::OPERA, WebDriverPlatform::ANY),
-      array('safari', WebDriverBrowserType::SAFARI, WebDriverPlatform::ANY),
-      array('phantomjs', WebDriverBrowserType::PHANTOMJS, WebDriverPlatform::ANY),
-    );
-  }
-
-  public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrowser()
-  {
-    $capabilities = DesiredCapabilities::firefox();
-
-    /** @var FirefoxProfile $firefoxProfile */
-    $firefoxProfile = $capabilities->getCapability(FirefoxDriver::PROFILE);
-    $this->assertInstanceOf('Facebook\WebDriver\Firefox\FirefoxProfile', $firefoxProfile);
-
-    $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
-  }
+    public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
+    {
+        $capabilities = new DesiredCapabilities(
+            array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY)
+        );
+
+        $this->assertSame('fooVal', $capabilities->getCapability('fooKey'));
+        $this->assertSame('ANY', $capabilities->getPlatform());
+
+        $this->assertSame(
+            array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY),
+            $capabilities->toArray()
+        );
+    }
+
+    public function testShouldInstantiateEmptyInstance()
+    {
+        $capabilities = new DesiredCapabilities();
+
+        $this->assertNull($capabilities->getCapability('foo'));
+        $this->assertSame(array(), $capabilities->toArray());
+    }
+
+    public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
+    {
+        $capabilities = new DesiredCapabilities();
+        // generic capability setter
+        $capabilities->setCapability('custom', 1337);
+        // specific setters
+        $capabilities->setBrowserName(WebDriverBrowserType::CHROME);
+        $capabilities->setPlatform(WebDriverPlatform::LINUX);
+        $capabilities->setVersion(333);
+
+        $this->assertSame(1337, $capabilities->getCapability('custom'));
+        $this->assertSame(WebDriverBrowserType::CHROME, $capabilities->getBrowserName());
+        $this->assertSame(WebDriverPlatform::LINUX, $capabilities->getPlatform());
+        $this->assertSame(333, $capabilities->getVersion());
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage isJavascriptEnable() is a htmlunit-only option
+     */
+    public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
+    {
+        $capabilities = new DesiredCapabilities();
+        $capabilities->setBrowserName(WebDriverBrowserType::FIREFOX);
+        $capabilities->setJavascriptEnabled(false);
+    }
+
+    public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser()
+    {
+        $capabilities = new DesiredCapabilities();
+        $capabilities->setBrowserName(WebDriverBrowserType::HTMLUNIT);
+        $capabilities->setJavascriptEnabled(false);
+
+        $this->assertFalse($capabilities->isJavascriptEnabled());
+    }
+
+    /**
+     * @dataProvider browserCapabilitiesProvider
+     * @param string $setupMethod
+     * @param string $expectedBrowser
+     * @param string $expectedPlatform
+     */
+    public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
+        $setupMethod,
+        $expectedBrowser,
+        $expectedPlatform
+    ) {
+        /** @var DesiredCapabilities $capabilities */
+        $capabilities = call_user_func(array('Facebook\WebDriver\Remote\DesiredCapabilities', $setupMethod));
+
+        $this->assertSame($expectedBrowser, $capabilities->getBrowserName());
+        $this->assertSame($expectedPlatform, $capabilities->getPlatform());
+    }
+
+    /**
+     * @return array
+     */
+    public function browserCapabilitiesProvider()
+    {
+        return array(
+            array('android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID),
+            array('chrome', WebDriverBrowserType::CHROME, WebDriverPlatform::ANY),
+            array('firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY),
+            array('htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
+            array('htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
+            array('internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS),
+            array('iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC),
+            array('ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC),
+            array('opera', WebDriverBrowserType::OPERA, WebDriverPlatform::ANY),
+            array('safari', WebDriverBrowserType::SAFARI, WebDriverPlatform::ANY),
+            array('phantomjs', WebDriverBrowserType::PHANTOMJS, WebDriverPlatform::ANY),
+        );
+    }
+
+    public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrowser()
+    {
+        $capabilities = DesiredCapabilities::firefox();
+
+        /** @var FirefoxProfile $firefoxProfile */
+        $firefoxProfile = $capabilities->getCapability(FirefoxDriver::PROFILE);
+        $this->assertInstanceOf('Facebook\WebDriver\Firefox\FirefoxProfile', $firefoxProfile);
+
+        $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
+    }
 }
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index b4b9fc052..c315b4b46 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -17,12 +17,12 @@
 
 class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
 {
-  public function testShouldSetOptionsUsingConstructot()
-  {
-    $command = new WebDriverCommand('session-id-123', 'bar-baz-name', array('foo' => 'bar'));
+    public function testShouldSetOptionsUsingConstructot()
+    {
+        $command = new WebDriverCommand('session-id-123', 'bar-baz-name', array('foo' => 'bar'));
 
-    $this->assertSame('session-id-123', $command->getSessionID());
-    $this->assertSame('bar-baz-name', $command->getName());
-    $this->assertSame(array('foo' => 'bar'), $command->getParameters());
-  }
+        $this->assertSame('session-id-123', $command->getSessionID());
+        $this->assertSame('bar-baz-name', $command->getName());
+        $this->assertSame(array('foo' => 'bar'), $command->getParameters());
+    }
 }

From c8d18c6a6a214225aee6724c6a2f955cce163bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jul 2016 16:19:22 +0200
Subject: [PATCH 218/784] Check codestyle on Travis

---
 .gitignore    |  3 ++-
 .php_cs       | 41 +++++++++++++++++++++++++++++++++++++++++
 .travis.yml   | 25 +++++++++++++++++--------
 composer.json |  4 +++-
 4 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 .php_cs

diff --git a/.gitignore b/.gitignore
index 88ca8c5ff..2444076bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,11 @@
 composer.phar
 composer.lock
 vendor
+.php_cs.cache
 
 # generic files to ignore
 *.lock
 *.DS_Store
 *~
 *.swp
-.idea
\ No newline at end of file
+.idea
diff --git a/.php_cs b/.php_cs
new file mode 100644
index 000000000..752fb9606
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,41 @@
+<?php
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(array(__DIR__ . '/lib', __DIR__ . '/tests'));
+
+return Symfony\CS\Config\Config::create()
+    ->fixers(array(
+        'duplicate_semicolon',
+        'extra_empty_lines',
+        'multiline_array_trailing_comma',
+        'namespace_no_leading_whitespace',
+        'new_with_braces',
+        'no_blank_lines_after_class_opening',
+        'no_empty_lines_after_phpdocs',
+        'object_operator',
+        'operators_spaces',
+        'trim_array_spaces',
+        'phpdoc_indent',
+        'phpdoc_no_access',
+        'phpdoc_no_empty_return',
+        'phpdoc_no_package',
+        'phpdoc_scalar',
+        'phpdoc_trim',
+        'phpdoc_types',
+        'phpdoc_order',
+        'unused_use',
+        'ordered_use',
+        'remove_leading_slash_use',
+        'remove_lines_between_uses',
+        'function_typehint_space',
+        'self_accessor',
+        'single_array_no_trailing_comma',
+        'single_blank_line_before_namespace',
+        'single_quote',
+        'spaces_cast',
+        'whitespacy_lines',
+        'newline_after_open_tag',
+    ))
+    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
+    ->setUsingCache(true)
+    ->finder($finder);
diff --git a/.travis.yml b/.travis.yml
index 20d852e96..eb8e94685 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,12 @@ php:
   - 7
   - hhvm
 
+matrix:
+  include:
+    # Add PHP 7 build to check codestyle only in PHP 7 build
+    - php: 7
+      env: CHECK_CODESTYLE=1
+
 env:
   global:
     - DISPLAY=:99.0
@@ -19,18 +25,21 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  - composer self-update
+  - travis_retry composer self-update
 
 install:
-  - composer install --no-interaction --prefer-source
+  - travis_retry composer install --no-interaction --prefer-source
 
 before_script:
-  - sh -e /etc/init.d/xvfb start
-  - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
-  - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
-  - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done;
-
-script: ./vendor/bin/phpunit
+  - if [ -z "$CHECK_CODESTYLE" ]; then sh -e /etc/init.d/xvfb start; fi
+  - if [ -z "$CHECK_CODESTYLE" ]; then wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar; fi
+  - if [ -z "$CHECK_CODESTYLE" ]; then java -jar selenium-server-standalone-2.45.0.jar -log selenium.log; fi &
+  - if [ -z "$CHECK_CODESTYLE" ]; then until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done; fi
+
+script:
+  - if [ -n "$CHECK_CODESTYLE" ]; then ./vendor/bin/php-cs-fixer fix --diff --dry-run; fi
+  - if [ -n "$CHECK_CODESTYLE" ]; then ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/; fi
+  - if [ -z "$CHECK_CODESTYLE" ]; then ./vendor/bin/phpunit; fi
 
 after_script:
   - cat selenium.log
diff --git a/composer.json b/composer.json
index 43c61fa88..227542bf1 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,9 @@
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.6.* || ~5.0"
+    "phpunit/phpunit": "4.6.* || ~5.0",
+    "friendsofphp/php-cs-fixer": "^1.11",
+    "squizlabs/php_codesniffer": "^2.6"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"

From 642b5e4d2348d3f79080a62be1d8ce44af8fbe6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jul 2016 16:41:07 +0200
Subject: [PATCH 219/784] Update contributor info with code-style requirements

---
 CONTRIBUTING.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b426d475d..2abd92165 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ send a pull request (see bellow) with your contribution.
 
 1. Fork the project on GitHub
 2. Implement your code changes into separate branch
-3. Make sure all PHPUnit tests passes (see below). We also have Travis CI build which will automatically run tests on your pull request).
+3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have Travis CI build which will automatically run tests on your pull request.
 4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
 5. Submit your [pull request](https://github.com/facebook/php-webdriver/pulls) against community branch
  
@@ -34,3 +34,10 @@ For the functional tests you must first download and start the selenium server,
 
     java -jar selenium-server-standalone-2.48.2.jar -log selenium.log &
     ./vendor/bin/phpunit --testsuite functional
+
+### Check coding style
+
+Your code-style should comply with [PSR-2](http://www.php-fig.org/psr/psr-2/). To make sure your code matches this requirement run:
+
+    ./vendor/bin/php-cs-fixer fix --diff --dry-run
+    ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/

From 8dd44ed56e4c61f308597486c47268a7574407de Mon Sep 17 00:00:00 2001
From: Michael Rijsdijk <MichaelRijsdijk@users.noreply.github.com>
Date: Wed, 3 Aug 2016 14:06:12 +0200
Subject: [PATCH 220/784] Edit the link to the official Java API

The link to the official Java API was broken
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b426d475d..a6125e2b3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ send a pull request (see bellow) with your contribution.
 Note before any pull request can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed.
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
-FYI, here is the overview of [the official Java API](http://selenium.googlecode.com/svn/trunk/docs/api/java/index.html?overview-summary.html)
+FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
 
 ### Run unit tests
 

From 8606656ea824e535d56de3582ddec532a552cb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 2 Aug 2016 00:57:34 +0200
Subject: [PATCH 221/784] Add MicrosoftEdge to known browser types to enable
 basic Edge support (see #244)

---
 lib/Remote/DesiredCapabilities.php            | 11 +++++++++++
 lib/Remote/WebDriverBrowserType.php           |  1 +
 tests/unit/Remote/DesiredCapabilitiesTest.php |  1 +
 3 files changed, 13 insertions(+)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 8e30aae14..9366a0293 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -271,6 +271,17 @@ public static function internetExplorer()
         ));
     }
 
+    /**
+     * @return DesiredCapabilities
+     */
+    public static function microsoftEdge()
+    {
+        return new self(array(
+            WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::MICROSOFT_EDGE,
+            WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
+        ));
+    }
+
     /**
      * @return DesiredCapabilities
      */
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 977662a4a..4aa38125c 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -28,6 +28,7 @@ class WebDriverBrowserType
     const GOOGLECHROME = 'googlechrome';
     const SAFARI = 'safari';
     const OPERA = 'opera';
+    const MICROSOFT_EDGE = 'MicrosoftEdge';
     const IEXPLORE = 'iexplore';
     const IEXPLORE_PROXY = 'iexploreproxy';
     const SAFARI_PROXY = 'safariproxy';
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 54f17a14d..c68a747ed 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -110,6 +110,7 @@ public function browserCapabilitiesProvider()
             array('firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY),
             array('htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
             array('htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
+            array('MicrosoftEdge', WebDriverBrowserType::MICROSOFT_EDGE, WebDriverPlatform::WINDOWS),
             array('internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS),
             array('iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC),
             array('ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC),

From 5b3fdbe2fef3e3cba60d1d11904a487c67c0c22b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 18 Aug 2016 20:23:18 +0200
Subject: [PATCH 222/784] Remove deprecated browser types

---
 lib/Remote/WebDriverBrowserType.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 4aa38125c..5dd61505e 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -21,17 +21,15 @@
 class WebDriverBrowserType
 {
     const FIREFOX = 'firefox';
-    const FIREFOX_2 = 'firefox2';
-    const FIREFOX_3 = 'firefox3';
     const FIREFOX_PROXY = 'firefoxproxy';
     const FIREFOX_CHROME = 'firefoxchrome';
     const GOOGLECHROME = 'googlechrome';
     const SAFARI = 'safari';
+    const SAFARI_PROXY = 'safariproxy';
     const OPERA = 'opera';
     const MICROSOFT_EDGE = 'MicrosoftEdge';
     const IEXPLORE = 'iexplore';
     const IEXPLORE_PROXY = 'iexploreproxy';
-    const SAFARI_PROXY = 'safariproxy';
     const CHROME = 'chrome';
     const KONQUEROR = 'konqueror';
     const MOCK = 'mock';

From 78582b90b721861bce6f90c2762d64a02c8fb51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 26 Aug 2016 00:31:32 +0200
Subject: [PATCH 223/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f379bdaa7..b24bc9bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- Added initial basic support of Microsoft Edge browser
+
+## 1.1.3 - 2016-08-10
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
 - Comply codestyle with [PSR-2](http://www.php-fig.org/psr/psr-2/)
 

From b9cd2ad25331566d5f9957e279ac31bb3ba56a2d Mon Sep 17 00:00:00 2001
From: Ivan Sebastian <ivantedja@gmail.com>
Date: Wed, 14 Sep 2016 09:04:02 +0700
Subject: [PATCH 224/784] Modify README to add link to sample code

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 146d45ad6..6cdae5742 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,8 @@ $driver = RemoteWebDriver::create($host, $desired_capabilities);
 
 * See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities for more details.
 
+* Above snippets are not intended to be a working example by simply copy pasting. See [example.php](example.php) for working example.
+
 ## Changelog
 For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 

From af4294ce7d703d39860a98d8a4c8545d62466580 Mon Sep 17 00:00:00 2001
From: Phelipe Alves de Souza <sougyn@gmail.com>
Date: Fri, 16 Sep 2016 18:54:23 -0300
Subject: [PATCH 225/784] Declared not found fields

---
 lib/Interactions/Touch/WebDriverFlickAction.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Interactions/Touch/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
index 48e65dc95..52f43fde6 100644
--- a/lib/Interactions/Touch/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -19,6 +19,9 @@
 
 class WebDriverFlickAction extends WebDriverTouchAction implements WebDriverAction
 {
+    private $x;
+    private $y;
+
     /**
      * @param WebDriverTouchScreen $touch_screen
      * @param int $x

From 3ab0f89954a5bae784f3c4dab2cc57624bba7ba8 Mon Sep 17 00:00:00 2001
From: Sepehr Lajevardi <lajevardi@gmail.com>
Date: Tue, 20 Sep 2016 00:49:47 +0430
Subject: [PATCH 226/784] Fix typo in test method name.

---
 tests/unit/Remote/WebDriverCommandTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index c315b4b46..30a206119 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -17,7 +17,7 @@
 
 class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
 {
-    public function testShouldSetOptionsUsingConstructot()
+    public function testShouldSetOptionsUsingConstructor()
     {
         $command = new WebDriverCommand('session-id-123', 'bar-baz-name', array('foo' => 'bar'));
 

From 25eeb6a1f2b99a85a8b79c6418e2453cd82a9f3e Mon Sep 17 00:00:00 2001
From: Sepehr Lajevardi <lajevardi@gmail.com>
Date: Wed, 5 Oct 2016 10:09:03 +0330
Subject: [PATCH 227/784] Utilize late static binding.

---
 lib/Chrome/ChromeDriverService.php |  2 +-
 lib/Remote/DesiredCapabilities.php | 24 ++++++++++----------
 lib/WebDriverBy.php                | 16 ++++++-------
 lib/WebDriverExpectedCondition.php | 36 +++++++++++++++---------------
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index a48207a46..4fb3b59e5 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -27,7 +27,7 @@ public static function createDefaultService()
         $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
         $port = 9515; // TODO: Get another port if the default port is used.
         $args = array("--port=$port");
-        $service = new self($exe, $port, $args);
+        $service = new static($exe, $port, $args);
 
         return $service;
     }
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 9366a0293..2a132b576 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -201,7 +201,7 @@ private function get($key, $default = null)
      */
     public static function android()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANDROID,
         ));
@@ -212,7 +212,7 @@ public static function android()
      */
     public static function chrome()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -223,7 +223,7 @@ public static function chrome()
      */
     public static function firefox()
     {
-        $caps = new self(array(
+        $caps = new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -241,7 +241,7 @@ public static function firefox()
      */
     public static function htmlUnit()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -252,7 +252,7 @@ public static function htmlUnit()
      */
     public static function htmlUnitWithJS()
     {
-        $caps = new self(array(
+        $caps = new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -265,7 +265,7 @@ public static function htmlUnitWithJS()
      */
     public static function internetExplorer()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
         ));
@@ -276,7 +276,7 @@ public static function internetExplorer()
      */
     public static function microsoftEdge()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::MICROSOFT_EDGE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
         ));
@@ -287,7 +287,7 @@ public static function microsoftEdge()
      */
     public static function iphone()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
         ));
@@ -298,7 +298,7 @@ public static function iphone()
      */
     public static function ipad()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
         ));
@@ -309,7 +309,7 @@ public static function ipad()
      */
     public static function opera()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -320,7 +320,7 @@ public static function opera()
      */
     public static function safari()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
@@ -331,7 +331,7 @@ public static function safari()
      */
     public static function phantomjs()
     {
-        return new self(array(
+        return new static(array(
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ));
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index 92242ae56..af51c26b2 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -58,7 +58,7 @@ public function getValue()
      */
     public static function className($class_name)
     {
-        return new self('class name', $class_name);
+        return new static('class name', $class_name);
     }
 
     /**
@@ -69,7 +69,7 @@ public static function className($class_name)
      */
     public static function cssSelector($css_selector)
     {
-        return new self('css selector', $css_selector);
+        return new static('css selector', $css_selector);
     }
 
     /**
@@ -80,7 +80,7 @@ public static function cssSelector($css_selector)
      */
     public static function id($id)
     {
-        return new self('id', $id);
+        return new static('id', $id);
     }
 
     /**
@@ -91,7 +91,7 @@ public static function id($id)
      */
     public static function name($name)
     {
-        return new self('name', $name);
+        return new static('name', $name);
     }
 
     /**
@@ -102,7 +102,7 @@ public static function name($name)
      */
     public static function linkText($link_text)
     {
-        return new self('link text', $link_text);
+        return new static('link text', $link_text);
     }
 
     /**
@@ -114,7 +114,7 @@ public static function linkText($link_text)
      */
     public static function partialLinkText($partial_link_text)
     {
-        return new self('partial link text', $partial_link_text);
+        return new static('partial link text', $partial_link_text);
     }
 
     /**
@@ -125,7 +125,7 @@ public static function partialLinkText($partial_link_text)
      */
     public static function tagName($tag_name)
     {
-        return new self('tag name', $tag_name);
+        return new static('tag name', $tag_name);
     }
 
     /**
@@ -136,6 +136,6 @@ public static function tagName($tag_name)
      */
     public static function xpath($xpath)
     {
-        return new self('xpath', $xpath);
+        return new static('xpath', $xpath);
     }
 }
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 8c069bd41..775d23cf5 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -55,7 +55,7 @@ protected function __construct($apply)
      */
     public static function titleIs($title)
     {
-        return new self(
+        return new static(
             function ($driver) use ($title) {
                 return $title === $driver->getTitle();
             }
@@ -71,7 +71,7 @@ function ($driver) use ($title) {
      */
     public static function titleContains($title)
     {
-        return new self(
+        return new static(
             function ($driver) use ($title) {
                 return strpos($driver->getTitle(), $title) !== false;
             }
@@ -88,7 +88,7 @@ function ($driver) use ($title) {
      */
     public static function presenceOfElementLocated(WebDriverBy $by)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by) {
                 return $driver->findElement($by);
             }
@@ -106,7 +106,7 @@ function ($driver) use ($by) {
      */
     public static function visibilityOfElementLocated(WebDriverBy $by)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by) {
                 try {
                     $element = $driver->findElement($by);
@@ -130,7 +130,7 @@ function ($driver) use ($by) {
      */
     public static function visibilityOf(WebDriverElement $element)
     {
-        return new self(
+        return new static(
             function ($driver) use ($element) {
                 return $element->isDisplayed() ? $element : null;
             }
@@ -147,7 +147,7 @@ function ($driver) use ($element) {
      */
     public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by) {
                 $elements = $driver->findElements($by);
 
@@ -166,7 +166,7 @@ function ($driver) use ($by) {
      */
     public static function textToBePresentInElement(WebDriverBy $by, $text)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getText();
@@ -189,7 +189,7 @@ function ($driver) use ($by, $text) {
      */
     public static function textToBePresentInElementValue(WebDriverBy $by, $text)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getAttribute('value');
@@ -213,7 +213,7 @@ function ($driver) use ($by, $text) {
      */
     public static function frameToBeAvailableAndSwitchToIt($frame_locator)
     {
-        return new self(
+        return new static(
             function ($driver) use ($frame_locator) {
                 try {
                     return $driver->switchTo()->frame($frame_locator);
@@ -234,7 +234,7 @@ function ($driver) use ($frame_locator) {
      */
     public static function invisibilityOfElementLocated(WebDriverBy $by)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by) {
                 try {
                     return !($driver->findElement($by)->isDisplayed());
@@ -258,7 +258,7 @@ function ($driver) use ($by) {
      */
     public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
     {
-        return new self(
+        return new static(
             function ($driver) use ($by, $text) {
                 try {
                     return !($driver->findElement($by)->getText() === $text);
@@ -284,7 +284,7 @@ public static function elementToBeClickable(WebDriverBy $by)
         $visibility_of_element_located =
             self::visibilityOfElementLocated($by);
 
-        return new self(
+        return new static(
             function ($driver) use ($visibility_of_element_located) {
                 $element = call_user_func(
                     $visibility_of_element_located->getApply(),
@@ -312,7 +312,7 @@ function ($driver) use ($visibility_of_element_located) {
      */
     public static function stalenessOf(WebDriverElement $element)
     {
-        return new self(
+        return new static(
             function ($driver) use ($element) {
                 try {
                     $element->isEnabled();
@@ -340,7 +340,7 @@ function ($driver) use ($element) {
      */
     public static function refreshed(WebDriverExpectedCondition $condition)
     {
-        return new self(
+        return new static(
             function ($driver) use ($condition) {
                 try {
                     return call_user_func($condition->getApply(), $driver);
@@ -375,14 +375,14 @@ public static function elementToBeSelected($element_or_by)
     public static function elementSelectionStateToBe($element_or_by, $selected)
     {
         if ($element_or_by instanceof WebDriverElement) {
-            return new self(
+            return new static(
                 function ($driver) use ($element_or_by, $selected) {
                     return $element_or_by->isSelected() === $selected;
                 }
             );
         } else {
             if ($element_or_by instanceof WebDriverBy) {
-                return new self(
+                return new static(
                     function ($driver) use ($element_or_by, $selected) {
                         try {
                             $element = $driver->findElement($element_or_by);
@@ -405,7 +405,7 @@ function ($driver) use ($element_or_by, $selected) {
      */
     public static function alertIsPresent()
     {
-        return new self(
+        return new static(
             function ($driver) {
                 try {
                     // Unlike the Java code, we get a WebDriverAlert object regardless
@@ -430,7 +430,7 @@ function ($driver) {
      */
     public static function not(WebDriverExpectedCondition $condition)
     {
-        return new self(
+        return new static(
             function ($driver) use ($condition) {
                 $result = call_user_func($condition->getApply(), $driver);
 

From a67e8ec9674a0951c268c3e1b542c6925de8c055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2016 21:42:33 +0200
Subject: [PATCH 228/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b24bc9bcb..0b067bed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 - Added initial basic support of Microsoft Edge browser
+- Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible
 
 ## 1.1.3 - 2016-08-10
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file

From 395cf63e6d85715951143240e35479e5fb8b800c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 20 Sep 2016 18:41:55 +0200
Subject: [PATCH 229/784] Require PHP 5.5+ (fixes #324)

---
 .travis.yml   | 5 +----
 CHANGELOG.md  | 1 +
 composer.json | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb8e94685..facb0d4db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 language: php
 
-sudo: false
-
 php:
-  - 5.3
-  - 5.4
   - 5.5
   - 5.6
   - 7
+  - 7.1
   - hhvm
 
 matrix:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b067bed7..a74435bef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 - Added initial basic support of Microsoft Edge browser
 - Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible
+- PHP version at least 5.5 is required
 
 ## 1.1.3 - 2016-08-10
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
diff --git a/composer.json b/composer.json
index 227542bf1..e8afaf77e 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": ">=5.3.19",
+    "php": "^5.5 || ~7.0",
     "ext-curl": "*"
   },
   "require-dev": {

From 89d3c316cb9e71b4d20c94a37f1e65c8e5ed615a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 20 Sep 2016 18:52:08 +0200
Subject: [PATCH 230/784] Use PHP 5.5 features - class, short array syntax

---
 .php_cs                                       |  32 ++-
 example.php                                   |  18 +-
 lib/Chrome/ChromeDriver.php                   |   4 +-
 lib/Chrome/ChromeDriverService.php            |   2 +-
 lib/Chrome/ChromeOptions.php                  |   6 +-
 lib/Firefox/FirefoxProfile.php                |   8 +-
 lib/Interactions/WebDriverCompositeAction.php |   2 +-
 lib/JavaScriptExecutor.php                    |   4 +-
 lib/Remote/DesiredCapabilities.php            |  50 ++---
 lib/Remote/ExecuteMethod.php                  |   2 +-
 lib/Remote/HttpCommandExecutor.php            | 209 ++++++++----------
 lib/Remote/RemoteExecuteMethod.php            |   2 +-
 lib/Remote/RemoteKeyboard.php                 |  16 +-
 lib/Remote/RemoteMouse.php                    |  10 +-
 lib/Remote/RemoteTargetLocator.php            |   8 +-
 lib/Remote/RemoteTouchScreen.php              |  34 +--
 lib/Remote/RemoteWebDriver.php                |  40 ++--
 lib/Remote/RemoteWebElement.php               |  56 ++---
 lib/Remote/Service/DriverService.php          |  14 +-
 lib/Support/Events/EventFiringWebDriver.php   |   6 +-
 lib/Support/Events/EventFiringWebElement.php  |   2 +-
 lib/WebDriverAction.php                       |   2 -
 lib/WebDriverAlert.php                        |   2 +-
 lib/WebDriverDispatcher.php                   |   4 +-
 lib/WebDriverExpectedCondition.php            |   4 +-
 lib/WebDriverKeys.php                         |   4 +-
 lib/WebDriverNavigation.php                   |   2 +-
 lib/WebDriverOptions.php                      |   6 +-
 lib/WebDriverSelect.php                       |   2 +-
 lib/WebDriverTimeouts.php                     |   8 +-
 lib/WebDriverWindow.php                       |  18 +-
 tests/functional/WebDriverTestCase.php        |   4 +-
 .../WebDriverButtonReleaseActionTest.php      |   6 +-
 .../Internal/WebDriverClickActionTest.php     |   6 +-
 .../WebDriverClickAndHoldActionTest.php       |   6 +-
 .../WebDriverContextClickActionTest.php       |   6 +-
 .../WebDriverDoubleClickActionTest.php        |   6 +-
 .../Internal/WebDriverKeyDownActionTest.php   |   8 +-
 .../Internal/WebDriverKeyUpActionTest.php     |   8 +-
 .../Internal/WebDriverMouseMoveActionTest.php |   6 +-
 .../WebDriverMouseToOffsetActionTest.php      |   6 +-
 .../Internal/WebDriverSendKeysActionTest.php  |  10 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php |  38 ++--
 tests/unit/Remote/WebDriverCommandTest.php    |   4 +-
 44 files changed, 340 insertions(+), 351 deletions(-)

diff --git a/.php_cs b/.php_cs
index 752fb9606..0466edfbe 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,17 +1,24 @@
 <?php
 
 $finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in(array(__DIR__ . '/lib', __DIR__ . '/tests'));
+    ->in([__DIR__ . '/lib', __DIR__ . '/tests']);
 
 return Symfony\CS\Config\Config::create()
-    ->fixers(array(
+    ->fixers([
+        'array_element_white_space_after_comma',
         'duplicate_semicolon',
         'extra_empty_lines',
+        'function_typehint_space',
+        'lowercase_cast',
+        'method_argument_default_value',
         'multiline_array_trailing_comma',
         'namespace_no_leading_whitespace',
+        'native_function_casing',
         'new_with_braces',
         'no_blank_lines_after_class_opening',
         'no_empty_lines_after_phpdocs',
+        'no_empty_phpdoc',
+        'no_empty_statement',
         'object_operator',
         'operators_spaces',
         'trim_array_spaces',
@@ -20,6 +27,7 @@ return Symfony\CS\Config\Config::create()
         'phpdoc_no_empty_return',
         'phpdoc_no_package',
         'phpdoc_scalar',
+        'phpdoc_single_line_var_spacing',
         'phpdoc_trim',
         'phpdoc_types',
         'phpdoc_order',
@@ -27,15 +35,31 @@ return Symfony\CS\Config\Config::create()
         'ordered_use',
         'remove_leading_slash_use',
         'remove_lines_between_uses',
-        'function_typehint_space',
+        'return',
         'self_accessor',
         'single_array_no_trailing_comma',
         'single_blank_line_before_namespace',
         'single_quote',
+        'spaces_after_semicolon',
+        'spaces_before_semicolon',
         'spaces_cast',
+        'standardize_not_equal',
+        'ternary_spaces',
+        'trim_array_spaces',
+        'unary_operators_spaces',
+        'unused_use',
         'whitespacy_lines',
+
+        // additional contrib checks
+        'concat_with_spaces',
         'newline_after_open_tag',
-    ))
+        'no_useless_else',
+        'no_useless_return',
+        'php_unit_construct',
+        'php_unit_dedicate_assert',
+        'phpdoc_order',
+        'short_array_syntax',
+    ])
     ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
     ->setUsingCache(true)
     ->finder($finder);
diff --git a/example.php b/example.php
index 690a3b1c3..03b16728e 100644
--- a/example.php
+++ b/example.php
@@ -18,16 +18,16 @@
 
 // adding cookie
 $driver->manage()->deleteAllCookies();
-$driver->manage()->addCookie(array(
-  'name' => 'cookie_name',
-  'value' => 'cookie_value',
-));
+$driver->manage()->addCookie([
+    'name' => 'cookie_name',
+    'value' => 'cookie_value',
+]);
 $cookies = $driver->manage()->getCookies();
 print_r($cookies);
 
 // click the link 'About'
 $link = $driver->findElement(
-  WebDriverBy::id('menu_about')
+    WebDriverBy::id('menu_about')
 );
 $link->click();
 
@@ -39,15 +39,15 @@
 
 // Search 'php' in the search box
 $input = $driver->findElement(
-  WebDriverBy::id('q')
+    WebDriverBy::id('q')
 );
 $input->sendKeys('php')->submit();
 
 // wait at most 10 seconds until at least one result is shown
 $driver->wait(10)->until(
-  WebDriverExpectedCondition::presenceOfAllElementsLocatedBy(
-    WebDriverBy::className('gsc-result')
-  )
+    WebDriverExpectedCondition::presenceOfAllElementsLocatedBy(
+        WebDriverBy::className('gsc-result')
+    )
 );
 
 // close the Firefox
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 75131c215..be807d7bc 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -45,9 +45,9 @@ public function startSession($desired_capabilities)
         $command = new WebDriverCommand(
             null,
             DriverCommand::NEW_SESSION,
-            array(
+            [
                 'desiredCapabilities' => $desired_capabilities->toArray(),
-            )
+            ]
         );
         $response = $this->executor->execute($command);
         $this->setSessionID($response->getSessionID());
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index 4fb3b59e5..90b3d24f7 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -26,7 +26,7 @@ public static function createDefaultService()
     {
         $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
         $port = 9515; // TODO: Get another port if the default port is used.
-        $args = array("--port=$port");
+        $args = ["--port=$port"];
         $service = new static($exe, $port, $args);
 
         return $service;
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 3af14b9c3..901dc5388 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -31,7 +31,7 @@ class ChromeOptions
     /**
      * @var array
      */
-    private $arguments = array();
+    private $arguments = [];
     /**
      * @var string
      */
@@ -39,11 +39,11 @@ class ChromeOptions
     /**
      * @var array
      */
-    private $extensions = array();
+    private $extensions = [];
     /**
      * @var array
      */
-    private $experimentalOptions = array();
+    private $experimentalOptions = [];
 
     /**
      * Sets the path of the Chrome executable. The path should be either absolute
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 925ac157f..6dd4d41b3 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -26,15 +26,15 @@ class FirefoxProfile
     /**
      * @var array
      */
-    private $preferences = array();
+    private $preferences = [];
     /**
      * @var array
      */
-    private $extensions = array();
+    private $extensions = [];
     /**
      * @var array
      */
-    private $extensions_datas = array();
+    private $extensions_datas = [];
     /**
      * @var string
      */
@@ -220,7 +220,7 @@ private function installExtension($extension, $profile_dir)
             }
         }
         // Get the extension id from the install manifest.
-        $matches = array();
+        $matches = [];
         preg_match('#<' . $prefix . 'id>([^<]+)</' . $prefix . 'id>#', $xml->asXML(), $matches);
         if (isset($matches[1])) {
             $ext_dir = $profile_dir . '/extensions/' . $matches[1];
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index f17cc4588..742544f59 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -22,7 +22,7 @@
  */
 class WebDriverCompositeAction implements WebDriverAction
 {
-    private $actions = array();
+    private $actions = [];
 
     /**
      * Add an WebDriverAction to the sequence.
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index 61aa21b0e..d4a587acf 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -29,7 +29,7 @@ interface JavaScriptExecutor
      * @param array $arguments The arguments of the script.
      * @return mixed The return value of the script.
      */
-    public function executeScript($script, array $arguments = array());
+    public function executeScript($script, array $arguments = []);
 
     /**
      * Inject a snippet of JavaScript into the page for asynchronous execution in
@@ -44,5 +44,5 @@ public function executeScript($script, array $arguments = array());
      * @param array $arguments The arguments of the script.
      * @return mixed The value passed by the script to the callback.
      */
-    public function executeAsyncScript($script, array $arguments = array());
+    public function executeAsyncScript($script, array $arguments = []);
 }
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 2a132b576..a1cbfddf0 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -27,7 +27,7 @@ class DesiredCapabilities implements WebDriverCapabilities
 {
     private $capabilities;
 
-    public function __construct(array $capabilities = array())
+    public function __construct(array $capabilities = [])
     {
         $this->capabilities = $capabilities;
     }
@@ -201,10 +201,10 @@ private function get($key, $default = null)
      */
     public static function android()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::ANDROID,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANDROID,
-        ));
+        ]);
     }
 
     /**
@@ -212,10 +212,10 @@ public static function android()
      */
     public static function chrome()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
     }
 
     /**
@@ -223,10 +223,10 @@ public static function chrome()
      */
     public static function firefox()
     {
-        $caps = new static(array(
+        $caps = new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::FIREFOX,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
 
         // disable the "Reader View" help tooltip, which can hide elements in the window.document
         $profile = new FirefoxProfile();
@@ -241,10 +241,10 @@ public static function firefox()
      */
     public static function htmlUnit()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
     }
 
     /**
@@ -252,10 +252,10 @@ public static function htmlUnit()
      */
     public static function htmlUnitWithJS()
     {
-        $caps = new static(array(
+        $caps = new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::HTMLUNIT,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
 
         return $caps->setJavascriptEnabled(true);
     }
@@ -265,10 +265,10 @@ public static function htmlUnitWithJS()
      */
     public static function internetExplorer()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
-        ));
+        ]);
     }
 
     /**
@@ -276,10 +276,10 @@ public static function internetExplorer()
      */
     public static function microsoftEdge()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::MICROSOFT_EDGE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::WINDOWS,
-        ));
+        ]);
     }
 
     /**
@@ -287,10 +287,10 @@ public static function microsoftEdge()
      */
     public static function iphone()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPHONE,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
-        ));
+        ]);
     }
 
     /**
@@ -298,10 +298,10 @@ public static function iphone()
      */
     public static function ipad()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::IPAD,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::MAC,
-        ));
+        ]);
     }
 
     /**
@@ -309,10 +309,10 @@ public static function ipad()
      */
     public static function opera()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::OPERA,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
     }
 
     /**
@@ -320,10 +320,10 @@ public static function opera()
      */
     public static function safari()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::SAFARI,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
     }
 
     /**
@@ -331,9 +331,9 @@ public static function safari()
      */
     public static function phantomjs()
     {
-        return new static(array(
+        return new static([
             WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::PHANTOMJS,
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
-        ));
+        ]);
     }
 }
diff --git a/lib/Remote/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
index 38ad319e7..b12c25ed8 100644
--- a/lib/Remote/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -22,5 +22,5 @@ interface ExecuteMethod
      * @param array $parameters
      * @return WebDriverResponse
      */
-    public function execute($command_name, array $parameters = array());
+    public function execute($command_name, array $parameters = []);
 }
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 37670610d..9cfcd1fa4 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -29,142 +29,109 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
      * @see
      *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
      */
-    protected static $commands = array(
-        DriverCommand::ACCEPT_ALERT => array('method' => 'POST', 'url' => '/session/:sessionId/accept_alert'),
-        DriverCommand::ADD_COOKIE => array('method' => 'POST', 'url' => '/session/:sessionId/cookie'),
-        DriverCommand::CLEAR_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'),
-        DriverCommand::CLICK_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'),
-        DriverCommand::CLOSE => array('method' => 'DELETE', 'url' => '/session/:sessionId/window'),
-        DriverCommand::DELETE_ALL_COOKIES => array('method' => 'DELETE', 'url' => '/session/:sessionId/cookie'),
-        DriverCommand::DELETE_COOKIE => array('method' => 'DELETE', 'url' => '/session/:sessionId/cookie/:name'),
-        DriverCommand::DISMISS_ALERT => array('method' => 'POST', 'url' => '/session/:sessionId/dismiss_alert'),
-        DriverCommand::ELEMENT_EQUALS => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/element/:id/equals/:other',
-        ),
-        DriverCommand::FIND_CHILD_ELEMENT => array(
-            'method' => 'POST',
-            'url' => '/session/:sessionId/element/:id/element',
-        ),
-        DriverCommand::FIND_CHILD_ELEMENTS => array(
-            'method' => 'POST',
-            'url' => '/session/:sessionId/element/:id/elements',
-        ),
-        DriverCommand::EXECUTE_SCRIPT => array('method' => 'POST', 'url' => '/session/:sessionId/execute'),
-        DriverCommand::EXECUTE_ASYNC_SCRIPT => array('method' => 'POST', 'url' => '/session/:sessionId/execute_async'),
-        DriverCommand::FIND_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element'),
-        DriverCommand::FIND_ELEMENTS => array('method' => 'POST', 'url' => '/session/:sessionId/elements'),
-        DriverCommand::SWITCH_TO_FRAME => array('method' => 'POST', 'url' => '/session/:sessionId/frame'),
-        DriverCommand::SWITCH_TO_WINDOW => array('method' => 'POST', 'url' => '/session/:sessionId/window'),
-        DriverCommand::GET => array('method' => 'POST', 'url' => '/session/:sessionId/url'),
-        DriverCommand::GET_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/active'),
-        DriverCommand::GET_ALERT_TEXT => array('method' => 'GET', 'url' => '/session/:sessionId/alert_text'),
-        DriverCommand::GET_ALL_COOKIES => array('method' => 'GET', 'url' => '/session/:sessionId/cookie'),
-        DriverCommand::GET_ALL_SESSIONS => array('method' => 'GET', 'url' => '/sessions'),
-        DriverCommand::GET_AVAILABLE_LOG_TYPES => array('method' => 'GET', 'url' => '/session/:sessionId/log/types'),
-        DriverCommand::GET_CURRENT_URL => array('method' => 'GET', 'url' => '/session/:sessionId/url'),
-        DriverCommand::GET_CURRENT_WINDOW_HANDLE => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/window_handle',
-        ),
-        DriverCommand::GET_ELEMENT_ATTRIBUTE => array(
+    protected static $commands = [
+        DriverCommand::ACCEPT_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/accept_alert'],
+        DriverCommand::ADD_COOKIE => ['method' => 'POST', 'url' => '/session/:sessionId/cookie'],
+        DriverCommand::CLEAR_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/clear'],
+        DriverCommand::CLICK_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/click'],
+        DriverCommand::CLOSE => ['method' => 'DELETE', 'url' => '/session/:sessionId/window'],
+        DriverCommand::DELETE_ALL_COOKIES => ['method' => 'DELETE', 'url' => '/session/:sessionId/cookie'],
+        DriverCommand::DELETE_COOKIE => ['method' => 'DELETE', 'url' => '/session/:sessionId/cookie/:name'],
+        DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/dismiss_alert'],
+        DriverCommand::ELEMENT_EQUALS => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/equals/:other'],
+        DriverCommand::FIND_CHILD_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/element'],
+        DriverCommand::FIND_CHILD_ELEMENTS => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/elements'],
+        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute'],
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute_async'],
+        DriverCommand::FIND_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element'],
+        DriverCommand::FIND_ELEMENTS => ['method' => 'POST', 'url' => '/session/:sessionId/elements'],
+        DriverCommand::SWITCH_TO_FRAME => ['method' => 'POST', 'url' => '/session/:sessionId/frame'],
+        DriverCommand::SWITCH_TO_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window'],
+        DriverCommand::GET => ['method' => 'POST', 'url' => '/session/:sessionId/url'],
+        DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/active'],
+        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert_text'],
+        DriverCommand::GET_ALL_COOKIES => ['method' => 'GET', 'url' => '/session/:sessionId/cookie'],
+        DriverCommand::GET_ALL_SESSIONS => ['method' => 'GET', 'url' => '/sessions'],
+        DriverCommand::GET_AVAILABLE_LOG_TYPES => ['method' => 'GET', 'url' => '/session/:sessionId/log/types'],
+        DriverCommand::GET_CURRENT_URL => ['method' => 'GET', 'url' => '/session/:sessionId/url'],
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window_handle'],
+        DriverCommand::GET_ELEMENT_ATTRIBUTE => [
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/attribute/:name',
-        ),
-        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => array(
+        ],
+        DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY => [
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/css/:propertyName',
-        ),
-        DriverCommand::GET_ELEMENT_LOCATION => array(
+        ],
+        DriverCommand::GET_ELEMENT_LOCATION => [
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/location',
-        ),
-        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => array(
+        ],
+        DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW => [
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/location_in_view',
-        ),
-        DriverCommand::GET_ELEMENT_SIZE => array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/size'),
-        DriverCommand::GET_ELEMENT_TAG_NAME => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/element/:id/name',
-        ),
-        DriverCommand::GET_ELEMENT_TEXT => array('method' => 'GET', 'url' => '/session/:sessionId/element/:id/text'),
-        DriverCommand::GET_LOG => array('method' => 'POST', 'url' => '/session/:sessionId/log'),
-        DriverCommand::GET_PAGE_SOURCE => array('method' => 'GET', 'url' => '/session/:sessionId/source'),
-        DriverCommand::GET_SCREEN_ORIENTATION => array('method' => 'GET', 'url' => '/session/:sessionId/orientation'),
-        DriverCommand::GET_CAPABILITIES => array('method' => 'GET', 'url' => '/session/:sessionId'),
-        DriverCommand::GET_TITLE => array('method' => 'GET', 'url' => '/session/:sessionId/title'),
-        DriverCommand::GET_WINDOW_HANDLES => array('method' => 'GET', 'url' => '/session/:sessionId/window_handles'),
-        DriverCommand::GET_WINDOW_POSITION => array(
+        ],
+        DriverCommand::GET_ELEMENT_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/size'],
+        DriverCommand::GET_ELEMENT_TAG_NAME => ['method' => 'GET',  'url' => '/session/:sessionId/element/:id/name'],
+        DriverCommand::GET_ELEMENT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/text'],
+        DriverCommand::GET_LOG => ['method' => 'POST', 'url' => '/session/:sessionId/log'],
+        DriverCommand::GET_PAGE_SOURCE => ['method' => 'GET', 'url' => '/session/:sessionId/source'],
+        DriverCommand::GET_SCREEN_ORIENTATION => ['method' => 'GET', 'url' => '/session/:sessionId/orientation'],
+        DriverCommand::GET_CAPABILITIES => ['method' => 'GET', 'url' => '/session/:sessionId'],
+        DriverCommand::GET_TITLE => ['method' => 'GET', 'url' => '/session/:sessionId/title'],
+        DriverCommand::GET_WINDOW_HANDLES => ['method' => 'GET', 'url' => '/session/:sessionId/window_handles'],
+        DriverCommand::GET_WINDOW_POSITION => [
             'method' => 'GET',
             'url' => '/session/:sessionId/window/:windowHandle/position',
-        ),
-        DriverCommand::GET_WINDOW_SIZE => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/window/:windowHandle/size',
-        ),
-        DriverCommand::GO_BACK => array('method' => 'POST', 'url' => '/session/:sessionId/back'),
-        DriverCommand::GO_FORWARD => array('method' => 'POST', 'url' => '/session/:sessionId/forward'),
-        DriverCommand::IS_ELEMENT_DISPLAYED => array(
+        ],
+        DriverCommand::GET_WINDOW_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/window/:windowHandle/size'],
+        DriverCommand::GO_BACK => ['method' => 'POST', 'url' => '/session/:sessionId/back'],
+        DriverCommand::GO_FORWARD => ['method' => 'POST', 'url' => '/session/:sessionId/forward'],
+        DriverCommand::IS_ELEMENT_DISPLAYED => [
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/displayed',
-        ),
-        DriverCommand::IS_ELEMENT_ENABLED => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/element/:id/enabled',
-        ),
-        DriverCommand::IS_ELEMENT_SELECTED => array(
-            'method' => 'GET',
-            'url' => '/session/:sessionId/element/:id/selected',
-        ),
-        DriverCommand::MAXIMIZE_WINDOW => array(
+        ],
+        DriverCommand::IS_ELEMENT_ENABLED => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/enabled'],
+        DriverCommand::IS_ELEMENT_SELECTED => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/selected'],
+        DriverCommand::MAXIMIZE_WINDOW => [
             'method' => 'POST',
             'url' => '/session/:sessionId/window/:windowHandle/maximize',
-        ),
-        DriverCommand::MOUSE_DOWN => array('method' => 'POST', 'url' => '/session/:sessionId/buttondown'),
-        DriverCommand::MOUSE_UP => array('method' => 'POST', 'url' => '/session/:sessionId/buttonup'),
-        DriverCommand::CLICK => array('method' => 'POST', 'url' => '/session/:sessionId/click'),
-        DriverCommand::DOUBLE_CLICK => array('method' => 'POST', 'url' => '/session/:sessionId/doubleclick'),
-        DriverCommand::MOVE_TO => array('method' => 'POST', 'url' => '/session/:sessionId/moveto'),
-        DriverCommand::NEW_SESSION => array('method' => 'POST', 'url' => '/session'),
-        DriverCommand::QUIT => array('method' => 'DELETE', 'url' => '/session/:sessionId'),
-        DriverCommand::REFRESH => array('method' => 'POST', 'url' => '/session/:sessionId/refresh'),
-        DriverCommand::UPLOAD_FILE => array('method' => 'POST', 'url' => '/session/:sessionId/file'), // undocumented
-        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/keys'),
-        DriverCommand::SET_ALERT_VALUE => array('method' => 'POST', 'url' => '/session/:sessionId/alert_text'),
-        DriverCommand::SEND_KEYS_TO_ELEMENT => array(
-            'method' => 'POST',
-            'url' => '/session/:sessionId/element/:id/value',
-        ),
-        DriverCommand::IMPLICITLY_WAIT => array(
-            'method' => 'POST',
-            'url' => '/session/:sessionId/timeouts/implicit_wait',
-        ),
-        DriverCommand::SET_SCREEN_ORIENTATION => array('method' => 'POST', 'url' => '/session/:sessionId/orientation'),
-        DriverCommand::SET_TIMEOUT => array('method' => 'POST', 'url' => '/session/:sessionId/timeouts'),
-        DriverCommand::SET_SCRIPT_TIMEOUT => array(
-            'method' => 'POST',
-            'url' => '/session/:sessionId/timeouts/async_script',
-        ),
-        DriverCommand::SET_WINDOW_POSITION => array(
+        ],
+        DriverCommand::MOUSE_DOWN => ['method' => 'POST', 'url' => '/session/:sessionId/buttondown'],
+        DriverCommand::MOUSE_UP => ['method' => 'POST', 'url' => '/session/:sessionId/buttonup'],
+        DriverCommand::CLICK => ['method' => 'POST', 'url' => '/session/:sessionId/click'],
+        DriverCommand::DOUBLE_CLICK => ['method' => 'POST', 'url' => '/session/:sessionId/doubleclick'],
+        DriverCommand::MOVE_TO => ['method' => 'POST', 'url' => '/session/:sessionId/moveto'],
+        DriverCommand::NEW_SESSION => ['method' => 'POST', 'url' => '/session'],
+        DriverCommand::QUIT => ['method' => 'DELETE', 'url' => '/session/:sessionId'],
+        DriverCommand::REFRESH => ['method' => 'POST', 'url' => '/session/:sessionId/refresh'],
+        DriverCommand::UPLOAD_FILE => ['method' => 'POST', 'url' => '/session/:sessionId/file'], // undocumented
+        DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/keys'],
+        DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert_text'],
+        DriverCommand::SEND_KEYS_TO_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/value'],
+        DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts/implicit_wait'],
+        DriverCommand::SET_SCREEN_ORIENTATION => ['method' => 'POST', 'url' => '/session/:sessionId/orientation'],
+        DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts/async_script'],
+        DriverCommand::SET_WINDOW_POSITION => [
             'method' => 'POST',
             'url' => '/session/:sessionId/window/:windowHandle/position',
-        ),
-        DriverCommand::SET_WINDOW_SIZE => array(
+        ],
+        DriverCommand::SET_WINDOW_SIZE => [
             'method' => 'POST',
             'url' => '/session/:sessionId/window/:windowHandle/size',
-        ),
-        DriverCommand::SUBMIT_ELEMENT => array('method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'),
-        DriverCommand::SCREENSHOT => array('method' => 'GET', 'url' => '/session/:sessionId/screenshot'),
-        DriverCommand::TOUCH_SINGLE_TAP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/click'),
-        DriverCommand::TOUCH_DOWN => array('method' => 'POST', 'url' => '/session/:sessionId/touch/down'),
-        DriverCommand::TOUCH_DOUBLE_TAP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'),
-        DriverCommand::TOUCH_FLICK => array('method' => 'POST', 'url' => '/session/:sessionId/touch/flick'),
-        DriverCommand::TOUCH_LONG_PRESS => array('method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'),
-        DriverCommand::TOUCH_MOVE => array('method' => 'POST', 'url' => '/session/:sessionId/touch/move'),
-        DriverCommand::TOUCH_SCROLL => array('method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'),
-        DriverCommand::TOUCH_UP => array('method' => 'POST', 'url' => '/session/:sessionId/touch/up'),
-    );
+        ],
+        DriverCommand::SUBMIT_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'],
+        DriverCommand::SCREENSHOT => ['method' => 'GET', 'url' => '/session/:sessionId/screenshot'],
+        DriverCommand::TOUCH_SINGLE_TAP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/click'],
+        DriverCommand::TOUCH_DOWN => ['method' => 'POST', 'url' => '/session/:sessionId/touch/down'],
+        DriverCommand::TOUCH_DOUBLE_TAP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'],
+        DriverCommand::TOUCH_FLICK => ['method' => 'POST', 'url' => '/session/:sessionId/touch/flick'],
+        DriverCommand::TOUCH_LONG_PRESS => ['method' => 'POST', 'url' => '/session/:sessionId/touch/longclick'],
+        DriverCommand::TOUCH_MOVE => ['method' => 'POST', 'url' => '/session/:sessionId/touch/move'],
+        DriverCommand::TOUCH_SCROLL => ['method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'],
+        DriverCommand::TOUCH_UP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/up'],
+    ];
     /**
      * @var string
      */
@@ -205,10 +172,10 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
         curl_setopt(
             $this->curl,
             CURLOPT_HTTPHEADER,
-            array(
+            [
                 'Content-Type: application/json;charset=UTF-8',
                 'Accept: application/json',
-            )
+            ]
         );
         $this->setRequestTimeout(30000);
         $this->setConnectionTimeout(30000);
@@ -317,7 +284,7 @@ public function execute(WebDriverCommand $command)
             if ($params && is_array($params)) {
                 $msg .= sprintf(' with params: %s', json_encode($params));
             }
-            WebDriverException::throwException(-1, $msg . "\n\n" . $error, array());
+            WebDriverException::throwException(-1, $msg . "\n\n" . $error, []);
         }
 
         $results = json_decode($raw_results, true);
diff --git a/lib/Remote/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
index 5a995215e..ce66e5610 100644
--- a/lib/Remote/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -32,7 +32,7 @@ public function __construct(RemoteWebDriver $driver)
      * @param array $parameters
      * @return mixed
      */
-    public function execute($command_name, array $parameters = array())
+    public function execute($command_name, array $parameters = [])
     {
         return $this->driver->execute($command_name, $parameters);
     }
diff --git a/lib/Remote/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
index 7b2e114a2..b10b1ca72 100644
--- a/lib/Remote/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -43,9 +43,9 @@ public function __construct(RemoteExecuteMethod $executor)
      */
     public function sendKeys($keys)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
             'value' => WebDriverKeys::encode($keys),
-        ));
+        ]);
 
         return $this;
     }
@@ -59,9 +59,9 @@ public function sendKeys($keys)
      */
     public function pressKey($key)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
-            'value' => array((string) $key),
-        ));
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
+            'value' => [(string) $key],
+        ]);
 
         return $this;
     }
@@ -75,9 +75,9 @@ public function pressKey($key)
      */
     public function releaseKey($key)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, array(
-            'value' => array((string) $key),
-        ));
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
+            'value' => [(string) $key],
+        ]);
 
         return $this;
     }
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 00a4ef7b6..48c578df7 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -44,9 +44,9 @@ public function __construct(RemoteExecuteMethod $executor)
     public function click(WebDriverCoordinates $where = null)
     {
         $this->moveIfNeeded($where);
-        $this->executor->execute(DriverCommand::CLICK, array(
+        $this->executor->execute(DriverCommand::CLICK, [
             'button' => 0,
-        ));
+        ]);
 
         return $this;
     }
@@ -59,9 +59,9 @@ public function click(WebDriverCoordinates $where = null)
     public function contextClick(WebDriverCoordinates $where = null)
     {
         $this->moveIfNeeded($where);
-        $this->executor->execute(DriverCommand::CLICK, array(
+        $this->executor->execute(DriverCommand::CLICK, [
             'button' => 2,
-        ));
+        ]);
 
         return $this;
     }
@@ -104,7 +104,7 @@ public function mouseMove(
         $x_offset = null,
         $y_offset = null
     ) {
-        $params = array();
+        $params = [];
         if ($where !== null) {
             $params['element'] = $where->getAuxiliary();
         }
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 67d2ad7cd..8eb38814f 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -42,7 +42,7 @@ public function __construct($executor, $driver)
      */
     public function defaultContent()
     {
-        $params = array('id' => null);
+        $params = ['id' => null];
         $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
         return $this->driver;
@@ -58,12 +58,12 @@ public function defaultContent()
     public function frame($frame)
     {
         if ($frame instanceof WebDriverElement) {
-            $id = array('ELEMENT' => $frame->getID());
+            $id = ['ELEMENT' => $frame->getID()];
         } else {
             $id = (string) $frame;
         }
 
-        $params = array('id' => $id);
+        $params = ['id' => $id];
         $this->executor->execute(DriverCommand::SWITCH_TO_FRAME, $params);
 
         return $this->driver;
@@ -78,7 +78,7 @@ public function frame($frame)
      */
     public function window($handle)
     {
-        $params = array('name' => (string) $handle);
+        $params = ['name' => (string) $handle];
         $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
 
         return $this->driver;
diff --git a/lib/Remote/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
index a052a6063..8c3981474 100644
--- a/lib/Remote/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -45,7 +45,7 @@ public function tap(WebDriverElement $element)
     {
         $this->executor->execute(
             DriverCommand::TOUCH_SINGLE_TAP,
-            array('element' => $element->getID())
+            ['element' => $element->getID()]
         );
 
         return $this;
@@ -60,7 +60,7 @@ public function doubleTap(WebDriverElement $element)
     {
         $this->executor->execute(
             DriverCommand::TOUCH_DOUBLE_TAP,
-            array('element' => $element->getID())
+            ['element' => $element->getID()]
         );
 
         return $this;
@@ -74,10 +74,10 @@ public function doubleTap(WebDriverElement $element)
      */
     public function down($x, $y)
     {
-        $this->executor->execute(DriverCommand::TOUCH_DOWN, array(
+        $this->executor->execute(DriverCommand::TOUCH_DOWN, [
             'x' => $x,
             'y' => $y,
-        ));
+        ]);
 
         return $this;
     }
@@ -90,10 +90,10 @@ public function down($x, $y)
      */
     public function flick($xspeed, $yspeed)
     {
-        $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
+        $this->executor->execute(DriverCommand::TOUCH_FLICK, [
             'xspeed' => $xspeed,
             'yspeed' => $yspeed,
-        ));
+        ]);
 
         return $this;
     }
@@ -108,12 +108,12 @@ public function flick($xspeed, $yspeed)
      */
     public function flickFromElement(WebDriverElement $element, $xoffset, $yoffset, $speed)
     {
-        $this->executor->execute(DriverCommand::TOUCH_FLICK, array(
+        $this->executor->execute(DriverCommand::TOUCH_FLICK, [
             'xoffset' => $xoffset,
             'yoffset' => $yoffset,
             'element' => $element->getID(),
             'speed' => $speed,
-        ));
+        ]);
 
         return $this;
     }
@@ -127,7 +127,7 @@ public function longPress(WebDriverElement $element)
     {
         $this->executor->execute(
             DriverCommand::TOUCH_LONG_PRESS,
-            array('element' => $element->getID())
+            ['element' => $element->getID()]
         );
 
         return $this;
@@ -141,10 +141,10 @@ public function longPress(WebDriverElement $element)
      */
     public function move($x, $y)
     {
-        $this->executor->execute(DriverCommand::TOUCH_MOVE, array(
+        $this->executor->execute(DriverCommand::TOUCH_MOVE, [
             'x' => $x,
             'y' => $y,
-        ));
+        ]);
 
         return $this;
     }
@@ -157,10 +157,10 @@ public function move($x, $y)
      */
     public function scroll($xoffset, $yoffset)
     {
-        $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
+        $this->executor->execute(DriverCommand::TOUCH_SCROLL, [
             'xoffset' => $xoffset,
             'yoffset' => $yoffset,
-        ));
+        ]);
 
         return $this;
     }
@@ -174,11 +174,11 @@ public function scroll($xoffset, $yoffset)
      */
     public function scrollFromElement(WebDriverElement $element, $xoffset, $yoffset)
     {
-        $this->executor->execute(DriverCommand::TOUCH_SCROLL, array(
+        $this->executor->execute(DriverCommand::TOUCH_SCROLL, [
             'element' => $element->getID(),
             'xoffset' => $xoffset,
             'yoffset' => $yoffset,
-        ));
+        ]);
 
         return $this;
     }
@@ -191,10 +191,10 @@ public function scrollFromElement(WebDriverElement $element, $xoffset, $yoffset)
      */
     public function up($x, $y)
     {
-        $this->executor->execute(DriverCommand::TOUCH_UP, array(
+        $this->executor->execute(DriverCommand::TOUCH_UP, [
             'x' => $x,
             'y' => $y,
-        ));
+        ]);
 
         return $this;
     }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 4f885bc43..f1706e75b 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -94,7 +94,7 @@ public static function create(
         $command = new WebDriverCommand(
             null,
             DriverCommand::NEW_SESSION,
-            array('desiredCapabilities' => $desired_capabilities)
+            ['desiredCapabilities' => $desired_capabilities]
         );
 
         $response = $executor->execute($command);
@@ -133,7 +133,7 @@ public static function createBySessionID($session_id, $url = 'http://localhost:4
      */
     public function close()
     {
-        $this->execute(DriverCommand::CLOSE, array());
+        $this->execute(DriverCommand::CLOSE, []);
 
         return $this;
     }
@@ -148,7 +148,7 @@ public function close()
      */
     public function findElement(WebDriverBy $by)
     {
-        $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
+        $params = ['using' => $by->getMechanism(), 'value' => $by->getValue()];
         $raw_element = $this->execute(
             DriverCommand::FIND_ELEMENT,
             $params
@@ -168,13 +168,13 @@ public function findElement(WebDriverBy $by)
      */
     public function findElements(WebDriverBy $by)
     {
-        $params = array('using' => $by->getMechanism(), 'value' => $by->getValue());
+        $params = ['using' => $by->getMechanism(), 'value' => $by->getValue()];
         $raw_elements = $this->execute(
             DriverCommand::FIND_ELEMENTS,
             $params
         );
 
-        $elements = array();
+        $elements = [];
         foreach ($raw_elements as $raw_element) {
             $elements[] = $this->newElement($raw_element['ELEMENT']);
         }
@@ -191,7 +191,7 @@ public function findElements(WebDriverBy $by)
      */
     public function get($url)
     {
-        $params = array('url' => (string) $url);
+        $params = ['url' => (string) $url];
         $this->execute(DriverCommand::GET, $params);
 
         return $this;
@@ -237,7 +237,7 @@ public function getWindowHandle()
     {
         return $this->execute(
             DriverCommand::GET_CURRENT_WINDOW_HANDLE,
-            array()
+            []
         );
     }
 
@@ -248,7 +248,7 @@ public function getWindowHandle()
      */
     public function getWindowHandles()
     {
-        return $this->execute(DriverCommand::GET_WINDOW_HANDLES, array());
+        return $this->execute(DriverCommand::GET_WINDOW_HANDLES, []);
     }
 
     /**
@@ -268,10 +268,10 @@ public function quit()
      */
     private function prepareScriptArguments(array $arguments)
     {
-        $args = array();
+        $args = [];
         foreach ($arguments as $key => $value) {
             if ($value instanceof WebDriverElement) {
-                $args[$key] = array('ELEMENT' => $value->getID());
+                $args[$key] = ['ELEMENT' => $value->getID()];
             } else {
                 if (is_array($value)) {
                     $value = $this->prepareScriptArguments($value);
@@ -292,12 +292,12 @@ private function prepareScriptArguments(array $arguments)
      * @param array $arguments The arguments of the script.
      * @return mixed The return value of the script.
      */
-    public function executeScript($script, array $arguments = array())
+    public function executeScript($script, array $arguments = [])
     {
-        $params = array(
+        $params = [
             'script' => $script,
             'args' => $this->prepareScriptArguments($arguments),
-        );
+        ];
 
         return $this->execute(DriverCommand::EXECUTE_SCRIPT, $params);
     }
@@ -315,12 +315,12 @@ public function executeScript($script, array $arguments = array())
      * @param array $arguments The arguments of the script.
      * @return mixed The value passed by the script to the callback.
      */
-    public function executeAsyncScript($script, array $arguments = array())
+    public function executeAsyncScript($script, array $arguments = [])
     {
-        $params = array(
+        $params = [
             'script' => $script,
             'args' => $this->prepareScriptArguments($arguments),
-        );
+        ];
 
         return $this->execute(
             DriverCommand::EXECUTE_ASYNC_SCRIPT,
@@ -529,13 +529,13 @@ public static function getAllSessions($url = 'http://localhost:4444/wd/hub', $ti
         $command = new WebDriverCommand(
             null,
             DriverCommand::GET_ALL_SESSIONS,
-            array()
+            []
         );
 
         return $executor->execute($command)->getValue();
     }
 
-    public function execute($command_name, $params = array())
+    public function execute($command_name, $params = [])
     {
         $command = new WebDriverCommand(
             $this->sessionID,
@@ -547,8 +547,8 @@ public function execute($command_name, $params = array())
             $response = $this->executor->execute($command);
 
             return $response->getValue();
-        } else {
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 217356592..d05b1e67a 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -64,7 +64,7 @@ public function clear()
     {
         $this->executor->execute(
             DriverCommand::CLEAR_ELEMENT,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return $this;
@@ -79,7 +79,7 @@ public function click()
     {
         $this->executor->execute(
             DriverCommand::CLICK_ELEMENT,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return $this;
@@ -96,11 +96,11 @@ public function click()
      */
     public function findElement(WebDriverBy $by)
     {
-        $params = array(
+        $params = [
             'using' => $by->getMechanism(),
             'value' => $by->getValue(),
             ':id' => $this->id,
-        );
+        ];
         $raw_element = $this->executor->execute(
             DriverCommand::FIND_CHILD_ELEMENT,
             $params
@@ -119,17 +119,17 @@ public function findElement(WebDriverBy $by)
      */
     public function findElements(WebDriverBy $by)
     {
-        $params = array(
+        $params = [
             'using' => $by->getMechanism(),
             'value' => $by->getValue(),
             ':id' => $this->id,
-        );
+        ];
         $raw_elements = $this->executor->execute(
             DriverCommand::FIND_CHILD_ELEMENTS,
             $params
         );
 
-        $elements = array();
+        $elements = [];
         foreach ($raw_elements as $raw_element) {
             $elements[] = $this->newElement($raw_element['ELEMENT']);
         }
@@ -145,10 +145,10 @@ public function findElements(WebDriverBy $by)
      */
     public function getAttribute($attribute_name)
     {
-        $params = array(
+        $params = [
             ':name' => $attribute_name,
             ':id' => $this->id,
-        );
+        ];
 
         return $this->executor->execute(
             DriverCommand::GET_ELEMENT_ATTRIBUTE,
@@ -164,10 +164,10 @@ public function getAttribute($attribute_name)
      */
     public function getCSSValue($css_property_name)
     {
-        $params = array(
+        $params = [
             ':propertyName' => $css_property_name,
             ':id' => $this->id,
-        );
+        ];
 
         return $this->executor->execute(
             DriverCommand::GET_ELEMENT_VALUE_OF_CSS_PROPERTY,
@@ -184,7 +184,7 @@ public function getLocation()
     {
         $location = $this->executor->execute(
             DriverCommand::GET_ELEMENT_LOCATION,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return new WebDriverPoint($location['x'], $location['y']);
@@ -200,7 +200,7 @@ public function getLocationOnScreenOnceScrolledIntoView()
     {
         $location = $this->executor->execute(
             DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return new WebDriverPoint($location['x'], $location['y']);
@@ -239,7 +239,7 @@ public function getSize()
     {
         $size = $this->executor->execute(
             DriverCommand::GET_ELEMENT_SIZE,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return new WebDriverDimension($size['width'], $size['height']);
@@ -258,7 +258,7 @@ public function getTagName()
         // Remove it when fixed to be consistent with the protocol.
         return strtolower($this->executor->execute(
             DriverCommand::GET_ELEMENT_TAG_NAME,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         ));
     }
 
@@ -272,7 +272,7 @@ public function getText()
     {
         return $this->executor->execute(
             DriverCommand::GET_ELEMENT_TEXT,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
     }
 
@@ -286,7 +286,7 @@ public function isDisplayed()
     {
         return $this->executor->execute(
             DriverCommand::IS_ELEMENT_DISPLAYED,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
     }
 
@@ -300,7 +300,7 @@ public function isEnabled()
     {
         return $this->executor->execute(
             DriverCommand::IS_ELEMENT_ENABLED,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
     }
 
@@ -313,7 +313,7 @@ public function isSelected()
     {
         return $this->executor->execute(
             DriverCommand::IS_ELEMENT_SELECTED,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
     }
 
@@ -327,17 +327,17 @@ public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
         if ($local_file === null) {
-            $params = array(
+            $params = [
                 'value' => WebDriverKeys::encode($value),
                 ':id' => $this->id,
-            );
+            ];
             $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
         } else {
             $remote_path = $this->upload($local_file);
-            $params = array(
+            $params = [
                 'value' => WebDriverKeys::encode($remote_path),
                 ':id' => $this->id,
-            );
+            ];
             $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
         }
 
@@ -368,9 +368,9 @@ private function upload($local_file)
         $file_name = $info['basename'];
         $zip->addFile($local_file, $file_name);
         $zip->close();
-        $params = array(
+        $params = [
             'file' => base64_encode(file_get_contents($temp_zip)),
-        );
+        ];
         $remote_path = $this->executor->execute(
             DriverCommand::UPLOAD_FILE,
             $params
@@ -412,7 +412,7 @@ public function submit()
     {
         $this->executor->execute(
             DriverCommand::SUBMIT_ELEMENT,
-            array(':id' => $this->id)
+            [':id' => $this->id]
         );
 
         return $this;
@@ -436,10 +436,10 @@ public function getID()
      */
     public function equals(WebDriverElement $other)
     {
-        return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, array(
+        return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, [
             ':id' => $this->id,
             ':other' => $other->getID(),
-        ));
+        ]);
     }
 
     /**
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 82a427a44..c32ce7246 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -51,7 +51,7 @@ class DriverService
      * @param array $args
      * @param array|null $environment Use the system environment if it is null
      */
-    public function __construct($executable, $port, $args = array(), $environment = null)
+    public function __construct($executable, $port, $args = [], $environment = null)
     {
         $this->executable = self::checkExecutable($executable);
         $this->url = sprintf('http://localhost:%d', $port);
@@ -76,14 +76,14 @@ public function start()
             return $this;
         }
 
-        $pipes = array();
+        $pipes = [];
         $this->process = proc_open(
             sprintf('%s %s', $this->executable, implode(' ', $this->args)),
-            $descriptorspec = array(
-                0 => array('pipe', 'r'), // stdin
-                1 => array('pipe', 'w'), // stdout
-                2 => array('pipe', 'a'), // stderr
-            ),
+            $descriptorspec = [
+                0 => ['pipe', 'r'], // stdin
+                1 => ['pipe', 'w'], // stdout
+                2 => ['pipe', 'a'], // stderr
+            ],
             $pipes,
             null,
             $this->environment
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 7ea2242b0..2052d014f 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -120,7 +120,7 @@ public function findElements(WebDriverBy $by)
     {
         $this->dispatch('beforeFindBy', $by, null, $this);
         try {
-            $elements = array();
+            $elements = [];
             foreach ($this->driver->findElements($by) as $element) {
                 $elements[] = $this->newElement($element);
             }
@@ -156,7 +156,7 @@ public function findElement(WebDriverBy $by)
      * @throws WebDriverException
      * @return mixed
      */
-    public function executeScript($script, array $arguments = array())
+    public function executeScript($script, array $arguments = [])
     {
         if (!$this->driver instanceof JavaScriptExecutor) {
             throw new UnsupportedOperationException(
@@ -181,7 +181,7 @@ public function executeScript($script, array $arguments = array())
      * @throws WebDriverException
      * @return mixed
      */
-    public function executeAsyncScript($script, array $arguments = array())
+    public function executeAsyncScript($script, array $arguments = [])
     {
         if (!$this->driver instanceof JavaScriptExecutor) {
             throw new UnsupportedOperationException(
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 8f6f20d81..4a0384f53 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -162,7 +162,7 @@ public function findElements(WebDriverBy $by)
             $this->dispatcher->getDefaultDriver()
         );
         try {
-            $elements = array();
+            $elements = [];
             foreach ($this->element->findElements($by) as $element) {
                 $elements[] = $this->newElement($element);
             }
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index e73b883ad..aead0a708 100644
--- a/lib/WebDriverAction.php
+++ b/lib/WebDriverAction.php
@@ -20,7 +20,5 @@
  */
 interface WebDriverAction
 {
-    /**
-     */
     public function perform();
 }
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 4ba9f6168..2ef69172c 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -73,7 +73,7 @@ public function sendKeys($value)
     {
         $this->executor->execute(
             DriverCommand::SET_ALERT_VALUE,
-            array('text' => $value)
+            ['text' => $value]
         );
 
         return $this;
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 202a3ec93..782c84690 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -22,7 +22,7 @@ class WebDriverDispatcher
     /**
      * @var array
      */
-    protected $listeners = array();
+    protected $listeners = [];
     /**
      * @var EventFiringWebDriver
      */
@@ -83,7 +83,7 @@ public function unregister(WebDriverEventListener $listener)
     public function dispatch($method, $arguments)
     {
         foreach ($this->listeners as $listener) {
-            call_user_func_array(array($listener, $method), $arguments);
+            call_user_func_array([$listener, $method], $arguments);
         }
 
         return $this;
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 775d23cf5..54e2283b5 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -293,9 +293,9 @@ function ($driver) use ($visibility_of_element_located) {
                 try {
                     if ($element !== null && $element->isEnabled()) {
                         return $element;
-                    } else {
-                        return null;
                     }
+
+                    return null;
                 } catch (StaleElementReferenceException $e) {
                     return null;
                 }
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index ecab819b6..57d37c1eb 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -98,10 +98,10 @@ public static function encode($keys)
         }
 
         if (is_string($keys)) {
-            $keys = array($keys);
+            $keys = [$keys];
         }
 
-        $encoded = array();
+        $encoded = [];
         foreach ($keys as $key) {
             if (is_array($key)) {
                 // handle modified keys
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 5e06d6257..6c7857d1d 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -80,7 +80,7 @@ public function refresh()
      */
     public function to($url)
     {
-        $params = array('url' => (string) $url);
+        $params = ['url' => (string) $url];
         $this->executor->execute(DriverCommand::GET, $params);
 
         return $this;
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 8b80d3dba..d9c8bee44 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -55,7 +55,7 @@ public function addCookie(array $cookie)
         $this->validate($cookie);
         $this->executor->execute(
             DriverCommand::ADD_COOKIE,
-            array('cookie' => $cookie)
+            ['cookie' => $cookie]
         );
 
         return $this;
@@ -83,7 +83,7 @@ public function deleteCookieNamed($name)
     {
         $this->executor->execute(
             DriverCommand::DELETE_COOKIE,
-            array(':name' => $name)
+            [':name' => $name]
         );
 
         return $this;
@@ -174,7 +174,7 @@ public function getLog($log_type)
     {
         return $this->executor->execute(
             DriverCommand::GET_LOG,
-            array('type' => $log_type)
+            ['type' => $log_type]
         );
     }
 
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 158690b2f..4a9797a00 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -62,7 +62,7 @@ public function getOptions()
      */
     public function getAllSelectedOptions()
     {
-        $selected_options = array();
+        $selected_options = [];
         foreach ($this->getOptions() as $option) {
             if ($option->isSelected()) {
                 $selected_options[] = $option;
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 50b62f24f..3e5936a4b 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -40,7 +40,7 @@ public function implicitlyWait($seconds)
     {
         $this->executor->execute(
             DriverCommand::IMPLICITLY_WAIT,
-            array('ms' => $seconds * 1000)
+            ['ms' => $seconds * 1000]
         );
 
         return $this;
@@ -57,7 +57,7 @@ public function setScriptTimeout($seconds)
     {
         $this->executor->execute(
             DriverCommand::SET_SCRIPT_TIMEOUT,
-            array('ms' => $seconds * 1000)
+            ['ms' => $seconds * 1000]
         );
 
         return $this;
@@ -72,10 +72,10 @@ public function setScriptTimeout($seconds)
      */
     public function pageLoadTimeout($seconds)
     {
-        $this->executor->execute(DriverCommand::SET_TIMEOUT, array(
+        $this->executor->execute(DriverCommand::SET_TIMEOUT, [
             'type' => 'page load',
             'ms' => $seconds * 1000,
-        ));
+        ]);
 
         return $this;
     }
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index b63a681b3..828d4969c 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -40,7 +40,7 @@ public function getPosition()
     {
         $position = $this->executor->execute(
             DriverCommand::GET_WINDOW_POSITION,
-            array(':windowHandle' => 'current')
+            [':windowHandle' => 'current']
         );
 
         return new WebDriverPoint(
@@ -59,7 +59,7 @@ public function getSize()
     {
         $size = $this->executor->execute(
             DriverCommand::GET_WINDOW_SIZE,
-            array(':windowHandle' => 'current')
+            [':windowHandle' => 'current']
         );
 
         return new WebDriverDimension(
@@ -77,7 +77,7 @@ public function maximize()
     {
         $this->executor->execute(
             DriverCommand::MAXIMIZE_WINDOW,
-            array(':windowHandle' => 'current')
+            [':windowHandle' => 'current']
         );
 
         return $this;
@@ -92,11 +92,11 @@ public function maximize()
      */
     public function setSize(WebDriverDimension $size)
     {
-        $params = array(
+        $params = [
             'width' => $size->getWidth(),
             'height' => $size->getHeight(),
             ':windowHandle' => 'current',
-        );
+        ];
         $this->executor->execute(DriverCommand::SET_WINDOW_SIZE, $params);
 
         return $this;
@@ -111,11 +111,11 @@ public function setSize(WebDriverDimension $size)
      */
     public function setPosition(WebDriverPoint $position)
     {
-        $params = array(
+        $params = [
             'x' => $position->getX(),
             'y' => $position->getY(),
             ':windowHandle' => 'current',
-        );
+        ];
         $this->executor->execute(DriverCommand::SET_WINDOW_POSITION, $params);
 
         return $this;
@@ -142,7 +142,7 @@ public function getScreenOrientation()
     public function setScreenOrientation($orientation)
     {
         $orientation = strtoupper($orientation);
-        if (!in_array($orientation, array('PORTRAIT', 'LANDSCAPE'))) {
+        if (!in_array($orientation, ['PORTRAIT', 'LANDSCAPE'])) {
             throw new IndexOutOfBoundsException(
                 'Orientation must be either PORTRAIT, or LANDSCAPE'
             );
@@ -150,7 +150,7 @@ public function setScreenOrientation($orientation)
 
         $this->executor->execute(
             DriverCommand::SET_SCREEN_ORIENTATION,
-            array('orientation' => $orientation)
+            ['orientation' => $orientation]
         );
 
         return $this;
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index fca694854..6ebe98b61 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -31,11 +31,11 @@ protected function setUp()
     {
         $this->driver = RemoteWebDriver::create(
             'http://localhost:4444/wd/hub',
-            array(
+            [
                 WebDriverCapabilityType::BROWSER_NAME
                 //=> WebDriverBrowserType::FIREFOX,
                 => WebDriverBrowserType::HTMLUNIT,
-            )
+            ]
         );
     }
 
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index a192190f9..f2bb1b647 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -29,8 +29,8 @@ class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
         $this->webDriverButtonReleaseAction = new WebDriverButtonReleaseAction(
             $this->webDriverMouse,
             $this->locationProvider
@@ -39,7 +39,7 @@ public function setUp()
 
     public function testPerformSendsMouseUpCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 62162c77e..fdb868141 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -29,8 +29,8 @@ class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
         $this->webDriverClickAction = new WebDriverClickAction(
             $this->webDriverMouse,
             $this->locationProvider
@@ -39,7 +39,7 @@ public function setUp()
 
     public function testPerformSendsClickCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index 9dec8b9aa..eb3f4bc6f 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -29,8 +29,8 @@ class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
         $this->webDriverClickAndHoldAction = new WebDriverClickAndHoldAction(
             $this->webDriverMouse,
             $this->locationProvider
@@ -39,7 +39,7 @@ public function setUp()
 
     public function testPerformSendsMouseDownCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index 2c5a92547..e9162f239 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -29,8 +29,8 @@ class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
         $this->webDriverContextClickAction = new WebDriverContextClickAction(
             $this->webDriverMouse,
             $this->locationProvider
@@ -39,7 +39,7 @@ public function setUp()
 
     public function testPerformSendsContextClickCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index b83115f77..acd74550f 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -29,8 +29,8 @@ class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
         $this->webDriverDoubleClickAction = new WebDriverDoubleClickAction(
             $this->webDriverMouse,
             $this->locationProvider
@@ -39,7 +39,7 @@ public function setUp()
 
     public function testPerformSendsDoubleClickCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index e1cb8acbc..267b58b3e 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -32,9 +32,9 @@ class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
 
         $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
             $this->webDriverKeyboard,
@@ -45,7 +45,7 @@ public function setUp()
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index c21ac24c1..970a35b0f 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -32,9 +32,9 @@ class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
 
         $this->webDriverKeyUpAction = new WebDriverKeyUpAction(
             $this->webDriverKeyboard,
@@ -46,7 +46,7 @@ public function setUp()
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index fe3ca9379..565530ad8 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -29,8 +29,8 @@ class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
 
         $this->webDriverMouseMoveAction = new WebDriverMouseMoveAction(
             $this->webDriverMouse,
@@ -40,7 +40,7 @@ public function setUp()
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index 37a2853ba..d2d5286a1 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -31,8 +31,8 @@ class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
 
         $this->webDriverMoveToOffsetAction = new WebDriverMoveToOffsetAction(
             $this->webDriverMouse,
@@ -44,7 +44,7 @@ public function setUp()
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index 82a736dea..9b06b3df7 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -34,11 +34,11 @@ class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->webDriverKeyboard = $this->getMockBuilder('Facebook\WebDriver\WebDriverKeyboard')->getMock();
-        $this->webDriverMouse = $this->getMockBuilder('Facebook\WebDriver\WebDriverMouse')->getMock();
-        $this->locationProvider = $this->getMockBuilder('Facebook\WebDriver\Internal\WebDriverLocatable')->getMock();
+        $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
+        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
+        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
 
-        $this->keys = array('t', 'e', 's', 't');
+        $this->keys = ['t', 'e', 's', 't'];
         $this->webDriverSendKeysAction = new WebDriverSendKeysAction(
             $this->webDriverKeyboard,
             $this->webDriverMouse,
@@ -49,7 +49,7 @@ public function setUp()
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder('Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates')
+        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index c68a747ed..dacdcd139 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -25,14 +25,14 @@ class DesiredCapabilitiesTest extends \PHPUnit_Framework_TestCase
     public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
     {
         $capabilities = new DesiredCapabilities(
-            array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY)
+            ['fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY]
         );
 
         $this->assertSame('fooVal', $capabilities->getCapability('fooKey'));
         $this->assertSame('ANY', $capabilities->getPlatform());
 
         $this->assertSame(
-            array('fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY),
+            ['fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY],
             $capabilities->toArray()
         );
     }
@@ -42,7 +42,7 @@ public function testShouldInstantiateEmptyInstance()
         $capabilities = new DesiredCapabilities();
 
         $this->assertNull($capabilities->getCapability('foo'));
-        $this->assertSame(array(), $capabilities->toArray());
+        $this->assertSame([], $capabilities->toArray());
     }
 
     public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
@@ -93,7 +93,7 @@ public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
         $expectedPlatform
     ) {
         /** @var DesiredCapabilities $capabilities */
-        $capabilities = call_user_func(array('Facebook\WebDriver\Remote\DesiredCapabilities', $setupMethod));
+        $capabilities = call_user_func([DesiredCapabilities::class, $setupMethod]);
 
         $this->assertSame($expectedBrowser, $capabilities->getBrowserName());
         $this->assertSame($expectedPlatform, $capabilities->getPlatform());
@@ -104,20 +104,20 @@ public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
      */
     public function browserCapabilitiesProvider()
     {
-        return array(
-            array('android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID),
-            array('chrome', WebDriverBrowserType::CHROME, WebDriverPlatform::ANY),
-            array('firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY),
-            array('htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
-            array('htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY),
-            array('MicrosoftEdge', WebDriverBrowserType::MICROSOFT_EDGE, WebDriverPlatform::WINDOWS),
-            array('internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS),
-            array('iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC),
-            array('ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC),
-            array('opera', WebDriverBrowserType::OPERA, WebDriverPlatform::ANY),
-            array('safari', WebDriverBrowserType::SAFARI, WebDriverPlatform::ANY),
-            array('phantomjs', WebDriverBrowserType::PHANTOMJS, WebDriverPlatform::ANY),
-        );
+        return [
+            ['android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID],
+            ['chrome', WebDriverBrowserType::CHROME, WebDriverPlatform::ANY],
+            ['firefox', WebDriverBrowserType::FIREFOX, WebDriverPlatform::ANY],
+            ['htmlUnit', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY],
+            ['htmlUnitWithJS', WebDriverBrowserType::HTMLUNIT, WebDriverPlatform::ANY],
+            ['MicrosoftEdge', WebDriverBrowserType::MICROSOFT_EDGE, WebDriverPlatform::WINDOWS],
+            ['internetExplorer', WebDriverBrowserType::IE, WebDriverPlatform::WINDOWS],
+            ['iphone', WebDriverBrowserType::IPHONE, WebDriverPlatform::MAC],
+            ['ipad', WebDriverBrowserType::IPAD, WebDriverPlatform::MAC],
+            ['opera', WebDriverBrowserType::OPERA, WebDriverPlatform::ANY],
+            ['safari', WebDriverBrowserType::SAFARI, WebDriverPlatform::ANY],
+            ['phantomjs', WebDriverBrowserType::PHANTOMJS, WebDriverPlatform::ANY],
+        ];
     }
 
     public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrowser()
@@ -126,7 +126,7 @@ public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrows
 
         /** @var FirefoxProfile $firefoxProfile */
         $firefoxProfile = $capabilities->getCapability(FirefoxDriver::PROFILE);
-        $this->assertInstanceOf('Facebook\WebDriver\Firefox\FirefoxProfile', $firefoxProfile);
+        $this->assertInstanceOf(FirefoxProfile::class, $firefoxProfile);
 
         $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
     }
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 30a206119..9993c6ce5 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -19,10 +19,10 @@ class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
 {
     public function testShouldSetOptionsUsingConstructor()
     {
-        $command = new WebDriverCommand('session-id-123', 'bar-baz-name', array('foo' => 'bar'));
+        $command = new WebDriverCommand('session-id-123', 'bar-baz-name', ['foo' => 'bar']);
 
         $this->assertSame('session-id-123', $command->getSessionID());
         $this->assertSame('bar-baz-name', $command->getName());
-        $this->assertSame(array('foo' => 'bar'), $command->getParameters());
+        $this->assertSame(['foo' => 'bar'], $command->getParameters());
     }
 }

From 901814b5569e23f4084c2ac210b6170e995d6d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 Oct 2016 12:39:37 +0200
Subject: [PATCH 231/784] Extend addCookie docs

---
 lib/WebDriverOptions.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index d9c8bee44..2b298f20f 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -35,18 +35,17 @@ public function __construct(ExecuteMethod $executor)
      * Add a specific cookie.
      *
      * Here are the valid attributes of a cookie array.
-     *  'name'  : string The name of the cookie; may not be null or an empty
-     *                    string.
-     *  'value' : string The cookie value; may not be null.
-     *  'path'  : string The path the cookie is visible to. If left blank or set
-     *                   to null, will be set to "/".
-     *  'domain': string The domain the cookie is visible to. It should be null or
-     *                   the same as the domain of the current URL.
-     *  'secure': bool   Whether this cookie requires a secure connection(https?).
-     *                   It should be null or equal to the security of the current
-     *                   URL.
-     *  'expiry': int    The cookie's expiration date; may be null.
+     *  'name'    : string The name of the cookie; may not be null or an empty string.
+     *  'value'   : string The cookie value; may not be null.
+     *  'path'    : string OPTIONAL The path the cookie is visible to. Defaults to "/" if omitted.
+     *  'domain'  : string OPTIONAL The domain the cookie is visible to. Defaults to the current browsing context's
+     *                     document's URL domain if omitted.
+     *  'secure'  : bool   OPTIONAL Whether this cookie requires a secure connection (https). Defaults to false if
+     *                     omitted.
+     *  'httpOnly': bool   OPTIONAL Whether the cookie is an HTTP only cookie. Defaults to false if omitted.
+     *  'expiry'  : int    OPTIONAL The cookie's expiration date, specified in seconds since Unix Epoch.
      *
+     * @see https://w3c.github.io/webdriver/webdriver-spec.html#cookies
      * @param array $cookie An array with key as the attributes mentioned above.
      * @return WebDriverOptions The current instance.
      */
@@ -93,8 +92,7 @@ public function deleteCookieNamed($name)
      * Get the cookie with a given name.
      *
      * @param string $name
-     * @return array The cookie, or null if no cookie with the given name is
-     *               presented.
+     * @return array The cookie, or null if no cookie with the given name is presented.
      */
     public function getCookieNamed($name)
     {

From b1d4b9fb05fb0437d5f8f68bea1ecb26fa8cdbda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 18 Sep 2016 23:19:01 +0200
Subject: [PATCH 232/784] Do not set URL placeholder params as part of POST
 body (fixes #323)

---
 composer.json                                 |  3 +-
 lib/Remote/HttpCommandExecutor.php            |  4 +-
 tests/unit/Remote/HttpCommandExecutorTest.php | 94 +++++++++++++++++++
 3 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/Remote/HttpCommandExecutorTest.php

diff --git a/composer.json b/composer.json
index e8afaf77e..a6b95a894 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,8 @@
   "require-dev": {
     "phpunit/phpunit": "4.6.* || ~5.0",
     "friendsofphp/php-cs-fixer": "^1.11",
-    "squizlabs/php_codesniffer": "^2.6"
+    "squizlabs/php_codesniffer": "^2.6",
+    "php-mock/php-mock-phpunit": "^1.1"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 9cfcd1fa4..11b53536a 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -240,9 +240,7 @@ public function execute(WebDriverCommand $command)
         foreach ($params as $name => $value) {
             if ($name[0] === ':') {
                 $url = str_replace($name, $value, $url);
-                if ($http_method != 'POST') {
-                    unset($params[$name]);
-                }
+                unset($params[$name]);
             }
         }
 
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
new file mode 100644
index 000000000..268b3e873
--- /dev/null
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -0,0 +1,94 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+use phpmock\phpunit\PHPMock;
+
+class HttpCommandExecutorTest extends \PHPUnit_Framework_TestCase
+{
+    use PHPMock;
+    /** @var HttpCommandExecutor */
+    private $executor;
+
+    public function setUp()
+    {
+        $this->executor = new HttpCommandExecutor('http://localhost:4444/');
+    }
+
+    /**
+     * @dataProvider commandProvider
+     * @param int $command
+     * @param array $params
+     * @param string $expectedUrl
+     * @param string $expectedPostData
+     */
+    public function testShouldSendRequestToAssembledUrl($command, array $params, $expectedUrl, $expectedPostData)
+    {
+        $command = new WebDriverCommand('foo-123', $command, $params);
+
+        $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
+        $curlSetoptMock->expects($this->at(0))
+            ->with($this->anything(), CURLOPT_URL, $expectedUrl);
+
+        $curlSetoptMock->expects($this->at(2))
+            ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+
+        $curlExecMock = $this->getFunctionMock(__NAMESPACE__, 'curl_exec');
+        $curlExecMock->expects($this->once())
+            ->willReturn('{}');
+
+        $this->executor->execute($command);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function commandProvider()
+    {
+        return [
+            'POST command having :id placeholder in url' => [
+                DriverCommand::SEND_KEYS_TO_ELEMENT,
+                ['value' => 'submitted-value', ':id' => '1337'],
+                'http://localhost:4444/session/foo-123/element/1337/value',
+                '{"value":"submitted-value"}',
+            ],
+            'POST command without :id placeholder in url' => [
+                DriverCommand::TOUCH_UP,
+                ['x' => 3, 'y' => 6],
+                'http://localhost:4444/session/foo-123/touch/up',
+                '{"x":3,"y":6}',
+            ],
+            'Extra useless placeholder parameter should be removed' => [
+                DriverCommand::TOUCH_UP,
+                ['x' => 3, 'y' => 6, ':useless' => 'foo'],
+                'http://localhost:4444/session/foo-123/touch/up',
+                '{"x":3,"y":6}',
+            ],
+            'DELETE command' => [
+                DriverCommand::DELETE_COOKIE,
+                [':name' => 'cookie-name'],
+                'http://localhost:4444/session/foo-123/cookie/cookie-name',
+                null,
+            ],
+            'GET command without session in URL' => [
+                DriverCommand::GET_ALL_SESSIONS,
+                [],
+                'http://localhost:4444/sessions',
+                null,
+            ],
+        ];
+    }
+}

From 41ae93d12e3a4f5b0d7ddb00e538829b75133d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Oct 2016 15:57:00 +0200
Subject: [PATCH 233/784] Add and fix typehints

---
 lib/Chrome/ChromeDriver.php                   |  3 +-
 .../Internal/WebDriverCoordinates.php         | 23 +++++-
 .../Internal/WebDriverKeysRelatedAction.php   |  9 +++
 .../Internal/WebDriverMouseAction.php         |  4 +
 .../Internal/WebDriverMoveToOffsetAction.php  | 12 +++
 .../Internal/WebDriverSendKeysAction.php      |  7 +-
 .../Internal/WebDriverSingleKeyAction.php     |  5 +-
 .../Touch/WebDriverDownAction.php             |  6 ++
 .../Touch/WebDriverFlickAction.php            |  6 ++
 .../Touch/WebDriverFlickFromElementAction.php |  9 +++
 lib/Interactions/WebDriverActions.php         |  3 +
 lib/Interactions/WebDriverCompositeAction.php |  3 +
 lib/Remote/DesiredCapabilities.php            |  3 +
 lib/Remote/RemoteExecuteMethod.php            |  3 +
 lib/Remote/RemoteTargetLocator.php            |  8 +-
 lib/Remote/RemoteWebDriver.php                | 21 +++--
 lib/Remote/RemoteWebElement.php               |  9 +--
 lib/Remote/UselessFileDetector.php            |  3 -
 lib/Support/Events/EventFiringWebDriver.php   |  8 +-
 lib/Support/Events/EventFiringWebElement.php  |  2 +
 lib/WebDriverAlert.php                        |  6 +-
 lib/WebDriverBy.php                           |  6 ++
 lib/WebDriverDimension.php                    | 13 +++-
 lib/WebDriverElement.php                      |  3 +-
 lib/WebDriverExpectedCondition.php            | 76 ++++++++-----------
 lib/WebDriverOptions.php                      |  3 +
 lib/WebDriverTimeouts.php                     |  6 +-
 lib/WebDriverWait.php                         | 17 +++--
 lib/WebDriverWindow.php                       |  6 +-
 29 files changed, 197 insertions(+), 86 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index be807d7bc..b8aad6a07 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -40,7 +40,7 @@ public static function start(DesiredCapabilities $desired_capabilities = null, C
         return $driver;
     }
 
-    public function startSession($desired_capabilities)
+    public function startSession(DesiredCapabilities $desired_capabilities)
     {
         $command = new WebDriverCommand(
             null,
@@ -76,6 +76,7 @@ public static function create(
      * @param string $url The url of the remote server
      *
      * @throws WebDriverException
+     * @return RemoteWebDriver|void
      */
     public static function createBySessionID(
         $session_id,
diff --git a/lib/Interactions/Internal/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
index ca7069cb5..911b7aece 100644
--- a/lib/Interactions/Internal/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-use Closure;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\WebDriverPoint;
 
@@ -24,12 +23,30 @@
  */
 class WebDriverCoordinates
 {
+    /**
+     * @var null
+     */
     private $onScreen;
+    /**
+     * @var callable
+     */
     private $inViewPort;
+    /**
+     * @var callable
+     */
     private $onPage;
+    /**
+     * @var string
+     */
     private $auxiliary;
 
-    public function __construct($on_screen, Closure $in_view_port, Closure $on_page, $auxiliary)
+    /**
+     * @param null $on_screen
+     * @param callable $in_view_port
+     * @param callable $on_page
+     * @param string $auxiliary
+     */
+    public function __construct($on_screen, callable $in_view_port, callable $on_page, $auxiliary)
     {
         $this->onScreen = $on_screen;
         $this->inViewPort = $in_view_port;
@@ -65,7 +82,7 @@ public function onPage()
     }
 
     /**
-     * @return object The attached object.
+     * @return string The attached object id.
      */
     public function getAuxiliary()
     {
diff --git a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index b2f062750..899bb822e 100644
--- a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -24,8 +24,17 @@
  */
 abstract class WebDriverKeysRelatedAction
 {
+    /**
+     * @var WebDriverKeyboard
+     */
     protected $keyboard;
+    /**
+     * @var WebDriverMouse
+     */
     protected $mouse;
+    /**
+     * @var WebDriverLocatable|null
+     */
     protected $locationProvider;
 
     /**
diff --git a/lib/Interactions/Internal/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
index 8a13d86a7..2bec07386 100644
--- a/lib/Interactions/Internal/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -32,6 +32,10 @@ class WebDriverMouseAction
      */
     protected $locationProvider;
 
+    /**
+     * @param WebDriverMouse $mouse
+     * @param WebDriverLocatable|null $location_provider
+     */
     public function __construct(WebDriverMouse $mouse, WebDriverLocatable $location_provider = null)
     {
         $this->mouse = $mouse;
diff --git a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index 7fffa0189..29be343d2 100644
--- a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -21,9 +21,21 @@
 
 class WebDriverMoveToOffsetAction extends WebDriverMouseAction implements WebDriverAction
 {
+    /**
+     * @var int|null
+     */
     private $xOffset;
+    /**
+     * @var int|null
+     */
     private $yOffset;
 
+    /**
+     * @param WebDriverMouse $mouse
+     * @param WebDriverLocatable|null $location_provider
+     * @param int|null $x_offset
+     * @param int|null $y_offset
+     */
     public function __construct(
         WebDriverMouse $mouse,
         WebDriverLocatable $location_provider = null,
diff --git a/lib/Interactions/Internal/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
index 14836be38..ef3ea0b71 100644
--- a/lib/Interactions/Internal/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -22,7 +22,10 @@
 
 class WebDriverSendKeysAction extends WebDriverKeysRelatedAction implements WebDriverAction
 {
-    private $keys;
+    /**
+     * @var string
+     */
+    private $keys = '';
 
     /**
      * @param WebDriverKeyboard $keyboard
@@ -34,7 +37,7 @@ public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
         WebDriverLocatable $location_provider = null,
-        $keys = null
+        $keys = ''
     ) {
         parent::__construct($keyboard, $mouse, $location_provider);
         $this->keys = $keys;
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 174304d15..6311ee805 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -22,13 +22,14 @@
 
 abstract class WebDriverSingleKeyAction extends WebDriverKeysRelatedAction implements WebDriverAction
 {
-    protected $key;
+    /** @var string */
+    protected $key = '';
 
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
         WebDriverLocatable $location_provider = null,
-        $key = null
+        $key = ''
     ) {
         parent::__construct($keyboard, $mouse, $location_provider);
         $this->key = $key;
diff --git a/lib/Interactions/Touch/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
index 46224aea2..5f392313c 100644
--- a/lib/Interactions/Touch/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -19,7 +19,13 @@
 
 class WebDriverDownAction extends WebDriverTouchAction implements WebDriverAction
 {
+    /**
+     * @var int
+     */
     private $x;
+    /**
+     * @var int
+     */
     private $y;
 
     /**
diff --git a/lib/Interactions/Touch/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
index 52f43fde6..a32164d83 100644
--- a/lib/Interactions/Touch/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -19,7 +19,13 @@
 
 class WebDriverFlickAction extends WebDriverTouchAction implements WebDriverAction
 {
+    /**
+     * @var int
+     */
     private $x;
+    /**
+     * @var int
+     */
     private $y;
 
     /**
diff --git a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index d91e84898..78445c256 100644
--- a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -20,8 +20,17 @@
 
 class WebDriverFlickFromElementAction extends WebDriverTouchAction implements WebDriverAction
 {
+    /**
+     * @var int
+     */
     private $x;
+    /**
+     * @var int
+     */
     private $y;
+    /**
+     * @var int
+     */
     private $speed;
 
     /**
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 860cf8d5a..281b84dac 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -38,6 +38,9 @@ class WebDriverActions
     protected $mouse;
     protected $action;
 
+    /**
+     * @param WebDriver $driver
+     */
     public function __construct(WebDriver $driver)
     {
         $this->driver = $driver;
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index 742544f59..75b879082 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -22,6 +22,9 @@
  */
 class WebDriverCompositeAction implements WebDriverAction
 {
+    /**
+     * @var array
+     */
     private $actions = [];
 
     /**
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index a1cbfddf0..badd04313 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -25,6 +25,9 @@
 
 class DesiredCapabilities implements WebDriverCapabilities
 {
+    /**
+     * @var array
+     */
     private $capabilities;
 
     public function __construct(array $capabilities = [])
diff --git a/lib/Remote/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
index ce66e5610..4ab9e3890 100644
--- a/lib/Remote/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -17,6 +17,9 @@
 
 class RemoteExecuteMethod implements ExecuteMethod
 {
+    /**
+     * @var RemoteWebDriver
+     */
     private $driver;
 
     /**
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 8eb38814f..9b4fe2526 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -25,7 +25,13 @@
  */
 class RemoteTargetLocator implements WebDriverTargetLocator
 {
+    /**
+     * @var ExecuteMethod
+     */
     protected $executor;
+    /**
+     * @var WebDriver
+     */
     protected $driver;
 
     public function __construct($executor, $driver)
@@ -103,7 +109,7 @@ public function alert()
      */
     public function activeElement()
     {
-        $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT);
+        $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT, []);
         $method = new RemoteExecuteMethod($this->driver);
 
         return new RemoteWebElement($method, $response['ELEMENT']);
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f1706e75b..a904024f5 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -142,8 +142,7 @@ public function close()
      * Find the first WebDriverElement using the given mechanism.
      *
      * @param WebDriverBy $by
-     * @return RemoteWebElement NoSuchElementException is thrown in
-     *    HttpCommandExecutor if no element is found.
+     * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
     public function findElement(WebDriverBy $by)
@@ -158,12 +157,10 @@ public function findElement(WebDriverBy $by)
     }
 
     /**
-     * Find all WebDriverElements within the current page using the given
-     * mechanism.
+     * Find all WebDriverElements within the current page using the given mechanism.
      *
      * @param WebDriverBy $by
-     * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
-     *    array if nothing matches
+     * @return RemoteWebElement[] A list of all WebDriverElements, or an empty array if nothing matches
      * @see WebDriverBy
      */
     public function findElements(WebDriverBy $by)
@@ -228,8 +225,7 @@ public function getTitle()
     }
 
     /**
-     * Return an opaque handle to this window that uniquely identifies it within
-     * this driver instance.
+     * Return an opaque handle to this window that uniquely identifies it within this driver instance.
      *
      * @return string The current window handle.
      */
@@ -369,8 +365,7 @@ public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
     }
 
     /**
-     * An abstraction for managing stuff you would do in a browser menu. For
-     * example, adding and deleting cookies.
+     * An abstraction for managing stuff you would do in a browser menu. For example, adding and deleting cookies.
      *
      * @return WebDriverOptions
      */
@@ -380,8 +375,7 @@ public function manage()
     }
 
     /**
-     * An abstraction allowing the driver to access the browser's history and to
-     * navigate to a given URL.
+     * An abstraction allowing the driver to access the browser's history and to navigate to a given URL.
      *
      * @return WebDriverNavigation
      * @see WebDriverNavigation
@@ -438,6 +432,9 @@ public function getTouch()
         return $this->touch;
     }
 
+    /**
+     * @return RemoteExecuteMethod
+     */
     protected function getExecuteMethod()
     {
         if (!$this->executeMethod) {
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index d05b1e67a..dfc66d124 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -55,8 +55,7 @@ public function __construct(RemoteExecuteMethod $executor, $id)
     }
 
     /**
-     * If this element is a TEXTAREA or text INPUT element, this will clear the
-     * value.
+     * If this element is a TEXTAREA or text INPUT element, this will clear the value.
      *
      * @return RemoteWebElement The current instance.
      */
@@ -86,8 +85,7 @@ public function click()
     }
 
     /**
-     * Find the first WebDriverElement within this element using the given
-     * mechanism.
+     * Find the first WebDriverElement within this element using the given mechanism.
      *
      * @param WebDriverBy $by
      * @return RemoteWebElement NoSuchElementException is thrown in
@@ -403,8 +401,7 @@ public function setFileDetector(FileDetector $detector)
     }
 
     /**
-     * If this current element is a form, or an element within a form, then this
-     * will be submitted to the remote server.
+     * If this current element is a form, or an element within a form, then this will be submitted to the remote server.
      *
      * @return RemoteWebElement The current instance.
      */
diff --git a/lib/Remote/UselessFileDetector.php b/lib/Remote/UselessFileDetector.php
index f1e71f0c5..5ddd78e7d 100644
--- a/lib/Remote/UselessFileDetector.php
+++ b/lib/Remote/UselessFileDetector.php
@@ -17,9 +17,6 @@
 
 class UselessFileDetector implements FileDetector
 {
-    /**
-     * @param string $file
-     */
     public function getLocalFile($file)
     {
         return null;
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 2052d014f..268b35ac7 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -119,14 +119,16 @@ public function get($url)
     public function findElements(WebDriverBy $by)
     {
         $this->dispatch('beforeFindBy', $by, null, $this);
+        $elements = [];
+
         try {
-            $elements = [];
             foreach ($this->driver->findElements($by) as $element) {
                 $elements[] = $this->newElement($element);
             }
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
         }
+
         $this->dispatch('afterFindBy', $by, null, $this);
 
         return $elements;
@@ -140,11 +142,13 @@ public function findElements(WebDriverBy $by)
     public function findElement(WebDriverBy $by)
     {
         $this->dispatch('beforeFindBy', $by, null, $this);
+
         try {
             $element = $this->newElement($this->driver->findElement($by));
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
         }
+
         $this->dispatch('afterFindBy', $by, null, $this);
 
         return $element;
@@ -165,11 +169,13 @@ public function executeScript($script, array $arguments = [])
         }
 
         $this->dispatch('beforeScript', $script, $this);
+
         try {
             $result = $this->driver->executeScript($script, $arguments);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
         }
+
         $this->dispatch('afterScript', $script, $this);
 
         return $result;
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 4a0384f53..872c59c5e 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -133,11 +133,13 @@ public function findElement(WebDriverBy $by)
             $this,
             $this->dispatcher->getDefaultDriver()
         );
+
         try {
             $element = $this->newElement($this->element->findElement($by));
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
         }
+
         $this->dispatch(
             'afterFindBy',
             $by,
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index 2ef69172c..b35132de6 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -16,15 +16,19 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
 
 /**
  * An abstraction allowing the driver to manipulate the javascript alerts
  */
 class WebDriverAlert
 {
+    /**
+     * @var ExecuteMethod
+     */
     protected $executor;
 
-    public function __construct($executor)
+    public function __construct(ExecuteMethod $executor)
     {
         $this->executor = $executor;
     }
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index af51c26b2..f882683b3 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -24,7 +24,13 @@
  */
 class WebDriverBy
 {
+    /**
+     * @var string
+     */
     private $mechanism;
+    /**
+     * @var string
+     */
     private $value;
 
     protected function __construct($mechanism, $value)
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 5b274e29a..111a77821 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -20,9 +20,19 @@
  */
 class WebDriverDimension
 {
+    /**
+     * @var int
+     */
     private $height;
+    /**
+     * @var int
+     */
     private $width;
 
+    /**
+     * @param int $width
+     * @param int $height
+     */
     public function __construct($width, $height)
     {
         $this->width = $width;
@@ -53,8 +63,7 @@ public function getWidth()
      * Check whether the given dimension is the same as the instance.
      *
      * @param WebDriverDimension $dimension The dimension to be compared with.
-     * @return bool Whether the height and the width are the same as the
-     *              instance.
+     * @return bool Whether the height and the width are the same as the instance.
      */
     public function equals(WebDriverDimension $dimension)
     {
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 6eb7df5c6..2505368b3 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -21,8 +21,7 @@
 interface WebDriverElement extends WebDriverSearchContext
 {
     /**
-     * If this element is a TEXTAREA or text INPUT element, this will clear the
-     * value.
+     * If this element is a TEXTAREA or text INPUT element, this will clear the value.
      *
      * @return WebDriverElement The current instance.
      */
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 54e2283b5..b7cd53204 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -28,20 +28,21 @@
 class WebDriverExpectedCondition
 {
     /**
-     * A closure function to be executed by WebDriverWait. It should return
+     * A callable function to be executed by WebDriverWait. It should return
      * a truthy value, mostly boolean or a WebDriverElement, on success.
+     * @var callable
      */
     private $apply;
 
     /**
-     * @return (function():T) a closure function to be executed by WebDriverWait
+     * @return callable A callable function to be executed by WebDriverWait
      */
     public function getApply()
     {
         return $this->apply;
     }
 
-    protected function __construct($apply)
+    protected function __construct(callable $apply)
     {
         $this->apply = $apply;
     }
@@ -50,13 +51,12 @@ protected function __construct($apply)
      * An expectation for checking the title of a page.
      *
      * @param string $title The expected title, which must be an exact match.
-     * @return bool WebDriverExpectedCondition True when the title matches,
-     *         false otherwise.
+     * @return bool WebDriverExpectedCondition True when the title matches, false otherwise.
      */
     public static function titleIs($title)
     {
         return new static(
-            function ($driver) use ($title) {
+            function (WebDriver $driver) use ($title) {
                 return $title === $driver->getTitle();
             }
         );
@@ -66,13 +66,12 @@ function ($driver) use ($title) {
      * An expectation for checking substring of a page Title.
      *
      * @param string $title The expected substring of Title.
-     * @return bool WebDriverExpectedCondition True when in title,
-     *         false otherwise.
+     * @return bool WebDriverExpectedCondition True when in title, false otherwise.
      */
     public static function titleContains($title)
     {
         return new static(
-            function ($driver) use ($title) {
+            function (WebDriver $driver) use ($title) {
                 return strpos($driver->getTitle(), $title) !== false;
             }
         );
@@ -83,13 +82,12 @@ function ($driver) use ($title) {
      * page. This does not necessarily mean that the element is visible.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> The element which
-     *         is located.
+     * @return WebDriverExpectedCondition<WebDriverElement> The element which is located.
      */
     public static function presenceOfElementLocated(WebDriverBy $by)
     {
         return new static(
-            function ($driver) use ($by) {
+            function (WebDriver $driver) use ($by) {
                 return $driver->findElement($by);
             }
         );
@@ -101,13 +99,12 @@ function ($driver) use ($by) {
      * also has a height and width that is greater than 0.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> The element which is
-     *         located and visible.
+     * @return WebDriverExpectedCondition<WebDriverElement> The element which is located and visible.
      */
     public static function visibilityOfElementLocated(WebDriverBy $by)
     {
         return new static(
-            function ($driver) use ($by) {
+            function (WebDriver $driver) use ($by) {
                 try {
                     $element = $driver->findElement($by);
 
@@ -125,13 +122,12 @@ function ($driver) use ($by) {
      * displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverElement $element The element to be checked.
-     * @return WebDriverExpectedCondition<WebDriverElement> The same
-     *         WebDriverElement once it is visible.
+     * @return WebDriverExpectedCondition<WebDriverElement> The same WebDriverElement once it is visible.
      */
     public static function visibilityOf(WebDriverElement $element)
     {
         return new static(
-            function ($driver) use ($element) {
+            function () use ($element) {
                 return $element->isDisplayed() ? $element : null;
             }
         );
@@ -142,13 +138,12 @@ function ($driver) use ($element) {
      * web page.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<array> An array of WebDriverElements
-     *         once they are located.
+     * @return WebDriverExpectedCondition<array> An array of WebDriverElements once they are located.
      */
     public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
     {
         return new static(
-            function ($driver) use ($by) {
+            function (WebDriver $driver) use ($by) {
                 $elements = $driver->findElements($by);
 
                 return count($elements) > 0 ? $elements : null;
@@ -167,7 +162,7 @@ function ($driver) use ($by) {
     public static function textToBePresentInElement(WebDriverBy $by, $text)
     {
         return new static(
-            function ($driver) use ($by, $text) {
+            function (WebDriver $driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getText();
 
@@ -190,7 +185,7 @@ function ($driver) use ($by, $text) {
     public static function textToBePresentInElementValue(WebDriverBy $by, $text)
     {
         return new static(
-            function ($driver) use ($by, $text) {
+            function (WebDriver $driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getAttribute('value');
 
@@ -214,7 +209,7 @@ function ($driver) use ($by, $text) {
     public static function frameToBeAvailableAndSwitchToIt($frame_locator)
     {
         return new static(
-            function ($driver) use ($frame_locator) {
+            function (WebDriver $driver) use ($frame_locator) {
                 try {
                     return $driver->switchTo()->frame($frame_locator);
                 } catch (NoSuchFrameException $e) {
@@ -229,13 +224,12 @@ function ($driver) use ($frame_locator) {
      * present on the DOM.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return bool WebDriverExpectedCondition Whether there is no element
-     *         located.
+     * @return bool WebDriverExpectedCondition Whether there is no element located.
      */
     public static function invisibilityOfElementLocated(WebDriverBy $by)
     {
         return new static(
-            function ($driver) use ($by) {
+            function (WebDriver $driver) use ($by) {
                 try {
                     return !($driver->findElement($by)->isDisplayed());
                 } catch (NoSuchElementException $e) {
@@ -253,13 +247,12 @@ function ($driver) use ($by) {
      *
      * @param WebdriverBy $by The locator used to find the element.
      * @param string $text The text of the element.
-     * @return bool WebDriverExpectedCondition Whether the text is found in the
-     *         element located.
+     * @return bool WebDriverExpectedCondition Whether the text is found in the element located.
      */
     public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
     {
         return new static(
-            function ($driver) use ($by, $text) {
+            function (WebDriver $driver) use ($by, $text) {
                 try {
                     return !($driver->findElement($by)->getText() === $text);
                 } catch (NoSuchElementException $e) {
@@ -285,7 +278,7 @@ public static function elementToBeClickable(WebDriverBy $by)
             self::visibilityOfElementLocated($by);
 
         return new static(
-            function ($driver) use ($visibility_of_element_located) {
+            function (WebDriver $driver) use ($visibility_of_element_located) {
                 $element = call_user_func(
                     $visibility_of_element_located->getApply(),
                     $driver
@@ -307,13 +300,12 @@ function ($driver) use ($visibility_of_element_located) {
      * Wait until an element is no longer attached to the DOM.
      *
      * @param WebDriverElement $element The element to wait for.
-     * @return bool WebDriverExpectedCondition false if the element is still
-     *         attached to the DOM, true otherwise.
+     * @return bool WebDriverExpectedCondition false if the element is still attached to the DOM, true otherwise.
      */
     public static function stalenessOf(WebDriverElement $element)
     {
         return new static(
-            function ($driver) use ($element) {
+            function () use ($element) {
                 try {
                     $element->isEnabled();
 
@@ -335,13 +327,12 @@ function ($driver) use ($element) {
      * when the second part of the condition is checked.
      *
      * @param WebDriverExpectedCondition $condition The condition wrapped.
-     * @return WebDriverExpectedCondition<mixed> The return value of the
-     *         getApply() of the given condition.
+     * @return WebDriverExpectedCondition<mixed> The return value of the getApply() of the given condition.
      */
     public static function refreshed(WebDriverExpectedCondition $condition)
     {
         return new static(
-            function ($driver) use ($condition) {
+            function (WebDriver $driver) use ($condition) {
                 try {
                     return call_user_func($condition->getApply(), $driver);
                 } catch (StaleElementReferenceException $e) {
@@ -376,14 +367,14 @@ public static function elementSelectionStateToBe($element_or_by, $selected)
     {
         if ($element_or_by instanceof WebDriverElement) {
             return new static(
-                function ($driver) use ($element_or_by, $selected) {
+                function () use ($element_or_by, $selected) {
                     return $element_or_by->isSelected() === $selected;
                 }
             );
         } else {
             if ($element_or_by instanceof WebDriverBy) {
                 return new static(
-                    function ($driver) use ($element_or_by, $selected) {
+                    function (WebDriver $driver) use ($element_or_by, $selected) {
                         try {
                             $element = $driver->findElement($element_or_by);
 
@@ -400,13 +391,12 @@ function ($driver) use ($element_or_by, $selected) {
     /**
      * An expectation for whether an alert() box is present.
      *
-     * @return WebDriverExpectedCondition<?WebDriverAlert> if alert() is present,
-     *         null otherwise.
+     * @return WebDriverExpectedCondition<?WebDriverAlert> if alert() is present, null otherwise.
      */
     public static function alertIsPresent()
     {
         return new static(
-            function ($driver) {
+            function (WebDriver $driver) {
                 try {
                     // Unlike the Java code, we get a WebDriverAlert object regardless
                     // of whether there is an alert.  Calling getText() will throw
@@ -431,7 +421,7 @@ function ($driver) {
     public static function not(WebDriverExpectedCondition $condition)
     {
         return new static(
-            function ($driver) use ($condition) {
+            function (WebDriver $driver) use ($condition) {
                 $result = call_user_func($condition->getApply(), $driver);
 
                 return !$result;
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 2b298f20f..fef36f695 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -24,6 +24,9 @@
  */
 class WebDriverOptions
 {
+    /**
+     * @var ExecuteMethod
+     */
     protected $executor;
 
     public function __construct(ExecuteMethod $executor)
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 3e5936a4b..d62f2a124 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -16,15 +16,19 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
 
 /**
  * Managing timeout behavior for WebDriver instances.
  */
 class WebDriverTimeouts
 {
+    /**
+     * @var ExecuteMethod
+     */
     protected $executor;
 
-    public function __construct($executor)
+    public function __construct(ExecuteMethod $executor)
     {
         $this->executor = $executor;
     }
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index a2297779d..37c44f94f 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -19,15 +19,23 @@
 use Facebook\WebDriver\Exception\TimeOutException;
 
 /**
- * A utility class, designed to help the user to wait until a condition turns
- * true.
+ * A utility class, designed to help the user to wait until a condition turns true.
  *
  * @see WebDriverExpectedCondition.
  */
 class WebDriverWait
 {
+    /**
+     * @var WebDriver
+     */
     protected $driver;
+    /**
+     * @var int
+     */
     protected $timeout;
+    /**
+     * @var int
+     */
     protected $interval;
 
     public function __construct(WebDriver $driver, $timeout_in_second = null, $interval_in_millisecond = null)
@@ -38,10 +46,9 @@ public function __construct(WebDriver $driver, $timeout_in_second = null, $inter
     }
 
     /**
-     * Calls the function provided with the driver as an argument until the return
-     * value is not falsey.
+     * Calls the function provided with the driver as an argument until the return value is not falsey.
      *
-     * @param (closure|WebDriverExpectedCondition)
+     * @param callable|WebDriverExpectedCondition $func_or_ec
      * @param string $message
      *
      * @throws NoSuchElementException
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 828d4969c..68e49e015 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -17,15 +17,19 @@
 
 use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
 use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
 
 /**
  * An abstraction allowing the driver to manipulate the browser's window
  */
 class WebDriverWindow
 {
+    /**
+     * @var ExecuteMethod
+     */
     protected $executor;
 
-    public function __construct($executor)
+    public function __construct(ExecuteMethod $executor)
     {
         $this->executor = $executor;
     }

From e8a899389b012b6d2cb6681ee35c29952ec05264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Oct 2016 16:18:47 +0200
Subject: [PATCH 234/784] Use Symfony Process component to start local
 webdriver processes

---
 composer.json                        |  1 +
 lib/Remote/Service/DriverService.php | 32 +++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index e8afaf77e..b0fcd0901 100644
--- a/composer.json
+++ b/composer.json
@@ -12,6 +12,7 @@
   },
   "require": {
     "php": "^5.5 || ~7.0",
+    "symfony/process": "^2.8 || ^3.1",
     "ext-curl": "*"
   },
   "require-dev": {
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index c32ce7246..634c45864 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -17,7 +17,12 @@
 
 use Exception;
 use Facebook\WebDriver\Net\URLChecker;
+use Symfony\Component\Process\Process;
+use Symfony\Component\Process\ProcessBuilder;
 
+/**
+ * Start local WebDriver service (when remote WebDriver server is not used).
+ */
 class DriverService
 {
     /**
@@ -41,7 +46,7 @@ class DriverService
     private $environment;
 
     /**
-     * @var resource
+     * @var Process
      */
     private $process;
 
@@ -76,18 +81,13 @@ public function start()
             return $this;
         }
 
-        $pipes = [];
-        $this->process = proc_open(
-            sprintf('%s %s', $this->executable, implode(' ', $this->args)),
-            $descriptorspec = [
-                0 => ['pipe', 'r'], // stdin
-                1 => ['pipe', 'w'], // stdout
-                2 => ['pipe', 'a'], // stderr
-            ],
-            $pipes,
-            null,
-            $this->environment
-        );
+        $processBuilder = (new ProcessBuilder())
+            ->setPrefix($this->executable)
+            ->setArguments($this->args)
+            ->addEnvironmentVariables($this->environment);
+
+        $this->process = $processBuilder->getProcess();
+        $this->process->start();
 
         $checker = new URLChecker();
         $checker->waitUntilAvailable(20 * 1000, $this->url . '/status');
@@ -104,7 +104,7 @@ public function stop()
             return $this;
         }
 
-        proc_terminate($this->process);
+        $this->process->stop();
         $this->process = null;
 
         $checker = new URLChecker();
@@ -122,9 +122,7 @@ public function isRunning()
             return false;
         }
 
-        $status = proc_get_status($this->process);
-
-        return $status['running'];
+        return $this->process->isRunning();
     }
 
     /**

From eafb4ca316b5aa5d7f085b45dcd7d7a4c34b4e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Oct 2016 17:15:38 +0200
Subject: [PATCH 235/784] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a74435bef..4791dbe55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- Added initial basic support of Microsoft Edge browser
+- Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported)
 - Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible
 - PHP version at least 5.5 is required
+- Fixed incompatibility with Appium, caused by redundant params present in requests to Selenium server
 
 ## 1.1.3 - 2016-08-10
 - Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file

From af21de3ae5306a8ca0bcc02a19735dadc43e83f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Oct 2016 17:16:51 +0200
Subject: [PATCH 236/784] Release 1.2.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4791dbe55..f89047b65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported)
 - Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible
 - PHP version at least 5.5 is required

From d9d94a74444e81c6d0b195c3535edee24ce6428c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 18 Oct 2016 23:00:06 +0200
Subject: [PATCH 237/784] Add badges to readme

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6cdae5742..a09dd9843 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
-php-webdriver – WebDriver bindings for PHP
-===========================================
+# php-webdriver – Selenium WebDriver bindings for PHP
+
+[![Latest Stable Version](https://img.shields.io/packagist/v/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
+[![Total Downloads](https://img.shields.io/packagist/dt/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
+[![License](https://img.shields.io/packagist/l/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
 
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.

From 6be7aea8ba2ccd249d3537ceb4ab3b58fa09a894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 18 Oct 2016 23:04:08 +0200
Subject: [PATCH 238/784] Add link to StackOverflow where one can also look for
 help

---
 README.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a09dd9843..8c3e2370a 100644
--- a/README.md
+++ b/README.md
@@ -81,17 +81,9 @@ Learn how to integrate it with PHPUnit [Blogpost](http://codeception.com/11-12-2
 
 We have a great community willing to try and help you!
 
-Currently we offer support in two manners:
-
-### Via our Facebook Group
-
-If you have questions or are an active contributor consider joining our facebook group and contributing to the communal discussion and support
-
-https://www.facebook.com/groups/phpwebdriver/
-
-### Via Github
-
-If you're reading this you've already found our Github repository. If you have a question, feel free to submit it as an issue and our staff will do their best to help you as soon as possible.
+- **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contributing to the communal discussion and support.
+- **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow.
+- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as an new issue.
 
 ## Contributing
 

From 87a7eae1af88425289bbf33e059d9c253148b59e Mon Sep 17 00:00:00 2001
From: "borgogelli@iubar.it" <borgogelli@iubar.it>
Date: Mon, 31 Oct 2016 21:42:41 +0100
Subject: [PATCH 239/784] Fix unused code in the URLChecker class

---
 lib/Net/URLChecker.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 3a5d76316..97813202b 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -28,7 +28,7 @@ public function waitUntilAvailable($timeout_in_ms, $url)
         $end = microtime(true) + $timeout_in_ms / 1000;
 
         while ($end > microtime(true)) {
-            if ($this->getHTTPResponseCode($timeout_in_ms, $url) === 200) {
+            if ($this->getHTTPResponseCode($url) === 200) {
                 return $this;
             }
             usleep(self::POLL_INTERVAL_MS);
@@ -46,7 +46,7 @@ public function waitUntilUnavailable($timeout_in_ms, $url)
         $end = microtime(true) + $timeout_in_ms / 1000;
 
         while ($end > microtime(true)) {
-            if ($this->getHTTPResponseCode($timeout_in_ms, $url) !== 200) {
+            if ($this->getHTTPResponseCode($url) !== 200) {
                 return $this;
             }
             usleep(self::POLL_INTERVAL_MS);
@@ -59,7 +59,7 @@ public function waitUntilUnavailable($timeout_in_ms, $url)
         ));
     }
 
-    private function getHTTPResponseCode($timeout_in_ms, $url)
+    private function getHTTPResponseCode($url)
     {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);

From e9d0e39456d630e777596df33fb729456778989a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 2 Nov 2016 21:41:03 +0100
Subject: [PATCH 240/784] Clarify meaning of selenium server URL variable of
 RemoteWebDriver

---
 lib/Chrome/ChromeDriver.php    |  6 +++---
 lib/Remote/RemoteWebDriver.php | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index b8aad6a07..32ddf8f85 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -59,7 +59,7 @@ public function startSession(DesiredCapabilities $desired_capabilities)
      * @throws WebDriverException
      */
     public static function create(
-        $url = 'http://localhost:4444/wd/hub',
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
         $desired_capabilities = null,
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null,
@@ -73,14 +73,14 @@ public static function create(
      * Always throws an exception. Use ChromeDriver::start() instead.
      *
      * @param string $session_id The existing session id
-     * @param string $url The url of the remote server
+     * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      *
      * @throws WebDriverException
      * @return RemoteWebDriver|void
      */
     public static function createBySessionID(
         $session_id,
-        $url = 'http://localhost:4444/wd/hub'
+        $selenium_server_url = 'http://localhost:4444/wd/hub'
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index a904024f5..964740ead 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -59,7 +59,7 @@ protected function __construct()
     /**
      * Construct the RemoteWebDriver by a desired capabilities.
      *
-     * @param string $url The url of the remote server
+     * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
      * @param int|null $connection_timeout_in_ms
      * @param int|null $request_timeout_in_ms
@@ -68,14 +68,14 @@ protected function __construct()
      * @return RemoteWebDriver
      */
     public static function create(
-        $url = 'http://localhost:4444/wd/hub',
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
         $desired_capabilities = null,
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null,
         $http_proxy = null,
         $http_proxy_port = null
     ) {
-        $url = preg_replace('#/+$#', '', $url);
+        $selenium_server_url = preg_replace('#/+$#', '', $selenium_server_url);
 
         // Passing DesiredCapabilities as $desired_capabilities is encouraged but
         // array is also accepted for legacy reason.
@@ -83,7 +83,7 @@ public static function create(
             $desired_capabilities = $desired_capabilities->toArray();
         }
 
-        $executor = new HttpCommandExecutor($url, $http_proxy, $http_proxy_port);
+        $executor = new HttpCommandExecutor($selenium_server_url, $http_proxy, $http_proxy_port);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);
         }
@@ -113,15 +113,15 @@ public static function create(
      * browser for the whole test suite. You do not have to pass the desired
      * capabilities because the session was created before.
      *
-     * @param string $url The url of the remote server
+     * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param string $session_id The existing session id
      * @return RemoteWebDriver
      */
-    public static function createBySessionID($session_id, $url = 'http://localhost:4444/wd/hub')
+    public static function createBySessionID($session_id, $selenium_server_url = 'http://localhost:4444/wd/hub')
     {
         $driver = new static();
         $driver->setSessionID($session_id)
-            ->setCommandExecutor(new HttpCommandExecutor($url));
+            ->setCommandExecutor(new HttpCommandExecutor($selenium_server_url));
 
         return $driver;
     }
@@ -514,13 +514,13 @@ public function getSessionID()
     /**
      * Get all selenium sessions.
      *
-     * @param string $url The url of the remote server
+     * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param int $timeout_in_ms
      * @return array
      */
-    public static function getAllSessions($url = 'http://localhost:4444/wd/hub', $timeout_in_ms = 30000)
+    public static function getAllSessions($selenium_server_url = 'http://localhost:4444/wd/hub', $timeout_in_ms = 30000)
     {
-        $executor = new HttpCommandExecutor($url);
+        $executor = new HttpCommandExecutor($selenium_server_url);
         $executor->setConnectionTimeout($timeout_in_ms);
 
         $command = new WebDriverCommand(

From e135093fdfc9b59860b003364b8c0fda76d2c7f8 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@dixonscarphone.com>
Date: Thu, 1 Dec 2016 14:53:43 +0100
Subject: [PATCH 241/784] chore: fixed phpdoc in WebDriverWindow class

---
 lib/WebDriverWindow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 68e49e015..d48a70773 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -38,7 +38,7 @@ public function __construct(ExecuteMethod $executor)
      * Get the position of the current window, relative to the upper left corner
      * of the screen.
      *
-     * @return array The current window position.
+     * @return WebDriverPoint The current window position.
      */
     public function getPosition()
     {
@@ -57,7 +57,7 @@ public function getPosition()
      * Get the size of the current window. This will return the outer window
      * dimension, not just the view port.
      *
-     * @return array The current window size.
+     * @return WebDriverDimension The current window size.
      */
     public function getSize()
     {

From f45b91dc17096bcf0d3a2f566cd8f18be3a4a5e4 Mon Sep 17 00:00:00 2001
From: danielemontesi <daniele.montesi@iubar.it>
Date: Fri, 28 Oct 2016 17:58:42 +0200
Subject: [PATCH 242/784] Fix: const overwritten

---
 lib/Net/URLChecker.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 3a5d76316..dd197c46c 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -64,13 +64,13 @@ private function getHTTPResponseCode($timeout_in_ms, $url)
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        // The PHP doc indicates that CURLOPT_CONNECTTIMEOUT_MS constant is added in cURL 7.16.2
+        // available since PHP 5.2.3.
+        if (!defined(CURLOPT_CONNECTTIMEOUT_MS)) {
+            define('CURLOPT_CONNECTTIMEOUT_MS', 156);  // default value for CURLOPT_CONNECTTIMEOUT_MS
+        }
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
-        // There is a PHP bug in some versions which didn't define the constant.
-        curl_setopt(
-            $ch,
-            156, // CURLOPT_CONNECTTIMEOUT_MS
-            self::CONNECT_TIMEOUT_MS
-        );
+
         $code = null;
         try {
             curl_exec($ch);

From baaaec74d76e3ff0ff53f946e9a63364410cc0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 31 Dec 2016 18:25:21 +0100
Subject: [PATCH 243/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f89047b65..fadf18bf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve poratbility
+-  Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class
 
 ## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported)

From 465f523eb5c5697d3863f623596366f898789426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 9 Dec 2016 11:56:19 +0100
Subject: [PATCH 244/784] Simplify build matrix

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index facb0d4db..a2161a201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,10 @@ matrix:
     # Add PHP 7 build to check codestyle only in PHP 7 build
     - php: 7
       env: CHECK_CODESTYLE=1
+      before_script: ~
+      script:
+        - ./vendor/bin/php-cs-fixer fix --diff --dry-run
+        - ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/
 
 env:
   global:
@@ -28,15 +32,13 @@ install:
   - travis_retry composer install --no-interaction --prefer-source
 
 before_script:
-  - if [ -z "$CHECK_CODESTYLE" ]; then sh -e /etc/init.d/xvfb start; fi
-  - if [ -z "$CHECK_CODESTYLE" ]; then wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar; fi
-  - if [ -z "$CHECK_CODESTYLE" ]; then java -jar selenium-server-standalone-2.45.0.jar -log selenium.log; fi &
-  - if [ -z "$CHECK_CODESTYLE" ]; then until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done; fi
+  - sh -e /etc/init.d/xvfb start
+  - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
+  - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
+  - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
 
 script:
-  - if [ -n "$CHECK_CODESTYLE" ]; then ./vendor/bin/php-cs-fixer fix --diff --dry-run; fi
-  - if [ -n "$CHECK_CODESTYLE" ]; then ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/; fi
-  - if [ -z "$CHECK_CODESTYLE" ]; then ./vendor/bin/phpunit; fi
+  - ./vendor/bin/phpunit
 
 after_script:
   - cat selenium.log

From c123f84528b66d7e566e0147c5f41f52759339a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 18 Dec 2016 02:18:42 +0100
Subject: [PATCH 245/784] Do not prefer source when installing from composer to
 take advantage from the Travis cache

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a2161a201..68a261845 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer install --no-interaction
 
 before_script:
   - sh -e /etc/init.d/xvfb start

From 882d263a68179806e8fcd51806f2398f63d694e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 20:43:52 +0100
Subject: [PATCH 246/784] Make browser to run the functional tests against
 configurable

---
 tests/functional/WebDriverTestCase.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 6ebe98b61..080a30bca 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -15,9 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
-use Facebook\WebDriver\Remote\WebDriverCapabilityType;
 
 /**
  * The base class for test cases.
@@ -26,17 +26,23 @@ class WebDriverTestCase extends \PHPUnit_Framework_TestCase
 {
     /** @var RemoteWebDriver $driver */
     protected $driver;
+    /** @var DesiredCapabilities */
+    protected $desiredCapabilities;
 
     protected function setUp()
     {
-        $this->driver = RemoteWebDriver::create(
-            'http://localhost:4444/wd/hub',
-            [
-                WebDriverCapabilityType::BROWSER_NAME
-                //=> WebDriverBrowserType::FIREFOX,
-                => WebDriverBrowserType::HTMLUNIT,
-            ]
-        );
+        $this->desiredCapabilities = new DesiredCapabilities();
+        $serverUrl = 'http://localhost:4444/wd/hub';
+
+        if (getenv('BROWSER_NAME')) {
+            $browserName = getenv('BROWSER_NAME');
+        } else {
+            $browserName = WebDriverBrowserType::HTMLUNIT;
+        }
+
+        $this->desiredCapabilities->setBrowserName($browserName);
+
+        $this->driver = RemoteWebDriver::create($serverUrl, $this->desiredCapabilities);
     }
 
     protected function tearDown()

From d0f29eeee746ffe2b4f2c2da4686dccf77943ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 21:07:25 +0100
Subject: [PATCH 247/784] Use Selenium server 2.53.1 (with disabled marionette)
 for integration tests

Selenium 3 will follow hopefully after 3.0.2 will be released.
---
 .travis.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68a261845..609ba75cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ env:
 cache:
   directories:
     - $HOME/.composer/cache
+    - jar
 
 before_install:
   - travis_retry composer self-update
@@ -33,8 +34,13 @@ install:
 
 before_script:
   - sh -e /etc/init.d/xvfb start
-  - wget -q -t 3 http://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar
-  - java -jar selenium-server-standalone-2.45.0.jar -log selenium.log &
+  # TODO: upgrade to Selenium 3.0.2 (with latest HtmlUnit) once released, as HtmlUnit in 3.0.1 is broken
+  - if [ ! -f jar/selenium-server-standalone-2.53.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar; fi
+  - if [ ! -f jar/htmlunit-driver-standalone-2.20.jar ]; then wget -q -t 3 -P jar https://github.com/SeleniumHQ/htmlunit-driver/releases/download/2.20/htmlunit-driver-standalone-2.20.jar; fi
+  # Temporarily run HtmlUnit from standalone jar file (it was not part of Selenium server standalone in version 2.53)
+  - java -cp "jar/selenium-server-standalone-2.53.1.jar:jar/htmlunit-driver-standalone-2.20.jar" org.openqa.grid.selenium.GridLauncher -log selenium.log &
+  # TODO: use this after upgrade to Selenium 3.0.2
+  #- /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.0.2.jar -log selenium.log &
   - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
 
 script:
@@ -42,3 +48,9 @@ script:
 
 after_script:
   - cat selenium.log
+
+addons:
+  apt:
+    packages:
+      - oracle-java8-installer
+

From e55a533a07397e2fbf65319bc8677eba213fc8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 20:44:36 +0100
Subject: [PATCH 248/784] Run tests on Travis also against Firefox

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 609ba75cf..21f11b4e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ php:
 
 matrix:
   include:
+    # Add build to run tests against Firefox (other runs are agains HtmlUnit by default)
+    - php: 7
+      env: BROWSER_NAME="firefox"
     # Add PHP 7 build to check codestyle only in PHP 7 build
     - php: 7
       env: CHECK_CODESTYLE=1
@@ -50,7 +53,7 @@ after_script:
   - cat selenium.log
 
 addons:
+  firefox: "latest-esr"
   apt:
     packages:
       - oracle-java8-installer
-

From 75ee70317c914ec55b69df1966baf31a9396507c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 20:48:41 +0100
Subject: [PATCH 249/784] Ignore local phpunit.xml

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2444076bd..e2cc31fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ composer.phar
 composer.lock
 vendor
 .php_cs.cache
+phpunit.xml
 
 # generic files to ignore
 *.lock

From 49d39df13c960d1b1289c20a6bfc1ef978c4360e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 20:44:49 +0100
Subject: [PATCH 250/784] Minor phpdoc fixes

---
 lib/Remote/RemoteWebDriver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 964740ead..d06dc2e36 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -479,7 +479,7 @@ public function setCommandExecutor(WebDriverCommandExecutor $executor)
     }
 
     /**
-     * Set the command executor of this RemoteWebdriver
+     * Get the command executor of this RemoteWebdriver
      *
      * @return HttpCommandExecutor
      */
@@ -512,7 +512,7 @@ public function getSessionID()
     }
 
     /**
-     * Get all selenium sessions.
+     * Returns a list of the currently active sessions.
      *
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param int $timeout_in_ms

From bdf7e2ecc718503b49836851933d656fc7955f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 20:22:05 +0100
Subject: [PATCH 251/784] Functional tests for RemoteWebDriver

---
 tests/functional/FileUploadTest.php           |   4 +-
 .../{BaseTest.php => FindElementTest.php}     |  29 +--
 tests/functional/RemoteWebDriverTest.php      | 202 ++++++++++++++++++
 tests/functional/html/index.html              |  20 +-
 tests/functional/html/open_new_window.html    |   8 +
 tests/functional/html/upload.html             |   8 +-
 6 files changed, 239 insertions(+), 32 deletions(-)
 rename tests/functional/{BaseTest.php => FindElementTest.php} (84%)
 create mode 100644 tests/functional/RemoteWebDriverTest.php
 create mode 100644 tests/functional/html/open_new_window.html

diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 29b878d9f..57ebff23c 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -31,7 +31,7 @@ public function testFileUploading()
         $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
         $file_input->setFileDetector(new LocalFileDetector())
             ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
-        self::assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+        $this->assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
     }
 
     public function testUselessFileDetectorSendKeys()
@@ -39,7 +39,7 @@ public function testUselessFileDetectorSendKeys()
         $this->driver->get($this->getTestPath('upload.html'));
         $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
         $file_input->sendKeys($this->getFilePath());
-        self::assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+        $this->assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
     }
 
     private function getFilePath()
diff --git a/tests/functional/BaseTest.php b/tests/functional/FindElementTest.php
similarity index 84%
rename from tests/functional/BaseTest.php
rename to tests/functional/FindElementTest.php
index c9c522651..f479fc9bc 100644
--- a/tests/functional/BaseTest.php
+++ b/tests/functional/FindElementTest.php
@@ -15,21 +15,12 @@
 
 namespace Facebook\WebDriver;
 
-class BaseTest extends WebDriverTestCase
+class FindElementTest extends WebDriverTestCase
 {
-    public function testGetTitle()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
-            'php-webdriver test page',
-            $this->driver->getTitle()
-        );
-    }
-
     public function testGetText()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Welcome to the facebook/php-webdriver testing page.',
             $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
         );
@@ -38,7 +29,7 @@ public function testGetText()
     public function testGetById()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test by ID',
             $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
         );
@@ -47,7 +38,7 @@ public function testGetById()
     public function testGetByClassName()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test by Class',
             $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
         );
@@ -56,7 +47,7 @@ public function testGetByClassName()
     public function testGetByCssSelector()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test by Class',
             $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
         );
@@ -65,7 +56,7 @@ public function testGetByCssSelector()
     public function testGetByLinkText()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Click here',
             $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
         );
@@ -74,7 +65,7 @@ public function testGetByLinkText()
     public function testGetByName()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test Value',
             $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
         );
@@ -83,7 +74,7 @@ public function testGetByName()
     public function testGetByXpath()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test Value',
             $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
         );
@@ -92,7 +83,7 @@ public function testGetByXpath()
     public function testGetByPartialLinkText()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Click here',
             $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
         );
@@ -101,7 +92,7 @@ public function testGetByPartialLinkText()
     public function testGetByTagName()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        self::assertEquals(
+        $this->assertEquals(
             'Test Value',
             $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
         );
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
new file mode 100644
index 000000000..0f9691c96
--- /dev/null
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -0,0 +1,202 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\HttpCommandExecutor;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+class RemoteWebDriverTest extends WebDriverTestCase
+{
+    public function testShouldGetPageTitle()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $this->assertEquals(
+            'php-webdriver test page',
+            $this->driver->getTitle()
+        );
+    }
+
+    public function testShouldGetCurrentUrl()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $this->assertContains(
+            '/index.html',
+            $this->driver->getCurrentURL()
+        );
+    }
+
+    public function testShouldGetPageSource()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $source = $this->driver->getPageSource();
+        $this->assertContains('<h1 id="welcome">', $source);
+        $this->assertContains('Welcome to the facebook/php-webdriver testing page.', $source);
+    }
+
+    public function testShouldGetSessionId()
+    {
+        $sessionId = $this->driver->getSessionID();
+
+        $this->assertInternalType('string', $sessionId);
+        $this->assertNotEmpty($sessionId);
+    }
+
+    public function testShouldGetAllSessions()
+    {
+        $sessions = RemoteWebDriver::getAllSessions();
+
+        $this->assertInternalType('array', $sessions);
+        $this->assertCount(1, $sessions);
+
+        $this->assertArrayHasKey('capabilities', $sessions[0]);
+        $this->assertArrayHasKey('id', $sessions[0]);
+        $this->assertArrayHasKey('class', $sessions[0]);
+    }
+
+    public function testShouldQuitAndUnsetExecutor()
+    {
+        $this->assertCount(1, RemoteWebDriver::getAllSessions());
+        $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
+
+        $this->driver->quit();
+
+        $this->assertCount(0, RemoteWebDriver::getAllSessions());
+        $this->assertNull($this->driver->getCommandExecutor());
+    }
+
+    public function testShouldGetWindowHandles()
+    {
+        $this->driver->get($this->getTestPath('open_new_window.html'));
+
+        $windowHandle = $this->driver->getWindowHandle();
+        $windowHandles = $this->driver->getWindowHandles();
+
+        $this->assertInternalType('string', $windowHandle);
+        $this->assertNotEmpty($windowHandle);
+        $this->assertSame([$windowHandle], $windowHandles);
+
+        // Open second window
+        $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
+
+        $this->assertCount(2, $this->driver->getWindowHandles());
+    }
+
+    public function testShouldCloseWindow()
+    {
+        $this->driver->get($this->getTestPath('open_new_window.html'));
+        $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
+
+        $this->assertCount(2, $this->driver->getWindowHandles());
+
+        $this->driver->close();
+
+        $this->assertCount(1, $this->driver->getWindowHandles());
+    }
+
+    public function testShouldExecuteScriptAndDoNotBlockExecution()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('id_test'));
+        $this->assertSame('Test by ID', $element->getText());
+
+        $this->driver->executeScript('
+            setTimeout(
+                function(){document.getElementById("id_test").innerHTML = "Text changed by script"},
+                250
+            )');
+
+        // Make sure the script don't block the test execution
+        $this->assertSame('Test by ID', $element->getText());
+
+        // If we wait, the script should be executed
+        usleep(300000); // wait 300 ms
+        $this->assertSame('Text changed by script', $element->getText());
+    }
+
+    public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
+    {
+        $this->driver->manage()->timeouts()->setScriptTimeout(1);
+
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('id_test'));
+        $this->assertSame('Test by ID', $element->getText());
+
+        $this->driver->executeAsyncScript(
+            'var callback = arguments[arguments.length - 1];
+            setTimeout(
+                function(){
+                    document.getElementById("id_test").innerHTML = "Text changed by script";
+                    callback();
+                 },
+                250
+            );'
+        );
+
+        // The result must be immediately available, as the executeAsyncScript should block the execution until the
+        // callback is called.
+        $this->assertSame('Text changed by script', $element->getText());
+    }
+
+    public function testShouldTakeScreenshot()
+    {
+        if (!extension_loaded('gd')) {
+            $this->markTestSkipped('GD extension must be enabled');
+        }
+        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $outputPng = $this->driver->takeScreenshot();
+
+        $image = imagecreatefromstring($outputPng);
+        $this->assertInternalType('resource', $image);
+
+        $this->assertGreaterThan(0, imagesx($image));
+        $this->assertGreaterThan(0, imagesy($image));
+    }
+
+    public function testShouldSaveScreenshotToFile()
+    {
+        if (!extension_loaded('gd')) {
+            $this->markTestSkipped('GD extension must be enabled');
+        }
+        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
+        }
+
+        $screenshotPath = sys_get_temp_dir() . '/selenium-screenshot.png';
+
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $this->driver->takeScreenshot($screenshotPath);
+
+        $image = imagecreatefrompng($screenshotPath);
+        $this->assertInternalType('resource', $image);
+
+        $this->assertGreaterThan(0, imagesx($image));
+        $this->assertGreaterThan(0, imagesy($image));
+
+        unlink($screenshotPath);
+    }
+}
diff --git a/tests/functional/html/index.html b/tests/functional/html/index.html
index 6bafefdc9..419b41ee2 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/html/index.html
@@ -1,12 +1,18 @@
 <html>
 <head>
-  <title>php-webdriver test page</title>
+    <title>php-webdriver test page</title>
 </head>
 <body>
-  <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
-  <p id="id_test">Test by ID</p>
-  <p class="test_class">Test by Class</p>
-  <a href="#">Click here</a>
-  <input type="text" name="test_name" value="Test Value" />
+    <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
+    <p id="id_test">Test by ID</p>
+    <p class="test_class">Test by Class</p>
+    <a href="#">Click here</a>
+    <input type="text" name="test_name" value="Test Value"/>
+
+<ul class="list">
+    <li>First</li>
+    <li>Second</li>
+    <li>Third</li>
+</ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/functional/html/open_new_window.html b/tests/functional/html/open_new_window.html
new file mode 100644
index 000000000..f2ff1cf00
--- /dev/null
+++ b/tests/functional/html/open_new_window.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <title>php-webdriver test page</title>
+</head>
+<body>
+    <a href="#" target="_blank">open new window</a>
+</body>
+</html>
diff --git a/tests/functional/html/upload.html b/tests/functional/html/upload.html
index ed03702d3..2eef0c026 100644
--- a/tests/functional/html/upload.html
+++ b/tests/functional/html/upload.html
@@ -1,10 +1,10 @@
 <html>
 <head>
-  <title>Upload a file</title>
+    <title>Upload a file</title>
 </head>
 <body>
-  <form method="post" enctype="multipart/form-data">
-    <input type="file" id="upload" />
-  </form>
+    <form method="post" enctype="multipart/form-data">
+        <input type="file" id="upload"/>
+    </form>
 </body>
 </html>

From f55c684703826a30d19e9bd3dd6567c833cc8c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Jan 2017 21:40:41 +0100
Subject: [PATCH 252/784] Separate functional test that finds elemements

---
 tests/functional/FindElementTest.php          | 100 ------------------
 .../RemoteWebDriverFindElementTest.php        |  63 +++++++++++
 tests/functional/RemoteWebElementTest.php     |  30 ++++++
 tests/functional/WebDriverByTest.php          |  64 +++++++++++
 4 files changed, 157 insertions(+), 100 deletions(-)
 delete mode 100644 tests/functional/FindElementTest.php
 create mode 100644 tests/functional/RemoteWebDriverFindElementTest.php
 create mode 100644 tests/functional/RemoteWebElementTest.php
 create mode 100644 tests/functional/WebDriverByTest.php

diff --git a/tests/functional/FindElementTest.php b/tests/functional/FindElementTest.php
deleted file mode 100644
index f479fc9bc..000000000
--- a/tests/functional/FindElementTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
-
-class FindElementTest extends WebDriverTestCase
-{
-    public function testGetText()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Welcome to the facebook/php-webdriver testing page.',
-            $this->driver->findElement(WebDriverBy::id('welcome'))->getText()
-        );
-    }
-
-    public function testGetById()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test by ID',
-            $this->driver->findElement(WebDriverBy::id('id_test'))->getText()
-        );
-    }
-
-    public function testGetByClassName()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test by Class',
-            $this->driver->findElement(WebDriverBy::className('test_class'))->getText()
-        );
-    }
-
-    public function testGetByCssSelector()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test by Class',
-            $this->driver->findElement(WebDriverBy::cssSelector('.test_class'))->getText()
-        );
-    }
-
-    public function testGetByLinkText()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Click here',
-            $this->driver->findElement(WebDriverBy::linkText('Click here'))->getText()
-        );
-    }
-
-    public function testGetByName()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test Value',
-            $this->driver->findElement(WebDriverBy::name('test_name'))->getAttribute('value')
-        );
-    }
-
-    public function testGetByXpath()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test Value',
-            $this->driver->findElement(WebDriverBy::xpath('//input[@name="test_name"]'))->getAttribute('value')
-        );
-    }
-
-    public function testGetByPartialLinkText()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Click here',
-            $this->driver->findElement(WebDriverBy::partialLinkText('Click'))->getText()
-        );
-    }
-
-    public function testGetByTagName()
-    {
-        $this->driver->get($this->getTestPath('index.html'));
-        $this->assertEquals(
-            'Test Value',
-            $this->driver->findElement(WebDriverBy::tagName('input'))->getAttribute('value')
-        );
-    }
-}
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
new file mode 100644
index 000000000..64f7b8d9c
--- /dev/null
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -0,0 +1,63 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+
+/**
+ * Tests for findElement() and findElements() method of RemoteWebDriver.
+ */
+class RemoteWebDriverFindElementTest extends WebDriverTestCase
+{
+    public function testShouldThrowExceptionOfElementCannotBeFound()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $this->setExpectedException(NoSuchElementException::class, 'Unable to locate element');
+        $this->driver->findElement(WebDriverBy::id('not_existing'));
+    }
+
+    public function testShouldFindElementIfExistsOnAPage()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('id_test'));
+
+        $this->assertInstanceOf(RemoteWebElement::class, $element);
+    }
+
+    public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $elements = $this->driver->findElements(WebDriverBy::cssSelector('not_existing'));
+
+        $this->assertInternalType('array', $elements);
+        $this->assertCount(0, $elements);
+    }
+
+    public function testShouldFindMultipleElements()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
+
+        $this->assertInternalType('array', $elements);
+        $this->assertCount(3, $elements);
+        $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
+    }
+}
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
new file mode 100644
index 000000000..1869671d4
--- /dev/null
+++ b/tests/functional/RemoteWebElementTest.php
@@ -0,0 +1,30 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+class RemoteWebElementTest extends WebDriverTestCase
+{
+    public function testShouldGetText()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        $element = $this->driver->findElement(WebDriverBy::id('welcome'));
+
+        $this->assertEquals(
+            'Welcome to the facebook/php-webdriver testing page.',
+            $element->getText()
+        );
+    }
+}
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
new file mode 100644
index 000000000..4309836f6
--- /dev/null
+++ b/tests/functional/WebDriverByTest.php
@@ -0,0 +1,64 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\RemoteWebElement;
+
+/**
+ * Tests for locator strategies provided by WebDriverBy.
+ */
+class WebDriverByTest extends WebDriverTestCase
+{
+    /**
+     * @dataProvider textElementsProvider
+     * @param WebDriverBy $locator
+     * @param string $expectedText
+     * @param string $expectedAttributeValue
+     */
+    public function testShouldFindTextElementByLocator(
+        WebDriverBy $locator,
+        $expectedText = null,
+        $expectedAttributeValue = null
+    ) {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement($locator);
+
+        $this->assertInstanceOf(RemoteWebElement::class, $element);
+
+        if ($expectedText !== null) {
+            $this->assertEquals($expectedText, $element->getText());
+        }
+
+        if ($expectedAttributeValue !== null) {
+            $this->assertEquals($expectedAttributeValue, $element->getAttribute('value'));
+        }
+    }
+
+    public function textElementsProvider()
+    {
+        return [
+            'id' => [WebDriverBy::id('id_test'), 'Test by ID'],
+            'className' => [WebDriverBy::className('test_class'), 'Test by Class'],
+            'cssSelector' => [WebDriverBy::cssSelector('.test_class'), 'Test by Class'],
+            'linkText' => [WebDriverBy::linkText('Click here'), 'Click here'],
+            'partialLinkText' => [WebDriverBy::partialLinkText('Click'), 'Click here'],
+            'xpath' => [WebDriverBy::xpath('//input[@name="test_name"]'), '', 'Test Value'],
+            'name' => [WebDriverBy::name('test_name'), '', 'Test Value'],
+            'tagName' => [WebDriverBy::tagName('input'), '', 'Test Value'],
+        ];
+    }
+}

From 3da2cc1527a143b8e93c2138794d0cebe6bdc115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 2 Jan 2017 02:13:45 +0100
Subject: [PATCH 253/784] Rewrite file upload functional tests to execute real
 upload against webserver

---
 .travis.yml                                   |  2 +
 tests/functional/FileUploadTest.php           | 48 ++++++++++++-------
 .../FileUploadTestFile.txt}                   |  0
 tests/functional/WebDriverTestCase.php        | 24 ++++++++--
 tests/functional/html/upload.html             | 10 ----
 tests/functional/{html => web}/index.html     |  4 +-
 .../{html => web}/open_new_window.html        |  4 +-
 tests/functional/web/upload.html              | 18 +++++++
 tests/functional/web/upload.php               | 29 +++++++++++
 9 files changed, 106 insertions(+), 33 deletions(-)
 rename tests/functional/{files/FileUploadTestCaseFile.txt => Fixtures/FileUploadTestFile.txt} (100%)
 delete mode 100644 tests/functional/html/upload.html
 rename tests/functional/{html => web}/index.html (87%)
 rename tests/functional/{html => web}/open_new_window.html (68%)
 create mode 100644 tests/functional/web/upload.html
 create mode 100644 tests/functional/web/upload.php

diff --git a/.travis.yml b/.travis.yml
index 21f11b4e5..b250e2d63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,12 +45,14 @@ before_script:
   # TODO: use this after upgrade to Selenium 3.0.2
   #- /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.0.2.jar -log selenium.log &
   - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
+  - php -S localhost:8000 -t tests/functional/web/ &>>php-server.log &
 
 script:
   - ./vendor/bin/phpunit
 
 after_script:
   - cat selenium.log
+  - cat php-server.log
 
 addons:
   firefox: "latest-esr"
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 57ebff23c..e3b6be1d3 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -17,33 +17,47 @@
 
 use Facebook\WebDriver\Remote\LocalFileDetector;
 
-/**
- * An example test case for php-webdriver.
- *
- * Try running it by
- *   '../vendor/phpunit/phpunit/phpunit.php ExampleTestCase.php'
- */
 class FileUploadTest extends WebDriverTestCase
 {
-    public function testFileUploading()
+    public function testShouldUploadAFile()
     {
-        $this->driver->get($this->getTestPath('upload.html'));
-        $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
-        $file_input->setFileDetector(new LocalFileDetector())
-            ->sendKeys(__DIR__ . '/files/FileUploadTestCaseFile.txt');
-        $this->assertNotEquals($this->getFilePath(), $file_input->getAttribute('value'));
+        $this->driver->get($this->getTestPageUrl('upload.html'));
+
+        $fileElement = $this->driver->findElement(WebDriverBy::name('upload'));
+
+        $fileElement->setFileDetector(new LocalFileDetector())
+            ->sendKeys($this->getTestFilePath());
+
+        $fileElement->submit();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::titleIs('File upload endpoint')
+        );
+
+        $uploadedFilesList = $this->driver->findElements(WebDriverBy::cssSelector('ul.uploaded-files li'));
+        $this->assertCount(1, $uploadedFilesList);
+
+        $uploadedFileName = $this->driver->findElement(WebDriverBy::cssSelector('ul.uploaded-files li span.file-name'))
+            ->getText();
+        $uploadedFileSize = $this->driver->findElement(WebDriverBy::cssSelector('ul.uploaded-files li span.file-size'))
+            ->getText();
+
+        $this->assertSame('FileUploadTestFile.txt', $uploadedFileName);
+        $this->assertSame('10', $uploadedFileSize);
     }
 
-    public function testUselessFileDetectorSendKeys()
+    public function xtestUselessFileDetectorSendKeys()
     {
         $this->driver->get($this->getTestPath('upload.html'));
+
         $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
-        $file_input->sendKeys($this->getFilePath());
-        $this->assertEquals($this->getFilePath(), $file_input->getAttribute('value'));
+        $file_input->sendKeys($this->getTestFilePath());
+
+        $this->assertEquals($this->getTestFilePath(), $file_input->getAttribute('value'));
     }
 
-    private function getFilePath()
+    private function getTestFilePath()
     {
-        return __DIR__ . '/files/FileUploadTestCaseFile.txt';
+        return __DIR__ . '/Fixtures/FileUploadTestFile.txt';
     }
 }
diff --git a/tests/functional/files/FileUploadTestCaseFile.txt b/tests/functional/Fixtures/FileUploadTestFile.txt
similarity index 100%
rename from tests/functional/files/FileUploadTestCaseFile.txt
rename to tests/functional/Fixtures/FileUploadTestFile.txt
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 080a30bca..f44c70343 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\NoSuchWindowException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
@@ -47,19 +48,34 @@ protected function setUp()
 
     protected function tearDown()
     {
-        if ($this->driver) {
-            $this->driver->quit();
+        if ($this->driver->getCommandExecutor()) {
+            try {
+                $this->driver->quit();
+            } catch (NoSuchWindowException $e) {
+                // browser may have died or is already closed
+            }
         }
     }
 
     /**
-     * Get the URL of the test html.
+     * Get the URL of the test html on filesystem.
      *
      * @param $path
      * @return string
      */
     protected function getTestPath($path)
     {
-        return 'file:///' . __DIR__ . '/html/' . $path;
+        return 'file:///' . __DIR__ . '/web/' . $path;
+    }
+
+    /**
+     * Get the URL of given test HTML on running webserver.
+     *
+     * @param string $path
+     * @return string
+     */
+    protected function getTestPageUrl($path)
+    {
+        return 'http://localhost:8000/' . $path;
     }
 }
diff --git a/tests/functional/html/upload.html b/tests/functional/html/upload.html
deleted file mode 100644
index 2eef0c026..000000000
--- a/tests/functional/html/upload.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-    <title>Upload a file</title>
-</head>
-<body>
-    <form method="post" enctype="multipart/form-data">
-        <input type="file" id="upload"/>
-    </form>
-</body>
-</html>
diff --git a/tests/functional/html/index.html b/tests/functional/web/index.html
similarity index 87%
rename from tests/functional/html/index.html
rename to tests/functional/web/index.html
index 419b41ee2..139a25865 100644
--- a/tests/functional/html/index.html
+++ b/tests/functional/web/index.html
@@ -1,5 +1,7 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>php-webdriver test page</title>
 </head>
 <body>
diff --git a/tests/functional/html/open_new_window.html b/tests/functional/web/open_new_window.html
similarity index 68%
rename from tests/functional/html/open_new_window.html
rename to tests/functional/web/open_new_window.html
index f2ff1cf00..b56e93d69 100644
--- a/tests/functional/html/open_new_window.html
+++ b/tests/functional/web/open_new_window.html
@@ -1,5 +1,7 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
 <head>
+    <meta charset="utf-8">
     <title>php-webdriver test page</title>
 </head>
 <body>
diff --git a/tests/functional/web/upload.html b/tests/functional/web/upload.html
new file mode 100644
index 000000000..d02c5ed4b
--- /dev/null
+++ b/tests/functional/web/upload.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Upload a file</title>
+</head>
+<body>
+    <form method="post" action="http://github.com/upload.php" enctype="multipart/form-data" >
+        <p>
+            <label for="upload">Select a file to upload:</label>
+            <input type="file" name="upload" id="upload"  />
+        </p>
+        <p>
+            <input type="submit" name="submit" value="Submit"/>
+        </p>
+    </form>
+</body>
+</html>
diff --git a/tests/functional/web/upload.php b/tests/functional/web/upload.php
new file mode 100644
index 000000000..91a61bbcf
--- /dev/null
+++ b/tests/functional/web/upload.php
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>File upload endpoint</title>
+</head>
+<body>
+
+<?php
+if (empty($_FILES)) {
+    echo '<h2>File upload not detected</h2>';
+} elseif (isset($_FILES['upload']) && $_FILES['upload']['error'] == 4) {
+    echo '<h2>Form was submitted but no file was selected for upload</h2>';
+} else {
+    echo sprintf('<h2>Received %d uploaded file(s)</h2>', count($_FILES));
+    echo '<ul class="uploaded-files">';
+    foreach ($_FILES as $file) {
+        echo sprintf(
+            '<li>File name: <span class="file-name">%s</span>, size: <span class="file-size">%d</span></li>',
+            $file['name'],
+            $file['size']
+        );
+    }
+    echo '</ul>';
+}
+?>
+
+</body>
+</html>

From 6d385d71b1e705451fd07e3880c19f3b3d4e85f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 2 Jan 2017 03:44:31 +0100
Subject: [PATCH 254/784] Do not run tests on HHVM, as it doesn't support
 builtin webserver

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b250e2d63..b9b2fe6d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 5.6
   - 7
   - 7.1
-  - hhvm
 
 matrix:
   include:

From f718bfaf94af67d082d8374bd3a214d2606ce25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 2 Jan 2017 19:37:55 +0100
Subject: [PATCH 255/784] Add some clarifications about the library status in
 README

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8c3e2370a..bc3e9fbb0 100644
--- a/README.md
+++ b/README.md
@@ -7,11 +7,15 @@
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
 
-This WebDriver client aims to be as close as possible to bindings in other languages.
-The concepts are very similar to the Java, .NET, Python and Ruby bindings for WebDriver.
+This library is compatible with Selenium server version 2.x and 3.x.
+It implements the [JsonWireProtocol](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol), which is currently supported
+by the Selenium server and will also implement the [W3C WebDriver](https://w3c.github.io/webdriver/webdriver-spec.html) specification in the future.
 
-This is new version of PHP client, rewritten from scratch starting 2013.
-Using the old version? Check out Adam Goucher's fork of it at https://github.com/Element-34/php-webdriver
+The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
+[Selenium project](https://github.com/SeleniumHQ/selenium/).
+
+**This is new version of PHP client, rewritten from scratch starting 2013.**
+Using the old version? Check out [Adam Goucher's fork](https://github.com/Element-34/php-webdriver) of it.
 
 Looking for API documentation of php-webdriver? See http://facebook.github.io/php-webdriver/
 

From 8755ace212f55a783a5d50fb93e5d7d330121075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 00:22:00 +0100
Subject: [PATCH 256/784] Send code coverage reports to coveralls.io

---
 .coveralls.yml |  2 ++
 .gitignore     |  1 +
 .travis.yml    | 13 ++++++++-----
 composer.json  |  3 ++-
 logs/.gitkeep  |  0
 5 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 .coveralls.yml
 create mode 100644 logs/.gitkeep

diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 000000000..8115fc995
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1,2 @@
+coverage_clover: ./logs/coverage-clover.xml
+json_path: ./logs/coveralls-upload.json
diff --git a/.gitignore b/.gitignore
index e2cc31fbb..42ef8b562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ composer.lock
 vendor
 .php_cs.cache
 phpunit.xml
+logs/
 
 # generic files to ignore
 *.lock
diff --git a/.travis.yml b/.travis.yml
index b9b2fe6d3..d8674413c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,18 +40,21 @@ before_script:
   - if [ ! -f jar/selenium-server-standalone-2.53.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar; fi
   - if [ ! -f jar/htmlunit-driver-standalone-2.20.jar ]; then wget -q -t 3 -P jar https://github.com/SeleniumHQ/htmlunit-driver/releases/download/2.20/htmlunit-driver-standalone-2.20.jar; fi
   # Temporarily run HtmlUnit from standalone jar file (it was not part of Selenium server standalone in version 2.53)
-  - java -cp "jar/selenium-server-standalone-2.53.1.jar:jar/htmlunit-driver-standalone-2.20.jar" org.openqa.grid.selenium.GridLauncher -log selenium.log &
+  - java -cp "jar/selenium-server-standalone-2.53.1.jar:jar/htmlunit-driver-standalone-2.20.jar" org.openqa.grid.selenium.GridLauncher -log ./logs/selenium.log &
   # TODO: use this after upgrade to Selenium 3.0.2
   #- /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.0.2.jar -log selenium.log &
   - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
-  - php -S localhost:8000 -t tests/functional/web/ &>>php-server.log &
+  - php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
 script:
-  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml
 
 after_script:
-  - cat selenium.log
-  - cat php-server.log
+  - cat ./logs/selenium.log
+  - cat ./logs/php-server.log
+
+after_success:
+  - travis_retry php vendor/bin/coveralls -v
 
 addons:
   firefox: "latest-esr"
diff --git a/composer.json b/composer.json
index a8eb267e0..55780368b 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
     "phpunit/phpunit": "4.6.* || ~5.0",
     "friendsofphp/php-cs-fixer": "^1.11",
     "squizlabs/php_codesniffer": "^2.6",
-    "php-mock/php-mock-phpunit": "^1.1"
+    "php-mock/php-mock-phpunit": "^1.1",
+    "satooshi/php-coveralls": "^1.0"
   },
   "suggest": {
     "phpdocumentor/phpdocumentor": "2.*"
diff --git a/logs/.gitkeep b/logs/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 5e031e7bfde975e9a1b8b124c5a8ddf5676ed396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 00:15:35 +0100
Subject: [PATCH 257/784] Add lowest-dependencies Travis build

---
 .travis.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d8674413c..3710d83da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,19 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7
+  - 7.0
   - 7.1
 
 matrix:
   include:
     # Add build to run tests against Firefox (other runs are agains HtmlUnit by default)
-    - php: 7
+    - php: 7.0
       env: BROWSER_NAME="firefox"
+    # Build with lowest possible dependencies
+    - php: 7.0
+      env: dependencies="--prefer-lowest"
     # Add PHP 7 build to check codestyle only in PHP 7 build
-    - php: 7
+    - php: 7.0
       env: CHECK_CODESTYLE=1
       before_script: ~
       script:
@@ -32,7 +35,7 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction
+  - travis_retry composer update --no-interaction $dependencies
 
 before_script:
   - sh -e /etc/init.d/xvfb start

From a583ff49e62241b41cc285893fe7344134628938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 18 Dec 2016 00:03:41 +0100
Subject: [PATCH 258/784] Support required capabilities

---
 lib/Remote/RemoteWebDriver.php | 41 +++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index d06dc2e36..abc27ccb5 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -63,8 +63,9 @@ protected function __construct()
      * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
      * @param int|null $connection_timeout_in_ms
      * @param int|null $request_timeout_in_ms
-     * @param string|null $http_proxy The proxy to tunnel requests through
+     * @param string|null $http_proxy The proxy to tunnel requests to the remote Selenium WebDriver through
      * @param int|null $http_proxy_port
+     * @param DesiredCapabilities $required_capabilities The required capabilities
      * @return RemoteWebDriver
      */
     public static function create(
@@ -73,15 +74,12 @@ public static function create(
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null,
         $http_proxy = null,
-        $http_proxy_port = null
+        $http_proxy_port = null,
+        DesiredCapabilities $required_capabilities = null
     ) {
         $selenium_server_url = preg_replace('#/+$#', '', $selenium_server_url);
 
-        // Passing DesiredCapabilities as $desired_capabilities is encouraged but
-        // array is also accepted for legacy reason.
-        if ($desired_capabilities instanceof DesiredCapabilities) {
-            $desired_capabilities = $desired_capabilities->toArray();
-        }
+        $desired_capabilities = self::castToDesiredCapabilitiesObject($desired_capabilities);
 
         $executor = new HttpCommandExecutor($selenium_server_url, $http_proxy, $http_proxy_port);
         if ($connection_timeout_in_ms !== null) {
@@ -91,10 +89,17 @@ public static function create(
             $executor->setRequestTimeout($request_timeout_in_ms);
         }
 
+        if ($required_capabilities !== null) {
+            // TODO: Selenium (as of v3.0.1) does accept requiredCapabilities only as a property of desiredCapabilities.
+            // This will probably change in future with the W3C WebDriver spec, but is the only way how to pass these
+            // values now.
+            $desired_capabilities->setCapability('requiredCapabilities', $required_capabilities->toArray());
+        }
+
         $command = new WebDriverCommand(
             null,
             DriverCommand::NEW_SESSION,
-            ['desiredCapabilities' => $desired_capabilities]
+            ['desiredCapabilities' => $desired_capabilities->toArray()]
         );
 
         $response = $executor->execute($command);
@@ -106,6 +111,26 @@ public static function create(
         return $driver;
     }
 
+    /**
+     * Cast legacy types (array or null) to DesiredCapabilities object. To be removed in future when instance of
+     * DesiredCapabilities will be required.
+     *
+     * @param array|DesiredCapabilities|null $desired_capabilities
+     * @return DesiredCapabilities
+     */
+    protected static function castToDesiredCapabilitiesObject($desired_capabilities = null)
+    {
+        if ($desired_capabilities === null) {
+            return new DesiredCapabilities();
+        }
+
+        if (is_array($desired_capabilities)) {
+            return new DesiredCapabilities($desired_capabilities);
+        }
+
+        return $desired_capabilities;
+    }
+
     /**
      * [Experimental] Construct the RemoteWebDriver by an existing session.
      *

From 86a0b18b8f2abec691a59930b69b7d4c96c325ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 00:52:44 +0100
Subject: [PATCH 259/784] Add issue template

---
 ISSUE_TEMPLATE.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ISSUE_TEMPLATE.md

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..3eef8cde7
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+### What are you trying to achieve? (Expected behavior)
+<!-- Please fill -->
+
+### What do you get instead? (Actual behavior)
+<!-- Please fill -->
+
+### How could the issue be reproduced? (Steps to reproduce)
+<!-- Please fill everything relevant - the exact code you use, how you initialize the WebDriver, HTML snippet or URL of the page where you encounter the issue etc. -->
+
+```php
+// You can insert your PHP code here (or remove this block if it is not relevant for the issue).
+```
+
+### Details
+<!-- Please fill relevant following versions: -->
+
+* Php-webdriver version: 
+* PHP version: 
+* Selenium server version: 
+* Operating system: 
+* Browser used + version: 

From 1ba81ee6aa2e175a76f8d8d0ca512e888cd5cd1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 01:22:37 +0100
Subject: [PATCH 260/784] Add functional test for WebDriver creation

---
 .../functional/RemoteWebDriverCreateTest.php  | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 tests/functional/RemoteWebDriverCreateTest.php

diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
new file mode 100644
index 000000000..4f05a4319
--- /dev/null
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -0,0 +1,63 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\HttpCommandExecutor;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+/**
+ * @covers Facebook\WebDriver\Remote\RemoteWebDriver
+ * @covers Facebook\WebDriver\Remote\HttpCommandExecutor
+ */
+class RemoteWebDriverCreateTest extends WebDriverTestCase
+{
+    protected $createWebDriver = false;
+
+    public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
+    {
+        $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities, 10000, 13370);
+
+        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+
+        $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
+        $this->assertSame($this->serverUrl, $this->driver->getCommandExecutor()->getAddressOfRemoteServer());
+
+        $this->assertInternalType('string', $this->driver->getSessionID());
+        $this->assertNotEmpty($this->driver->getSessionID());
+
+        $returnedCapabilities = $this->driver->getCapabilities();
+        $this->assertInstanceOf(WebDriverCapabilities::class, $returnedCapabilities);
+        $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
+    }
+
+    public function testShouldCreateWebDriverWithRequiredCapabilities()
+    {
+        $requiredCapabilities = new DesiredCapabilities();
+
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            null,
+            null,
+            null,
+            null,
+            $requiredCapabilities
+        );
+
+        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+    }
+}

From 6c155c801ccc6fe3b1efb4ab51147da3e790d834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 00:10:37 +0100
Subject: [PATCH 261/784] Define @covers for functional tests, to cover just
 what is actually tested

---
 CHANGELOG.md                                  |  4 +-
 lib/Chrome/ChromeDriver.php                   |  7 +--
 lib/Remote/HttpCommandExecutor.php            |  2 +-
 lib/Remote/RemoteWebDriver.php                | 59 ++++++++++++++-----
 lib/Remote/Service/DriverCommandExecutor.php  |  3 +-
 lib/WebDriverCommandExecutor.php              |  3 +-
 tests/functional/FileUploadTest.php           |  4 ++
 .../RemoteWebDriverFindElementTest.php        |  3 +
 tests/functional/RemoteWebDriverTest.php      |  3 +
 tests/functional/RemoteWebElementTest.php     |  3 +
 tests/functional/WebDriverByTest.php          |  1 +
 tests/functional/WebDriverTestCase.php        | 12 +++-
 12 files changed, 77 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fadf18bf8..137452511 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve poratbility
--  Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class
+- Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class
+- Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
+- Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
 
 ## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported)
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 32ddf8f85..7aac128e4 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -33,9 +33,8 @@ public static function start(DesiredCapabilities $desired_capabilities = null, C
             $service = ChromeDriverService::createDefaultService();
         }
         $executor = new DriverCommandExecutor($service);
-        $driver = new static();
-        $driver->setCommandExecutor($executor)
-            ->startSession($desired_capabilities);
+        $driver = new static($executor, null, $desired_capabilities);
+        $driver->startSession($desired_capabilities);
 
         return $driver;
     }
@@ -50,7 +49,7 @@ public function startSession(DesiredCapabilities $desired_capabilities)
             ]
         );
         $response = $this->executor->execute($command);
-        $this->setSessionID($response->getSessionID());
+        $this->sessionID = $response->getSessionID();
     }
 
     /**
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 11b53536a..85045855e 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -224,7 +224,7 @@ public function setRequestTimeout($timeout_in_ms)
      * @param WebDriverCommand $command
      *
      * @throws WebDriverException
-     * @return mixed
+     * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command)
     {
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index abc27ccb5..dd1be325a 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -19,6 +19,7 @@
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverCapabilities;
 use Facebook\WebDriver\WebDriverCommandExecutor;
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverNavigation;
@@ -31,6 +32,11 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor
      * @var HttpCommandExecutor
      */
     protected $executor;
+    /**
+     * @var WebDriverCapabilities
+     */
+    protected $capabilities;
+
     /**
      * @var string
      */
@@ -52,8 +58,17 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor
      */
     protected $executeMethod;
 
-    protected function __construct()
-    {
+    protected function __construct(
+        HttpCommandExecutor $commandExecutor,
+        $sessionId,
+        WebDriverCapabilities $capabilities = null
+    ) {
+        $this->executor = $commandExecutor;
+        $this->sessionID = $sessionId;
+
+        if ($capabilities !== null) {
+            $this->capabilities = $capabilities;
+        }
     }
 
     /**
@@ -61,10 +76,10 @@ protected function __construct()
      *
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param DesiredCapabilities|array $desired_capabilities The desired capabilities
-     * @param int|null $connection_timeout_in_ms
-     * @param int|null $request_timeout_in_ms
+     * @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
      * @param string|null $http_proxy The proxy to tunnel requests to the remote Selenium WebDriver through
-     * @param int|null $http_proxy_port
+     * @param int|null $http_proxy_port The proxy  port to tunnel requests to the remote Selenium WebDriver through
      * @param DesiredCapabilities $required_capabilities The required capabilities
      * @return RemoteWebDriver
      */
@@ -103,10 +118,9 @@ public static function create(
         );
 
         $response = $executor->execute($command);
+        $returnedCapabilities = new DesiredCapabilities($response->getValue());
 
-        $driver = new static();
-        $driver->setSessionID($response->getSessionID())
-            ->setCommandExecutor($executor);
+        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities);
 
         return $driver;
     }
@@ -134,9 +148,8 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
     /**
      * [Experimental] Construct the RemoteWebDriver by an existing session.
      *
-     * This constructor can boost the performance a lot by reusing the same
-     * browser for the whole test suite. You do not have to pass the desired
-     * capabilities because the session was created before.
+     * This constructor can boost the performance a lot by reusing the same browser for the whole test suite.
+     * You cannot the desired capabilities because the session was created before.
      *
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param string $session_id The existing session id
@@ -144,11 +157,9 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
      */
     public static function createBySessionID($session_id, $selenium_server_url = 'http://localhost:4444/wd/hub')
     {
-        $driver = new static();
-        $driver->setSessionID($session_id)
-            ->setCommandExecutor(new HttpCommandExecutor($selenium_server_url));
+        $executor = new HttpCommandExecutor($selenium_server_url);
 
-        return $driver;
+        return new static($executor, $session_id);
     }
 
     /**
@@ -493,6 +504,9 @@ protected function newElement($id)
     /**
      * Set the command executor of this RemoteWebdriver
      *
+     * @deprecated To be removed in the future. Executor should be passed in the constructor.
+     * @internal
+     * @codeCoverageIgnore
      * @param WebDriverCommandExecutor $executor
      * @return RemoteWebDriver
      */
@@ -516,6 +530,9 @@ public function getCommandExecutor()
     /**
      * Set the session id of the RemoteWebDriver.
      *
+     * @deprecated To be removed in the future. Session ID should be passed in the constructor.
+     * @internal
+     * @codeCoverageIgnore
      * @param string $session_id
      * @return RemoteWebDriver
      */
@@ -529,13 +546,23 @@ public function setSessionID($session_id)
     /**
      * Get current selenium sessionID
      *
-     * @return string sessionID
+     * @return string
      */
     public function getSessionID()
     {
         return $this->sessionID;
     }
 
+    /**
+     * Get capabilities of the RemoteWebDriver.
+     *
+     * @return WebDriverCapabilities
+     */
+    public function getCapabilities()
+    {
+        return $this->capabilities;
+    }
+
     /**
      * Returns a list of the currently active sessions.
      *
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 59125833b..28cc5e438 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -19,6 +19,7 @@
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
+use Facebook\WebDriver\Remote\WebDriverResponse;
 
 /**
  * A HttpCommandExecutor that talks to a local driver service instead of
@@ -42,7 +43,7 @@ public function __construct(DriverService $service)
      *
      * @throws WebDriverException
      * @throws \Exception
-     * @return mixed
+     * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command)
     {
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 00357c6e7..0a50ccdde 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -16,6 +16,7 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\WebDriverCommand;
+use Facebook\WebDriver\Remote\WebDriverResponse;
 
 /**
  * Interface for all command executor.
@@ -25,7 +26,7 @@ interface WebDriverCommandExecutor
     /**
      * @param WebDriverCommand $command
      *
-     * @return mixed
+     * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command);
 }
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index e3b6be1d3..e8878e642 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -17,6 +17,10 @@
 
 use Facebook\WebDriver\Remote\LocalFileDetector;
 
+/**
+ * @covers Facebook\WebDriver\Remote\LocalFileDetector
+ * @covers Facebook\WebDriver\Remote\RemoteWebElement
+ */
 class FileUploadTest extends WebDriverTestCase
 {
     public function testShouldUploadAFile()
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 64f7b8d9c..751b0310e 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -20,6 +20,9 @@
 
 /**
  * Tests for findElement() and findElements() method of RemoteWebDriver.
+ * @covers Facebook\WebDriver\Remote\RemoteWebDriver
+ * @covers Facebook\WebDriver\Exception\WebDriverException
+ * @covers Facebook\WebDriver\Exception\NoSuchElementException
  */
 class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 0f9691c96..1ce4c9570 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -19,6 +19,9 @@
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
+/**
+ * @covers Facebook\WebDriver\Remote\RemoteWebDriver
+ */
 class RemoteWebDriverTest extends WebDriverTestCase
 {
     public function testShouldGetPageTitle()
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 1869671d4..e176d4189 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+/**
+ * @covers Facebook\WebDriver\Remote\RemoteWebElement
+ */
 class RemoteWebElementTest extends WebDriverTestCase
 {
     public function testShouldGetText()
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 4309836f6..da614f69b 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -19,6 +19,7 @@
 
 /**
  * Tests for locator strategies provided by WebDriverBy.
+ * @covers Facebook\WebDriver\WebDriverBy
  */
 class WebDriverByTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index f44c70343..8c2fd4b8d 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -25,6 +25,11 @@
  */
 class WebDriverTestCase extends \PHPUnit_Framework_TestCase
 {
+    /** @var bool Indicate whether WebDriver should be created on setUp */
+    protected $createWebDriver = true;
+    /** @var string */
+    protected $serverUrl = 'http://localhost:4444/wd/hub';
+
     /** @var RemoteWebDriver $driver */
     protected $driver;
     /** @var DesiredCapabilities */
@@ -33,7 +38,6 @@ class WebDriverTestCase extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->desiredCapabilities = new DesiredCapabilities();
-        $serverUrl = 'http://localhost:4444/wd/hub';
 
         if (getenv('BROWSER_NAME')) {
             $browserName = getenv('BROWSER_NAME');
@@ -43,12 +47,14 @@ protected function setUp()
 
         $this->desiredCapabilities->setBrowserName($browserName);
 
-        $this->driver = RemoteWebDriver::create($serverUrl, $this->desiredCapabilities);
+        if ($this->createWebDriver) {
+            $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
+        }
     }
 
     protected function tearDown()
     {
-        if ($this->driver->getCommandExecutor()) {
+        if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor()) {
             try {
                 $this->driver->quit();
             } catch (NoSuchWindowException $e) {

From 3e2413d87e0ec88bed56c99f485df84d3c6cad03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 00:35:35 +0100
Subject: [PATCH 262/784] Update changelog

---
 CHANGELOG.md | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 137452511..c3d9f1f42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,31 +2,32 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve poratbility
-- Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class
+- `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
+- Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class.
 - Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
 - Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
+- Added option to pass required capabilities when creating `RemoteWebDriver`. (So far only desired capabilities were supported.)
 
 ## 1.2.0 - 2016-10-14
-- Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported)
-- Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible
-- PHP version at least 5.5 is required
-- Fixed incompatibility with Appium, caused by redundant params present in requests to Selenium server
+- Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported).
+- Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible.
+- PHP version at least 5.5 is required.
+- Fixed incompatibility with Appium, caused by redundant params present in requests to Selenium server.
 
 ## 1.1.3 - 2016-08-10
-- Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file
-- Comply codestyle with [PSR-2](http://www.php-fig.org/psr/psr-2/)
+- Fixed FirefoxProfile to support installation of extensions with custom namespace prefix in their manifest file.
+- Comply codestyle with [PSR-2](http://www.php-fig.org/psr/psr-2/).
 
 ## 1.1.2 - 2016-06-04
-- Added ext-curl to composer.json
-- Added CHANGELOG.md
-- Added CONTRIBUTING.md with information and rules for contributors
+- Added ext-curl to composer.json.
+- Added CHANGELOG.md.
+- Added CONTRIBUTING.md with information and rules for contributors.
 
 ## 1.1.1 - 2015-12-31
-- Fixed strict standards error in `ChromeDriver`
-- Added unit tests for `WebDriverCommand` and `DesiredCapabilities`
-- Fixed retrieving temporary path name in `FirefoxDriver` when `open_basedir` restriction is in effect 
+- Fixed strict standards error in `ChromeDriver`.
+- Added unit tests for `WebDriverCommand` and `DesiredCapabilities`.
+- Fixed retrieving temporary path name in `FirefoxDriver` when `open_basedir` restriction is in effect.
 
 ## 1.1.0 - 2015-12-08
-- FirefoxProfile improved - added possibility to set RDF file and to add datas for extensions
-- Fixed setting 0 second timeout of `WebDriverWait`
+- FirefoxProfile improved - added possibility to set RDF file and to add datas for extensions.
+- Fixed setting 0 second timeout of `WebDriverWait`.

From 718d404e0a949afea74cde12a65acdcdeb1d8b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 01:18:51 +0100
Subject: [PATCH 263/784] Refactor WebDriverByTest data provider to not the
 repeat same code

---
 tests/functional/WebDriverByTest.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index da614f69b..753790248 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -25,18 +25,21 @@ class WebDriverByTest extends WebDriverTestCase
 {
     /**
      * @dataProvider textElementsProvider
-     * @param WebDriverBy $locator
+     * @param $webDriverByLocatorMethod
+     * @param $webDriverByLocatorValue
      * @param string $expectedText
      * @param string $expectedAttributeValue
      */
     public function testShouldFindTextElementByLocator(
-        WebDriverBy $locator,
+        $webDriverByLocatorMethod,
+        $webDriverByLocatorValue,
         $expectedText = null,
         $expectedAttributeValue = null
     ) {
         $this->driver->get($this->getTestPath('index.html'));
 
-        $element = $this->driver->findElement($locator);
+        $by = call_user_func([WebDriverBy::class, $webDriverByLocatorMethod], $webDriverByLocatorValue);
+        $element = $this->driver->findElement($by);
 
         $this->assertInstanceOf(RemoteWebElement::class, $element);
 
@@ -52,14 +55,14 @@ public function testShouldFindTextElementByLocator(
     public function textElementsProvider()
     {
         return [
-            'id' => [WebDriverBy::id('id_test'), 'Test by ID'],
-            'className' => [WebDriverBy::className('test_class'), 'Test by Class'],
-            'cssSelector' => [WebDriverBy::cssSelector('.test_class'), 'Test by Class'],
-            'linkText' => [WebDriverBy::linkText('Click here'), 'Click here'],
-            'partialLinkText' => [WebDriverBy::partialLinkText('Click'), 'Click here'],
-            'xpath' => [WebDriverBy::xpath('//input[@name="test_name"]'), '', 'Test Value'],
-            'name' => [WebDriverBy::name('test_name'), '', 'Test Value'],
-            'tagName' => [WebDriverBy::tagName('input'), '', 'Test Value'],
+            'id' => ['id', 'id_test', 'Test by ID'],
+            'className' => ['className', 'test_class', 'Test by Class'],
+            'cssSelector' => ['cssSelector', '.test_class', 'Test by Class'],
+            'linkText' => ['linkText', 'Click here', 'Click here'],
+            'partialLinkText' => ['partialLinkText', 'Click', 'Click here'],
+            'xpath' => ['xpath', '//input[@name="test_name"]', '', 'Test Value'],
+            'name' => ['name', 'test_name', '', 'Test Value'],
+            'tagName' => ['tagName', 'input', '', 'Test Value'],
         ];
     }
 }

From 702f5e287b6386462e131e0f9ccbb7dea8d1e14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 02:50:32 +0100
Subject: [PATCH 264/784] Fix coveralls reporting

---
 .travis.yml      | 2 ++
 phpunit.xml.dist | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3710d83da..7c0cd3e77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,8 @@ matrix:
       script:
         - ./vendor/bin/php-cs-fixer fix --diff --dry-run
         - ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/
+      after_script: ~
+      after_success: ~
 
 env:
   global:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 06dee9c0f..894ba470a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,4 +23,10 @@
             <directory>tests/functional</directory>
         </testsuite>
     </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./lib</directory>
+        </whitelist>
+    </filter>
 </phpunit>

From 60bf22af015e083c1ab08d9beaad163ed5ea8229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 16 Dec 2016 14:54:11 +0100
Subject: [PATCH 265/784] Add tests for part of expected conditions

---
 lib/WebDriverExpectedCondition.php            |  80 +++----
 tests/unit/WebDriverExpectedConditionTest.php | 210 ++++++++++++++++++
 2 files changed, 245 insertions(+), 45 deletions(-)
 create mode 100644 tests/unit/WebDriverExpectedConditionTest.php

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index b7cd53204..f82255845 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -78,8 +78,8 @@ function (WebDriver $driver) use ($title) {
     }
 
     /**
-     * An expectation for checking that an element is present on the DOM of a
-     * page. This does not necessarily mean that the element is visible.
+     * An expectation for checking that an element is present on the DOM of a page.
+     * This does not necessarily mean that the element is visible.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @return WebDriverExpectedCondition<WebDriverElement> The element which is located.
@@ -94,9 +94,25 @@ function (WebDriver $driver) use ($by) {
     }
 
     /**
-     * An expectation for checking that an element is present on the DOM of a page
-     * and visible. Visibility means that the element is not only displayed but
-     * also has a height and width that is greater than 0.
+     * An expectation for checking that there is at least one element present on a web page.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @return WebDriverExpectedCondition<array> An array of WebDriverElements once they are located.
+     */
+    public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
+    {
+        return new static(
+            function (WebDriver $driver) use ($by) {
+                $elements = $driver->findElements($by);
+
+                return count($elements) > 0 ? $elements : null;
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking that an element is present on the DOM of a page and visible.
+     * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @return WebDriverExpectedCondition<WebDriverElement> The element which is located and visible.
@@ -117,9 +133,8 @@ function (WebDriver $driver) use ($by) {
     }
 
     /**
-     * An expectation for checking that an element, known to be present on the DOM
-     * of a page, is visible. Visibility means that the element is not only
-     * displayed but also has a height and width that is greater than 0.
+     * An expectation for checking that an element, known to be present on the DOM of a page, is visible.
+     * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverElement $element The element to be checked.
      * @return WebDriverExpectedCondition<WebDriverElement> The same WebDriverElement once it is visible.
@@ -134,30 +149,11 @@ function () use ($element) {
     }
 
     /**
-     * An expectation for checking that there is at least one element present on a
-     * web page.
-     *
-     * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<array> An array of WebDriverElements once they are located.
-     */
-    public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
-    {
-        return new static(
-            function (WebDriver $driver) use ($by) {
-                $elements = $driver->findElements($by);
-
-                return count($elements) > 0 ? $elements : null;
-            }
-        );
-    }
-
-    /**
-     * An expectation for checking if the given text is present in the specified
-     * element.
+     * An expectation for checking if the given text is present in the specified element.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
-     * @return bool WebDriverExpectedCondition Whether the text is presented.
+     * @return bool WebDriverExpectedCondition Whether the text is present.
      */
     public static function textToBePresentInElement(WebDriverBy $by, $text)
     {
@@ -175,8 +171,7 @@ function (WebDriver $driver) use ($by, $text) {
     }
 
     /**
-     * An expectation for checking if the given text is present in the specified
-     * elements value attribute.
+     * An expectation for checking if the given text is present in the specified elements value attribute.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element value.
@@ -198,8 +193,7 @@ function (WebDriver $driver) use ($by, $text) {
     }
 
     /**
-     * Expectation for checking if iFrame exists.
-     * If iFrame exists switches driver's focus to the iFrame
+     * Expectation for checking if iFrame exists. If iFrame exists switches driver's focus to the iFrame.
      *
      * @param string $frame_locator The locator used to find the iFrame
      *   expected to be either the id or name value of the i/frame
@@ -220,8 +214,7 @@ function (WebDriver $driver) use ($frame_locator) {
     }
 
     /**
-     * An expectation for checking that an element is either invisible or not
-     * present on the DOM.
+     * An expectation for checking that an element is either invisible or not present on the DOM.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @return bool WebDriverExpectedCondition Whether there is no element located.
@@ -231,7 +224,7 @@ public static function invisibilityOfElementLocated(WebDriverBy $by)
         return new static(
             function (WebDriver $driver) use ($by) {
                 try {
-                    return !($driver->findElement($by)->isDisplayed());
+                    return !$driver->findElement($by)->isDisplayed();
                 } catch (NoSuchElementException $e) {
                     return true;
                 } catch (StaleElementReferenceException $e) {
@@ -242,8 +235,7 @@ function (WebDriver $driver) use ($by) {
     }
 
     /**
-     * An expectation for checking that an element with text is either invisible
-     * or not present on the DOM.
+     * An expectation for checking that an element with text is either invisible or not present on the DOM.
      *
      * @param WebdriverBy $by The locator used to find the element.
      * @param string $text The text of the element.
@@ -265,8 +257,7 @@ function (WebDriver $driver) use ($by, $text) {
     }
 
     /**
-     * An expectation for checking an element is visible and enabled such that you
-     * can click it.
+     * An expectation for checking an element is visible and enabled such that you can click it.
      *
      * @param WebDriverBy $by The locator used to find the element
      * @return WebDriverExpectedCondition<WebDriverElement> The WebDriverElement
@@ -320,11 +311,10 @@ function () use ($element) {
     /**
      * Wrapper for a condition, which allows for elements to update by redrawing.
      *
-     * This works around the problem of conditions which have two parts: find an
-     * element and then check for some condition on it. For these conditions it is
-     * possible that an element is located and then subsequently it is redrawn on
-     * the client. When this happens a StaleElementReferenceException is thrown
-     * when the second part of the condition is checked.
+     * This works around the problem of conditions which have two parts: find an element and then check for some
+     * condition on it. For these conditions it is possible that an element is located and then subsequently it is
+     * redrawn on the client. When this happens a StaleElementReferenceException is thrown when the second part of
+     * the condition is checked.
      *
      * @param WebDriverExpectedCondition $condition The condition wrapped.
      * @return WebDriverExpectedCondition<mixed> The return value of the getApply() of the given condition.
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
new file mode 100644
index 000000000..85997939e
--- /dev/null
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -0,0 +1,210 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\StaleElementReferenceException;
+use Facebook\WebDriver\Remote\RemoteExecuteMethod;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverExpectedCondition
+ */
+class WebDriverExpectedConditionTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var RemoteWebDriver|\PHPUnit_Framework_MockObject_MockObject */
+    private $driverMock;
+    /** @var WebDriverWait */
+    private $wait;
+
+    protected function setUp()
+    {
+        // TODO: replace with createMock() once PHP 5.5 support is dropped
+        $this->driverMock = $this
+            ->getMockBuilder(RemoteWebDriver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->wait = new WebDriverWait($this->driverMock, 1, 1);
+    }
+
+    public function testShouldDetectTitleIsCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getTitle')
+            ->willReturnOnConsecutiveCalls('old', 'oldwithnew', 'new');
+
+        $condition = WebDriverExpectedCondition::titleIs('new');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
+    public function testShouldDetectTitleContainsCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getTitle')
+            ->willReturnOnConsecutiveCalls('old', 'oldwithnew', 'new');
+
+        $condition = WebDriverExpectedCondition::titleContains('new');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
+    public function testShouldDetectPresenceOfElementLocatedCondition()
+    {
+        $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
+
+        $this->driverMock->expects($this->at(0))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willThrowException(new NoSuchElementException(''));
+
+        $this->driverMock->expects($this->at(1))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $condition = WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertSame($element, $this->wait->until($condition));
+    }
+
+    public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
+    {
+        $element = $this->createRemoteWebElementMock();
+
+        $this->driverMock->expects($this->at(0))
+            ->method('findElements')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn([]);
+
+        $this->driverMock->expects($this->at(1))
+            ->method('findElements')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn([$element]);
+
+        $condition = WebDriverExpectedCondition::presenceOfAllElementsLocatedBy(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertSame([$element], $this->wait->until($condition));
+    }
+
+    public function testShouldDetectVisibilityOfElementLocatedCondition()
+    {
+        // Set-up the consecutive calls to apply() as follows:
+        // Call #1: throws NoSuchElementException
+        // Call #2: return Element, but isDisplayed will throw StaleElementReferenceException
+        // Call #3: return Element, but isDisplayed will return false
+        // Call #4: return Element, isDisplayed will true and condition will match
+
+        $element = $this->createRemoteWebElementMock();
+        $element->expects($this->at(0))
+            ->method('isDisplayed')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $element->expects($this->at(1))
+            ->method('isDisplayed')
+            ->willReturn(false);
+
+        $element->expects($this->at(2))
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $this->driverMock->expects($this->at(0))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willThrowException(new NoSuchElementException(''));
+
+        $this->driverMock->expects($this->at(1))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $this->driverMock->expects($this->at(2))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $this->driverMock->expects($this->at(3))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $condition = WebDriverExpectedCondition::visibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertSame($element, $this->wait->until($condition));
+    }
+
+    public function testShouldDetectVisibilityOfCondition()
+    {
+        $element = $this->createRemoteWebElementMock();
+        $element->expects($this->at(0))
+            ->method('isDisplayed')
+            ->willReturn(false);
+
+        $element->expects($this->at(1))
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $condition = WebDriverExpectedCondition::visibilityOf($element);
+
+        $this->assertSame($element, $this->wait->until($condition));
+    }
+
+    public function testShouldDetectTextToBePresentInElementCondition()
+    {
+        // Set-up the consecutive calls to apply() as follows:
+        // Call #1: throws NoSuchElementException
+        // Call #2: return Element, but getText returns an old text
+        // Call #3: return Element, but getText will throw StaleElementReferenceException
+        // Call #4: return Element, getText will return new text and condition will match
+
+        $element = $this->createRemoteWebElementMock();
+        $element->expects($this->at(0))
+            ->method('getText')
+            ->willReturn('this is an old text');
+
+        $element->expects($this->at(1))
+            ->method('getText')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $element->expects($this->at(2))
+            ->method('getText')
+            ->willReturn('this is a new text');
+
+        $this->setupDriverToReturnElementAfterAnException($element, 4);
+
+        $condition = WebDriverExpectedCondition::textToBePresentInElement(WebDriverBy::cssSelector('.foo'), 'new');
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
+    /**
+     * @todo Replace with createMock() once PHP 5.5 support is dropped
+     * @return \PHPUnit_Framework_MockObject_MockObject|RemoteWebElement
+     */
+    private function createRemoteWebElementMock()
+    {
+        return $this->getMockBuilder(RemoteWebElement::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->getMock();
+    }
+}

From 3d96ee5e36bc85e47afaf904da7cae3a64594aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 16 Dec 2016 16:07:58 +0100
Subject: [PATCH 266/784] Add titleMatches condition to test against regexp

---
 lib/WebDriverExpectedCondition.php            | 15 +++++++++++++++
 tests/unit/WebDriverExpectedConditionTest.php | 13 +++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index f82255845..45ef86f50 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -77,6 +77,21 @@ function (WebDriver $driver) use ($title) {
         );
     }
 
+    /**
+     * An expectation for checking current page title matches the given regular expression.
+     *
+     * @param string $titleRegexp The regular expression to test against.
+     * @return bool WebDriverExpectedCondition True when in title, false otherwise.
+     */
+    public static function titleMatches($titleRegexp)
+    {
+        return new static(
+            function (WebDriver $driver) use ($titleRegexp) {
+                return (bool) preg_match($titleRegexp, $driver->getTitle());
+            }
+        );
+    }
+
     /**
      * An expectation for checking that an element is present on the DOM of a page.
      * This does not necessarily mean that the element is visible.
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 85997939e..a8d078e7a 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -67,6 +67,19 @@ public function testShouldDetectTitleContainsCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
+    public function testShouldDetectTitleMatchesCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getTitle')
+            ->willReturnOnConsecutiveCalls('non-matching', 'matching-not', 'matching-123');
+
+        $condition = WebDriverExpectedCondition::titleMatches('/matching-\d{3}/');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
     public function testShouldDetectPresenceOfElementLocatedCondition()
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');

From b4281e53344a58d7411aa3e161fdeaf3446dd4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 17 Dec 2016 17:16:38 +0100
Subject: [PATCH 267/784] Add new elementTextIs and elementTextMatches
 conditions

---
 lib/WebDriverExpectedCondition.php            |  42 ++++++++
 tests/unit/WebDriverExpectedConditionTest.php | 102 ++++++++++++++----
 2 files changed, 125 insertions(+), 19 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 45ef86f50..f2e75d1a2 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -165,6 +165,7 @@ function () use ($element) {
 
     /**
      * An expectation for checking if the given text is present in the specified element.
+     * To check exact text match use elementTextIs() condition.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
@@ -185,6 +186,47 @@ function (WebDriver $driver) use ($by, $text) {
         );
     }
 
+    /**
+     * An expectation for checking if the given text exactly equals the text in specified element.
+     * To check only partial substring of the text use textToBePresentInElement() condition.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $text The expected text of the element.
+     * @return bool WebDriverExpectedCondition True when element has text value equal to given one
+     */
+    public static function elementTextIs(WebDriverBy $by, $text)
+    {
+        return new static(
+            function (WebDriver $driver) use ($by, $text) {
+                try {
+                    return $driver->findElement($by)->getText() == $text;
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking if the given regular expression matches the text in specified element.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $regexp The regular expression to test against.
+     * @return bool WebDriverExpectedCondition True when element has text value equal to given one
+     */
+    public static function elementTextMatches(WebDriverBy $by, $regexp)
+    {
+        return new static(
+            function (WebDriver $driver) use ($by, $regexp) {
+                try {
+                    return (bool) preg_match($regexp, $driver->findElement($by)->getText());
+                } catch (StaleElementReferenceException $e) {
+                    return null;
+                }
+            }
+        );
+    }
+
     /**
      * An expectation for checking if the given text is present in the specified elements value attribute.
      *
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index a8d078e7a..fda958486 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -139,25 +139,7 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
             ->method('isDisplayed')
             ->willReturn(true);
 
-        $this->driverMock->expects($this->at(0))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willThrowException(new NoSuchElementException(''));
-
-        $this->driverMock->expects($this->at(1))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
-
-        $this->driverMock->expects($this->at(2))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
-
-        $this->driverMock->expects($this->at(3))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
+        $this->setupDriverToReturnElementAfterAnException($element, 4);
 
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
@@ -208,6 +190,88 @@ public function testShouldDetectTextToBePresentInElementCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
+    public function testShouldDetectElementTextIsCondition()
+    {
+        // Set-up the consecutive calls to apply() as follows:
+        // Call #1: throws NoSuchElementException
+        // Call #2: return Element, but getText will throw StaleElementReferenceException
+        // Call #3: return Element, getText will return not-matching text
+        // Call #4: return Element, getText will return new text and condition will match
+
+        $element = $this->createRemoteWebElementMock();
+        $element->expects($this->at(0))
+            ->method('getText')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $element->expects($this->at(1))
+            ->method('getText')
+            ->willReturn('this is a new text, but not exactly');
+
+        $element->expects($this->at(2))
+            ->method('getText')
+            ->willReturn('this is a new text');
+
+        $this->setupDriverToReturnElementAfterAnException($element, 4);
+
+        $condition = WebDriverExpectedCondition::elementTextIs(
+            WebDriverBy::cssSelector('.foo'),
+            'this is a new text'
+        );
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
+    public function testShouldDetectElementTextMatchesCondition()
+    {
+        // Set-up the consecutive calls to apply() as follows:
+        // Call #1: throws NoSuchElementException
+        // Call #2: return Element, but getText will throw StaleElementReferenceException
+        // Call #3: return Element, getText will return not-matching text
+        // Call #4: return Element, getText will return matching text
+
+        $element = $this->createRemoteWebElementMock();
+
+        $element->expects($this->at(0))
+            ->method('getText')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $element->expects($this->at(1))
+            ->method('getText')
+            ->willReturn('non-matching');
+
+        $element->expects($this->at(2))
+            ->method('getText')
+            ->willReturn('matching-123');
+
+        $this->setupDriverToReturnElementAfterAnException($element, 4);
+
+        $condition = WebDriverExpectedCondition::elementTextMatches(
+            WebDriverBy::cssSelector('.foo'),
+            '/matching-\d{3}/'
+        );
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
+    /**
+     * @param RemoteWebElement $element
+     * @param int $expectedNumberOfFindElementCalls
+     */
+    private function setupDriverToReturnElementAfterAnException($element, $expectedNumberOfFindElementCalls)
+    {
+        $this->driverMock->expects($this->at(0))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willThrowException(new NoSuchElementException(''));
+
+        for ($i = 1; $i < $expectedNumberOfFindElementCalls; $i++) {
+            $this->driverMock->expects($this->at($i))
+                ->method('findElement')
+                ->with($this->isInstanceOf(WebDriverBy::class))
+                ->willReturn($element);
+        }
+    }
+
     /**
      * @todo Replace with createMock() once PHP 5.5 support is dropped
      * @return \PHPUnit_Framework_MockObject_MockObject|RemoteWebElement

From 3b686905b8dd9c5b36b49dd4f4301f831fb1f4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 17 Dec 2016 17:54:57 +0100
Subject: [PATCH 268/784] Deprecate textToBePresentInElement condition in favor
 of elementTextContains

---
 lib/WebDriverExpectedCondition.php            | 17 ++++++++++++++++-
 tests/unit/WebDriverExpectedConditionTest.php |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index f2e75d1a2..0ab230a6a 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -167,11 +167,26 @@ function () use ($element) {
      * An expectation for checking if the given text is present in the specified element.
      * To check exact text match use elementTextIs() condition.
      *
+     * @codeCoverageIgnore
+     * @deprecated Use WebDriverExpectedCondition::elementTextContains() instead
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
      * @return bool WebDriverExpectedCondition Whether the text is present.
      */
     public static function textToBePresentInElement(WebDriverBy $by, $text)
+    {
+        return self::elementTextContains($by, $text);
+    }
+
+    /**
+     * An expectation for checking if the given text is present in the specified element.
+     * To check exact text match use elementTextIs() condition.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $text The text to be presented in the element.
+     * @return bool WebDriverExpectedCondition Whether the text is present.
+     */
+    public static function elementTextContains(WebDriverBy $by, $text)
     {
         return new static(
             function (WebDriver $driver) use ($by, $text) {
@@ -188,7 +203,7 @@ function (WebDriver $driver) use ($by, $text) {
 
     /**
      * An expectation for checking if the given text exactly equals the text in specified element.
-     * To check only partial substring of the text use textToBePresentInElement() condition.
+     * To check only partial substring of the text use elementTextContains() condition.
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The expected text of the element.
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index fda958486..a221b8012 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -162,7 +162,7 @@ public function testShouldDetectVisibilityOfCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
-    public function testShouldDetectTextToBePresentInElementCondition()
+    public function testShouldDetectElementTextContainsCondition()
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -185,7 +185,7 @@ public function testShouldDetectTextToBePresentInElementCondition()
 
         $this->setupDriverToReturnElementAfterAnException($element, 4);
 
-        $condition = WebDriverExpectedCondition::textToBePresentInElement(WebDriverBy::cssSelector('.foo'), 'new');
+        $condition = WebDriverExpectedCondition::elementTextContains(WebDriverBy::cssSelector('.foo'), 'new');
 
         $this->assertTrue($this->wait->until($condition));
     }

From b6a59dd7f3cb5fc8bca1d2787f8a34c740f752dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 17 Dec 2016 17:18:25 +0100
Subject: [PATCH 269/784] Add new numberOfWindowsToBe condition to check number
 of opened window handles

---
 lib/WebDriverExpectedCondition.php            | 15 +++++++++++++++
 tests/unit/WebDriverExpectedConditionTest.php | 13 +++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 0ab230a6a..6be57f834 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -474,6 +474,21 @@ function (WebDriver $driver) {
         );
     }
 
+    /**
+     * An expectation checking the number of opened windows.
+     *
+     * @param int $expectedNumberOfWindows
+     * @return WebDriverExpectedCondition
+     */
+    public static function numberOfWindowsToBe($expectedNumberOfWindows)
+    {
+        return new static(
+            function (WebDriver $driver) use ($expectedNumberOfWindows) {
+                return count($driver->getWindowHandles()) == $expectedNumberOfWindows;
+            }
+        );
+    }
+
     /**
      * An expectation with the logical opposite condition of the given condition.
      *
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index a221b8012..fea46f58f 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -253,6 +253,19 @@ public function testShouldDetectElementTextMatchesCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
+    public function testShouldDetectNumberOfWindowsToBeCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getWindowHandles')
+            ->willReturnOnConsecutiveCalls(['one'], ['one', 'two', 'three'], ['one', 'two']);
+
+        $condition = WebDriverExpectedCondition::numberOfWindowsToBe(2);
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
     /**
      * @param RemoteWebElement $element
      * @param int $expectedNumberOfFindElementCalls

From 81ee780856500ff4df90f38cdf594f5bef9ab707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 01:53:02 +0100
Subject: [PATCH 270/784] Improve functional test stability on slower
 environments

---
 tests/functional/RemoteWebDriverTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 1ce4c9570..27cc57e17 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -98,6 +98,10 @@ public function testShouldGetWindowHandles()
         // Open second window
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
 
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::numberOfWindowsToBe(2)
+        );
+
         $this->assertCount(2, $this->driver->getWindowHandles());
     }
 

From 17437fa0e61ed9c67736732075e8f47baba3d3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 02:29:03 +0100
Subject: [PATCH 271/784] Properly specify covered parts of RemoteWebDriver

---
 tests/functional/RemoteWebDriverTest.php | 42 +++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 27cc57e17..918b3514b 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -20,10 +20,13 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @covers Facebook\WebDriver\Remote\RemoteWebDriver
+ * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
  */
 class RemoteWebDriverTest extends WebDriverTestCase
 {
+    /**
+     * @covers ::getTitle
+     */
     public function testShouldGetPageTitle()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -34,6 +37,10 @@ public function testShouldGetPageTitle()
         );
     }
 
+    /**
+     * @covers ::getCurrentURL
+     * @covers ::get
+     */
     public function testShouldGetCurrentUrl()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -44,6 +51,9 @@ public function testShouldGetCurrentUrl()
         );
     }
 
+    /**
+     * @covers ::getPageSource
+     */
     public function testShouldGetPageSource()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -53,6 +63,9 @@ public function testShouldGetPageSource()
         $this->assertContains('Welcome to the facebook/php-webdriver testing page.', $source);
     }
 
+    /**
+     * @covers ::getSessionID
+     */
     public function testShouldGetSessionId()
     {
         $sessionId = $this->driver->getSessionID();
@@ -61,6 +74,9 @@ public function testShouldGetSessionId()
         $this->assertNotEmpty($sessionId);
     }
 
+    /**
+     * @covers ::getAllSessions
+     */
     public function testShouldGetAllSessions()
     {
         $sessions = RemoteWebDriver::getAllSessions();
@@ -73,6 +89,11 @@ public function testShouldGetAllSessions()
         $this->assertArrayHasKey('class', $sessions[0]);
     }
 
+    /**
+     * @covers ::getAllSessions
+     * @covers ::getCommandExecutor
+     * @covers ::quit
+     */
     public function testShouldQuitAndUnsetExecutor()
     {
         $this->assertCount(1, RemoteWebDriver::getAllSessions());
@@ -84,6 +105,10 @@ public function testShouldQuitAndUnsetExecutor()
         $this->assertNull($this->driver->getCommandExecutor());
     }
 
+    /**
+     * @covers ::getWindowHandle
+     * @covers ::getWindowHandles
+     */
     public function testShouldGetWindowHandles()
     {
         $this->driver->get($this->getTestPath('open_new_window.html'));
@@ -105,6 +130,9 @@ public function testShouldGetWindowHandles()
         $this->assertCount(2, $this->driver->getWindowHandles());
     }
 
+    /**
+     * @covers ::getWindowHandles
+     */
     public function testShouldCloseWindow()
     {
         $this->driver->get($this->getTestPath('open_new_window.html'));
@@ -117,6 +145,9 @@ public function testShouldCloseWindow()
         $this->assertCount(1, $this->driver->getWindowHandles());
     }
 
+    /**
+     * @covers ::executeScript
+     */
     public function testShouldExecuteScriptAndDoNotBlockExecution()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -138,6 +169,9 @@ function(){document.getElementById("id_test").innerHTML = "Text changed by scrip
         $this->assertSame('Text changed by script', $element->getText());
     }
 
+    /**
+     * @covers ::executeAsyncScript
+     */
     public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
@@ -163,6 +197,9 @@ function(){
         $this->assertSame('Text changed by script', $element->getText());
     }
 
+    /**
+     * @covers ::takeScreenshot
+     */
     public function testShouldTakeScreenshot()
     {
         if (!extension_loaded('gd')) {
@@ -183,6 +220,9 @@ public function testShouldTakeScreenshot()
         $this->assertGreaterThan(0, imagesy($image));
     }
 
+    /**
+     * @covers ::takeScreenshot
+     */
     public function testShouldSaveScreenshotToFile()
     {
         if (!extension_loaded('gd')) {

From aa90f690c9b59a3a7f66551b201c2d916e00c802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 02:41:28 +0100
Subject: [PATCH 272/784] Update changelog

---
 CHANGELOG.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d9f1f42..f4ed9fd1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,21 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
+- Added option to pass required capabilities when creating `RemoteWebDriver`. (So far only desired capabilities were supported.)
+- Added new expected conditions:
+    - `titleMatches` - current page title matches regular expression
+    - `elementTextIs` - text in element exactly equals given text
+    - `elementTextMatches` - text in element matches regular expression
+    - `elementTextContains` (as an alias for `textToBePresentInElement`) - text in element contains given text
+    - `numberOfWindowsToBe` - number of opened windows equals given number
+
+### Changed
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
 - Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class.
 - Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
-- Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
-- Added option to pass required capabilities when creating `RemoteWebDriver`. (So far only desired capabilities were supported.)
+- Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`
 
 ## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported).

From 8e1d0c517a844241b35ec9f15c3e7b4f78a37600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mar=C3=ADn?= <davefx@gmail.com>
Date: Thu, 15 Dec 2016 11:11:09 +0100
Subject: [PATCH 273/784] Adding URL related conditions

---
 lib/WebDriverExpectedCondition.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 6be57f834..e203c552e 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -92,6 +92,36 @@ function (WebDriver $driver) use ($titleRegexp) {
         );
     }
 
+    /**
+     * An expectation for checking the URL of a page.
+     *
+     * @param string $url The expected URL, which must be an exact match.
+     * @return bool WebDriverExpectedCondition True when the URL matches, false otherwise.
+     */
+    public static function urlIs($url)
+    {
+        return new static(
+            function (WebDriver $driver) use ($url) {
+                return $url === $driver->getCurrentURL();
+            }
+        );
+    }
+
+    /**
+     * An expectation for checking substring of the URL of a page.
+     *
+     * @param string $url The expected substring of the URL
+     * @return bool WebDriverExpectedCondition True when in URL, false otherwise.
+     */
+    public static function urlContains($url)
+    {
+        return new static(
+            function (WebDriver $driver) use ($url) {
+                return strpos($driver->getCurrentURL(), $url) !== false;
+            }
+        );
+    }
+
     /**
      * An expectation for checking that an element is present on the DOM of a page.
      * This does not necessarily mean that the element is visible.

From 8f9c3316dc16d9e78cec7ac97484e7c2dd9ba95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 13:15:07 +0100
Subject: [PATCH 274/784] Add urlMatches condition to test against regexp

---
 CHANGELOG.md                                  |  5 ++-
 lib/WebDriverExpectedCondition.php            | 15 +++++++
 tests/unit/WebDriverExpectedConditionTest.php | 39 +++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4ed9fd1f..f49ce0aeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,13 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
 - Added option to pass required capabilities when creating `RemoteWebDriver`. (So far only desired capabilities were supported.)
 - Added new expected conditions:
+    - `urlIs` - current URL exactly equals given value
+    - `urlContains` - current URL contains given text
+    - `urlMatches` - current URL matches regular expression
     - `titleMatches` - current page title matches regular expression
     - `elementTextIs` - text in element exactly equals given text
-    - `elementTextMatches` - text in element matches regular expression
     - `elementTextContains` (as an alias for `textToBePresentInElement`) - text in element contains given text
+    - `elementTextMatches` - text in element matches regular expression
     - `numberOfWindowsToBe` - number of opened windows equals given number
 
 ### Changed
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index e203c552e..0c70026f2 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -122,6 +122,21 @@ function (WebDriver $driver) use ($url) {
         );
     }
 
+    /**
+     * An expectation for checking current page URL matches the given regular expression.
+     *
+     * @param string $urlRegexp The regular expression to test against.
+     * @return bool WebDriverExpectedCondition True when in url, false otherwise.
+     */
+    public static function urlMatches($urlRegexp)
+    {
+        return new static(
+            function (WebDriver $driver) use ($urlRegexp) {
+                return (bool) preg_match($urlRegexp, $driver->getCurrentURL());
+            }
+        );
+    }
+
     /**
      * An expectation for checking that an element is present on the DOM of a page.
      * This does not necessarily mean that the element is visible.
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index fea46f58f..93d98b392 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -80,6 +80,45 @@ public function testShouldDetectTitleMatchesCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
+    public function testShouldDetectUrlIsCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getCurrentURL')
+            ->willReturnOnConsecutiveCalls('https://old/', 'https://oldwithnew/', 'https://new/');
+
+        $condition = WebDriverExpectedCondition::urlIs('https://new/');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
+    public function testShouldDetectUrlContainsCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getCurrentURL')
+            ->willReturnOnConsecutiveCalls('https://old/', 'https://oldwithnew/', 'https://new/');
+
+        $condition = WebDriverExpectedCondition::urlContains('new');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
+    public function testShouldDetectUrlMatchesCondition()
+    {
+        $this->driverMock->expects($this->any())
+            ->method('getCurrentURL')
+            ->willReturnOnConsecutiveCalls('https://non/matching/', 'https://matching/not/', 'https://matching/123/');
+
+        $condition = WebDriverExpectedCondition::urlMatches('/matching\/\d{3}\/$/');
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
     public function testShouldDetectPresenceOfElementLocatedCondition()
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');

From f2dc151ceeb99dce48ff6db741c7edb0cce7fb9f Mon Sep 17 00:00:00 2001
From: Cristian Fedatov <cristian-florin.fedatov@ubisoft.com>
Date: Wed, 21 Dec 2016 15:13:24 +0200
Subject: [PATCH 275/784] Possibility to select option by partial text using
 selectByVisiblePartialText method. (fixes #375)

---
 CHANGELOG.md            |  1 +
 lib/WebDriverSelect.php | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f49ce0aeb..fdd5a9019 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
     - `elementTextContains` (as an alias for `textToBePresentInElement`) - text in element contains given text
     - `elementTextMatches` - text in element matches regular expression
     - `numberOfWindowsToBe` - number of opened windows equals given number
+- Possibility to select option of `<select>` by its partial text (using `selectByVisiblePartialText()`)
 
 ### Changed
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 4a9797a00..88edd6314 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -219,6 +219,39 @@ public function selectByVisibleText($text)
         }
     }
 
+    /**
+     * Select all options that display text partially matching the argument. That is, when
+     * given "Bar" this would select an option like:
+     *
+     * <option value="bar">Foo Bar Baz</option>;
+     *
+     * @param string $text The visible text to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByVisiblePartialText($text)
+    {
+        $matched = false;
+        $xpath = './/option[contains(normalize-space(.), ' . $this->escapeQuotes($text) . ')]';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+
+        foreach ($options as $option) {
+            if (!$option->isSelected()) {
+                $option->click();
+            }
+            if (!$this->isMultiple()) {
+                return;
+            }
+            $matched = true;
+        }
+
+        if (!$matched) {
+            throw new NoSuchElementException(
+                sprintf('Cannot locate option with text: %s', $text)
+            );
+        }
+    }
+
     /**
      * Deselect the option at the given index.
      *

From 076c5900948db6eb3d062946b39cf1b6b662aa3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 22:42:09 +0100
Subject: [PATCH 276/784] Add UT for WebDriverException

---
 lib/Exception/WebDriverException.php          |  9 +-
 lib/Remote/HttpCommandExecutor.php            |  8 +-
 .../RemoteWebDriverFindElementTest.php        |  2 -
 .../unit/Exception/WebDriverExceptionTest.php | 89 +++++++++++++++++++
 4 files changed, 96 insertions(+), 12 deletions(-)
 create mode 100644 tests/unit/Exception/WebDriverExceptionTest.php

diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index d05519b51..8545729ad 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -40,9 +40,7 @@ public function getResults()
     }
 
     /**
-     * Throw WebDriverExceptions.
-     * For $status_code >= 0, they are errors defined in the json wired protocol.
-     * For $status_code < 0, they are errors defined in php-webdriver.
+     * Throw WebDriverExceptions based on WebDriver status code.
      *
      * @param int $status_code
      * @param string $message
@@ -88,11 +86,6 @@ public function getResults()
     public static function throwException($status_code, $message, $results)
     {
         switch ($status_code) {
-            case -1:
-                throw new WebDriverCurlException($message);
-            case 0:
-                // Success
-                break;
             case 1:
                 throw new IndexOutOfBoundsException($message, $results);
             case 2:
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 85045855e..defb51669 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -16,6 +16,7 @@
 namespace Facebook\WebDriver\Remote;
 
 use BadMethodCallException;
+use Facebook\WebDriver\Exception\WebDriverCurlException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\WebDriverCommandExecutor;
 use InvalidArgumentException;
@@ -282,7 +283,8 @@ public function execute(WebDriverCommand $command)
             if ($params && is_array($params)) {
                 $msg .= sprintf(' with params: %s', json_encode($params));
             }
-            WebDriverException::throwException(-1, $msg . "\n\n" . $error, []);
+
+            throw new WebDriverCurlException($msg . "\n\n" . $error);
         }
 
         $results = json_decode($raw_results, true);
@@ -315,7 +317,9 @@ public function execute(WebDriverCommand $command)
         }
 
         $status = isset($results['status']) ? $results['status'] : 0;
-        WebDriverException::throwException($status, $message, $results);
+        if ($status != 0) {
+            WebDriverException::throwException($status, $message, $results);
+        }
 
         $response = new WebDriverResponse($sessionId);
 
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 751b0310e..ad1daf348 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -21,8 +21,6 @@
 /**
  * Tests for findElement() and findElements() method of RemoteWebDriver.
  * @covers Facebook\WebDriver\Remote\RemoteWebDriver
- * @covers Facebook\WebDriver\Exception\WebDriverException
- * @covers Facebook\WebDriver\Exception\NoSuchElementException
  */
 class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
new file mode 100644
index 000000000..fb25eced2
--- /dev/null
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -0,0 +1,89 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+class WebDriverExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    public function testShouldStoreResultsOnInstantiation()
+    {
+        $exception = new WebDriverException('exception message', ['foo', 'bar']);
+
+        $this->assertInstanceOf(WebDriverException::class, $exception);
+        $this->assertSame('exception message', $exception->getMessage());
+        $this->assertSame(['foo', 'bar'], $exception->getResults());
+    }
+
+    /**
+     * @dataProvider statusCodeProvider
+     * @param int $statusCode
+     * @param string $expectedExceptionType
+     */
+    public function testShouldThrowProperExceptionBasedOnSeleniumStatusCode($statusCode, $expectedExceptionType)
+    {
+        try {
+            WebDriverException::throwException($statusCode, 'exception message', ['results']);
+        } catch (\Exception $e) {
+            $this->assertInstanceOf($expectedExceptionType, $e);
+
+            $this->assertSame('exception message', $e->getMessage());
+            $this->assertSame(['results'], $e->getResults());
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function statusCodeProvider()
+    {
+        return [
+            [1337, UnrecognizedExceptionException::class],
+            [1, IndexOutOfBoundsException::class],
+            [2, NoCollectionException::class],
+            [3, NoStringException::class],
+            [4, NoStringLengthException::class],
+            [5, NoStringWrapperException::class],
+            [6, NoSuchDriverException::class],
+            [7, NoSuchElementException::class],
+            [8, NoSuchFrameException::class],
+            [9, UnknownCommandException::class],
+            [10, StaleElementReferenceException::class],
+            [11, ElementNotVisibleException::class],
+            [12, InvalidElementStateException::class],
+            [13, UnknownServerException::class],
+            [14, ExpectedException::class],
+            [15, ElementNotSelectableException::class],
+            [16, NoSuchDocumentException::class],
+            [17, UnexpectedJavascriptException::class],
+            [18, NoScriptResultException::class],
+            [19, XPathLookupException::class],
+            [20, NoSuchCollectionException::class],
+            [21, TimeOutException::class],
+            [22, NullPointerException::class],
+            [23, NoSuchWindowException::class],
+            [24, InvalidCookieDomainException::class],
+            [25, UnableToSetCookieException::class],
+            [26, UnexpectedAlertOpenException::class],
+            [27, NoAlertOpenException::class],
+            [28, ScriptTimeoutException::class],
+            [29, InvalidCoordinatesException::class],
+            [30, IMENotAvailableException::class],
+            [31, IMEEngineActivationFailedException::class],
+            [32, InvalidSelectorException::class],
+            [33, SessionNotCreatedException::class],
+            [34, MoveTargetOutOfBoundsException::class],
+        ];
+    }
+}

From 02b1d20c3d5bb761acd4ae38c962c3a7106c26c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 19:37:38 +0100
Subject: [PATCH 277/784] Functional tests for WebDriverSelect

---
 tests/functional/WebDriverSelectTest.php | 390 +++++++++++++++++++++++
 tests/functional/web/form.html           |  48 +++
 2 files changed, 438 insertions(+)
 create mode 100644 tests/functional/WebDriverSelectTest.php
 create mode 100644 tests/functional/web/form.html

diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
new file mode 100644
index 000000000..a57870a17
--- /dev/null
+++ b/tests/functional/WebDriverSelectTest.php
@@ -0,0 +1,390 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnexpectedTagNameException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverSelect
+ * @covers Facebook\WebDriver\Exception\UnexpectedTagNameException
+ */
+class WebDriverSelectTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPath('form.html'));
+    }
+
+    public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple()
+    {
+        $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
+        $originalMultipleElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
+
+        $select = new WebDriverSelect($originalElement);
+        $selectMultiple = new WebDriverSelect($originalMultipleElement);
+
+        $this->assertInstanceOf(WebDriverSelect::class, $select);
+        $this->assertFalse($select->isMultiple());
+
+        $this->assertInstanceOf(WebDriverSelect::class, $selectMultiple);
+        $this->assertTrue($selectMultiple->isMultiple());
+    }
+
+    public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
+    {
+        $notSelectElement = $this->driver->findElement(WebDriverBy::cssSelector('textarea'));
+
+        $this->setExpectedException(
+            UnexpectedTagNameException::class,
+            'Element should have been "select" but was "textarea"'
+        );
+        new WebDriverSelect($notSelectElement);
+    }
+
+    /**
+     * @dataProvider selectSelectorProvider
+     * @param string $selector
+     */
+    public function testShouldGetOptionsOfSelect($selector)
+    {
+        $originalElement = $this->driver->findElement(WebDriverBy::cssSelector($selector));
+        $select = new WebDriverSelect($originalElement);
+
+        $options = $select->getOptions();
+
+        $this->assertContainsOnlyInstancesOf(WebDriverElement::class, $options);
+        $this->assertCount(5, $options);
+    }
+
+    public function selectSelectorProvider()
+    {
+        return [
+            'simple <select>' => ['#select'],
+            '<select> with multiple attribute' => ['#select-multiple'],
+        ];
+    }
+
+    public function testShouldDefaultSelectedOptionOfSimpleSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $selectedOptions = $select->getAllSelectedOptions();
+        $firstSelectedOption = $select->getFirstSelectedOption();
+
+        $this->assertContainsOnlyInstancesOf(WebDriverElement::class, $selectedOptions);
+        $this->assertCount(1, $selectedOptions);
+        $this->assertSame('First', $selectedOptions[0]->getText());
+
+        $this->assertInstanceOf(WebDriverElement::class, $firstSelectedOption);
+        $this->assertSame('First', $firstSelectedOption->getText());
+    }
+
+    public function testShouldReturnEmptyArrayIfNoOptionsOfMultipleSelectSelected()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+
+        $selectedOptions = $select->getAllSelectedOptions();
+
+        $this->assertSame([], $selectedOptions);
+    }
+
+    public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultipleSelect()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+
+        $this->setExpectedException(
+            NoSuchElementException::class,
+            'No options are selected'
+        );
+        $select->getFirstSelectedOption();
+    }
+
+    public function testShouldSelectOptionOfSimpleSelectByIndex()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByIndex(1);
+        $select->selectByIndex(1); // should be selected even if selected again
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByIndex(3);
+        $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testShouldSelectOptionOfMultipleSelectByIndex()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $this->assertSame([], $select->getAllSelectedOptions());
+
+        $select->selectByIndex(1);
+        $select->selectByIndex(1); // should be selected even if selected again
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+        $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
+
+        $select->selectByIndex(4);
+        $select->selectByIndex(3);
+        // the first selected option is still the same
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            NoSuchElementException::class,
+            'Cannot locate option with index: 1337'
+        );
+        $select->selectByIndex(1337);
+    }
+
+    public function testShouldSelectOptionOfSimpleSelectByValue()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByValue('second');
+        $select->selectByValue('second'); // should be selected even if selected again
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByValue('fourth');
+        $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testShouldSelectOptionOfMultipleSelectByValue()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $this->assertSame([], $select->getAllSelectedOptions());
+
+        $select->selectByValue('second');
+        $select->selectByValue('second'); // should be selected even if selected again
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+        $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
+
+        $select->selectByValue('fifth');
+        $select->selectByValue('fourth');
+        // the first selected option is still the same
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            NoSuchElementException::class,
+            'Cannot locate option with value: 1337'
+        );
+        $select->selectByValue(1337);
+    }
+
+    public function testShouldSelectOptionOfSimpleSelectByVisibleText()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByVisibleText('Fourth with spaces inside');
+        $select->selectByVisibleText('Fourth with spaces inside'); // should be selected even if selected again
+        $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByVisibleText('Fifth surrounded by spaces');
+        $this->assertSame('fifth', $select->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testShouldSelectOptionOfMultipleSelectByVisibleText()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $this->assertSame([], $select->getAllSelectedOptions());
+
+        $select->selectByVisibleText('This is second option');
+        $select->selectByVisibleText('This is second option');  // should be selected even if selected again
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+        $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
+
+        $select->selectByVisibleText('Fifth surrounded by spaces');
+        $select->selectByVisibleText('Fourth with spaces inside');
+        // the first selected option is still the same
+        $this->assertSame('second', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            NoSuchElementException::class,
+            'Cannot locate option with text: second'
+        );
+        $select->selectByVisibleText('second'); // the option is "This is second option"
+    }
+
+    public function testShouldSelectOptionOfSimpleSelectByVisiblePartialText()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByVisiblePartialText('not second');
+        $this->assertSame('third', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $select->selectByVisiblePartialText('Fourth with spaces');
+        $select->selectByVisiblePartialText('Fourth with spaces'); // should be selected even if selected again
+        $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testShouldSelectOptionOfMultipleSelectByVisiblePartialText()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $this->assertSame([], $select->getAllSelectedOptions());
+
+        $select->selectByVisiblePartialText('Firs');
+        $select->selectByVisiblePartialText('Firs'); // should be selected even if selected again
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+        $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
+
+        $select->selectByVisiblePartialText('second'); // matches options 'second' and 'third'
+        $select->selectByVisiblePartialText('Fourth with spaces');
+        // the first selected option is still the same
+        $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
+
+        $this->assertContainsOptionsWithValues(
+            ['first', 'second', 'third', 'fourth'],
+            $select->getAllSelectedOptions()
+        );
+    }
+
+    public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            NoSuchElementException::class,
+            'Cannot locate option with text: Not existing option'
+        );
+        $select->selectByVisiblePartialText('Not existing option');
+    }
+
+    public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            UnsupportedOperationException::class,
+            'You may only deselect all options of a multi-select'
+        );
+        $select->deselectAll();
+    }
+
+    public function testShouldDeselectAllOptionsOnMultipleSelect()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+
+        $select->selectByIndex(1);
+        $select->selectByIndex(3);
+        $select->selectByIndex(4);
+        $this->assertCount(3, $select->getAllSelectedOptions());
+
+        $select->deselectAll();
+
+        $this->assertCount(0, $select->getAllSelectedOptions());
+    }
+
+    public function testShouldDeselectOptionByIndex()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $select->selectByValue('fourth'); // index 3
+        $select->selectByValue('second'); // index 1
+
+        $select->deselectByIndex(3);
+        $select->deselectByIndex(3); // should be deselected even if deselected again
+        $select->deselectByIndex(4); // should not select unselected option
+
+        $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldDeselectOptionByValue()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $select->selectByValue('third');
+        $select->selectByValue('first');
+
+        $select->deselectByValue('third');
+        $select->deselectByValue('third'); // should be deselected even if deselected again
+        $select->deselectByValue('second'); // should not select unselected option
+
+        $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldDeselectOptionByVisibleText()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'
+        $select->selectByValue('fifth'); // text '   Fifth surrounded by spaces    '
+        $select->selectByValue('second'); // text 'This is second option'
+
+        $select->deselectByVisibleText('Fourth with spaces inside');
+        $select->deselectByVisibleText('Fourth with spaces inside'); // should be deselected even if deselected again
+        $select->deselectByVisibleText('Fifth surrounded by spaces');
+        $select->deselectByVisibleText('First'); // should not select unselected option
+
+        $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
+    }
+
+    /**
+     * @return WebDriverSelect
+     */
+    protected function getWebDriverSelectForSimpleSelect()
+    {
+        $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
+
+        return new WebDriverSelect($originalElement);
+    }
+
+    /**
+     * @return WebDriverSelect
+     */
+    protected function getWebDriverSelectForMultipleSelect()
+    {
+        $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
+
+        return new WebDriverSelect($originalElement);
+    }
+
+    /**
+     * @param string[] $expectedValues
+     * @param array $options
+     */
+    private function assertContainsOptionsWithValues(array $expectedValues, array $options)
+    {
+        $expectedCount = count($expectedValues);
+        $this->assertContainsOnlyInstancesOf(WebDriverElement::class, $options);
+        $this->assertCount($expectedCount, $options);
+
+        for ($i = 0; $i < $expectedCount; $i++) {
+            $this->assertSame($expectedValues[$i], $options[$i]->getAttribute('value'));
+        }
+    }
+}
diff --git a/tests/functional/web/form.html b/tests/functional/web/form.html
new file mode 100644
index 000000000..ac91336b1
--- /dev/null
+++ b/tests/functional/web/form.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>php-webdriver form test page</title>
+</head>
+<body>
+    <form>
+        <label>
+            Text:
+            <input type="text" name="text" id="text"/>
+        </label>
+        <br>
+
+        <label>
+            Textarea:
+            <textarea name="textarea" id="textarea"></textarea>
+        </label>
+        <br>
+
+        <label for="select">Select one:</label>
+        <select name="select" id="select">
+            <option value="first">First</option>
+            <option value="second">This is second option</option>
+            <option value="third">This is not second option</option>
+            <option value="fourth">Fourth  with   spaces   inside</option>
+            <option value="fifth">   Fifth surrounded by spaces    </option>
+        </select>
+        <br>
+
+        <label for="select-multiple">Select multiple:</label>
+        <select name="select-multiple" id="select-multiple" multiple>
+            <option value="first">First</option>
+            <option value="second">This is second option</option>
+            <option value="third">This is not second option</option>
+            <option value="fourth">Fourth  with   spaces   inside</option>
+            <option value="fifth">   Fifth surrounded by spaces    </option>
+        </select>
+        <br>
+
+        <p>
+            <input type="submit" name="submit" id="submit" value="Submit">
+        </p>
+
+
+    </form>
+</body>
+</html>

From 790ac29e93eeee2dab40b92ffb0a852ff4195c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 19:41:58 +0100
Subject: [PATCH 278/784] Allow to deselect option of <select> by partial text

---
 lib/WebDriverSelect.php                  | 70 +++++++++++++++---------
 tests/functional/WebDriverSelectTest.php | 32 +++++++++++
 2 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 88edd6314..7f24cac32 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -40,9 +40,7 @@ public function __construct(WebDriverElement $element)
     }
 
     /**
-     * @return bool Whether this select element support selecting multiple
-     *              options. This is done by checking the value of the 'multiple'
-     *              attribute.
+     * @return bool Whether this select element support selecting multiple options.
      */
     public function isMultiple()
     {
@@ -89,26 +87,6 @@ public function getFirstSelectedOption()
         throw new NoSuchElementException('No options are selected');
     }
 
-    /**
-     * Deselect all options in multiple select tag.
-     *
-     * @throws UnsupportedOperationException
-     */
-    public function deselectAll()
-    {
-        if (!$this->isMultiple()) {
-            throw new UnsupportedOperationException(
-                'You may only deselect all options of a multi-select'
-            );
-        }
-
-        foreach ($this->getOptions() as $option) {
-            if ($option->isSelected()) {
-                $option->click();
-            }
-        }
-    }
-
     /**
      * Select the option at the given index.
      *
@@ -252,6 +230,24 @@ public function selectByVisiblePartialText($text)
         }
     }
 
+    /**
+     * Deselect all options in multiple select tag.
+     *
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectAll()
+    {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException('You may only deselect all options of a multi-select');
+        }
+
+        foreach ($this->getOptions() as $option) {
+            if ($option->isSelected()) {
+                $option->click();
+            }
+        }
+    }
+
     /**
      * Deselect the option at the given index.
      *
@@ -268,7 +264,7 @@ public function deselectByIndex($index)
 
     /**
      * Deselect all options that have value attribute matching the argument. That
-     * is, when given "foo" this would select an option like:
+     * is, when given "foo" this would deselect an option like:
      *
      * <option value="foo">Bar</option>;
      *
@@ -287,7 +283,7 @@ public function deselectByValue($value)
 
     /**
      * Deselect all options that display text matching the argument. That is, when
-     * given "Bar" this would select an option like:
+     * given "Bar" this would deselect an option like:
      *
      * <option value="foo">Bar</option>;
      *
@@ -304,6 +300,30 @@ public function deselectByVisibleText($text)
         }
     }
 
+    /**
+     * Deselect all options that display text matching the argument. That is, when
+     * given "Bar" this would deselect an option like:
+     *
+     * <option value="foo">Foo Bar Baz</option>;
+     *
+     * @param string $text The visible text to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectByVisiblePartialText($text)
+    {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException('You may only deselect options of a multi-select');
+        }
+
+        $xpath = './/option[contains(normalize-space(.), ' . $this->escapeQuotes($text) . ')]';
+        $options = $this->element->findElements(WebDriverBy::xpath($xpath));
+        foreach ($options as $option) {
+            if ($option->isSelected()) {
+                $option->click();
+            }
+        }
+    }
+
     /**
      * Convert strings with both quotes and ticks into:
      *   foo'"bar -> concat("foo'", '"', "bar")
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index a57870a17..fe4800504 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -353,6 +353,38 @@ public function testShouldDeselectOptionByVisibleText()
         $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
     }
 
+    public function testShouldDeselectOptionByVisiblePartialText()
+    {
+        $select = $this->getWebDriverSelectForMultipleSelect();
+        $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'
+        $select->selectByValue('fifth'); // text '   Fifth surrounded by spaces    '
+        $select->selectByValue('second'); // text 'This is second option'
+        $select->selectByValue('third'); // text 'This is not second option'
+        $select->selectByValue('first'); // text 'First'
+        $this->assertCount(5, $select->getAllSelectedOptions());
+
+        $select->deselectByVisiblePartialText('second'); // should deselect two options
+        $this->assertContainsOptionsWithValues(['first', 'fourth', 'fifth'], $select->getAllSelectedOptions());
+
+        $select->deselectByVisiblePartialText('Fourth with spaces');
+        $select->deselectByVisiblePartialText('Fourth with spaces'); // should be deselected even if deselected again
+        $this->assertContainsOptionsWithValues(['first', 'fifth'], $select->getAllSelectedOptions());
+
+        $select->deselectByVisiblePartialText('Fifth surrounded');
+        $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
+    }
+
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartialText()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            UnsupportedOperationException::class,
+            'You may only deselect options of a multi-select'
+        );
+        $select->deselectByVisiblePartialText('First');
+    }
+
     /**
      * @return WebDriverSelect
      */

From a5ba38ae07ebc590eb5e58b94e4e050bc1bc2b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 19:31:45 +0100
Subject: [PATCH 279/784] Throw an exception when attempting to deselect
 options of non-multiselect

---
 CHANGELOG.md                             |  1 +
 lib/WebDriverSelect.php                  | 15 +++++++++++
 tests/functional/WebDriverSelectTest.php | 33 ++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdd5a9019..2f5ec16d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class.
 - Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
 - Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`
+- Throw an exception when attempting to deselect options of non-multiselect (it already didn't have any effect, but was silently ignored).
 
 ## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported).
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 7f24cac32..e45bcc22d 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -252,9 +252,14 @@ public function deselectAll()
      * Deselect the option at the given index.
      *
      * @param int $index The index of the option. (0-based)
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
      */
     public function deselectByIndex($index)
     {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException('You may only deselect options of a multi-select');
+        }
+
         foreach ($this->getOptions() as $option) {
             if ($option->getAttribute('index') === (string) $index && $option->isSelected()) {
                 $option->click();
@@ -269,9 +274,14 @@ public function deselectByIndex($index)
      * <option value="foo">Bar</option>;
      *
      * @param string $value The value to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
      */
     public function deselectByValue($value)
     {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException('You may only deselect options of a multi-select');
+        }
+
         $xpath = './/option[@value = ' . $this->escapeQuotes($value) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
@@ -288,9 +298,14 @@ public function deselectByValue($value)
      * <option value="foo">Bar</option>;
      *
      * @param string $text The visible text to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
      */
     public function deselectByVisibleText($text)
     {
+        if (!$this->isMultiple()) {
+            throw new UnsupportedOperationException('You may only deselect options of a multi-select');
+        }
+
         $xpath = './/option[normalize-space(.) = ' . $this->escapeQuotes($text) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index fe4800504..3a7d55f24 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -325,6 +325,17 @@ public function testShouldDeselectOptionByIndex()
         $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
     }
 
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            UnsupportedOperationException::class,
+            'You may only deselect options of a multi-select'
+        );
+        $select->deselectByIndex(0);
+    }
+
     public function testShouldDeselectOptionByValue()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -338,6 +349,17 @@ public function testShouldDeselectOptionByValue()
         $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
     }
 
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            UnsupportedOperationException::class,
+            'You may only deselect options of a multi-select'
+        );
+        $select->deselectByValue('first');
+    }
+
     public function testShouldDeselectOptionByVisibleText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -353,6 +375,17 @@ public function testShouldDeselectOptionByVisibleText()
         $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
     }
 
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
+    {
+        $select = $this->getWebDriverSelectForSimpleSelect();
+
+        $this->setExpectedException(
+            UnsupportedOperationException::class,
+            'You may only deselect options of a multi-select'
+        );
+        $select->deselectByVisibleText('First');
+    }
+
     public function testShouldDeselectOptionByVisiblePartialText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();

From d3850f8955d00b8aed06e5c6cb9aebc8d2e3dace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 20:52:44 +0100
Subject: [PATCH 280/784] Fix XPath escaping in WebDriverSelect

---
 CHANGELOG.md                            |  4 ++
 lib/Support/XPathEscaper.php            | 45 +++++++++++++++++++++++
 lib/WebDriverSelect.php                 | 45 ++++-------------------
 tests/unit/Support/XPathEscaperTest.php | 49 +++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 38 deletions(-)
 create mode 100644 lib/Support/XPathEscaper.php
 create mode 100644 tests/unit/Support/XPathEscaperTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f5ec16d1..caf23c691 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
     - `elementTextMatches` - text in element matches regular expression
     - `numberOfWindowsToBe` - number of opened windows equals given number
 - Possibility to select option of `<select>` by its partial text (using `selectByVisiblePartialText()`)
+- `XPathEscaper` helper class to quote XPaths containing both single and double quotes.
 
 ### Changed
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
@@ -23,6 +24,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`
 - Throw an exception when attempting to deselect options of non-multiselect (it already didn't have any effect, but was silently ignored).
 
+### Fixed
+- XPath escaping in `select*()` and `deselect*()` methods of `WebDriverSelect`.
+
 ## 1.2.0 - 2016-10-14
 - Added initial support of remote Microsoft Edge browser (but starting local EdgeDriver is still not supported).
 - Utilize late static binding to make eg. `WebDriverBy` and `DesiredCapabilities` classes easily extensible.
diff --git a/lib/Support/XPathEscaper.php b/lib/Support/XPathEscaper.php
new file mode 100644
index 000000000..10271128c
--- /dev/null
+++ b/lib/Support/XPathEscaper.php
@@ -0,0 +1,45 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Support;
+
+class XPathEscaper
+{
+    /**
+     * Converts xpath strings with both quotes and ticks into:
+     *   foo'"bar -> concat('foo', "'" ,'"bar')
+     *
+     * @param string $xpathToEscape The xpath to be converted.
+     * @return string The escaped string.
+     */
+    public static function escapeQuotes($xpathToEscape)
+    {
+        // Single quotes not present => we can quote in them
+        if (strpos($xpathToEscape, "'") === false) {
+            return sprintf("'%s'", $xpathToEscape);
+        }
+
+        // Double quotes not present => we can quote in them
+        if (strpos($xpathToEscape, '"') === false) {
+            return sprintf('"%s"', $xpathToEscape);
+        }
+
+        // Both single and double quotes are present
+        return sprintf(
+            "concat('%s')",
+            str_replace("'", "', \"'\" ,'", $xpathToEscape)
+        );
+    }
+}
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index e45bcc22d..a55a0ff90 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -18,6 +18,7 @@
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\UnexpectedTagNameException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\Support\XPathEscaper;
 
 /**
  * Models a SELECT tag, providing helper methods to select and deselect options.
@@ -128,7 +129,7 @@ public function selectByIndex($index)
     public function selectByValue($value)
     {
         $matched = false;
-        $xpath = './/option[@value = ' . $this->escapeQuotes($value) . ']';
+        $xpath = './/option[@value = ' . XPathEscaper::escapeQuotes($value) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
@@ -161,7 +162,7 @@ public function selectByValue($value)
     public function selectByVisibleText($text)
     {
         $matched = false;
-        $xpath = './/option[normalize-space(.) = ' . $this->escapeQuotes($text) . ']';
+        $xpath = './/option[normalize-space(.) = ' . XPathEscaper::escapeQuotes($text) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
@@ -210,7 +211,7 @@ public function selectByVisibleText($text)
     public function selectByVisiblePartialText($text)
     {
         $matched = false;
-        $xpath = './/option[contains(normalize-space(.), ' . $this->escapeQuotes($text) . ')]';
+        $xpath = './/option[contains(normalize-space(.), ' . XPathEscaper::escapeQuotes($text) . ')]';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
@@ -282,7 +283,7 @@ public function deselectByValue($value)
             throw new UnsupportedOperationException('You may only deselect options of a multi-select');
         }
 
-        $xpath = './/option[@value = ' . $this->escapeQuotes($value) . ']';
+        $xpath = './/option[@value = ' . XPathEscaper::escapeQuotes($value) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
             if ($option->isSelected()) {
@@ -306,7 +307,7 @@ public function deselectByVisibleText($text)
             throw new UnsupportedOperationException('You may only deselect options of a multi-select');
         }
 
-        $xpath = './/option[normalize-space(.) = ' . $this->escapeQuotes($text) . ']';
+        $xpath = './/option[normalize-space(.) = ' . XPathEscaper::escapeQuotes($text) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
             if ($option->isSelected()) {
@@ -330,7 +331,7 @@ public function deselectByVisiblePartialText($text)
             throw new UnsupportedOperationException('You may only deselect options of a multi-select');
         }
 
-        $xpath = './/option[contains(normalize-space(.), ' . $this->escapeQuotes($text) . ')]';
+        $xpath = './/option[contains(normalize-space(.), ' . XPathEscaper::escapeQuotes($text) . ')]';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
             if ($option->isSelected()) {
@@ -338,36 +339,4 @@ public function deselectByVisiblePartialText($text)
             }
         }
     }
-
-    /**
-     * Convert strings with both quotes and ticks into:
-     *   foo'"bar -> concat("foo'", '"', "bar")
-     *
-     * @param string $to_escape The string to be converted.
-     * @return string The escaped string.
-     */
-    protected function escapeQuotes($to_escape)
-    {
-        if (strpos($to_escape, '"') !== false && strpos($to_escape, "'") !== false) {
-            $substrings = explode('"', $to_escape);
-
-            $escaped = 'concat(';
-            $first = true;
-            foreach ($substrings as $string) {
-                if (!$first) {
-                    $escaped .= ", '\"',";
-                    $first = false;
-                }
-                $escaped .= '"' . $string . '"';
-            }
-
-            return $escaped;
-        }
-
-        if (strpos($to_escape, '"') !== false) {
-            return sprintf("'%s'", $to_escape);
-        }
-
-        return sprintf('"%s"', $to_escape);
-    }
 }
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
new file mode 100644
index 000000000..21ac4aea0
--- /dev/null
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -0,0 +1,49 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Support;
+
+class XPathEscaperTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider xpathProvider
+     * @param string $input
+     * @param string $expectedOutput
+     */
+    public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input, $expectedOutput)
+    {
+        $output = XPathEscaper::escapeQuotes($input);
+
+        $this->assertSame($expectedOutput, $output);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function xpathProvider()
+    {
+        return [
+            'empty string encapsulate in single quotes' => ['', "''"],
+            'string without quotes encapsulate in single quotes' => ['foo bar', "'foo bar'"],
+            'string with single quotes encapsulate in double quotes' => ['foo\'bar\'', '"foo\'bar\'"'],
+            'string with double quotes encapsulate in single quotes' => ['foo"bar"', '\'foo"bar"\''],
+            'string with both types of quotes concatenate' => ['\'"', "concat('', \"'\" ,'\"')"],
+            'string with multiple both types of quotes concatenate' => [
+                'a \'b\'"c"',
+                "concat('a ', \"'\" ,'b', \"'\" ,'\"c\"')",
+            ],
+        ];
+    }
+}

From c9d58a84a28e01713c183c9c4d5a855154bc70e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 21:00:25 +0100
Subject: [PATCH 281/784] No need to check for multiple values when
 selecting/deselecting by index, as the index is unique

---
 lib/WebDriverSelect.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index a55a0ff90..b071291ae 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -97,23 +97,17 @@ public function getFirstSelectedOption()
      */
     public function selectByIndex($index)
     {
-        $matched = false;
         foreach ($this->getOptions() as $option) {
             if ($option->getAttribute('index') === (string) $index) {
                 if (!$option->isSelected()) {
                     $option->click();
-                    if (!$this->isMultiple()) {
-                        return;
-                    }
                 }
-                $matched = true;
+
+                return;
             }
         }
-        if (!$matched) {
-            throw new NoSuchElementException(
-                sprintf('Cannot locate option with index: %d', $index)
-            );
-        }
+
+        throw new NoSuchElementException(sprintf('Cannot locate option with index: %d', $index));
     }
 
     /**
@@ -262,8 +256,12 @@ public function deselectByIndex($index)
         }
 
         foreach ($this->getOptions() as $option) {
-            if ($option->getAttribute('index') === (string) $index && $option->isSelected()) {
-                $option->click();
+            if ($option->getAttribute('index') === (string) $index) {
+                if ($option->isSelected()) {
+                    $option->click();
+                }
+
+                return;
             }
         }
     }

From 6e91c998c4b1c4a4bfeac4385da7b65b188f156e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 21:04:29 +0100
Subject: [PATCH 282/784] DRY when (de)selecting options

---
 lib/WebDriverSelect.php | 62 +++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index b071291ae..e8e9587ed 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -99,9 +99,7 @@ public function selectByIndex($index)
     {
         foreach ($this->getOptions() as $option) {
             if ($option->getAttribute('index') === (string) $index) {
-                if (!$option->isSelected()) {
-                    $option->click();
-                }
+                $this->selectOption($option);
 
                 return;
             }
@@ -127,9 +125,7 @@ public function selectByValue($value)
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
-            if (!$option->isSelected()) {
-                $option->click();
-            }
+            $this->selectOption($option);
             if (!$this->isMultiple()) {
                 return;
             }
@@ -160,9 +156,7 @@ public function selectByVisibleText($text)
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
-            if (!$option->isSelected()) {
-                $option->click();
-            }
+            $this->selectOption($option);
             if (!$this->isMultiple()) {
                 return;
             }
@@ -174,9 +168,7 @@ public function selectByVisibleText($text)
         if (!$matched) {
             foreach ($this->getOptions() as $option) {
                 if ($option->getText() === $text) {
-                    if (!$option->isSelected()) {
-                        $option->click();
-                    }
+                    $this->selectOption($option);
                     if (!$this->isMultiple()) {
                         return;
                     }
@@ -209,9 +201,7 @@ public function selectByVisiblePartialText($text)
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
 
         foreach ($options as $option) {
-            if (!$option->isSelected()) {
-                $option->click();
-            }
+            $this->selectOption($option);
             if (!$this->isMultiple()) {
                 return;
             }
@@ -237,9 +227,7 @@ public function deselectAll()
         }
 
         foreach ($this->getOptions() as $option) {
-            if ($option->isSelected()) {
-                $option->click();
-            }
+            $this->deselectOption($option);
         }
     }
 
@@ -257,9 +245,7 @@ public function deselectByIndex($index)
 
         foreach ($this->getOptions() as $option) {
             if ($option->getAttribute('index') === (string) $index) {
-                if ($option->isSelected()) {
-                    $option->click();
-                }
+                $this->deselectOption($option);
 
                 return;
             }
@@ -284,9 +270,7 @@ public function deselectByValue($value)
         $xpath = './/option[@value = ' . XPathEscaper::escapeQuotes($value) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
-            if ($option->isSelected()) {
-                $option->click();
-            }
+            $this->deselectOption($option);
         }
     }
 
@@ -308,9 +292,7 @@ public function deselectByVisibleText($text)
         $xpath = './/option[normalize-space(.) = ' . XPathEscaper::escapeQuotes($text) . ']';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
-            if ($option->isSelected()) {
-                $option->click();
-            }
+            $this->deselectOption($option);
         }
     }
 
@@ -332,9 +314,29 @@ public function deselectByVisiblePartialText($text)
         $xpath = './/option[contains(normalize-space(.), ' . XPathEscaper::escapeQuotes($text) . ')]';
         $options = $this->element->findElements(WebDriverBy::xpath($xpath));
         foreach ($options as $option) {
-            if ($option->isSelected()) {
-                $option->click();
-            }
+            $this->deselectOption($option);
+        }
+    }
+
+    /**
+     * Mark option selected
+     * @param WebDriverElement $option
+     */
+    protected function selectOption(WebDriverElement $option)
+    {
+        if (!$option->isSelected()) {
+            $option->click();
+        }
+    }
+
+    /**
+     * Mark option not selected
+     * @param WebDriverElement $option
+     */
+    protected function deselectOption(WebDriverElement $option)
+    {
+        if ($option->isSelected()) {
+            $option->click();
         }
     }
 }

From fa04797db3e48cab6be9265f85c6efec1a3ade9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 8 Jan 2017 21:11:26 +0100
Subject: [PATCH 283/784] Extract WebDriverSelectInterface, to allow
 implementation of custom select-like components

Eg. components not built around and actual select tag.
---
 CHANGELOG.md                     |   1 +
 lib/WebDriverSelect.php          |  96 +----------------------
 lib/WebDriverSelectInterface.php | 127 +++++++++++++++++++++++++++++++
 3 files changed, 132 insertions(+), 92 deletions(-)
 create mode 100644 lib/WebDriverSelectInterface.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf23c691..12c55520e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
     - `numberOfWindowsToBe` - number of opened windows equals given number
 - Possibility to select option of `<select>` by its partial text (using `selectByVisiblePartialText()`)
 - `XPathEscaper` helper class to quote XPaths containing both single and double quotes.
+- `WebDriverSelectInterface`, to allow implementation of custom select-like components, eg. those not built around and actual select tag.
 
 ### Changed
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index e8e9587ed..7e7455ae5 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -21,11 +21,13 @@
 use Facebook\WebDriver\Support\XPathEscaper;
 
 /**
- * Models a SELECT tag, providing helper methods to select and deselect options.
+ * Models a default HTML <select> tag, providing helper methods to select and deselect options.
  */
-class WebDriverSelect
+class WebDriverSelect implements WebDriverSelectInterface
 {
+    /** @var WebDriverElement */
     private $element;
+    /** @var bool */
     private $isMulti;
 
     public function __construct(WebDriverElement $element)
@@ -40,25 +42,16 @@ public function __construct(WebDriverElement $element)
         $this->isMulti = ($value === 'true');
     }
 
-    /**
-     * @return bool Whether this select element support selecting multiple options.
-     */
     public function isMultiple()
     {
         return $this->isMulti;
     }
 
-    /**
-     * @return WebDriverElement[] All options belonging to this select tag.
-     */
     public function getOptions()
     {
         return $this->element->findElements(WebDriverBy::tagName('option'));
     }
 
-    /**
-     * @return WebDriverElement[] All selected options belonging to this select tag.
-     */
     public function getAllSelectedOptions()
     {
         $selected_options = [];
@@ -71,12 +64,6 @@ public function getAllSelectedOptions()
         return $selected_options;
     }
 
-    /**
-     * @throws NoSuchElementException
-     *
-     * @return WebDriverElement The first selected option in this select tag (or
-     *                          the currently selected option in a normal select)
-     */
     public function getFirstSelectedOption()
     {
         foreach ($this->getOptions() as $option) {
@@ -88,13 +75,6 @@ public function getFirstSelectedOption()
         throw new NoSuchElementException('No options are selected');
     }
 
-    /**
-     * Select the option at the given index.
-     *
-     * @param int $index The index of the option. (0-based)
-     *
-     * @throws NoSuchElementException
-     */
     public function selectByIndex($index)
     {
         foreach ($this->getOptions() as $option) {
@@ -108,16 +88,6 @@ public function selectByIndex($index)
         throw new NoSuchElementException(sprintf('Cannot locate option with index: %d', $index));
     }
 
-    /**
-     * Select all options that have value attribute matching the argument. That
-     * is, when given "foo" this would select an option like:
-     *
-     * <option value="foo">Bar</option>;
-     *
-     * @param string $value The value to match against.
-     *
-     * @throws NoSuchElementException
-     */
     public function selectByValue($value)
     {
         $matched = false;
@@ -139,16 +109,6 @@ public function selectByValue($value)
         }
     }
 
-    /**
-     * Select all options that display text matching the argument. That is, when
-     * given "Bar" this would select an option like:
-     *
-     * <option value="foo">Bar</option>;
-     *
-     * @param string $text The visible text to match against.
-     *
-     * @throws NoSuchElementException
-     */
     public function selectByVisibleText($text)
     {
         $matched = false;
@@ -184,16 +144,6 @@ public function selectByVisibleText($text)
         }
     }
 
-    /**
-     * Select all options that display text partially matching the argument. That is, when
-     * given "Bar" this would select an option like:
-     *
-     * <option value="bar">Foo Bar Baz</option>;
-     *
-     * @param string $text The visible text to match against.
-     *
-     * @throws NoSuchElementException
-     */
     public function selectByVisiblePartialText($text)
     {
         $matched = false;
@@ -215,11 +165,6 @@ public function selectByVisiblePartialText($text)
         }
     }
 
-    /**
-     * Deselect all options in multiple select tag.
-     *
-     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
-     */
     public function deselectAll()
     {
         if (!$this->isMultiple()) {
@@ -231,12 +176,6 @@ public function deselectAll()
         }
     }
 
-    /**
-     * Deselect the option at the given index.
-     *
-     * @param int $index The index of the option. (0-based)
-     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
-     */
     public function deselectByIndex($index)
     {
         if (!$this->isMultiple()) {
@@ -252,15 +191,6 @@ public function deselectByIndex($index)
         }
     }
 
-    /**
-     * Deselect all options that have value attribute matching the argument. That
-     * is, when given "foo" this would deselect an option like:
-     *
-     * <option value="foo">Bar</option>;
-     *
-     * @param string $value The value to match against.
-     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
-     */
     public function deselectByValue($value)
     {
         if (!$this->isMultiple()) {
@@ -274,15 +204,6 @@ public function deselectByValue($value)
         }
     }
 
-    /**
-     * Deselect all options that display text matching the argument. That is, when
-     * given "Bar" this would deselect an option like:
-     *
-     * <option value="foo">Bar</option>;
-     *
-     * @param string $text The visible text to match against.
-     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
-     */
     public function deselectByVisibleText($text)
     {
         if (!$this->isMultiple()) {
@@ -296,15 +217,6 @@ public function deselectByVisibleText($text)
         }
     }
 
-    /**
-     * Deselect all options that display text matching the argument. That is, when
-     * given "Bar" this would deselect an option like:
-     *
-     * <option value="foo">Foo Bar Baz</option>;
-     *
-     * @param string $text The visible text to match against.
-     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
-     */
     public function deselectByVisiblePartialText($text)
     {
         if (!$this->isMultiple()) {
diff --git a/lib/WebDriverSelectInterface.php b/lib/WebDriverSelectInterface.php
new file mode 100644
index 000000000..cec06a33f
--- /dev/null
+++ b/lib/WebDriverSelectInterface.php
@@ -0,0 +1,127 @@
+<?php
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+
+/**
+ * Models an element of select type, providing helper methods to select and deselect options.
+ */
+interface WebDriverSelectInterface
+{
+    /**
+     * @return bool Whether this select element support selecting multiple options.
+     */
+    public function isMultiple();
+
+    /**
+     * @return WebDriverElement[] All options belonging to this select tag.
+     */
+    public function getOptions();
+
+    /**
+     * @return WebDriverElement[] All selected options belonging to this select tag.
+     */
+    public function getAllSelectedOptions();
+
+    /**
+     * @throws NoSuchElementException
+     *
+     * @return WebDriverElement The first selected option in this select tag (or
+     *                          the currently selected option in a normal select)
+     */
+    public function getFirstSelectedOption();
+
+    /**
+     * Select the option at the given index.
+     *
+     * @param int $index The index of the option. (0-based)
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByIndex($index);
+
+    /**
+     * Select all options that have value attribute matching the argument. That is, when given "foo" this would
+     * select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $value The value to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByValue($value);
+
+    /**
+     * Select all options that display text matching the argument. That is, when given "Bar" this would
+     * select an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $text The visible text to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByVisibleText($text);
+
+    /**
+     * Select all options that display text partially matching the argument. That is, when given "Bar" this would
+     * select an option like:
+     *
+     * <option value="bar">Foo Bar Baz</option>;
+     *
+     * @param string $text The visible text to match against.
+     *
+     * @throws NoSuchElementException
+     */
+    public function selectByVisiblePartialText($text);
+
+    /**
+     * Deselect all options in multiple select tag.
+     *
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectAll();
+
+    /**
+     * Deselect the option at the given index.
+     *
+     * @param int $index The index of the option. (0-based)
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectByIndex($index);
+
+    /**
+     * Deselect all options that have value attribute matching the argument. That is, when given "foo" this would
+     * deselect an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $value The value to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectByValue($value);
+
+    /**
+     * Deselect all options that display text matching the argument. That is, when given "Bar" this would
+     * deselect an option like:
+     *
+     * <option value="foo">Bar</option>;
+     *
+     * @param string $text The visible text to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectByVisibleText($text);
+
+    /**
+     * Deselect all options that display text matching the argument. That is, when given "Bar" this would
+     * deselect an option like:
+     *
+     * <option value="foo">Foo Bar Baz</option>;
+     *
+     * @param string $text The visible text to match against.
+     * @throws UnsupportedOperationException If the SELECT does not support multiple selections
+     */
+    public function deselectByVisiblePartialText($text);
+}

From 0979f5587a8e17d014c4e69d9415de32e3ff65a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 10 Jan 2017 14:57:43 +0100
Subject: [PATCH 284/784] Add some more tests for RemoteWebElement

---
 tests/functional/RemoteWebElementTest.php | 58 +++++++++++++++++++++--
 tests/functional/web/index.html           | 12 +++++
 2 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index e176d4189..1a04cf1a8 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -23,11 +23,59 @@ class RemoteWebElementTest extends WebDriverTestCase
     public function testShouldGetText()
     {
         $this->driver->get($this->getTestPath('index.html'));
-        $element = $this->driver->findElement(WebDriverBy::id('welcome'));
+        $elementWithSimpleText = $this->driver->findElement(WebDriverBy::id('text-simple'));
+        $elementWithTextWithSpaces = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
 
-        $this->assertEquals(
-            'Welcome to the facebook/php-webdriver testing page.',
-            $element->getText()
-        );
+        $this->assertEquals('Foo bar text', $elementWithSimpleText->getText());
+        $this->assertEquals('Multiple spaces are stripped', $elementWithTextWithSpaces->getText());
+    }
+
+    public function testShouldGetAttributeValue()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('text-simple'));
+
+        $this->assertSame('note', $element->getAttribute('role'));
+        $this->assertSame('height: 5em; border: 1px solid black;', $element->getAttribute('style'));
+        $this->assertSame('text-simple', $element->getAttribute('id'));
+    }
+
+    public function testShouldGetLocation()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
+
+        $elementLocation = $element->getLocation();
+        $this->assertInstanceOf(WebDriverPoint::class, $elementLocation);
+        $this->assertSame(33, $elementLocation->getX());
+        $this->assertSame(500, $elementLocation->getY());
+    }
+
+    public function testShouldGetSize()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
+
+        $elementSize = $element->getSize();
+        $this->assertInstanceOf(WebDriverDimension::class, $elementSize);
+        $this->assertSame(333, $elementSize->getWidth());
+        $this->assertSame(66, $elementSize->getHeight());
+    }
+
+    public function testShouldGetCssValue()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $elementWithBorder = $this->driver->findElement(WebDriverBy::id('text-simple'));
+        $elementWithoutBorder = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
+
+        $this->assertSame('solid', $elementWithBorder->getCSSValue('border-left-style'));
+        $this->assertSame('none', $elementWithoutBorder->getCSSValue('border-left-style'));
+
+        $this->assertSame('rgba(0, 0, 0, 1)', $elementWithBorder->getCSSValue('border-left-color'));
+        $this->assertSame('rgba(0, 0, 0, 1)', $elementWithoutBorder->getCSSValue('border-left-color'));
     }
 }
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 139a25865..282706cce 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -16,5 +16,17 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     <li>Second</li>
     <li>Third</li>
 </ul>
+
+<p id="text-simple" role="note" style="height: 5em; border: 1px solid black;">Foo bar text</p>
+<p id="text-with-spaces">
+    Multiple       spaces   are
+    stripped
+</p>
+
+<div id="element-with-location" style="position: absolute; top: 500px; left: 33px; width: 333px; height: 66px;">
+    Foo
+</div>
+
+
 </body>
 </html>

From efe3dc68124ba299d2b84263f91b6dd44d586327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 10 Jan 2017 14:06:06 +0100
Subject: [PATCH 285/784] Optimize getAllSelectedOptions method for single
 select, because it always contains exactly one selected option

---
 CHANGELOG.md            | 1 +
 lib/WebDriverSelect.php | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12c55520e..112936c86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
 - Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`
 - Throw an exception when attempting to deselect options of non-multiselect (it already didn't have any effect, but was silently ignored).
+- Optimize performance of `(de)selectByIndex()` and `getAllSelectedOptions()` methods of `WebDriverSelect` when used with non-multiple select element.
 
 ### Fixed
 - XPath escaping in `select*()` and `deselect*()` methods of `WebDriverSelect`.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 7e7455ae5..dc6a84038 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -58,6 +58,10 @@ public function getAllSelectedOptions()
         foreach ($this->getOptions() as $option) {
             if ($option->isSelected()) {
                 $selected_options[] = $option;
+
+                if (!$this->isMultiple()) {
+                    return $selected_options;
+                }
             }
         }
 

From 3df0ef7e929e984f2747b0a2846bc91b5a9f1d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 11 Jan 2017 23:57:07 +0100
Subject: [PATCH 286/784] Various codestyle and typehint fixes

---
 lib/Chrome/ChromeDriver.php                   |  3 +-
 lib/Firefox/FirefoxProfile.php                |  5 +-
 lib/Interactions/WebDriverActions.php         |  5 +-
 lib/Remote/RemoteWebDriver.php                | 10 ++--
 lib/Remote/Service/DriverService.php          |  2 +-
 lib/Support/Events/EventFiringWebDriver.php   | 27 +++++++--
 lib/Support/Events/EventFiringWebElement.php  | 27 +++++++--
 lib/WebDriver.php                             |  7 +++
 lib/WebDriverExpectedCondition.php            | 56 ++++++++++---------
 .../unit/Exception/WebDriverExceptionTest.php |  2 +-
 10 files changed, 99 insertions(+), 45 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 7aac128e4..249c4f1b5 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -63,7 +63,8 @@ public static function create(
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null,
         $http_proxy = null,
-        $http_proxy_port = null
+        $http_proxy_port = null,
+        DesiredCapabilities $required_capabilities = null
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 6dd4d41b3..00dcebd5c 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -226,9 +226,12 @@ private function installExtension($extension, $profile_dir)
             $ext_dir = $profile_dir . '/extensions/' . $matches[1];
             mkdir($ext_dir, 0777, true);
             $this->extractTo($extension, $ext_dir);
+        } else {
+            $this->deleteDirectory($temp_dir);
+
+            throw new WebDriverException('Cannot get the extension id from the install manifest.');
         }
 
-        // clean up
         $this->deleteDirectory($temp_dir);
 
         return $ext_dir;
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 281b84dac..e97796854 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -27,6 +27,7 @@
 use Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverHasInputDevices;
 
 /**
  * WebDriver action builder. It implements the builder pattern.
@@ -39,9 +40,9 @@ class WebDriverActions
     protected $action;
 
     /**
-     * @param WebDriver $driver
+     * @param WebDriverHasInputDevices $driver
      */
-    public function __construct(WebDriver $driver)
+    public function __construct(WebDriverHasInputDevices $driver)
     {
         $this->driver = $driver;
         $this->keyboard = $driver->getKeyboard();
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index dd1be325a..c2ecd8d37 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -20,16 +20,16 @@
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverCapabilities;
-use Facebook\WebDriver\WebDriverCommandExecutor;
 use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverHasInputDevices;
 use Facebook\WebDriver\WebDriverNavigation;
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
 
-class RemoteWebDriver implements WebDriver, JavaScriptExecutor
+class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInputDevices
 {
     /**
-     * @var HttpCommandExecutor
+     * @var HttpCommandExecutor|null
      */
     protected $executor;
     /**
@@ -507,10 +507,10 @@ protected function newElement($id)
      * @deprecated To be removed in the future. Executor should be passed in the constructor.
      * @internal
      * @codeCoverageIgnore
-     * @param WebDriverCommandExecutor $executor
+     * @param HttpCommandExecutor $executor
      * @return RemoteWebDriver
      */
-    public function setCommandExecutor(WebDriverCommandExecutor $executor)
+    public function setCommandExecutor(HttpCommandExecutor $executor)
     {
         $this->executor = $executor;
 
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 634c45864..c15ef94f9 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -46,7 +46,7 @@ class DriverService
     private $environment;
 
     /**
-     * @var Process
+     * @var Process|null
      */
     private $process;
 
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 268b35ac7..34514e9cd 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -50,8 +50,6 @@ public function __construct(WebDriver $driver, WebDriverDispatcher $dispatcher =
             $this->dispatcher->setDefaultDriver($this);
         }
         $this->driver = $driver;
-
-        return $this;
     }
 
     /**
@@ -105,6 +103,7 @@ public function get($url)
             $this->driver->get($url);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterNavigateTo', $url, $this);
 
@@ -127,6 +126,7 @@ public function findElements(WebDriverBy $by)
             }
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterFindBy', $by, null, $this);
@@ -147,6 +147,7 @@ public function findElement(WebDriverBy $by)
             $element = $this->newElement($this->driver->findElement($by));
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterFindBy', $by, null, $this);
@@ -174,6 +175,7 @@ public function executeScript($script, array $arguments = [])
             $result = $this->driver->executeScript($script, $arguments);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch('afterScript', $script, $this);
@@ -200,6 +202,7 @@ public function executeAsyncScript($script, array $arguments = [])
             $result = $this->driver->executeAsyncScript($script, $arguments);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterScript', $script, $this);
 
@@ -218,6 +221,7 @@ public function close()
             return $this;
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -231,6 +235,7 @@ public function getCurrentURL()
             return $this->driver->getCurrentURL();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -244,6 +249,7 @@ public function getPageSource()
             return $this->driver->getPageSource();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -257,6 +263,7 @@ public function getTitle()
             return $this->driver->getTitle();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -270,6 +277,7 @@ public function getWindowHandle()
             return $this->driver->getWindowHandle();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -283,6 +291,7 @@ public function getWindowHandles()
             return $this->driver->getWindowHandles();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -295,6 +304,7 @@ public function quit()
             $this->driver->quit();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -309,6 +319,7 @@ public function takeScreenshot($save_as = null)
             return $this->driver->takeScreenshot($save_as);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -324,6 +335,7 @@ public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
             return $this->driver->wait($timeout_in_second, $interval_in_millisecond);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -337,6 +349,7 @@ public function manage()
             return $this->driver->manage();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -353,6 +366,7 @@ public function navigate()
             );
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -366,6 +380,7 @@ public function switchTo()
             return $this->driver->switchTo();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -379,13 +394,16 @@ public function getTouch()
             return $this->driver->getTouch();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
-    private function dispatchOnException($exception)
+    /**
+     * @param WebDriverException $exception
+     */
+    private function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception, $this);
-        throw $exception;
     }
 
     public function execute($name, $params)
@@ -394,6 +412,7 @@ public function execute($name, $params)
             return $this->driver->execute($name, $params);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 }
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 872c59c5e..b9591b0ef 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -43,8 +43,6 @@ public function __construct(WebDriverElement $element, WebDriverDispatcher $disp
     {
         $this->element = $element;
         $this->dispatcher = $dispatcher;
-
-        return $this;
     }
 
     /**
@@ -97,6 +95,7 @@ public function sendKeys($value)
             $this->element->sendKeys($value);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterChangeValueOf', $this);
 
@@ -114,6 +113,7 @@ public function click()
             $this->element->click();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch('afterClickOn', $this);
 
@@ -138,6 +138,7 @@ public function findElement(WebDriverBy $by)
             $element = $this->newElement($this->element->findElement($by));
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
 
         $this->dispatch(
@@ -170,6 +171,7 @@ public function findElements(WebDriverBy $by)
             }
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
         $this->dispatch(
             'afterFindBy',
@@ -193,6 +195,7 @@ public function clear()
             return $this;
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -207,6 +210,7 @@ public function getAttribute($attribute_name)
             return $this->element->getAttribute($attribute_name);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -221,6 +225,7 @@ public function getCSSValue($css_property_name)
             return $this->element->getCSSValue($css_property_name);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -234,6 +239,7 @@ public function getLocation()
             return $this->element->getLocation();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -247,6 +253,7 @@ public function getLocationOnScreenOnceScrolledIntoView()
             return $this->element->getLocationOnScreenOnceScrolledIntoView();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -259,6 +266,7 @@ public function getCoordinates()
             return $this->element->getCoordinates();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -272,6 +280,7 @@ public function getSize()
             return $this->element->getSize();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -285,6 +294,7 @@ public function getTagName()
             return $this->element->getTagName();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -298,6 +308,7 @@ public function getText()
             return $this->element->getText();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -311,6 +322,7 @@ public function isDisplayed()
             return $this->element->isDisplayed();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -324,6 +336,7 @@ public function isEnabled()
             return $this->element->isEnabled();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -337,6 +350,7 @@ public function isSelected()
             return $this->element->isSelected();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -352,6 +366,7 @@ public function submit()
             return $this;
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -365,6 +380,7 @@ public function getID()
             return $this->element->getID();
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -380,16 +396,19 @@ public function equals(WebDriverElement $other)
             return $this->element->equals($other);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
-    private function dispatchOnException($exception)
+    /**
+     * @param WebDriverException $exception
+     */
+    private function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch(
             'onException',
             $exception,
             $this->dispatcher->getDefaultDriver()
         );
-        throw $exception;
     }
 }
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 85e8c1931..48aeefa6b 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Interactions\Touch\WebDriverTouchScreen;
+
 /**
  * The interface for WebDriver.
  */
@@ -126,6 +128,11 @@ public function navigate();
      */
     public function switchTo();
 
+    /**
+     * @return WebDriverTouchScreen
+     */
+    public function getTouch();
+
     /**
      * @param string $name
      * @param array $params
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 0c70026f2..930a13733 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -51,7 +51,7 @@ protected function __construct(callable $apply)
      * An expectation for checking the title of a page.
      *
      * @param string $title The expected title, which must be an exact match.
-     * @return bool WebDriverExpectedCondition True when the title matches, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title equals given string.
      */
     public static function titleIs($title)
     {
@@ -66,7 +66,7 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking substring of a page Title.
      *
      * @param string $title The expected substring of Title.
-     * @return bool WebDriverExpectedCondition True when in title, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title contains given string.
      */
     public static function titleContains($title)
     {
@@ -81,7 +81,8 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking current page title matches the given regular expression.
      *
      * @param string $titleRegexp The regular expression to test against.
-     * @return bool WebDriverExpectedCondition True when in title, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title matches the regular
+     * expression.
      */
     public static function titleMatches($titleRegexp)
     {
@@ -96,7 +97,7 @@ function (WebDriver $driver) use ($titleRegexp) {
      * An expectation for checking the URL of a page.
      *
      * @param string $url The expected URL, which must be an exact match.
-     * @return bool WebDriverExpectedCondition True when the URL matches, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL equals given one.
      */
     public static function urlIs($url)
     {
@@ -111,7 +112,7 @@ function (WebDriver $driver) use ($url) {
      * An expectation for checking substring of the URL of a page.
      *
      * @param string $url The expected substring of the URL
-     * @return bool WebDriverExpectedCondition True when in URL, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL contains given string.
      */
     public static function urlContains($url)
     {
@@ -126,7 +127,7 @@ function (WebDriver $driver) use ($url) {
      * An expectation for checking current page URL matches the given regular expression.
      *
      * @param string $urlRegexp The regular expression to test against.
-     * @return bool WebDriverExpectedCondition True when in url, false otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL matches the regular expression.
      */
     public static function urlMatches($urlRegexp)
     {
@@ -142,7 +143,7 @@ function (WebDriver $driver) use ($urlRegexp) {
      * This does not necessarily mean that the element is visible.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> The element which is located.
+     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the element which is located.
      */
     public static function presenceOfElementLocated(WebDriverBy $by)
     {
@@ -157,7 +158,7 @@ function (WebDriver $driver) use ($by) {
      * An expectation for checking that there is at least one element present on a web page.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<array> An array of WebDriverElements once they are located.
+     * @return WebDriverExpectedCondition<array> Condition returns  an array of WebDriverElements once they are located.
      */
     public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
     {
@@ -175,7 +176,7 @@ function (WebDriver $driver) use ($by) {
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> The element which is located and visible.
+     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the element which is located and visible.
      */
     public static function visibilityOfElementLocated(WebDriverBy $by)
     {
@@ -197,7 +198,8 @@ function (WebDriver $driver) use ($by) {
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverElement $element The element to be checked.
-     * @return WebDriverExpectedCondition<WebDriverElement> The same WebDriverElement once it is visible.
+     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the same WebDriverElement once it is
+     * visible.
      */
     public static function visibilityOf(WebDriverElement $element)
     {
@@ -216,7 +218,7 @@ function () use ($element) {
      * @deprecated Use WebDriverExpectedCondition::elementTextContains() instead
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
-     * @return bool WebDriverExpectedCondition Whether the text is present.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in the element.
      */
     public static function textToBePresentInElement(WebDriverBy $by, $text)
     {
@@ -229,7 +231,7 @@ public static function textToBePresentInElement(WebDriverBy $by, $text)
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
-     * @return bool WebDriverExpectedCondition Whether the text is present.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the partial text is present in the element.
      */
     public static function elementTextContains(WebDriverBy $by, $text)
     {
@@ -252,7 +254,7 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The expected text of the element.
-     * @return bool WebDriverExpectedCondition True when element has text value equal to given one
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the element has text value equal to given one.
      */
     public static function elementTextIs(WebDriverBy $by, $text)
     {
@@ -272,7 +274,7 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $regexp The regular expression to test against.
-     * @return bool WebDriverExpectedCondition True when element has text value equal to given one
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the element has text value equal to given one.
      */
     public static function elementTextMatches(WebDriverBy $by, $regexp)
     {
@@ -292,7 +294,7 @@ function (WebDriver $driver) use ($by, $regexp) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element value.
-     * @return bool WebDriverExpectedCondition Whether the text is presented.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in value attribute.
      */
     public static function textToBePresentInElementValue(WebDriverBy $by, $text)
     {
@@ -314,8 +316,8 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param string $frame_locator The locator used to find the iFrame
      *   expected to be either the id or name value of the i/frame
-     * @return WebDriverExpectedCondition<WebDriver> object focused on new frame
-     *         when frame is found bool false otherwise
+     * @return WebDriverExpectedCondition<WebDriver|bool> Condition returns object focused on new frame when frame is
+     * found, false otherwise.
      */
     public static function frameToBeAvailableAndSwitchToIt($frame_locator)
     {
@@ -334,7 +336,7 @@ function (WebDriver $driver) use ($frame_locator) {
      * An expectation for checking that an element is either invisible or not present on the DOM.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return bool WebDriverExpectedCondition Whether there is no element located.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether no visible element located.
      */
     public static function invisibilityOfElementLocated(WebDriverBy $by)
     {
@@ -356,7 +358,7 @@ function (WebDriver $driver) use ($by) {
      *
      * @param WebdriverBy $by The locator used to find the element.
      * @param string $text The text of the element.
-     * @return bool WebDriverExpectedCondition Whether the text is found in the element located.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is found in the element located.
      */
     public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
     {
@@ -377,8 +379,8 @@ function (WebDriver $driver) use ($by, $text) {
      * An expectation for checking an element is visible and enabled such that you can click it.
      *
      * @param WebDriverBy $by The locator used to find the element
-     * @return WebDriverExpectedCondition<WebDriverElement> The WebDriverElement
-     *         once it is located, visible and clickable
+     * @return WebDriverExpectedCondition<WebDriverElement> Condition return the WebDriverElement once it is located,
+     * visible and clickable.
      */
     public static function elementToBeClickable(WebDriverBy $by)
     {
@@ -408,7 +410,7 @@ function (WebDriver $driver) use ($visibility_of_element_located) {
      * Wait until an element is no longer attached to the DOM.
      *
      * @param WebDriverElement $element The element to wait for.
-     * @return bool WebDriverExpectedCondition false if the element is still attached to the DOM, true otherwise.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is still attached to the DOM.
      */
     public static function stalenessOf(WebDriverElement $element)
     {
@@ -434,7 +436,8 @@ function () use ($element) {
      * the condition is checked.
      *
      * @param WebDriverExpectedCondition $condition The condition wrapped.
-     * @return WebDriverExpectedCondition<mixed> The return value of the getApply() of the given condition.
+     * @return WebDriverExpectedCondition<mixed> Condition returns the return value of the getApply() of the given
+     * condition.
      */
     public static function refreshed(WebDriverExpectedCondition $condition)
     {
@@ -453,7 +456,7 @@ function (WebDriver $driver) use ($condition) {
      * An expectation for checking if the given element is selected.
      *
      * @param mixed $element_or_by Either the element or the locator.
-     * @return bool WebDriverExpectedCondition whether the element is selected.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is selected.
      */
     public static function elementToBeSelected($element_or_by)
     {
@@ -468,7 +471,7 @@ public static function elementToBeSelected($element_or_by)
      *
      * @param mixed $element_or_by Either the element or the locator.
      * @param bool $selected The required state.
-     * @return bool WebDriverExpectedCondition Whether the element is selected.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is selected.
      */
     public static function elementSelectionStateToBe($element_or_by, $selected)
     {
@@ -498,7 +501,8 @@ function (WebDriver $driver) use ($element_or_by, $selected) {
     /**
      * An expectation for whether an alert() box is present.
      *
-     * @return WebDriverExpectedCondition<?WebDriverAlert> if alert() is present, null otherwise.
+     * @return WebDriverExpectedCondition<?WebDriverAlert> Condition returns WebDriverAlert if alert() is present,
+     * null otherwise.
      */
     public static function alertIsPresent()
     {
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index fb25eced2..1dfd94fac 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -35,7 +35,7 @@ public function testShouldThrowProperExceptionBasedOnSeleniumStatusCode($statusC
     {
         try {
             WebDriverException::throwException($statusCode, 'exception message', ['results']);
-        } catch (\Exception $e) {
+        } catch (WebDriverException $e) {
             $this->assertInstanceOf($expectedExceptionType, $e);
 
             $this->assertSame('exception message', $e->getMessage());

From 4066768b1a1e6e29a5f2b3eabd22349543dd97a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 13 Jan 2017 15:47:37 +0100
Subject: [PATCH 287/784] We should not change WebDriver interface (it would be
 an BC break)

---
 lib/WebDriver.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 48aeefa6b..1c5b59418 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -130,8 +130,9 @@ public function switchTo();
 
     /**
      * @return WebDriverTouchScreen
+     * @todo Add in next major release (BC)
      */
-    public function getTouch();
+    //public function getTouch();
 
     /**
      * @param string $name

From cd4f352735552cb36bfcdb5f314846b8c34a32ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 13 Jan 2017 16:08:59 +0100
Subject: [PATCH 288/784] Also do not change RemoteWebDriver interface (it
 would be an BC break as well)

---
 lib/Remote/RemoteWebDriver.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index c2ecd8d37..6942c117a 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -20,6 +20,7 @@
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverCapabilities;
+use Facebook\WebDriver\WebDriverCommandExecutor;
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverHasInputDevices;
 use Facebook\WebDriver\WebDriverNavigation;
@@ -507,10 +508,10 @@ protected function newElement($id)
      * @deprecated To be removed in the future. Executor should be passed in the constructor.
      * @internal
      * @codeCoverageIgnore
-     * @param HttpCommandExecutor $executor
+     * @param WebDriverCommandExecutor $executor Despite the typehint, it have be an instance of HttpCommandExecutor.
      * @return RemoteWebDriver
      */
-    public function setCommandExecutor(HttpCommandExecutor $executor)
+    public function setCommandExecutor(WebDriverCommandExecutor $executor)
     {
         $this->executor = $executor;
 

From 77300c4ab2025d4316635f592ec849ca7323bd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 13 Jan 2017 16:48:08 +0100
Subject: [PATCH 289/784] Release version 1.3.0

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 112936c86..04ce2d4dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.3.0 - 2017-01-13
 ### Added
 - Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
 - Added option to pass required capabilities when creating `RemoteWebDriver`. (So far only desired capabilities were supported.)
@@ -14,7 +16,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
     - `elementTextContains` (as an alias for `textToBePresentInElement`) - text in element contains given text
     - `elementTextMatches` - text in element matches regular expression
     - `numberOfWindowsToBe` - number of opened windows equals given number
-- Possibility to select option of `<select>` by its partial text (using `selectByVisiblePartialText()`)
+- Possibility to select option of `<select>` by its partial text (using `selectByVisiblePartialText()`).
 - `XPathEscaper` helper class to quote XPaths containing both single and double quotes.
 - `WebDriverSelectInterface`, to allow implementation of custom select-like components, eg. those not built around and actual select tag.
 
@@ -22,7 +24,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - `Symfony\Process` is used to start local WebDriver processes (when browsers are run directly, without Selenium server) to workaround some PHP bugs and improve portability.
 - Clarified meaning of selenium server URL variable in methods of `RemoteWebDriver` class.
 - Deprecated `setSessionID()` and `setCommandExecutor()` methods of `RemoteWebDriver` class; these values should be immutable and thus passed only via constructor.
-- Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`
+- Deprecated `WebDriverExpectedCondition::textToBePresentInElement()` in favor of `elementTextContains()`.
 - Throw an exception when attempting to deselect options of non-multiselect (it already didn't have any effect, but was silently ignored).
 - Optimize performance of `(de)selectByIndex()` and `getAllSelectedOptions()` methods of `WebDriverSelect` when used with non-multiple select element.
 

From 62223d89bcdd4f755a62b2fbc193122e880c41fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 15 Jan 2017 00:50:02 +0100
Subject: [PATCH 290/784] Minor codestyle fixes

---
 lib/Remote/HttpCommandExecutor.php               |  2 +-
 lib/Remote/RemoteTargetLocator.php               |  2 +-
 lib/Support/Events/EventFiringWebDriver.php      | 16 ++++++++--------
 .../Events/EventFiringWebDriverNavigation.php    | 12 ++++++++----
 lib/WebDriverDispatcher.php                      |  2 +-
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index defb51669..2f6c1778f 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -154,7 +154,7 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
 
         if (!empty($http_proxy)) {
             curl_setopt($this->curl, CURLOPT_PROXY, $http_proxy);
-            if (!empty($http_proxy_port)) {
+            if ($http_proxy_port !== null) {
                 curl_setopt($this->curl, CURLOPT_PROXYPORT, $http_proxy_port);
             }
         }
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 9b4fe2526..5c218075d 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -79,7 +79,7 @@ public function frame($frame)
      * Switch the focus to another window by its handle.
      *
      * @param string $handle The handle of the window to be focused on.
-     * @return WebDriver Tge driver focused on the given window.
+     * @return WebDriver The driver focused on the given window.
      * @see WebDriver::getWindowHandles
      */
     public function window($handle)
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 34514e9cd..0dd805bcb 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -398,14 +398,6 @@ public function getTouch()
         }
     }
 
-    /**
-     * @param WebDriverException $exception
-     */
-    private function dispatchOnException(WebDriverException $exception)
-    {
-        $this->dispatch('onException', $exception, $this);
-    }
-
     public function execute($name, $params)
     {
         try {
@@ -415,4 +407,12 @@ public function execute($name, $params)
             throw $exception;
         }
     }
+
+    /**
+     * @param WebDriverException $exception
+     */
+    private function dispatchOnException(WebDriverException $exception)
+    {
+        $this->dispatch('onException', $exception, $this);
+    }
 }
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index a588d5e17..34bc196ae 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -38,8 +38,6 @@ public function __construct(WebDriverNavigation $navigator, WebDriverDispatcher
     {
         $this->navigator = $navigator;
         $this->dispatcher = $dispatcher;
-
-        return $this;
     }
 
     /**
@@ -130,6 +128,7 @@ public function refresh()
             return $this;
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
     }
 
@@ -145,11 +144,14 @@ public function to($url)
             $url,
             $this->getDispatcher()->getDefaultDriver()
         );
+
         try {
             $this->navigator->to($url);
         } catch (WebDriverException $exception) {
             $this->dispatchOnException($exception);
+            throw $exception;
         }
+
         $this->dispatch(
             'afterNavigateTo',
             $url,
@@ -159,9 +161,11 @@ public function to($url)
         return $this;
     }
 
-    private function dispatchOnException($exception)
+    /**
+     * @param WebDriverException $exception
+     */
+    private function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception);
-        throw $exception;
     }
 }
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 782c84690..65e0f688d 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -26,7 +26,7 @@ class WebDriverDispatcher
     /**
      * @var EventFiringWebDriver
      */
-    protected $driver = null;
+    protected $driver;
 
     /**
      * this is needed so that EventFiringWebElement can pass the driver to the

From 43e17c76e23bf927836ff03ea72a46dd4fc321cc Mon Sep 17 00:00:00 2001
From: trotskyist <david@davidmintz.org>
Date: Wed, 3 Jun 2015 13:58:07 -0400
Subject: [PATCH 291/784] Fix an apparent typo in the doc comment to window()
 method

---
 lib/WebDriverTargetLocator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index d9fdf5c18..e6e5dabc5 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -41,7 +41,7 @@ public function frame($frame);
      * Switch the focus to another window by its handle.
      *
      * @param string $handle The handle of the window to be focused on.
-     * @return WebDriver Tge driver focused on the given window.
+     * @return WebDriver The driver focused on the given window.
      * @see WebDriver::getWindowHandles
      */
     public function window($handle);

From 232684ee8ad676618733c918a0d668e02d6bd339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 15 Jan 2017 13:14:39 +0100
Subject: [PATCH 292/784] Upgrade php-cs-fixer to version 2.0

---
 .php_cs       | 65 ------------------------------------------------
 .php_cs.dist  | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 composer.json |  4 +--
 3 files changed, 71 insertions(+), 67 deletions(-)
 delete mode 100644 .php_cs
 create mode 100644 .php_cs.dist

diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 0466edfbe..000000000
--- a/.php_cs
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in([__DIR__ . '/lib', __DIR__ . '/tests']);
-
-return Symfony\CS\Config\Config::create()
-    ->fixers([
-        'array_element_white_space_after_comma',
-        'duplicate_semicolon',
-        'extra_empty_lines',
-        'function_typehint_space',
-        'lowercase_cast',
-        'method_argument_default_value',
-        'multiline_array_trailing_comma',
-        'namespace_no_leading_whitespace',
-        'native_function_casing',
-        'new_with_braces',
-        'no_blank_lines_after_class_opening',
-        'no_empty_lines_after_phpdocs',
-        'no_empty_phpdoc',
-        'no_empty_statement',
-        'object_operator',
-        'operators_spaces',
-        'trim_array_spaces',
-        'phpdoc_indent',
-        'phpdoc_no_access',
-        'phpdoc_no_empty_return',
-        'phpdoc_no_package',
-        'phpdoc_scalar',
-        'phpdoc_single_line_var_spacing',
-        'phpdoc_trim',
-        'phpdoc_types',
-        'phpdoc_order',
-        'unused_use',
-        'ordered_use',
-        'remove_leading_slash_use',
-        'remove_lines_between_uses',
-        'return',
-        'self_accessor',
-        'single_array_no_trailing_comma',
-        'single_blank_line_before_namespace',
-        'single_quote',
-        'spaces_after_semicolon',
-        'spaces_before_semicolon',
-        'spaces_cast',
-        'standardize_not_equal',
-        'ternary_spaces',
-        'trim_array_spaces',
-        'unary_operators_spaces',
-        'unused_use',
-        'whitespacy_lines',
-
-        // additional contrib checks
-        'concat_with_spaces',
-        'newline_after_open_tag',
-        'no_useless_else',
-        'no_useless_return',
-        'php_unit_construct',
-        'php_unit_dedicate_assert',
-        'phpdoc_order',
-        'short_array_syntax',
-    ])
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->setUsingCache(true)
-    ->finder($finder);
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 000000000..deb2dc803
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,69 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in([__DIR__ . '/lib', __DIR__ . '/tests']);
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'binary_operator_spaces' => true,
+        'blank_line_before_return' => true,
+        'cast_spaces' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'function_typehint_space' => true,
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast' => true,
+        'native_function_casing' => true,
+        'new_with_braces' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => [
+            'use',
+            'break',
+            'continue',
+            'extra',
+            'return',
+            'throw',
+            'useTrait',
+            'curly_brace_block',
+            'parenthesis_brace_block',
+            'square_brace_block',
+        ],
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'no_whitespace_in_blank_line' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true,
+        'php_unit_dedicate_assert' => true,
+        'phpdoc_indent' => true,
+        'phpdoc_no_access' => true,
+        'phpdoc_no_empty_return' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_order' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_trim' => true,
+        'phpdoc_types' => true,
+        'self_accessor' => true,
+        'single_blank_line_before_namespace' => true,
+        'single_quote' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'trim_array_spaces' => true,
+        'unary_operator_spaces' => true,
+        'whitespace_after_comma_in_array' => true,
+    ])
+    ->setRiskyAllowed(true)
+    ->setFinder($finder);
diff --git a/composer.json b/composer.json
index 55780368b..557b0c908 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "facebook/webdriver",
-  "description": "A PHP client for WebDriver",
+  "description": "A PHP client for Selenium WebDriver",
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
@@ -17,7 +17,7 @@
   },
   "require-dev": {
     "phpunit/phpunit": "4.6.* || ~5.0",
-    "friendsofphp/php-cs-fixer": "^1.11",
+    "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
     "satooshi/php-coveralls": "^1.0"

From 3e64225dad97b72551e48eb85a63b526acd51b2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 15 Jan 2017 13:34:38 +0100
Subject: [PATCH 293/784] Add new php-cs-fixer checks; use multibyte string
 functions

---
 .php_cs.dist                       | 7 +++++++
 lib/Chrome/ChromeDriver.php        | 8 ++++++++
 lib/Firefox/FirefoxProfile.php     | 2 +-
 lib/Remote/RemoteWebElement.php    | 2 +-
 lib/Support/XPathEscaper.php       | 4 ++--
 lib/WebDriver.php                  | 8 ++++----
 lib/WebDriverExpectedCondition.php | 8 ++++----
 lib/WebDriverOptions.php           | 4 ++--
 lib/WebDriverWindow.php            | 2 +-
 9 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index deb2dc803..0d4568a4b 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,10 +14,14 @@ return PhpCsFixer\Config::create()
         'function_typehint_space' => true,
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
+        'mb_str_functions' => true,
+        'method_separation' => true,
         'native_function_casing' => true,
         'new_with_braces' => true,
+        'no_alias_functions' => true,
         'no_blank_lines_after_class_opening' => true,
         'no_blank_lines_after_phpdoc' => true,
+        'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
         'no_extra_consecutive_blank_lines' => [
@@ -45,6 +49,7 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
+        'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
         'phpdoc_no_empty_return' => true,
@@ -54,7 +59,9 @@ return PhpCsFixer\Config::create()
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_trim' => true,
         'phpdoc_types' => true,
+        'psr4' => true,
         'self_accessor' => true,
+        'short_scalar_cast' => true,
         'single_blank_line_before_namespace' => true,
         'single_quote' => true,
         'space_after_semicolon' => true,
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 249c4f1b5..8ba76583c 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -55,7 +55,15 @@ public function startSession(DesiredCapabilities $desired_capabilities)
     /**
      * Always throws an exception. Use ChromeDriver::start() instead.
      *
+     * @param string $selenium_server_url
+     * @param DesiredCapabilities|array $desired_capabilities
+     * @param int|null $connection_timeout_in_ms
+     * @param int|null $request_timeout_in_ms
+     * @param string|null $http_proxy
+     * @param int|null $http_proxy_port
+     * @param DesiredCapabilities $required_capabilities
      * @throws WebDriverException
+     * @return RemoteWebDriver
      */
     public static function create(
         $selenium_server_url = 'http://localhost:4444/wd/hub',
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 00dcebd5c..8086198ca 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -211,7 +211,7 @@ private function installExtension($extension, $profile_dir)
         $prefix = '';
         if (!empty($ns)) {
             foreach ($ns as $key => $value) {
-                if (strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
+                if (mb_strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
                     if ($key != '') {
                         $prefix = $key . ':'; // Separate the namespace from the name.
                     }
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index dfc66d124..a7fbf6834 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -254,7 +254,7 @@ public function getTagName()
         // until this issue is not resolved :
         // https://github.com/operasoftware/operadriver/issues/102
         // Remove it when fixed to be consistent with the protocol.
-        return strtolower($this->executor->execute(
+        return mb_strtolower($this->executor->execute(
             DriverCommand::GET_ELEMENT_TAG_NAME,
             [':id' => $this->id]
         ));
diff --git a/lib/Support/XPathEscaper.php b/lib/Support/XPathEscaper.php
index 10271128c..dc5907f01 100644
--- a/lib/Support/XPathEscaper.php
+++ b/lib/Support/XPathEscaper.php
@@ -27,12 +27,12 @@ class XPathEscaper
     public static function escapeQuotes($xpathToEscape)
     {
         // Single quotes not present => we can quote in them
-        if (strpos($xpathToEscape, "'") === false) {
+        if (mb_strpos($xpathToEscape, "'") === false) {
             return sprintf("'%s'", $xpathToEscape);
         }
 
         // Double quotes not present => we can quote in them
-        if (strpos($xpathToEscape, '"') === false) {
+        if (mb_strpos($xpathToEscape, '"') === false) {
             return sprintf('"%s"', $xpathToEscape);
         }
 
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 1c5b59418..ea413f883 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -128,10 +128,10 @@ public function navigate();
      */
     public function switchTo();
 
-    /**
-     * @return WebDriverTouchScreen
-     * @todo Add in next major release (BC)
-     */
+    ///**
+    // * @return WebDriverTouchScreen
+    // * @todo Add in next major release (BC)
+    // */
     //public function getTouch();
 
     /**
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 930a13733..baee93e85 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -72,7 +72,7 @@ public static function titleContains($title)
     {
         return new static(
             function (WebDriver $driver) use ($title) {
-                return strpos($driver->getTitle(), $title) !== false;
+                return mb_strpos($driver->getTitle(), $title) !== false;
             }
         );
     }
@@ -118,7 +118,7 @@ public static function urlContains($url)
     {
         return new static(
             function (WebDriver $driver) use ($url) {
-                return strpos($driver->getCurrentURL(), $url) !== false;
+                return mb_strpos($driver->getCurrentURL(), $url) !== false;
             }
         );
     }
@@ -240,7 +240,7 @@ function (WebDriver $driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getText();
 
-                    return strpos($element_text, $text) !== false;
+                    return mb_strpos($element_text, $text) !== false;
                 } catch (StaleElementReferenceException $e) {
                     return null;
                 }
@@ -303,7 +303,7 @@ function (WebDriver $driver) use ($by, $text) {
                 try {
                     $element_text = $driver->findElement($by)->getAttribute('value');
 
-                    return strpos($element_text, $text) !== false;
+                    return mb_strpos($element_text, $text) !== false;
                 } catch (StaleElementReferenceException $e) {
                     return null;
                 }
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index fef36f695..bdf4db2ae 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -123,7 +123,7 @@ private function validate(array $cookie)
     {
         if (!isset($cookie['name']) ||
             $cookie['name'] === '' ||
-            strpos($cookie['name'], ';') !== false
+            mb_strpos($cookie['name'], ';') !== false
         ) {
             throw new InvalidArgumentException(
                 '"name" should be non-empty and does not contain a ";"'
@@ -136,7 +136,7 @@ private function validate(array $cookie)
             );
         }
 
-        if (isset($cookie['domain']) && strpos($cookie['domain'], ':') !== false) {
+        if (isset($cookie['domain']) && mb_strpos($cookie['domain'], ':') !== false) {
             throw new InvalidArgumentException(
                 '"domain" should not contain a port:' . (string) $cookie['domain']
             );
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index d48a70773..6b9090a99 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -145,7 +145,7 @@ public function getScreenOrientation()
      */
     public function setScreenOrientation($orientation)
     {
-        $orientation = strtoupper($orientation);
+        $orientation = mb_strtoupper($orientation);
         if (!in_array($orientation, ['PORTRAIT', 'LANDSCAPE'])) {
             throw new IndexOutOfBoundsException(
                 'Orientation must be either PORTRAIT, or LANDSCAPE'

From 04aab9f79dc5ac34d1c727fff46fc491350b4c7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 15 Jan 2017 13:42:38 +0100
Subject: [PATCH 294/784] Rearrange class methods order to match the standard
 one (public > protected > private)

---
 .php_cs.dist                                  |   1 +
 lib/Remote/DesiredCapabilities.php            |  48 +++----
 lib/Remote/RemoteWebDriver.php                | 132 +++++++++---------
 lib/Remote/RemoteWebElement.php               |  72 +++++-----
 lib/Support/Events/EventFiringWebDriver.php   |  48 +++----
 .../Events/EventFiringWebDriverNavigation.php |  30 ++--
 lib/Support/Events/EventFiringWebElement.php  |  46 +++---
 lib/WebDriverExpectedCondition.php            |  10 +-
 lib/WebDriverOptions.php                      |  45 +++---
 9 files changed, 214 insertions(+), 218 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 0d4568a4b..c40510179 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -46,6 +46,7 @@ return PhpCsFixer\Config::create()
         'no_useless_return' => true,
         'no_whitespace_in_blank_line' => true,
         'object_operator_without_whitespace' => true,
+        'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index badd04313..12060ab7b 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -175,30 +175,6 @@ public function toArray()
         return $this->capabilities;
     }
 
-    /**
-     * @param string $key
-     * @param mixed $value
-     * @return DesiredCapabilities
-     */
-    private function set($key, $value)
-    {
-        $this->capabilities[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * @param string $key
-     * @param mixed $default
-     * @return mixed
-     */
-    private function get($key, $default = null)
-    {
-        return isset($this->capabilities[$key])
-            ? $this->capabilities[$key]
-            : $default;
-    }
-
     /**
      * @return DesiredCapabilities
      */
@@ -339,4 +315,28 @@ public static function phantomjs()
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ]);
     }
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return DesiredCapabilities
+     */
+    private function set($key, $value)
+    {
+        $this->capabilities[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed $default
+     * @return mixed
+     */
+    private function get($key, $default = null)
+    {
+        return isset($this->capabilities[$key])
+            ? $this->capabilities[$key]
+            : $default;
+    }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 6942c117a..a06beb132 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -126,26 +126,6 @@ public static function create(
         return $driver;
     }
 
-    /**
-     * Cast legacy types (array or null) to DesiredCapabilities object. To be removed in future when instance of
-     * DesiredCapabilities will be required.
-     *
-     * @param array|DesiredCapabilities|null $desired_capabilities
-     * @return DesiredCapabilities
-     */
-    protected static function castToDesiredCapabilitiesObject($desired_capabilities = null)
-    {
-        if ($desired_capabilities === null) {
-            return new DesiredCapabilities();
-        }
-
-        if (is_array($desired_capabilities)) {
-            return new DesiredCapabilities($desired_capabilities);
-        }
-
-        return $desired_capabilities;
-    }
-
     /**
      * [Experimental] Construct the RemoteWebDriver by an existing session.
      *
@@ -293,29 +273,6 @@ public function quit()
         $this->executor = null;
     }
 
-    /**
-     * Prepare arguments for JavaScript injection
-     *
-     * @param array $arguments
-     * @return array
-     */
-    private function prepareScriptArguments(array $arguments)
-    {
-        $args = [];
-        foreach ($arguments as $key => $value) {
-            if ($value instanceof WebDriverElement) {
-                $args[$key] = ['ELEMENT' => $value->getID()];
-            } else {
-                if (is_array($value)) {
-                    $value = $this->prepareScriptArguments($value);
-                }
-                $args[$key] = $value;
-            }
-        }
-
-        return $args;
-    }
-
     /**
      * Inject a snippet of JavaScript into the page for execution in the context
      * of the currently selected frame. The executed script is assumed to be
@@ -469,18 +426,6 @@ public function getTouch()
         return $this->touch;
     }
 
-    /**
-     * @return RemoteExecuteMethod
-     */
-    protected function getExecuteMethod()
-    {
-        if (!$this->executeMethod) {
-            $this->executeMethod = new RemoteExecuteMethod($this);
-        }
-
-        return $this->executeMethod;
-    }
-
     /**
      * Construct a new action builder.
      *
@@ -491,17 +436,6 @@ public function action()
         return new WebDriverActions($this);
     }
 
-    /**
-     * Return the WebDriverElement with the given id.
-     *
-     * @param string $id The id of the element to be created.
-     * @return RemoteWebElement
-     */
-    protected function newElement($id)
-    {
-        return new RemoteWebElement($this->getExecuteMethod(), $id);
-    }
-
     /**
      * Set the command executor of this RemoteWebdriver
      *
@@ -601,4 +535,70 @@ public function execute($command_name, $params = [])
 
         return null;
     }
+
+    /**
+     * Prepare arguments for JavaScript injection
+     *
+     * @param array $arguments
+     * @return array
+     */
+    protected function prepareScriptArguments(array $arguments)
+    {
+        $args = [];
+        foreach ($arguments as $key => $value) {
+            if ($value instanceof WebDriverElement) {
+                $args[$key] = ['ELEMENT' => $value->getID()];
+            } else {
+                if (is_array($value)) {
+                    $value = $this->prepareScriptArguments($value);
+                }
+                $args[$key] = $value;
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * @return RemoteExecuteMethod
+     */
+    protected function getExecuteMethod()
+    {
+        if (!$this->executeMethod) {
+            $this->executeMethod = new RemoteExecuteMethod($this);
+        }
+
+        return $this->executeMethod;
+    }
+
+    /**
+     * Return the WebDriverElement with the given id.
+     *
+     * @param string $id The id of the element to be created.
+     * @return RemoteWebElement
+     */
+    protected function newElement($id)
+    {
+        return new RemoteWebElement($this->getExecuteMethod(), $id);
+    }
+
+    /**
+     * Cast legacy types (array or null) to DesiredCapabilities object. To be removed in future when instance of
+     * DesiredCapabilities will be required.
+     *
+     * @param array|DesiredCapabilities|null $desired_capabilities
+     * @return DesiredCapabilities
+     */
+    protected static function castToDesiredCapabilitiesObject($desired_capabilities = null)
+    {
+        if ($desired_capabilities === null) {
+            return new DesiredCapabilities();
+        }
+
+        if (is_array($desired_capabilities)) {
+            return new DesiredCapabilities($desired_capabilities);
+        }
+
+        return $desired_capabilities;
+    }
 }
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index a7fbf6834..c10bfbf32 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -342,42 +342,6 @@ public function sendKeys($value)
         return $this;
     }
 
-    /**
-     * Upload a local file to the server
-     *
-     * @param string $local_file
-     *
-     * @throws WebDriverException
-     * @return string The remote path of the file.
-     */
-    private function upload($local_file)
-    {
-        if (!is_file($local_file)) {
-            throw new WebDriverException('You may only upload files: ' . $local_file);
-        }
-
-        // Create a temporary file in the system temp directory.
-        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
-        $zip = new ZipArchive();
-        if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
-            return false;
-        }
-        $info = pathinfo($local_file);
-        $file_name = $info['basename'];
-        $zip->addFile($local_file, $file_name);
-        $zip->close();
-        $params = [
-            'file' => base64_encode(file_get_contents($temp_zip)),
-        ];
-        $remote_path = $this->executor->execute(
-            DriverCommand::UPLOAD_FILE,
-            $params
-        );
-        unlink($temp_zip);
-
-        return $remote_path;
-    }
-
     /**
      * Set the fileDetector in order to let the RemoteWebElement to know that
      * you are going to upload a file.
@@ -450,4 +414,40 @@ protected function newElement($id)
     {
         return new static($this->executor, $id);
     }
+
+    /**
+     * Upload a local file to the server
+     *
+     * @param string $local_file
+     *
+     * @throws WebDriverException
+     * @return string The remote path of the file.
+     */
+    protected function upload($local_file)
+    {
+        if (!is_file($local_file)) {
+            throw new WebDriverException('You may only upload files: ' . $local_file);
+        }
+
+        // Create a temporary file in the system temp directory.
+        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
+        $zip = new ZipArchive();
+        if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
+            return false;
+        }
+        $info = pathinfo($local_file);
+        $file_name = $info['basename'];
+        $zip->addFile($local_file, $file_name);
+        $zip->close();
+        $params = [
+            'file' => base64_encode(file_get_contents($temp_zip)),
+        ];
+        $remote_path = $this->executor->execute(
+            DriverCommand::UPLOAD_FILE,
+            $params
+        );
+        unlink($temp_zip);
+
+        return $remote_path;
+    }
 }
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 0dd805bcb..ffac00e5c 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -60,20 +60,6 @@ public function getDispatcher()
         return $this->dispatcher;
     }
 
-    /**
-     * @param mixed $method
-     */
-    protected function dispatch($method)
-    {
-        if (!$this->dispatcher) {
-            return;
-        }
-
-        $arguments = func_get_args();
-        unset($arguments[0]);
-        $this->dispatcher->dispatch($method, $arguments);
-    }
-
     /**
      * @return WebDriver
      */
@@ -82,15 +68,6 @@ public function getWebDriver()
         return $this->driver;
     }
 
-    /**
-     * @param WebDriverElement $element
-     * @return EventFiringWebElement
-     */
-    protected function newElement(WebDriverElement $element)
-    {
-        return new EventFiringWebElement($element, $this->getDispatcher());
-    }
-
     /**
      * @param mixed $url
      * @throws WebDriverException
@@ -408,10 +385,33 @@ public function execute($name, $params)
         }
     }
 
+    /**
+     * @param WebDriverElement $element
+     * @return EventFiringWebElement
+     */
+    protected function newElement(WebDriverElement $element)
+    {
+        return new EventFiringWebElement($element, $this->getDispatcher());
+    }
+
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
+    }
+
     /**
      * @param WebDriverException $exception
      */
-    private function dispatchOnException(WebDriverException $exception)
+    protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception, $this);
     }
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 34bc196ae..5aeaf510b 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -48,20 +48,6 @@ public function getDispatcher()
         return $this->dispatcher;
     }
 
-    /**
-     * @param mixed $method
-     */
-    protected function dispatch($method)
-    {
-        if (!$this->dispatcher) {
-            return;
-        }
-
-        $arguments = func_get_args();
-        unset($arguments[0]);
-        $this->dispatcher->dispatch($method, $arguments);
-    }
-
     /**
      * @return WebDriverNavigation
      */
@@ -161,10 +147,24 @@ public function to($url)
         return $this;
     }
 
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
+    }
+
     /**
      * @param WebDriverException $exception
      */
-    private function dispatchOnException(WebDriverException $exception)
+    protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception);
     }
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index b9591b0ef..f932b20a3 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -53,19 +53,6 @@ public function getDispatcher()
         return $this->dispatcher;
     }
 
-    /**
-     * @param mixed $method
-     */
-    protected function dispatch($method)
-    {
-        if (!$this->dispatcher) {
-            return;
-        }
-        $arguments = func_get_args();
-        unset($arguments[0]);
-        $this->dispatcher->dispatch($method, $arguments);
-    }
-
     /**
      * @return WebDriverElement
      */
@@ -74,15 +61,6 @@ public function getElement()
         return $this->element;
     }
 
-    /**
-     * @param WebDriverElement $element
-     * @return EventFiringWebElement
-     */
-    protected function newElement(WebDriverElement $element)
-    {
-        return new static($element, $this->getDispatcher());
-    }
-
     /**
      * @param mixed $value
      * @throws WebDriverException
@@ -403,7 +381,7 @@ public function equals(WebDriverElement $other)
     /**
      * @param WebDriverException $exception
      */
-    private function dispatchOnException(WebDriverException $exception)
+    protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch(
             'onException',
@@ -411,4 +389,26 @@ private function dispatchOnException(WebDriverException $exception)
             $this->dispatcher->getDefaultDriver()
         );
     }
+
+    /**
+     * @param mixed $method
+     */
+    protected function dispatch($method)
+    {
+        if (!$this->dispatcher) {
+            return;
+        }
+        $arguments = func_get_args();
+        unset($arguments[0]);
+        $this->dispatcher->dispatch($method, $arguments);
+    }
+
+    /**
+     * @param WebDriverElement $element
+     * @return EventFiringWebElement
+     */
+    protected function newElement(WebDriverElement $element)
+    {
+        return new static($element, $this->getDispatcher());
+    }
 }
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index baee93e85..58ba939e9 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -34,6 +34,11 @@ class WebDriverExpectedCondition
      */
     private $apply;
 
+    protected function __construct(callable $apply)
+    {
+        $this->apply = $apply;
+    }
+
     /**
      * @return callable A callable function to be executed by WebDriverWait
      */
@@ -42,11 +47,6 @@ public function getApply()
         return $this->apply;
     }
 
-    protected function __construct(callable $apply)
-    {
-        $this->apply = $apply;
-    }
-
     /**
      * An expectation for checking the title of a page.
      *
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index bdf4db2ae..b728382cc 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -54,7 +54,7 @@ public function __construct(ExecuteMethod $executor)
      */
     public function addCookie(array $cookie)
     {
-        $this->validate($cookie);
+        $this->validateCookie($cookie);
         $this->executor->execute(
             DriverCommand::ADD_COOKIE,
             ['cookie' => $cookie]
@@ -119,30 +119,6 @@ public function getCookies()
         return $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
     }
 
-    private function validate(array $cookie)
-    {
-        if (!isset($cookie['name']) ||
-            $cookie['name'] === '' ||
-            mb_strpos($cookie['name'], ';') !== false
-        ) {
-            throw new InvalidArgumentException(
-                '"name" should be non-empty and does not contain a ";"'
-            );
-        }
-
-        if (!isset($cookie['value'])) {
-            throw new InvalidArgumentException(
-                '"value" is required when setting a cookie.'
-            );
-        }
-
-        if (isset($cookie['domain']) && mb_strpos($cookie['domain'], ':') !== false) {
-            throw new InvalidArgumentException(
-                '"domain" should not contain a port:' . (string) $cookie['domain']
-            );
-        }
-    }
-
     /**
      * Return the interface for managing driver timeouts.
      *
@@ -189,4 +165,23 @@ public function getAvailableLogTypes()
     {
         return $this->executor->execute(DriverCommand::GET_AVAILABLE_LOG_TYPES);
     }
+
+    /**
+     * @param array $cookie
+     * @throws \InvalidArgumentException
+     */
+    private function validateCookie(array $cookie)
+    {
+        if (!isset($cookie['name']) || $cookie['name'] === '' || mb_strpos($cookie['name'], ';') !== false) {
+            throw new InvalidArgumentException('"name" should be non-empty and does not contain a ";"');
+        }
+
+        if (!isset($cookie['value'])) {
+            throw new InvalidArgumentException('"value" is required when setting a cookie.');
+        }
+
+        if (isset($cookie['domain']) && mb_strpos($cookie['domain'], ':') !== false) {
+            throw new InvalidArgumentException('"domain" should not contain a port:' . (string) $cookie['domain']);
+        }
+    }
 }

From ccab174d84cca426220800be0b79d2efb7065825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Jan 2017 02:50:48 +0100
Subject: [PATCH 295/784] Do not suggest phpdocumentor, the API docs is now
 generated using Sami

---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index 55780368b..941a816c3 100644
--- a/composer.json
+++ b/composer.json
@@ -22,9 +22,6 @@
     "php-mock/php-mock-phpunit": "^1.1",
     "satooshi/php-coveralls": "^1.0"
   },
-  "suggest": {
-    "phpdocumentor/phpdocumentor": "2.*"
-  },
   "autoload": {
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"

From 37d5925bcb63af1fb409a5e3d9374770f9c6c8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Jan 2017 02:53:58 +0100
Subject: [PATCH 296/784] Update API documentation URL (fixes #378)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc3e9fbb0..37fb7f393 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The concepts of this library are very similar to the "official" Java, .NET, Pyth
 **This is new version of PHP client, rewritten from scratch starting 2013.**
 Using the old version? Check out [Adam Goucher's fork](https://github.com/Element-34/php-webdriver) of it.
 
-Looking for API documentation of php-webdriver? See http://facebook.github.io/php-webdriver/
+Looking for API documentation of php-webdriver? See [https://facebook.github.io/php-webdriver/](https://facebook.github.io/php-webdriver/latest/)
 
 Any complaint, question, idea? You can post it on the user group https://www.facebook.com/groups/phpwebdriver/.
 

From f3e1c4576feabc76999cb33af63282b6690c3f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Jan 2017 03:32:38 +0100
Subject: [PATCH 297/784] Update links in README, add link to another
 php-webdriver integrations

---
 README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 37fb7f393..d2a8d6132 100644
--- a/README.md
+++ b/README.md
@@ -77,9 +77,18 @@ For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
 ## More information
 
-Check out the Selenium docs and wiki at http://docs.seleniumhq.org/docs/ and https://code.google.com/p/selenium/wiki
+Some how-tos are provided right here in [our GitHub wiki](https://github.com/facebook/php-webdriver/wiki).
 
-Learn how to integrate it with PHPUnit [Blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) | [Demo Project](https://github.com/DavertMik/php-webdriver-demo)
+You may also want to check out the Selenium [docs](http://docs.seleniumhq.org/docs/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
+
+## Testing framework integration
+
+To take advantage of automatized testing you will most probably want to integrate php-webdriver to your testing framework.
+There are some project already providing this:
+
+- [Steward](https://github.com/lmc-eu/steward) integrates php-webdriver directly to [PHPUnit](https://phpunit.de/), also providers parallelization.
+- [Codeception](http://codeception.com) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](http://codeception.com/docs/modules/WebDriver).
+- You can also check out this [blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration.
 
 ## Support
 

From 1fdbab925e26893ba8a0cb93ddf5c6b613e307a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Jan 2017 20:39:13 +0100
Subject: [PATCH 298/784] Specify covered methods to have more accurate code
 coverage

---
 tests/functional/RemoteWebElementTest.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 1a04cf1a8..c74b5d384 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -16,10 +16,13 @@
 namespace Facebook\WebDriver;
 
 /**
- * @covers Facebook\WebDriver\Remote\RemoteWebElement
+ * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
  */
 class RemoteWebElementTest extends WebDriverTestCase
 {
+    /**
+     * @covers ::getText
+     */
     public function testShouldGetText()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -30,6 +33,9 @@ public function testShouldGetText()
         $this->assertEquals('Multiple spaces are stripped', $elementWithTextWithSpaces->getText());
     }
 
+    /**
+     * @covers ::getAttribute
+     */
     public function testShouldGetAttributeValue()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -41,6 +47,9 @@ public function testShouldGetAttributeValue()
         $this->assertSame('text-simple', $element->getAttribute('id'));
     }
 
+    /**
+     * @covers ::getLocation
+     */
     public function testShouldGetLocation()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -53,6 +62,9 @@ public function testShouldGetLocation()
         $this->assertSame(500, $elementLocation->getY());
     }
 
+    /**
+     * @covers ::getSize
+     */
     public function testShouldGetSize()
     {
         $this->driver->get($this->getTestPath('index.html'));
@@ -65,6 +77,9 @@ public function testShouldGetSize()
         $this->assertSame(66, $elementSize->getHeight());
     }
 
+    /**
+     * @covers ::getCSSValue
+     */
     public function testShouldGetCssValue()
     {
         $this->driver->get($this->getTestPath('index.html'));

From 4ab3d675cd9bf2714d0841e558db7b00231f968d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Jan 2017 21:20:43 +0100
Subject: [PATCH 299/784] Add more functional tests for RemoteWebElement

---
 lib/Remote/RemoteWebElement.php           |   4 +-
 tests/functional/RemoteWebElementTest.php | 164 ++++++++++++++++++++++
 tests/functional/web/form.html            |  28 +++-
 tests/functional/web/index.html           |   7 +
 tests/functional/web/submit.php           |  28 ++++
 tests/functional/web/upload.html          |   2 +-
 6 files changed, 227 insertions(+), 6 deletions(-)
 create mode 100644 tests/functional/web/submit.php

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index c10bfbf32..71fdb4305 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -244,13 +244,13 @@ public function getSize()
     }
 
     /**
-     * Get the tag name of this element.
+     * Get the (lowercase) tag name of this element.
      *
      * @return string The tag name.
      */
     public function getTagName()
     {
-        // Force tag name to be lowercase as expected by protocol for Opera driver
+        // Force tag name to be lowercase as expected by JsonWire protocol for Opera driver
         // until this issue is not resolved :
         // https://github.com/operasoftware/operadriver/issues/102
         // Remove it when fixed to be consistent with the protocol.
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index c74b5d384..48983a14e 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -93,4 +93,168 @@ public function testShouldGetCssValue()
         $this->assertSame('rgba(0, 0, 0, 1)', $elementWithBorder->getCSSValue('border-left-color'));
         $this->assertSame('rgba(0, 0, 0, 1)', $elementWithoutBorder->getCSSValue('border-left-color'));
     }
+
+    /**
+     * @covers ::getTagName
+     */
+    public function testShouldGetTagName()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $paragraphElement = $this->driver->findElement(WebDriverBy::id('id_test'));
+
+        $this->assertSame('p', $paragraphElement->getTagName());
+    }
+
+    /**
+     * @covers ::click
+     */
+    public function testShouldClick()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+        $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
+
+        $linkElement->click();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::urlContains('form.html')
+        );
+    }
+
+    /**
+     * @covers ::clear
+     */
+    public function testShouldClearFormElementText()
+    {
+        $this->driver->get($this->getTestPath('form.html'));
+
+        $input = $this->driver->findElement(WebDriverBy::id('input-text'));
+        $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
+
+        $this->assertSame('Default input text', $input->getAttribute('value'));
+        $input->clear();
+        $this->assertSame('', $input->getAttribute('value'));
+
+        $this->assertSame('Default textarea text', $textarea->getAttribute('value'));
+        $textarea->clear();
+        $this->assertSame('', $textarea->getAttribute('value'));
+    }
+
+    /**
+     * @covers ::sendKeys
+     */
+    public function testShouldSendKeysToFormElement()
+    {
+        $this->driver->get($this->getTestPath('form.html'));
+
+        $input = $this->driver->findElement(WebDriverBy::id('input-text'));
+        $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
+
+        $input->clear();
+        $input->sendKeys('foo bar');
+        $this->assertSame('foo bar', $input->getAttribute('value'));
+        $input->sendKeys(' baz');
+        $this->assertSame('foo bar baz', $input->getAttribute('value'));
+
+        $textarea->clear();
+        $textarea->sendKeys('foo bar');
+        $this->assertSame('foo bar', $textarea->getAttribute('value'));
+        $textarea->sendKeys(' baz');
+        $this->assertSame('foo bar baz', $textarea->getAttribute('value'));
+    }
+
+    /**
+     * @covers ::isEnabled
+     */
+    public function testShouldDetectEnabledInputs()
+    {
+        $this->driver->get($this->getTestPath('form.html'));
+
+        $inputEnabled = $this->driver->findElement(WebDriverBy::id('input-text'));
+        $inputDisabled = $this->driver->findElement(WebDriverBy::id('input-text-disabled'));
+
+        $this->assertTrue($inputEnabled->isEnabled());
+        $this->assertFalse($inputDisabled->isEnabled());
+    }
+
+    /**
+     * @covers ::isSelected
+     */
+    public function testShouldSelectedInputsOrOptions()
+    {
+        $this->driver->get($this->getTestPath('form.html'));
+
+        $checkboxSelected = $this->driver->findElement(
+            WebDriverBy::cssSelector('input[name=checkbox][value=second]')
+        );
+        $checkboxNotSelected = $this->driver->findElement(
+            WebDriverBy::cssSelector('input[name=checkbox][value=first]')
+        );
+        $this->assertTrue($checkboxSelected->isSelected());
+        $this->assertFalse($checkboxNotSelected->isSelected());
+
+        $radioSelected = $this->driver->findElement(WebDriverBy::cssSelector('input[name=radio][value=second]'));
+        $radioNotSelected = $this->driver->findElement(WebDriverBy::cssSelector('input[name=radio][value=first]'));
+        $this->assertTrue($radioSelected->isSelected());
+        $this->assertFalse($radioNotSelected->isSelected());
+
+        $optionSelected = $this->driver->findElement(WebDriverBy::cssSelector('#select option[value=first]'));
+        $optionNotSelected = $this->driver->findElement(WebDriverBy::cssSelector('#select option[value=second]'));
+        $this->assertTrue($optionSelected->isSelected());
+        $this->assertFalse($optionNotSelected->isSelected());
+    }
+
+    /**
+     * @covers ::submit
+     */
+    public function testShouldSubmitFormBySubmitEventOnForm()
+    {
+        $this->driver->get($this->getTestPageUrl('form.html'));
+
+        $formElement = $this->driver->findElement(WebDriverBy::cssSelector('form'));
+
+        $formElement->submit();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::titleIs('Form submit endpoint')
+        );
+
+        $this->assertSame('Received POST data', $this->driver->findElement(WebDriverBy::cssSelector('h2'))->getText());
+    }
+
+    /**
+     * @covers ::submit
+     */
+    public function testShouldSubmitFormBySubmitEventOnFormInputElement()
+    {
+        $this->driver->get($this->getTestPageUrl('form.html'));
+
+        $inputTextElement = $this->driver->findElement(WebDriverBy::id('input-text'));
+
+        $inputTextElement->submit();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::titleIs('Form submit endpoint')
+        );
+
+        $this->assertSame('Received POST data', $this->driver->findElement(WebDriverBy::cssSelector('h2'))->getText());
+    }
+
+    /**
+     * @covers ::click
+     */
+    public function testShouldSubmitFormByClickOnSubmitInput()
+    {
+        $this->driver->get($this->getTestPageUrl('form.html'));
+
+        $submitElement = $this->driver->findElement(WebDriverBy::id('submit'));
+
+        $submitElement->click();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::titleIs('Form submit endpoint')
+        );
+
+        $this->assertSame('Received POST data', $this->driver->findElement(WebDriverBy::cssSelector('h2'))->getText());
+    }
 }
diff --git a/tests/functional/web/form.html b/tests/functional/web/form.html
index ac91336b1..c1570df8a 100644
--- a/tests/functional/web/form.html
+++ b/tests/functional/web/form.html
@@ -5,16 +5,22 @@
     <title>php-webdriver form test page</title>
 </head>
 <body>
-    <form>
+    <form method="post" action="http://github.com/submit.php">
         <label>
             Text:
-            <input type="text" name="text" id="text"/>
+            <input type="text" name="text" id="input-text" value="Default input text"/>
+        </label>
+        <br>
+
+        <label>
+            Text disabled:
+            <input type="text" name="text" id="input-text-disabled" value="Text of disabled input" disabled/>
         </label>
         <br>
 
         <label>
             Textarea:
-            <textarea name="textarea" id="textarea"></textarea>
+            <textarea name="textarea" id="textarea">Default textarea text</textarea>
         </label>
         <br>
 
@@ -38,6 +44,22 @@
         </select>
         <br>
 
+        <fieldset>
+            <legend>Checkboxes</legend>
+            <input type="checkbox" name="checkbox" value="first">First<br>
+            <input type="checkbox" name="checkbox" value="second" checked>Second (preselected)<br>
+            <input type="checkbox" name="checkbox" value="third" checked>Third (preselected)<br>
+            <input type="checkbox" name="checkbox" value="fourth">Fourth<br>
+        </fieldset>
+
+        <fieldset>
+            <legend>Radio buttons</legend>
+            <input type="radio" name="radio" value="first">First<br>
+            <input type="radio" name="radio" value="second" checked>Second (preselected)<br>
+            <input type="radio" name="radio" value="third">Third<br>
+            <input type="radio" name="radio" value="fourth">Fourth<br>
+        </fieldset>
+
         <p>
             <input type="submit" name="submit" id="submit" value="Submit">
         </p>
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 282706cce..f0dc03af4 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -6,6 +6,13 @@
 </head>
 <body>
     <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
+
+    <a href="http://github.com/form.html" id="a-form">Form test page</a>
+    |
+    <a href="http://github.com/upload.html" id="a-form-upload">Form with file upload</a>
+    |
+    <a href="http://github.com/open_new_window.html" id="a-new-window">New window opener test page</a>
+
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>
     <a href="#">Click here</a>
diff --git a/tests/functional/web/submit.php b/tests/functional/web/submit.php
new file mode 100644
index 000000000..4d8219ec5
--- /dev/null
+++ b/tests/functional/web/submit.php
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Form submit endpoint</title>
+</head>
+<body>
+
+<?php
+if (empty($_POST)) {
+    echo '<h2>POST data not detected</h2>';
+} else {
+    echo '<h2>Received POST data</h2>';
+    echo '<ul class="post-data">';
+    foreach ($_POST as $key => $value) {
+        echo sprintf(
+            '<li data-key="%s">%s: <span class="value">%s</span></li>' . "\n",
+            $key,
+            $key,
+            $value
+        );
+    }
+    echo '</ul>';
+}
+?>
+
+</body>
+</html>
diff --git a/tests/functional/web/upload.html b/tests/functional/web/upload.html
index d02c5ed4b..65a622c50 100644
--- a/tests/functional/web/upload.html
+++ b/tests/functional/web/upload.html
@@ -5,7 +5,7 @@
     <title>Upload a file</title>
 </head>
 <body>
-    <form method="post" action="http://github.com/upload.php" enctype="multipart/form-data" >
+    <form method="post" action="http://github.com/upload.php" enctype="multipart/form-data">
         <p>
             <label for="upload">Select a file to upload:</label>
             <input type="file" name="upload" id="upload"  />

From c8e3f5ac5015773691b92bf224a11909a38a338f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Jan 2017 21:25:51 +0100
Subject: [PATCH 300/784] Test equals() method of RemoteWebElementTest

---
 tests/functional/RemoteWebElementTest.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 48983a14e..e5d1ead06 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -257,4 +257,23 @@ public function testShouldSubmitFormByClickOnSubmitInput()
 
         $this->assertSame('Received POST data', $this->driver->findElement(WebDriverBy::cssSelector('h2'))->getText());
     }
+
+    /**
+     * @covers ::equals
+     */
+    public function testShouldCompareEqualsElement()
+    {
+        $this->driver->get($this->getTestPath('index.html'));
+
+        $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+        $differentElement = $this->driver->findElement(WebDriverBy::cssSelector('#text-simple'));
+        $againTheFirstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+
+        $this->assertTrue($firstElement->equals($againTheFirstElement));
+        $this->assertTrue($againTheFirstElement->equals($firstElement));
+
+        $this->assertFalse($differentElement->equals($firstElement));
+        $this->assertFalse($firstElement->equals($differentElement));
+        $this->assertFalse($differentElement->equals($againTheFirstElement));
+    }
 }

From 9f7019aeeb975d61a7929a73c5809983aac27ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Jan 2017 23:53:49 +0100
Subject: [PATCH 301/784] Improve phpdoc formatting to make apidoc more
 readable

---
 lib/Remote/RemoteWebDriver.php     |  3 ++-
 lib/Remote/RemoteWebElement.php    |  2 +-
 lib/Support/XPathEscaper.php       |  2 +-
 lib/WebDriverExpectedCondition.php |  2 +-
 lib/WebDriverNavigation.php        |  2 +-
 lib/WebDriverOptions.php           |  2 +-
 lib/WebDriverSelect.php            |  2 +-
 lib/WebDriverSelectInterface.php   | 16 ++++++++--------
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index a06beb132..ce7450720 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -340,10 +340,11 @@ public function takeScreenshot($save_as = null)
      * Construct a new WebDriverWait by the current WebDriver instance.
      * Sample usage:
      *
+     * ```
      *   $driver->wait(20, 1000)->until(
      *     WebDriverExpectedCondition::titleIs('WebDriver Page')
      *   );
-     *
+     * ```
      * @param int $timeout_in_second
      * @param int $interval_in_millisecond
      *
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 71fdb4305..17fa258c4 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -349,7 +349,7 @@ public function sendKeys($value)
      * Basically, if you want WebDriver trying to send a file, set the fileDetector
      * to be LocalFileDetector. Otherwise, keep it UselessFileDetector.
      *
-     *   eg. $element->setFileDetector(new LocalFileDetector);
+     *   eg. `$element->setFileDetector(new LocalFileDetector);`
      *
      * @param FileDetector $detector
      * @return RemoteWebElement
diff --git a/lib/Support/XPathEscaper.php b/lib/Support/XPathEscaper.php
index dc5907f01..c90cefa87 100644
--- a/lib/Support/XPathEscaper.php
+++ b/lib/Support/XPathEscaper.php
@@ -19,7 +19,7 @@ class XPathEscaper
 {
     /**
      * Converts xpath strings with both quotes and ticks into:
-     *   foo'"bar -> concat('foo', "'" ,'"bar')
+     *   `foo'"bar` -> `concat('foo', "'" ,'"bar')`
      *
      * @param string $xpathToEscape The xpath to be converted.
      * @return string The escaped string.
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 58ba939e9..5612a5bbe 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -66,7 +66,7 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking substring of a page Title.
      *
      * @param string $title The expected substring of Title.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title contains given string.
+     * @return WebDriverExpectedCondition <bool> Condition returns whether current page title contains given string.
      */
     public static function titleContains($title)
     {
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 6c7857d1d..ccc8cee30 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -25,7 +25,7 @@
  * Note that they are all blocking functions until the page is loaded by
  * by default. It could be overridden by 'webdriver.load.strategy' in the
  * FirefoxProfile preferences.
- * https://code.google.com/p/selenium/wiki/DesiredCapabilities#settings
+ * https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#firefoxprofile-settings
  */
 class WebDriverNavigation
 {
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index b728382cc..e02d24136 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -37,7 +37,7 @@ public function __construct(ExecuteMethod $executor)
     /**
      * Add a specific cookie.
      *
-     * Here are the valid attributes of a cookie array.
+     * Valid attributes of a cookie array:
      *  'name'    : string The name of the cookie; may not be null or an empty string.
      *  'value'   : string The cookie value; may not be null.
      *  'path'    : string OPTIONAL The path the cookie is visible to. Defaults to "/" if omitted.
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index dc6a84038..abe6b54fe 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -21,7 +21,7 @@
 use Facebook\WebDriver\Support\XPathEscaper;
 
 /**
- * Models a default HTML <select> tag, providing helper methods to select and deselect options.
+ * Models a default HTML `<select>` tag, providing helper methods to select and deselect options.
  */
 class WebDriverSelect implements WebDriverSelectInterface
 {
diff --git a/lib/WebDriverSelectInterface.php b/lib/WebDriverSelectInterface.php
index cec06a33f..bd4db90e4 100644
--- a/lib/WebDriverSelectInterface.php
+++ b/lib/WebDriverSelectInterface.php
@@ -27,8 +27,8 @@ public function getAllSelectedOptions();
     /**
      * @throws NoSuchElementException
      *
-     * @return WebDriverElement The first selected option in this select tag (or
-     *                          the currently selected option in a normal select)
+     * @return WebDriverElement The first selected option in this select tag (or the currently selected option in a
+     * normal select)
      */
     public function getFirstSelectedOption();
 
@@ -45,7 +45,7 @@ public function selectByIndex($index);
      * Select all options that have value attribute matching the argument. That is, when given "foo" this would
      * select an option like:
      *
-     * <option value="foo">Bar</option>;
+     * `<option value="foo">Bar</option>`
      *
      * @param string $value The value to match against.
      *
@@ -57,7 +57,7 @@ public function selectByValue($value);
      * Select all options that display text matching the argument. That is, when given "Bar" this would
      * select an option like:
      *
-     * <option value="foo">Bar</option>;
+     * `<option value="foo">Bar</option>`
      *
      * @param string $text The visible text to match against.
      *
@@ -69,7 +69,7 @@ public function selectByVisibleText($text);
      * Select all options that display text partially matching the argument. That is, when given "Bar" this would
      * select an option like:
      *
-     * <option value="bar">Foo Bar Baz</option>;
+     * `<option value="bar">Foo Bar Baz</option>`
      *
      * @param string $text The visible text to match against.
      *
@@ -96,7 +96,7 @@ public function deselectByIndex($index);
      * Deselect all options that have value attribute matching the argument. That is, when given "foo" this would
      * deselect an option like:
      *
-     * <option value="foo">Bar</option>;
+     * `<option value="foo">Bar</option>`
      *
      * @param string $value The value to match against.
      * @throws UnsupportedOperationException If the SELECT does not support multiple selections
@@ -107,7 +107,7 @@ public function deselectByValue($value);
      * Deselect all options that display text matching the argument. That is, when given "Bar" this would
      * deselect an option like:
      *
-     * <option value="foo">Bar</option>;
+     * `<option value="foo">Bar</option>`
      *
      * @param string $text The visible text to match against.
      * @throws UnsupportedOperationException If the SELECT does not support multiple selections
@@ -118,7 +118,7 @@ public function deselectByVisibleText($text);
      * Deselect all options that display text matching the argument. That is, when given "Bar" this would
      * deselect an option like:
      *
-     * <option value="foo">Foo Bar Baz</option>;
+     * `<option value="foo">Foo Bar Baz</option>`
      *
      * @param string $text The visible text to match against.
      * @throws UnsupportedOperationException If the SELECT does not support multiple selections

From 85aa68020ef2cf4fd261b1f1a690052afe67a9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Jan 2017 00:07:01 +0100
Subject: [PATCH 302/784] Update links to Selenium wiki

---
 lib/Remote/DesiredCapabilities.php | 4 ++--
 lib/Remote/HttpCommandExecutor.php | 3 +--
 lib/WebDriverExpectedCondition.php | 2 +-
 lib/WebDriverOptions.php           | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 12060ab7b..94d8e1de2 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -136,7 +136,7 @@ public function isJavascriptEnabled()
      * @param bool $enabled
      * @throws Exception
      * @return DesiredCapabilities
-     * @see https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities
+     * @see https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#read-write-capabilities
      */
     public function setJavascriptEnabled($enabled)
     {
@@ -144,7 +144,7 @@ public function setJavascriptEnabled($enabled)
         if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
             throw new Exception(
                 'isJavascriptEnable() is a htmlunit-only option. ' .
-                'See https://code.google.com/p/selenium/wiki/DesiredCapabilities#Read-write_capabilities.'
+                'See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#read-write-capabilities.'
             );
         }
 
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 2f6c1778f..09bf000d0 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -27,8 +27,7 @@
 class HttpCommandExecutor implements WebDriverCommandExecutor
 {
     /**
-     * @see
-     *   http://code.google.com/p/selenium/wiki/JsonWireProtocol#Command_Reference
+     * @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#command-reference
      */
     protected static $commands = [
         DriverCommand::ACCEPT_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/accept_alert'],
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 5612a5bbe..58ba939e9 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -66,7 +66,7 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking substring of a page Title.
      *
      * @param string $title The expected substring of Title.
-     * @return WebDriverExpectedCondition <bool> Condition returns whether current page title contains given string.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title contains given string.
      */
     public static function titleContains($title)
     {
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index e02d24136..14cacd176 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -145,7 +145,7 @@ public function window()
      *
      * @param string $log_type The log type.
      * @return array The list of log entries.
-     * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
+     * @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-type
      */
     public function getLog($log_type)
     {
@@ -159,7 +159,7 @@ public function getLog($log_type)
      * Get available log types.
      *
      * @return array The list of available log types.
-     * @see https://code.google.com/p/selenium/wiki/JsonWireProtocol#Log_Type
+     * @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#log-type
      */
     public function getAvailableLogTypes()
     {

From 122ae7abd1b495fcbfe432d75d99f5403ad76e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 27 Jan 2017 19:48:01 +0100
Subject: [PATCH 303/784] Add value object to hold cookie data

---
 lib/Cookie.php            | 208 ++++++++++++++++++++++++++++++++++++++
 tests/unit/CookieTest.php | 138 +++++++++++++++++++++++++
 2 files changed, 346 insertions(+)
 create mode 100644 lib/Cookie.php
 create mode 100644 tests/unit/CookieTest.php

diff --git a/lib/Cookie.php b/lib/Cookie.php
new file mode 100644
index 000000000..a3b86dbf0
--- /dev/null
+++ b/lib/Cookie.php
@@ -0,0 +1,208 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+/**
+ * Set values of an cookie.
+ *
+ * Implements ArrayAccess for backwards compatibility.
+ *
+ * @see https://w3c.github.io/webdriver/webdriver-spec.html#cookies
+ */
+class Cookie implements \ArrayAccess
+{
+    /** @var array */
+    protected $cookie = [
+        'name' => null,
+        'value' => null,
+        'path' => null,
+        'domain' => null,
+        'expiry' => null,
+        'secure' => null,
+        'httpOnly' => null,
+    ];
+
+    /**
+     * @param string $name The name of the cookie; may not be null or an empty string.
+     * @param string $value The cookie value; may not be null.
+     */
+    public function __construct($name, $value)
+    {
+        $this->cookie['name'] = $name;
+        $this->cookie['value'] = $value;
+    }
+
+    /**
+     * @param array $cookieArray
+     * @return Cookie
+     */
+    public static function createFromArray(array $cookieArray)
+    {
+        $cookie = new self($cookieArray['name'], $cookieArray['value']);
+
+        if (isset($cookieArray['path'])) {
+            $cookie->setPath($cookieArray['path']);
+        }
+        if (isset($cookieArray['domain'])) {
+            $cookie->setDomain($cookieArray['domain']);
+        }
+        if (isset($cookieArray['expiry'])) {
+            $cookie->setExpiry($cookieArray['expiry']);
+        }
+        if (isset($cookieArray['secure'])) {
+            $cookie->setSecure($cookieArray['secure']);
+        }
+        if (isset($cookieArray['httpOnly'])) {
+            $cookie->setHttpOnly($cookieArray['httpOnly']);
+        }
+
+        return $cookie;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->cookie['name'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->cookie['value'];
+    }
+
+    /**
+     * The path the cookie is visible to. Defaults to "/" if omitted.
+     *
+     * @param string $path
+     */
+    public function setPath($path)
+    {
+        $this->cookie['path'] = $path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->cookie['path'];
+    }
+
+    /**
+     * The domain the cookie is visible to. Defaults to the current browsing context's document's URL domain if omitted.
+     *
+     * @param string $domain
+     */
+    public function setDomain($domain)
+    {
+        $this->cookie['domain'] = $domain;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDomain()
+    {
+        return $this->cookie['domain'];
+    }
+
+    /**
+     * The cookie's expiration date, specified in seconds since Unix Epoch.
+     *
+     * @param int $expiry
+     */
+    public function setExpiry($expiry)
+    {
+        $this->cookie['expiry'] = (int) $expiry;
+    }
+
+    /**
+     * @return int
+     */
+    public function getExpiry()
+    {
+        return $this->cookie['expiry'];
+    }
+
+    /**
+     * Whether this cookie requires a secure connection (https). Defaults to false if omitted.
+     *
+     * @param bool $secure
+     */
+    public function setSecure($secure)
+    {
+        $this->cookie['secure'] = $secure;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSecure()
+    {
+        return $this->cookie['secure'];
+    }
+
+    /**
+     * Whether the cookie is an HTTP only cookie. Defaults to false if omitted.
+     *
+     * @param bool $httpOnly
+     */
+    public function setHttpOnly($httpOnly)
+    {
+        $this->cookie['httpOnly'] = $httpOnly;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isHttpOnly()
+    {
+        return $this->cookie['httpOnly'];
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->cookie;
+    }
+
+    public function offsetExists($offset)
+    {
+        return isset($this->cookie[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->cookie[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->cookie[$offset] = $value;
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->cookie[$offset]);
+    }
+}
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
new file mode 100644
index 000000000..1ed18b39c
--- /dev/null
+++ b/tests/unit/CookieTest.php
@@ -0,0 +1,138 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+/**
+ * @covers Facebook\WebDriver\Cookie
+ */
+class CookieTest extends \PHPUnit_Framework_TestCase
+{
+    public function testShouldSetAllProperties()
+    {
+        $cookie = new Cookie('cookieName', 'someValue');
+        $cookie->setPath('/bar');
+        $cookie->setDomain('foo.com');
+        $cookie->setExpiry(1485388387);
+        $cookie->setSecure(true);
+        $cookie->setHttpOnly(true);
+
+        $this->assertSame('cookieName', $cookie->getName());
+        $this->assertSame('someValue', $cookie->getValue());
+        $this->assertSame('/bar', $cookie->getPath());
+        $this->assertSame('foo.com', $cookie->getDomain());
+        $this->assertSame(1485388387, $cookie->getExpiry());
+        $this->assertTrue($cookie->isSecure());
+        $this->assertTrue($cookie->isHttpOnly());
+
+        return $cookie;
+    }
+
+    /**
+     * @depends testShouldSetAllProperties
+     * @param Cookie $cookie
+     */
+    public function testShouldBeConvertibleToArray(Cookie $cookie)
+    {
+        $this->assertSame(
+            [
+                'name' => 'cookieName',
+                'value' => 'someValue',
+                'path' => '/bar',
+                'domain' => 'foo.com',
+                'expiry' => 1485388387,
+                'secure' => true,
+                'httpOnly' => true,
+            ],
+            $cookie->toArray()
+        );
+    }
+
+    /**
+     * @depends testShouldSetAllProperties
+     * @param Cookie $cookie
+     */
+    public function testShouldProvideArrayAccessToProperties(Cookie $cookie)
+    {
+        $this->assertSame('cookieName', $cookie['name']);
+        $this->assertSame('someValue', $cookie['value']);
+        $this->assertSame('/bar', $cookie['path']);
+        $this->assertSame('foo.com', $cookie['domain']);
+        $this->assertSame(1485388387, $cookie['expiry']);
+        $this->assertTrue($cookie['secure']);
+        $this->assertTrue($cookie['httpOnly']);
+
+        $cookie->offsetSet('domain', 'bar.com');
+        $this->assertSame('bar.com', $cookie['domain']);
+        $cookie->offsetUnset('domain');
+        $this->assertFalse(isset($cookie['domain']));
+    }
+
+    public function testShouldBeCreatableFromAnArrayWithBasicValues()
+    {
+        $sourceArray = [
+            'name' => 'cookieName',
+            'value' => 'someValue',
+        ];
+
+        $cookie = Cookie::createFromArray($sourceArray);
+
+        $this->assertSame('cookieName', $cookie['name']);
+        $this->assertSame('someValue', $cookie['value']);
+
+        $this->assertFalse(isset($cookie['path']));
+        $this->assertNull($cookie['path']);
+        $this->assertNull($cookie->getPath());
+
+        $this->assertFalse(isset($cookie['domain']));
+        $this->assertNull($cookie['domain']);
+        $this->assertNull($cookie->getDomain());
+
+        $this->assertFalse(isset($cookie['expiry']));
+        $this->assertNull($cookie['expiry']);
+        $this->assertNull($cookie->getExpiry());
+
+        $this->assertFalse(isset($cookie['secure']));
+        $this->assertNull($cookie['secure']);
+        $this->assertNull($cookie->isSecure());
+
+        $this->assertFalse(isset($cookie['httpOnly']));
+        $this->assertNull($cookie['httpOnly']);
+        $this->assertNull($cookie->isHttpOnly());
+    }
+
+    public function testShouldBeCreatableFromAnArrayWithAllValues()
+    {
+        $sourceArray = [
+            'name' => 'cookieName',
+            'value' => 'someValue',
+            'path' => '/bar',
+            'domain' => 'foo',
+            'expiry' => 1485388333,
+            'secure' => false,
+            'httpOnly' => false,
+        ];
+
+        $cookie = Cookie::createFromArray($sourceArray);
+
+        $this->assertSame('cookieName', $cookie['name']);
+        $this->assertSame('someValue', $cookie['value']);
+        $this->assertSame('/bar', $cookie['path']);
+        $this->assertSame('foo', $cookie['domain']);
+        $this->assertSame(1485388333, $cookie['expiry']);
+        $this->assertFalse($cookie['secure']);
+        $this->assertFalse($cookie['httpOnly']);
+    }
+}

From 33224c27e3f1fffd4ea62d5c33968496677ac79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 27 Jan 2017 20:15:55 +0100
Subject: [PATCH 304/784] Validate cookie values on creation

---
 lib/Cookie.php            | 33 +++++++++++++++++++++++++++++++
 tests/unit/CookieTest.php | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index a3b86dbf0..0434a128b 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use InvalidArgumentException;
+
 /**
  * Set values of an cookie.
  *
@@ -41,6 +43,9 @@ class Cookie implements \ArrayAccess
      */
     public function __construct($name, $value)
     {
+        $this->validateCookieName($name);
+        $this->validateCookieValue($value);
+
         $this->cookie['name'] = $name;
         $this->cookie['value'] = $value;
     }
@@ -113,6 +118,10 @@ public function getPath()
      */
     public function setDomain($domain)
     {
+        if (mb_strpos($domain, ':') !== false) {
+            throw new InvalidArgumentException(sprintf('Cookie domain "%s" should not contain a port', $domain));
+        }
+
         $this->cookie['domain'] = $domain;
     }
 
@@ -205,4 +214,28 @@ public function offsetUnset($offset)
     {
         unset($this->cookie[$offset]);
     }
+
+    /**
+     * @param string $name
+     */
+    protected function validateCookieName($name)
+    {
+        if ($name === null || $name === '') {
+            throw new InvalidArgumentException('Cookie name should be non-empty');
+        }
+
+        if (mb_strpos($name, ';') !== false) {
+            throw new InvalidArgumentException('Cookie name should not contain a ";"');
+        }
+    }
+
+    /**
+     * @param string $value
+     */
+    protected function validateCookieValue($value)
+    {
+        if ($value === null) {
+            throw new InvalidArgumentException('Cookie value is required when setting a cookie');
+        }
+    }
 }
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 1ed18b39c..0742a0789 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -135,4 +135,45 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
         $this->assertFalse($cookie['secure']);
         $this->assertFalse($cookie['httpOnly']);
     }
+
+    /**
+     * @dataProvider invalidCookieProvider
+     * @param string $name
+     * @param string $value
+     * @param string $domain
+     * @param string $expectedMessage
+     */
+    public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)
+    {
+        if ($expectedMessage) {
+            $this->setExpectedException(\InvalidArgumentException::class, $expectedMessage);
+        }
+
+        $cookie = new Cookie($name, $value);
+        if ($domain !== null) {
+            $cookie->setDomain($domain);
+        }
+    }
+
+    /**
+     * @return array[]
+     */
+    public function invalidCookieProvider()
+    {
+        return [
+            // $name, $value, $domain, $expectedMessage
+            'name cannot be empty' => ['', 'foo', null, 'Cookie name should be non-empty'],
+            'name cannot be null' => [null, 'foo', null, 'Cookie name should be non-empty'],
+            'name cannot contain semicolon' => ['name;semicolon', 'foo', null, 'Cookie name should not contain a ";"'],
+            'value could be empty string' => ['name', '', null, null],
+            'value cannot be null' => ['name', null, null, 'Cookie value is required when setting a cookie'],
+            'domain cannot containt port' => [
+                'name',
+                'value',
+                'localhost:443',
+                'Cookie domain "localhost:443" should not contain a port',
+            ],
+            'cookie with valid values' => ['name', 'value', '*.localhost', null],
+        ];
+    }
 }

From 865e9b2c44eb8b1d7f21b4149f319875e5681d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 27 Jan 2017 20:34:00 +0100
Subject: [PATCH 305/784] Add unit test to cookie setting and retrieval in
 WebDriverOptions class

---
 tests/unit/WebDriverOptionsTest.php | 152 ++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 tests/unit/WebDriverOptionsTest.php

diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
new file mode 100644
index 000000000..f95671470
--- /dev/null
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -0,0 +1,152 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\ExecuteMethod;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverOptions
+ */
+class WebDriverOptionsTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var ExecuteMethod|\PHPUnit_Framework_MockObject_MockObject */
+    private $executor;
+
+    public function setUp()
+    {
+        $this->executor = $this->getMockBuilder(ExecuteMethod::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    public function testShouldAddCookieFromArray()
+    {
+        $cookieInArray = [
+            'name' => 'cookieName',
+            'value' => 'someValue',
+            'path' => '/bar',
+            'domain' => 'foo',
+            'expiry' => 1485388333,
+            'secure' => false,
+            'httpOnly' => false,
+        ];
+
+        $this->executor->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::ADD_COOKIE, ['cookie' => $cookieInArray]);
+
+        $options = new WebDriverOptions($this->executor);
+
+        $options->addCookie($cookieInArray);
+    }
+
+    public function testShouldGetAllCookies()
+    {
+        $this->executor->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::GET_ALL_COOKIES)
+            ->willReturn(
+                [
+                    [
+                        'path' => '/',
+                        'domain' => '*.seleniumhq.org',
+                        'name' => 'firstCookie',
+                        'httpOnly' => false,
+                        'secure' => true,
+                        'value' => 'value',
+                    ],
+                    [
+                        'path' => '/',
+                        'domain' => 'docs.seleniumhq.org',
+                        'name' => 'secondCookie',
+                        'httpOnly' => false,
+                        'secure' => false,
+                        'value' => 'foo',
+                    ],
+                ]
+            );
+
+        $options = new WebDriverOptions($this->executor);
+
+        $cookies = $options->getCookies();
+
+        $this->assertCount(2, $cookies);
+        $this->assertSame('firstCookie', $cookies[0]['name']);
+        $this->assertSame('secondCookie', $cookies[1]['name']);
+    }
+
+    public function testShouldGetCookieByName()
+    {
+        $this->executor->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::GET_ALL_COOKIES)
+            ->willReturn(
+                [
+                    [
+                        'path' => '/',
+                        'domain' => '*.seleniumhq.org',
+                        'name' => 'cookieToFind',
+                        'httpOnly' => false,
+                        'secure' => true,
+                        'value' => 'value',
+                    ],
+                    [
+                        'path' => '/',
+                        'domain' => 'docs.seleniumhq.org',
+                        'name' => 'otherCookie',
+                        'httpOnly' => false,
+                        'secure' => false,
+                        'value' => 'foo',
+                    ],
+                ]
+            );
+
+        $options = new WebDriverOptions($this->executor);
+
+        $cookie = $options->getCookieNamed('cookieToFind');
+
+        $this->assertSame('cookieToFind', $cookie['name']);
+        $this->assertSame('value', $cookie['value']);
+        $this->assertSame('/', $cookie['path']);
+        $this->assertSame('*.seleniumhq.org', $cookie['domain']);
+        $this->assertFalse($cookie['httpOnly']);
+        $this->assertTrue($cookie['secure']);
+    }
+
+    public function testShouldReturnNullIfCookieWithNameNotFound()
+    {
+        $this->executor->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::GET_ALL_COOKIES)
+            ->willReturn(
+                [
+                    [
+                        'path' => '/',
+                        'domain' => '*.seleniumhq.org',
+                        'name' => 'cookieToNotFind',
+                        'httpOnly' => false,
+                        'secure' => true,
+                        'value' => 'value',
+                    ],
+                ]
+            );
+
+        $options = new WebDriverOptions($this->executor);
+
+        $this->assertNull($options->getCookieNamed('notExistingCookie'));
+    }
+}

From c2e3e30af9d6880f2b07cea0e6b280196aea03ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 27 Jan 2017 20:54:04 +0100
Subject: [PATCH 306/784] Set/receive cookie using Cookie value object instead
 of an array

---
 CHANGELOG.md                        |  3 ++
 lib/WebDriverOptions.php            | 59 ++++++++++-------------------
 tests/unit/WebDriverOptionsTest.php | 59 +++++++++++++++++++++++++----
 3 files changed, 75 insertions(+), 46 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04ce2d4dc..1d24e1582 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Cookies should now be set using `Cookie` value object instead of an array when passed to to `addCookie()` method of `WebDriverOptions`.
+- Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
 
 ## 1.3.0 - 2017-01-13
 ### Added
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 14cacd176..9791b9f1c 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -37,27 +37,22 @@ public function __construct(ExecuteMethod $executor)
     /**
      * Add a specific cookie.
      *
-     * Valid attributes of a cookie array:
-     *  'name'    : string The name of the cookie; may not be null or an empty string.
-     *  'value'   : string The cookie value; may not be null.
-     *  'path'    : string OPTIONAL The path the cookie is visible to. Defaults to "/" if omitted.
-     *  'domain'  : string OPTIONAL The domain the cookie is visible to. Defaults to the current browsing context's
-     *                     document's URL domain if omitted.
-     *  'secure'  : bool   OPTIONAL Whether this cookie requires a secure connection (https). Defaults to false if
-     *                     omitted.
-     *  'httpOnly': bool   OPTIONAL Whether the cookie is an HTTP only cookie. Defaults to false if omitted.
-     *  'expiry'  : int    OPTIONAL The cookie's expiration date, specified in seconds since Unix Epoch.
-     *
-     * @see https://w3c.github.io/webdriver/webdriver-spec.html#cookies
-     * @param array $cookie An array with key as the attributes mentioned above.
+     * @see Facebook\WebDriver\Cookie for description of possible cookie properties
+     * @param Cookie|array $cookie Cookie object. May be also created from array for compatibility reasons.
      * @return WebDriverOptions The current instance.
      */
-    public function addCookie(array $cookie)
+    public function addCookie($cookie)
     {
-        $this->validateCookie($cookie);
+        if (is_array($cookie)) {
+            $cookie = Cookie::createFromArray($cookie);
+        }
+        if (!$cookie instanceof Cookie) {
+            throw new InvalidArgumentException('Cookie must be set from instance of Cookie class or from array.');
+        }
+
         $this->executor->execute(
             DriverCommand::ADD_COOKIE,
-            ['cookie' => $cookie]
+            ['cookie' => $cookie->toArray()]
         );
 
         return $this;
@@ -95,7 +90,7 @@ public function deleteCookieNamed($name)
      * Get the cookie with a given name.
      *
      * @param string $name
-     * @return array The cookie, or null if no cookie with the given name is presented.
+     * @return Cookie The cookie, or null if no cookie with the given name is presented.
      */
     public function getCookieNamed($name)
     {
@@ -112,11 +107,18 @@ public function getCookieNamed($name)
     /**
      * Get all the cookies for the current domain.
      *
-     * @return array The array of cookies presented.
+     * @return Cookie[] The array of cookies presented.
      */
     public function getCookies()
     {
-        return $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
+        $cookieArrays = $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
+        $cookies = [];
+
+        foreach ($cookieArrays as $cookieArray) {
+            $cookies[] = Cookie::createFromArray($cookieArray);
+        }
+
+        return $cookies;
     }
 
     /**
@@ -165,23 +167,4 @@ public function getAvailableLogTypes()
     {
         return $this->executor->execute(DriverCommand::GET_AVAILABLE_LOG_TYPES);
     }
-
-    /**
-     * @param array $cookie
-     * @throws \InvalidArgumentException
-     */
-    private function validateCookie(array $cookie)
-    {
-        if (!isset($cookie['name']) || $cookie['name'] === '' || mb_strpos($cookie['name'], ';') !== false) {
-            throw new InvalidArgumentException('"name" should be non-empty and does not contain a ";"');
-        }
-
-        if (!isset($cookie['value'])) {
-            throw new InvalidArgumentException('"value" is required when setting a cookie.');
-        }
-
-        if (isset($cookie['domain']) && mb_strpos($cookie['domain'], ':') !== false) {
-            throw new InvalidArgumentException('"domain" should not contain a port:' . (string) $cookie['domain']);
-        }
-    }
 }
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index f95671470..38f329726 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -54,6 +54,47 @@ public function testShouldAddCookieFromArray()
         $options->addCookie($cookieInArray);
     }
 
+    public function testShouldAddCookieFromCookieObject()
+    {
+        $cookieObject = new Cookie('cookieName', 'someValue');
+        $cookieObject->setPath('/bar');
+        $cookieObject->setDomain('foo');
+        $cookieObject->setExpiry(1485388333);
+        $cookieObject->setSecure(false);
+        $cookieObject->setHttpOnly(false);
+
+        $expectedCookieData = [
+            'name' => 'cookieName',
+            'value' => 'someValue',
+            'path' => '/bar',
+            'domain' => 'foo',
+            'expiry' => 1485388333,
+            'secure' => false,
+            'httpOnly' => false,
+        ];
+
+        $this->executor->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::ADD_COOKIE, ['cookie' => $expectedCookieData]);
+
+        $options = new WebDriverOptions($this->executor);
+
+        $options->addCookie($cookieObject);
+    }
+
+    public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
+    {
+        $notCookie = new \stdClass();
+
+        $options = new WebDriverOptions($this->executor);
+
+        $this->setExpectedException(
+            \InvalidArgumentException::class,
+            'Cookie must be set from instance of Cookie class or from array.'
+        );
+        $options->addCookie($notCookie);
+    }
+
     public function testShouldGetAllCookies()
     {
         $this->executor->expects($this->once())
@@ -85,8 +126,9 @@ public function testShouldGetAllCookies()
         $cookies = $options->getCookies();
 
         $this->assertCount(2, $cookies);
-        $this->assertSame('firstCookie', $cookies[0]['name']);
-        $this->assertSame('secondCookie', $cookies[1]['name']);
+        $this->assertContainsOnlyInstancesOf(Cookie::class, $cookies);
+        $this->assertSame('firstCookie', $cookies[0]->getName());
+        $this->assertSame('secondCookie', $cookies[1]->getName());
     }
 
     public function testShouldGetCookieByName()
@@ -119,12 +161,13 @@ public function testShouldGetCookieByName()
 
         $cookie = $options->getCookieNamed('cookieToFind');
 
-        $this->assertSame('cookieToFind', $cookie['name']);
-        $this->assertSame('value', $cookie['value']);
-        $this->assertSame('/', $cookie['path']);
-        $this->assertSame('*.seleniumhq.org', $cookie['domain']);
-        $this->assertFalse($cookie['httpOnly']);
-        $this->assertTrue($cookie['secure']);
+        $this->assertInstanceOf(Cookie::class, $cookie);
+        $this->assertSame('cookieToFind', $cookie->getName());
+        $this->assertSame('value', $cookie->getValue());
+        $this->assertSame('/', $cookie->getPath());
+        $this->assertSame('*.seleniumhq.org', $cookie->getDomain());
+        $this->assertFalse($cookie->isHttpOnly());
+        $this->assertTrue($cookie->isSecure());
     }
 
     public function testShouldReturnNullIfCookieWithNameNotFound()

From e722283fc5b6d9fe8a420b32eb269a13684af527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 28 Jan 2017 12:45:34 +0100
Subject: [PATCH 307/784] Update example.php to use the Cookie object

---
 example.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/example.php b/example.php
index 03b16728e..7bebd10b5 100644
--- a/example.php
+++ b/example.php
@@ -18,10 +18,10 @@
 
 // adding cookie
 $driver->manage()->deleteAllCookies();
-$driver->manage()->addCookie([
-    'name' => 'cookie_name',
-    'value' => 'cookie_value',
-]);
+
+$cookie = new Cookie('cookie_name', 'cookie_value');
+$driver->manage()->addCookie($cookie);
+
 $cookies = $driver->manage()->getCookies();
 print_r($cookies);
 

From 1b303fdbed19c7825a92b8e225c25031f338fdf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 2 Feb 2017 22:37:31 +0100
Subject: [PATCH 308/784] Add functional tests for WebDriverTimeouts

---
 tests/functional/WebDriverTimeoutsTest.php | 68 ++++++++++++++++++++++
 tests/functional/web/delayed_element.html  | 19 ++++++
 tests/functional/web/index.html            |  4 ++
 tests/functional/web/slow_loading.html     | 14 +++++
 tests/functional/web/slow_pixel.png.php    | 10 ++++
 5 files changed, 115 insertions(+)
 create mode 100644 tests/functional/WebDriverTimeoutsTest.php
 create mode 100644 tests/functional/web/delayed_element.html
 create mode 100644 tests/functional/web/slow_loading.html
 create mode 100644 tests/functional/web/slow_pixel.png.php

diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
new file mode 100644
index 000000000..b7a7eb183
--- /dev/null
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -0,0 +1,68 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\ScriptTimeoutException;
+use Facebook\WebDriver\Exception\TimeOutException;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+/**
+ * @coversDefaultClass Facebook\WebDriver\WebDriverTimeouts
+ */
+class WebDriverTimeoutsTest extends WebDriverTestCase
+{
+    public function testShouldFailGettingDelayedElementWithoutWait()
+    {
+        $this->driver->get($this->getTestPath('delayed_element.html'));
+
+        $this->setExpectedException(NoSuchElementException::class);
+        $this->driver->findElement(WebDriverBy::id('delayed'));
+    }
+
+    /**
+     * @covers ::implicitlyWait
+     */
+    public function testShouldGetDelayedElementWithImplicitWait()
+    {
+        $this->driver->get($this->getTestPath('delayed_element.html'));
+
+        $this->driver->manage()->timeouts()->implicitlyWait(1);
+        $element = $this->driver->findElement(WebDriverBy::id('delayed'));
+
+        $this->assertInstanceOf(RemoteWebElement::class, $element);
+    }
+
+    /**
+     * @covers ::pageLoadTimeout
+     */
+    public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
+    {
+        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $this->driver->manage()->timeouts()->pageLoadTimeout(1);
+
+        try {
+            $this->driver->get($this->getTestPageUrl('slow_loading.html'));
+            $this->fail('ScriptTimeoutException or TimeOutException exception should be thrown');
+        } catch (TimeOutException $e) { // thrown by Selenium 3.0.0+
+        } catch (ScriptTimeoutException $e) { // thrown by Selenium 2
+        }
+    }
+}
diff --git a/tests/functional/web/delayed_element.html b/tests/functional/web/delayed_element.html
new file mode 100644
index 000000000..b0f057a9a
--- /dev/null
+++ b/tests/functional/web/delayed_element.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>php-webdriver test page with delayed element appearing</title>
+</head>
+<body>
+
+<div id="wrapper"></div>
+
+<script>
+    setTimeout(function () {
+        var wrapper = document.getElementById("wrapper");
+        wrapper.innerHTML = '<div id="delayed">Element appearing after 500ms</div>';
+    }, 500);
+</script>
+
+</body>
+</html>
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index f0dc03af4..c3d53c4a3 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -12,6 +12,10 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     <a href="http://github.com/upload.html" id="a-form-upload">Form with file upload</a>
     |
     <a href="http://github.com/open_new_window.html" id="a-new-window">New window opener test page</a>
+    |
+    <a href="http://github.com/delayed_element.html" id="a-delayed-element">Delayed render</a>
+    |
+    <a href="http://github.com/slow_loading.html" id="a-slow-loading">Slow loading page</a>
 
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>
diff --git a/tests/functional/web/slow_loading.html b/tests/functional/web/slow_loading.html
new file mode 100644
index 000000000..984272bf3
--- /dev/null
+++ b/tests/functional/web/slow_loading.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>php-webdriver test page which is taking long to load</title>
+</head>
+<body>
+
+<h1>This page is loading slowly</h1>
+
+<img src="http://github.com/slow_pixel.png.php" alt="Slowly loading pixel">
+
+</body>
+</html>
diff --git a/tests/functional/web/slow_pixel.png.php b/tests/functional/web/slow_pixel.png.php
new file mode 100644
index 000000000..d95805e21
--- /dev/null
+++ b/tests/functional/web/slow_pixel.png.php
@@ -0,0 +1,10 @@
+<?php
+
+sleep(5);
+
+// Transparent 1x1 pixel
+header('Content-Type: image/png');
+echo base64_decode(
+    'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjY'
+    . 'AAAAAIAAeIhvDMAAAAASUVORK5CYII='
+);

From c28cb85b9e063a6bae9aa41db66a1a79d7ff6ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 3 Feb 2017 01:08:44 +0100
Subject: [PATCH 309/784] Minor phpdoc formatting fixes

---
 lib/Remote/RemoteWebDriver.php | 14 ++++++--------
 lib/WebDriverTimeouts.php      |  9 +++------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index ce7450720..ed69c23ac 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -274,9 +274,8 @@ public function quit()
     }
 
     /**
-     * Inject a snippet of JavaScript into the page for execution in the context
-     * of the currently selected frame. The executed script is assumed to be
-     * synchronous and the result of evaluating the script will be returned.
+     * Inject a snippet of JavaScript into the page for execution in the context of the currently selected frame.
+     * The executed script is assumed to be synchronous and the result of evaluating the script will be returned.
      *
      * @param string $script The script to inject.
      * @param array $arguments The arguments of the script.
@@ -293,13 +292,12 @@ public function executeScript($script, array $arguments = [])
     }
 
     /**
-     * Inject a snippet of JavaScript into the page for asynchronous execution in
-     * the context of the currently selected frame.
+     * Inject a snippet of JavaScript into the page for asynchronous execution in the context of the currently selected
+     * frame.
      *
-     * The driver will pass a callback as the last argument to the snippet, and
-     * block until the callback is invoked.
+     * The driver will pass a callback as the last argument to the snippet, and block until the callback is invoked.
      *
-     * @see WebDriverExecuteAsyncScriptTestCase
+     * You may need to define script timeout using `setScriptTimeout()` method of `WebDriverTimeouts` first.
      *
      * @param string $script The script to inject.
      * @param array $arguments The arguments of the script.
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index d62f2a124..6903f7080 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -34,8 +34,7 @@ public function __construct(ExecuteMethod $executor)
     }
 
     /**
-     * Specify the amount of time the driver should wait when searching for an
-     * element if it is not immediately present.
+     * Specify the amount of time the driver should wait when searching for an element if it is not immediately present.
      *
      * @param int $seconds Wait time in second.
      * @return WebDriverTimeouts The current instance.
@@ -51,8 +50,7 @@ public function implicitlyWait($seconds)
     }
 
     /**
-     * Set the amount of time to wait for an asynchronous script to finish
-     * execution before throwing an error.
+     * Set the amount of time to wait for an asynchronous script to finish execution before throwing an error.
      *
      * @param int $seconds Wait time in second.
      * @return WebDriverTimeouts The current instance.
@@ -68,8 +66,7 @@ public function setScriptTimeout($seconds)
     }
 
     /**
-     * Set the amount of time to wait for a page load to complete before throwing
-     * an error.
+     * Set the amount of time to wait for a page load to complete before throwing an error.
      *
      * @param int $seconds Wait time in second.
      * @return WebDriverTimeouts The current instance.

From 91b92332630c24556b608d7c9b31274d9bd36358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 3 Feb 2017 01:12:28 +0100
Subject: [PATCH 310/784] Add some more unit tests for WebDriverOptions

---
 tests/unit/WebDriverOptionsTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 38f329726..5e335854f 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -192,4 +192,20 @@ public function testShouldReturnNullIfCookieWithNameNotFound()
 
         $this->assertNull($options->getCookieNamed('notExistingCookie'));
     }
+
+    public function testShouldReturnTimeoutsInstance()
+    {
+        $options = new WebDriverOptions($this->executor);
+
+        $timeouts = $options->timeouts();
+        $this->assertInstanceOf(WebDriverTimeouts::class, $timeouts);
+    }
+
+    public function testShouldReturnWindowInstance()
+    {
+        $options = new WebDriverOptions($this->executor);
+
+        $window = $options->window();
+        $this->assertInstanceOf(WebDriverWindow::class, $window);
+    }
 }

From 7a6bf0dd9c785e11660c798e3d895d83babf2306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 7 Feb 2017 23:45:13 +0100
Subject: [PATCH 311/784] Fix incorrect covers annotation

---
 tests/functional/RemoteWebDriverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 918b3514b..847479afa 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -131,7 +131,7 @@ public function testShouldGetWindowHandles()
     }
 
     /**
-     * @covers ::getWindowHandles
+     * @covers ::close
      */
     public function testShouldCloseWindow()
     {

From 2a7a3537450331d9c6a7f6f9e06587858a8ce903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 7 Feb 2017 23:52:33 +0100
Subject: [PATCH 312/784] Add missing phpdoc

---
 lib/Remote/RemoteWebDriver.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index ed69c23ac..58381cff4 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -59,6 +59,11 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
      */
     protected $executeMethod;
 
+    /**
+     * @param HttpCommandExecutor $commandExecutor
+     * @param string $sessionId
+     * @param WebDriverCapabilities|null $capabilities
+     */
     protected function __construct(
         HttpCommandExecutor $commandExecutor,
         $sessionId,

From ca4300c0be26750dd94eb4694f9ca78ee96cf8d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 7 Feb 2017 23:57:58 +0100
Subject: [PATCH 313/784] Add unit tests for parts of RemoteWebDriver which do
 not interact with the real remote

---
 tests/unit/Remote/HttpCommandExecutorTest.php |   1 +
 tests/unit/Remote/RemoteWebDriverTest.php     | 117 ++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 tests/unit/Remote/RemoteWebDriverTest.php

diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 268b3e873..63d004e6b 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -20,6 +20,7 @@
 class HttpCommandExecutorTest extends \PHPUnit_Framework_TestCase
 {
     use PHPMock;
+
     /** @var HttpCommandExecutor */
     private $executor;
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
new file mode 100644
index 000000000..48b149f84
--- /dev/null
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -0,0 +1,117 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\WebDriverNavigation;
+use Facebook\WebDriver\WebDriverOptions;
+use Facebook\WebDriver\WebDriverWait;
+
+/**
+ * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
+ *
+ * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
+ */
+class RemoteWebDriverTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var RemoteWebDriver */
+    private $driver;
+
+    public function setUp()
+    {
+        $this->driver = RemoteWebDriver::createBySessionID('session-id', 'http://foo.bar:4444/');
+    }
+
+    /**
+     * @covers ::manage
+     */
+    public function testShouldCreateWebDriverOptionsInstance()
+    {
+        $wait = $this->driver->manage();
+
+        $this->assertInstanceOf(WebDriverOptions::class, $wait);
+    }
+
+    /**
+     * @covers ::navigate
+     */
+    public function testShouldCreateWebDriverNavigationInstance()
+    {
+        $wait = $this->driver->navigate();
+
+        $this->assertInstanceOf(WebDriverNavigation::class, $wait);
+    }
+
+    /**
+     * @covers ::switchTo
+     */
+    public function testShouldCreateRemoteTargetLocatorInstance()
+    {
+        $wait = $this->driver->switchTo();
+
+        $this->assertInstanceOf(RemoteTargetLocator::class, $wait);
+    }
+
+    /**
+     * @covers ::getMouse
+     */
+    public function testShouldCreateRemoteMouseInstance()
+    {
+        $wait = $this->driver->getMouse();
+
+        $this->assertInstanceOf(RemoteMouse::class, $wait);
+    }
+
+    /**
+     * @covers ::getKeyboard
+     */
+    public function testShouldCreateRemoteKeyboardInstance()
+    {
+        $wait = $this->driver->getKeyboard();
+
+        $this->assertInstanceOf(RemoteKeyboard::class, $wait);
+    }
+
+    /**
+     * @covers ::getTouch
+     */
+    public function testShouldCreateRemoteTouchScreenInstance()
+    {
+        $wait = $this->driver->getTouch();
+
+        $this->assertInstanceOf(RemoteTouchScreen::class, $wait);
+    }
+
+    /**
+     * @covers ::action
+     */
+    public function testShouldCreateWebDriverActionsInstance()
+    {
+        $wait = $this->driver->action();
+
+        $this->assertInstanceOf(WebDriverActions::class, $wait);
+    }
+
+    /**
+     * @covers ::wait
+     */
+    public function testShouldCreateWebDriverWaitInstance()
+    {
+        $wait = $this->driver->wait(15, 1337);
+
+        $this->assertInstanceOf(WebDriverWait::class, $wait);
+    }
+}

From 4eb204b350c4647775b0137908a62a9f3b912c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Feb 2017 00:51:28 +0100
Subject: [PATCH 314/784] Test reusing WebDriver session ID

---
 lib/Remote/RemoteWebDriver.php                 |  2 +-
 tests/functional/RemoteWebDriverCreateTest.php | 17 +++++++++++++++++
 tests/functional/WebDriverTestCase.php         |  1 -
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 58381cff4..f8b8e5e6e 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -135,7 +135,7 @@ public static function create(
      * [Experimental] Construct the RemoteWebDriver by an existing session.
      *
      * This constructor can boost the performance a lot by reusing the same browser for the whole test suite.
-     * You cannot the desired capabilities because the session was created before.
+     * You cannot pass the desired capabilities because the session was created before.
      *
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param string $session_id The existing session id
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 4f05a4319..161adb2bf 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -60,4 +60,21 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
     }
+
+    public function testShouldCreateInstanceFromExistingSessionId()
+    {
+        // Create driver instance and load page "index.html"
+        $originalDriver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
+        $originalDriver->get($this->getTestPath('index.html'));
+        $this->assertContains('/index.html', $originalDriver->getCurrentURL());
+
+        // Store session ID
+        $sessionId = $originalDriver->getSessionID();
+
+        // Create new RemoteWebDriver instance based on the session ID
+        $this->driver = RemoteWebDriver::createBySessionID($sessionId);
+
+        // Check we reused the previous instance (window) and it has the same URL
+        $this->assertContains('/index.html', $this->driver->getCurrentURL());
+    }
 }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 8c2fd4b8d..5626d1e82 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -29,7 +29,6 @@ class WebDriverTestCase extends \PHPUnit_Framework_TestCase
     protected $createWebDriver = true;
     /** @var string */
     protected $serverUrl = 'http://localhost:4444/wd/hub';
-
     /** @var RemoteWebDriver $driver */
     protected $driver;
     /** @var DesiredCapabilities */

From 67cb575fc727530d6c4cb4a852dd34b45f036074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Feb 2017 01:04:42 +0100
Subject: [PATCH 315/784] Add new php-cs-fixer rule

---
 .php_cs.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.php_cs.dist b/.php_cs.dist
index c40510179..d95f9d0fc 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -71,6 +71,7 @@ return PhpCsFixer\Config::create()
         'trailing_comma_in_multiline_array' => true,
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
+        'visibility_required' => true,
         'whitespace_after_comma_in_array' => true,
     ])
     ->setRiskyAllowed(true)

From 7cd8e163883a6dd22f0c5f6372fba05e5b8d2785 Mon Sep 17 00:00:00 2001
From: Nino <nino.skopac@gmail.com>
Date: Wed, 8 Feb 2017 13:09:02 +0100
Subject: [PATCH 316/784] Added ext-zip to require section of composer.json
 (#410)

* Added ext-zip to require section of composer.json, as it is required by file upload and firefox profile.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9114afdd8..3523361f9 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
   "require": {
     "php": "^5.5 || ~7.0",
     "symfony/process": "^2.8 || ^3.1",
-    "ext-curl": "*"
+    "ext-curl": "*",
+    "ext-zip": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "4.6.* || ~5.0",

From 7b5d48850ad5f8085363c839fc2d250a7af62732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Feb 2017 14:30:47 +0100
Subject: [PATCH 317/784] Mark executeSQL command deprecated - as it was
 removed from officialn java bindings in 2014

---
 lib/Remote/DriverCommand.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index e2ce958b5..1b86c71c6 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -83,6 +83,7 @@ class DriverCommand
     const SET_TIMEOUT = 'setTimeout';
     const IMPLICITLY_WAIT = 'implicitlyWait';
     const SET_SCRIPT_TIMEOUT = 'setScriptTimeout';
+    /** @deprecated */
     const EXECUTE_SQL = 'executeSQL';
     const GET_LOCATION = 'getLocation';
     const SET_LOCATION = 'setLocation';
@@ -91,18 +92,21 @@ class DriverCommand
     const CLEAR_APP_CACHE = 'clearAppCache';
     const IS_BROWSER_ONLINE = 'isBrowserOnline';
     const SET_BROWSER_ONLINE = 'setBrowserOnline';
+    // Local storage
     const GET_LOCAL_STORAGE_ITEM = 'getLocalStorageItem';
     const GET_LOCAL_STORAGE_KEYS = 'getLocalStorageKeys';
     const SET_LOCAL_STORAGE_ITEM = 'setLocalStorageItem';
     const REMOVE_LOCAL_STORAGE_ITEM = 'removeLocalStorageItem';
     const CLEAR_LOCAL_STORAGE = 'clearLocalStorage';
     const GET_LOCAL_STORAGE_SIZE = 'getLocalStorageSize';
+    // Session storage
     const GET_SESSION_STORAGE_ITEM = 'getSessionStorageItem';
     const GET_SESSION_STORAGE_KEYS = 'getSessionStorageKey';
     const SET_SESSION_STORAGE_ITEM = 'setSessionStorageItem';
     const REMOVE_SESSION_STORAGE_ITEM = 'removeSessionStorageItem';
     const CLEAR_SESSION_STORAGE = 'clearSessionStorage';
     const GET_SESSION_STORAGE_SIZE = 'getSessionStorageSize';
+    // Screen orientation
     const SET_SCREEN_ORIENTATION = 'setScreenOrientation';
     const GET_SCREEN_ORIENTATION = 'getScreenOrientation';
     // These belong to the Advanced user interactions - an element is optional for these commands.

From 58a942c1091939e02eb6aa2f56c0ebb2d2c9aaa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Feb 2017 20:49:38 +0100
Subject: [PATCH 318/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d24e1582..6b99a4f66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Cookies should now be set using `Cookie` value object instead of an array when passed to to `addCookie()` method of `WebDriverOptions`.
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
+- `ext-zip` is now specified as required dependency in composer.json (but the extension was already required by the code, though).
 
 ## 1.3.0 - 2017-01-13
 ### Added

From 47191c71d0024d1158326a5178dc931a1915ebd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Feb 2017 01:53:36 +0100
Subject: [PATCH 319/784] Add WebDriverAlert functional test

---
 tests/functional/WebDriverAlertTest.php | 103 ++++++++++++++++++++++++
 tests/functional/web/alert.html         |  35 ++++++++
 tests/functional/web/index.html         |   2 +
 3 files changed, 140 insertions(+)
 create mode 100644 tests/functional/WebDriverAlertTest.php
 create mode 100644 tests/functional/web/alert.html

diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
new file mode 100644
index 000000000..ce403c549
--- /dev/null
+++ b/tests/functional/WebDriverAlertTest.php
@@ -0,0 +1,103 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoAlertOpenException;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverAlert
+ */
+class WebDriverAlertTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPath('alert.html'));
+    }
+
+    public function testShouldAcceptAlert()
+    {
+        // Open alert
+        $this->driver->findElement(WebDriverBy::id('open-alert'))->click();
+
+        // Wait until present
+        $this->driver->wait()->until(WebDriverExpectedCondition::alertIsPresent());
+
+        $this->assertSame('This is alert', $this->driver->switchTo()->alert()->getText());
+
+        $this->driver->switchTo()->alert()->accept();
+
+        $this->setExpectedException(NoAlertOpenException::class);
+        $this->driver->switchTo()->alert()->accept();
+    }
+
+    public function testShouldAcceptAndDismissConfirmation()
+    {
+        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+            /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        // Open confirmation
+        $this->driver->findElement(WebDriverBy::id('open-confirm'))->click();
+
+        // Wait until present
+        $this->driver->wait()->until(WebDriverExpectedCondition::alertIsPresent());
+
+        $this->assertSame('Do you confirm?', $this->driver->switchTo()->alert()->getText());
+
+        // Test accepting
+        $this->driver->switchTo()->alert()->accept();
+        $this->assertSame('accepted', $this->getResultText());
+
+        // Open confirmation
+        $this->driver->findElement(WebDriverBy::id('open-confirm'))->click();
+
+        // Test dismissal
+        $this->driver->switchTo()->alert()->dismiss();
+        $this->assertSame('dismissed', $this->getResultText());
+    }
+
+    public function testShouldSubmitPromptText()
+    {
+        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+            /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        // Open confirmation
+        $this->driver->findElement(WebDriverBy::id('open-prompt'))->click();
+
+        // Wait until present
+        $this->driver->wait()->until(WebDriverExpectedCondition::alertIsPresent());
+
+        $this->assertSame('Enter prompt value', $this->driver->switchTo()->alert()->getText());
+
+        $this->driver->switchTo()->alert()->sendKeys('Text entered to prompt');
+        $this->driver->switchTo()->alert()->accept();
+
+        $this->assertSame('Text entered to prompt', $this->getResultText());
+    }
+
+    private function getResultText()
+    {
+        return $this->driver
+            ->findElement(WebDriverBy::id('result'))
+            ->getText();
+    }
+}
diff --git a/tests/functional/web/alert.html b/tests/functional/web/alert.html
new file mode 100644
index 000000000..079d75130
--- /dev/null
+++ b/tests/functional/web/alert.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Open an alert</title>
+</head>
+<body>
+
+<p>
+    <a href="#" onclick="javascript:alert('This is alert'); return false;" id="open-alert">Open alert</a>
+    <br>
+
+    <a href="#" onclick="javascript:openConfirm(); return false;" id="open-confirm">Open confirm</a>
+    <br>
+
+    <a href="#" onclick="javascript:openPrompt(); return false;" id="open-prompt">Open prompt</a>
+    <br>
+</p>
+
+<div id="result"></div>
+
+<script>
+    function openConfirm() {
+        document.getElementById("result").innerHTML = (confirm("Do you confirm?") ? 'accepted' : 'dismissed');
+
+        return false;
+    }
+
+    function openPrompt() {
+        document.getElementById("result").innerHTML = prompt("Enter prompt value");
+    }
+</script>
+
+</body>
+</html>
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index c3d53c4a3..8e314f798 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -16,6 +16,8 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     <a href="http://github.com/delayed_element.html" id="a-delayed-element">Delayed render</a>
     |
     <a href="http://github.com/slow_loading.html" id="a-slow-loading">Slow loading page</a>
+    |
+    <a href="http://github.com/alert.html" id="a-alerts">Javascript alerts</a>
 
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>

From ff3c556707cb1524ad99d4752db496ab574bf41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 10 Feb 2017 15:02:01 +0100
Subject: [PATCH 320/784] Prepare toArray() method to be added to
 WebDriverCapabilities interface in next major version

---
 lib/WebDriver.php             | 2 +-
 lib/WebDriverCapabilities.php | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index ea413f883..f6e8200ae 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -128,9 +128,9 @@ public function navigate();
      */
     public function switchTo();
 
+    // TODO: Add in next major release (BC)
     ///**
     // * @return WebDriverTouchScreen
-    // * @todo Add in next major release (BC)
     // */
     //public function getTouch();
 
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 6fce03c08..b489a1e6e 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -48,4 +48,10 @@ public function is($capability_name);
      * @return bool Whether javascript is enabled.
      */
     public function isJavascriptEnabled();
+
+    // TODO: Add in next major release (BC)
+    ///**
+    // * @return array
+    // */
+    //public function toArray();
 }

From 85f8ac1e4705f92ea2b4d2abe4f164c36cce6809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 18 Dec 2016 01:27:57 +0100
Subject: [PATCH 321/784] Run tests on SauceLabs

---
 .travis.yml                                   | 18 ++++++-
 tests/functional/FileUploadTest.php           |  2 +-
 .../functional/RemoteWebDriverCreateTest.php  |  6 +--
 .../RemoteWebDriverFindElementTest.php        |  8 +--
 tests/functional/RemoteWebDriverTest.php      | 28 ++++++-----
 tests/functional/RemoteWebElementTest.php     | 24 ++++-----
 tests/functional/WebDriverAlertTest.php       |  2 +-
 tests/functional/WebDriverByTest.php          |  2 +-
 tests/functional/WebDriverSelectTest.php      |  2 +-
 tests/functional/WebDriverTestCase.php        | 50 +++++++++++++------
 tests/functional/WebDriverTimeoutsTest.php    |  4 +-
 11 files changed, 93 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c0cd3e77..f7229a2c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,25 @@ php:
 
 matrix:
   include:
-    # Add build to run tests against Firefox (other runs are agains HtmlUnit by default)
+    # Add build to run tests against Firefox inside Travis environment (other runs are agains HtmlUnit by default)
     - php: 7.0
       env: BROWSER_NAME="firefox"
+
     # Build with lowest possible dependencies
     - php: 7.0
       env: dependencies="--prefer-lowest"
+
+    # Saucelabs builds
+    - php: 7.0
+      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
+      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+    - php: 7.0
+      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="45.0" PLATFORM="Linux"
+      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+    - php: 7.0
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
+      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+
     # Add PHP 7 build to check codestyle only in PHP 7 build
     - php: 7.0
       env: CHECK_CODESTYLE=1
@@ -66,3 +79,6 @@ addons:
   apt:
     packages:
       - oracle-java8-installer
+  sauce_connect: true
+  jwt:
+    secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index e8878e642..ef6cf1bb2 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -52,7 +52,7 @@ public function testShouldUploadAFile()
 
     public function xtestUselessFileDetectorSendKeys()
     {
-        $this->driver->get($this->getTestPath('upload.html'));
+        $this->driver->get($this->getTestPageUrl('upload.html'));
 
         $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
         $file_input->sendKeys($this->getTestFilePath());
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 161adb2bf..95ff4851c 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -34,7 +34,7 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
-        $this->assertSame($this->serverUrl, $this->driver->getCommandExecutor()->getAddressOfRemoteServer());
+        $this->assertNotEmpty($this->driver->getCommandExecutor()->getAddressOfRemoteServer());
 
         $this->assertInternalType('string', $this->driver->getSessionID());
         $this->assertNotEmpty($this->driver->getSessionID());
@@ -65,14 +65,14 @@ public function testShouldCreateInstanceFromExistingSessionId()
     {
         // Create driver instance and load page "index.html"
         $originalDriver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
-        $originalDriver->get($this->getTestPath('index.html'));
+        $originalDriver->get($this->getTestPageUrl('index.html'));
         $this->assertContains('/index.html', $originalDriver->getCurrentURL());
 
         // Store session ID
         $sessionId = $originalDriver->getSessionID();
 
         // Create new RemoteWebDriver instance based on the session ID
-        $this->driver = RemoteWebDriver::createBySessionID($sessionId);
+        $this->driver = RemoteWebDriver::createBySessionID($sessionId, $this->serverUrl);
 
         // Check we reused the previous instance (window) and it has the same URL
         $this->assertContains('/index.html', $this->driver->getCurrentURL());
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index ad1daf348..808763bad 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -26,7 +26,7 @@ class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
     public function testShouldThrowExceptionOfElementCannotBeFound()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $this->setExpectedException(NoSuchElementException::class, 'Unable to locate element');
         $this->driver->findElement(WebDriverBy::id('not_existing'));
@@ -34,7 +34,7 @@ public function testShouldThrowExceptionOfElementCannotBeFound()
 
     public function testShouldFindElementIfExistsOnAPage()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
 
@@ -43,7 +43,7 @@ public function testShouldFindElementIfExistsOnAPage()
 
     public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('not_existing'));
 
@@ -53,7 +53,7 @@ public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
 
     public function testShouldFindMultipleElements()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
 
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 847479afa..0f38d0f3c 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -29,7 +29,7 @@ class RemoteWebDriverTest extends WebDriverTestCase
      */
     public function testShouldGetPageTitle()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $this->assertEquals(
             'php-webdriver test page',
@@ -43,7 +43,7 @@ public function testShouldGetPageTitle()
      */
     public function testShouldGetCurrentUrl()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $this->assertContains(
             '/index.html',
@@ -56,7 +56,7 @@ public function testShouldGetCurrentUrl()
      */
     public function testShouldGetPageSource()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $source = $this->driver->getPageSource();
         $this->assertContains('<h1 id="welcome">', $source);
@@ -79,7 +79,9 @@ public function testShouldGetSessionId()
      */
     public function testShouldGetAllSessions()
     {
-        $sessions = RemoteWebDriver::getAllSessions();
+        $this->skipOnSauceLabs('getAllSessions() is not supported on SauceLabs');
+
+        $sessions = RemoteWebDriver::getAllSessions($this->serverUrl);
 
         $this->assertInternalType('array', $sessions);
         $this->assertCount(1, $sessions);
@@ -96,12 +98,14 @@ public function testShouldGetAllSessions()
      */
     public function testShouldQuitAndUnsetExecutor()
     {
-        $this->assertCount(1, RemoteWebDriver::getAllSessions());
+        $this->skipOnSauceLabs('getAllSessions() is not supported on SauceLabs');
+
+        $this->assertCount(1, RemoteWebDriver::getAllSessions($this->serverUrl));
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
 
         $this->driver->quit();
 
-        $this->assertCount(0, RemoteWebDriver::getAllSessions());
+        $this->assertCount(0, RemoteWebDriver::getAllSessions($this->serverUrl));
         $this->assertNull($this->driver->getCommandExecutor());
     }
 
@@ -111,7 +115,7 @@ public function testShouldQuitAndUnsetExecutor()
      */
     public function testShouldGetWindowHandles()
     {
-        $this->driver->get($this->getTestPath('open_new_window.html'));
+        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
 
         $windowHandle = $this->driver->getWindowHandle();
         $windowHandles = $this->driver->getWindowHandles();
@@ -135,7 +139,7 @@ public function testShouldGetWindowHandles()
      */
     public function testShouldCloseWindow()
     {
-        $this->driver->get($this->getTestPath('open_new_window.html'));
+        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
 
         $this->assertCount(2, $this->driver->getWindowHandles());
@@ -150,7 +154,7 @@ public function testShouldCloseWindow()
      */
     public function testShouldExecuteScriptAndDoNotBlockExecution()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
@@ -176,7 +180,7 @@ public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
 
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
@@ -209,7 +213,7 @@ public function testShouldTakeScreenshot()
             $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
         }
 
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $outputPng = $this->driver->takeScreenshot();
 
@@ -234,7 +238,7 @@ public function testShouldSaveScreenshotToFile()
 
         $screenshotPath = sys_get_temp_dir() . '/selenium-screenshot.png';
 
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $this->driver->takeScreenshot($screenshotPath);
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index e5d1ead06..26d13f6e2 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -25,7 +25,7 @@ class RemoteWebElementTest extends WebDriverTestCase
      */
     public function testShouldGetText()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
         $elementWithSimpleText = $this->driver->findElement(WebDriverBy::id('text-simple'));
         $elementWithTextWithSpaces = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
 
@@ -38,7 +38,7 @@ public function testShouldGetText()
      */
     public function testShouldGetAttributeValue()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('text-simple'));
 
@@ -52,7 +52,7 @@ public function testShouldGetAttributeValue()
      */
     public function testShouldGetLocation()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
 
@@ -67,7 +67,7 @@ public function testShouldGetLocation()
      */
     public function testShouldGetSize()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
 
@@ -82,7 +82,7 @@ public function testShouldGetSize()
      */
     public function testShouldGetCssValue()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $elementWithBorder = $this->driver->findElement(WebDriverBy::id('text-simple'));
         $elementWithoutBorder = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
@@ -99,7 +99,7 @@ public function testShouldGetCssValue()
      */
     public function testShouldGetTagName()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $paragraphElement = $this->driver->findElement(WebDriverBy::id('id_test'));
 
@@ -111,7 +111,7 @@ public function testShouldGetTagName()
      */
     public function testShouldClick()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
 
         $linkElement->click();
@@ -126,7 +126,7 @@ public function testShouldClick()
      */
     public function testShouldClearFormElementText()
     {
-        $this->driver->get($this->getTestPath('form.html'));
+        $this->driver->get($this->getTestPageUrl('form.html'));
 
         $input = $this->driver->findElement(WebDriverBy::id('input-text'));
         $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
@@ -145,7 +145,7 @@ public function testShouldClearFormElementText()
      */
     public function testShouldSendKeysToFormElement()
     {
-        $this->driver->get($this->getTestPath('form.html'));
+        $this->driver->get($this->getTestPageUrl('form.html'));
 
         $input = $this->driver->findElement(WebDriverBy::id('input-text'));
         $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
@@ -168,7 +168,7 @@ public function testShouldSendKeysToFormElement()
      */
     public function testShouldDetectEnabledInputs()
     {
-        $this->driver->get($this->getTestPath('form.html'));
+        $this->driver->get($this->getTestPageUrl('form.html'));
 
         $inputEnabled = $this->driver->findElement(WebDriverBy::id('input-text'));
         $inputDisabled = $this->driver->findElement(WebDriverBy::id('input-text-disabled'));
@@ -182,7 +182,7 @@ public function testShouldDetectEnabledInputs()
      */
     public function testShouldSelectedInputsOrOptions()
     {
-        $this->driver->get($this->getTestPath('form.html'));
+        $this->driver->get($this->getTestPageUrl('form.html'));
 
         $checkboxSelected = $this->driver->findElement(
             WebDriverBy::cssSelector('input[name=checkbox][value=second]')
@@ -263,7 +263,7 @@ public function testShouldSubmitFormByClickOnSubmitInput()
      */
     public function testShouldCompareEqualsElement()
     {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
         $differentElement = $this->driver->findElement(WebDriverBy::cssSelector('#text-simple'));
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index ce403c549..eddf3a9ae 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -27,7 +27,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPath('alert.html'));
+        $this->driver->get($this->getTestPageUrl('alert.html'));
     }
 
     public function testShouldAcceptAlert()
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 753790248..43d8c0457 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -36,7 +36,7 @@ public function testShouldFindTextElementByLocator(
         $expectedText = null,
         $expectedAttributeValue = null
     ) {
-        $this->driver->get($this->getTestPath('index.html'));
+        $this->driver->get($this->getTestPageUrl('index.html'));
 
         $by = call_user_func([WebDriverBy::class, $webDriverByLocatorMethod], $webDriverByLocatorValue);
         $element = $this->driver->findElement($by);
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 3a7d55f24..ac32cbca7 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -29,7 +29,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPath('form.html'));
+        $this->driver->get($this->getTestPageUrl('form.html'));
     }
 
     public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple()
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5626d1e82..62f98b5d1 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -38,13 +38,17 @@ protected function setUp()
     {
         $this->desiredCapabilities = new DesiredCapabilities();
 
-        if (getenv('BROWSER_NAME')) {
-            $browserName = getenv('BROWSER_NAME');
+        if (getenv('SAUCELABS')) {
+            $this->setUpSauceLabs();
         } else {
-            $browserName = WebDriverBrowserType::HTMLUNIT;
-        }
+            if (getenv('BROWSER_NAME')) {
+                $browserName = getenv('BROWSER_NAME');
+            } else {
+                $browserName = WebDriverBrowserType::HTMLUNIT;
+            }
 
-        $this->desiredCapabilities->setBrowserName($browserName);
+            $this->desiredCapabilities->setBrowserName($browserName);
+        }
 
         if ($this->createWebDriver) {
             $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
@@ -63,24 +67,40 @@ protected function tearDown()
     }
 
     /**
-     * Get the URL of the test html on filesystem.
+     * Get the URL of given test HTML on running webserver.
      *
-     * @param $path
+     * @param string $path
      * @return string
      */
-    protected function getTestPath($path)
+    protected function getTestPageUrl($path)
     {
-        return 'file:///' . __DIR__ . '/web/' . $path;
+        return 'http://localhost:8000/' . $path;
+    }
+
+    protected function setUpSauceLabs()
+    {
+        $this->serverUrl = sprintf(
+            'http://%s:%s@ondemand.saucelabs.com/wd/hub',
+            getenv('SAUCE_USERNAME'),
+            getenv('SAUCE_ACCESS_KEY')
+        );
+        $this->desiredCapabilities->setBrowserName(getenv('BROWSER_NAME'));
+        $this->desiredCapabilities->setVersion(getenv('VERSION'));
+        $this->desiredCapabilities->setPlatform(getenv('PLATFORM'));
+
+        if (getenv('TRAVIS_JOB_NUMBER')) {
+            $this->desiredCapabilities->setCapability('tunnel-identifier', getenv('TRAVIS_JOB_NUMBER'));
+            $this->desiredCapabilities->setCapability('build', getenv('TRAVIS_JOB_NUMBER'));
+        }
     }
 
     /**
-     * Get the URL of given test HTML on running webserver.
-     *
-     * @param string $path
-     * @return string
+     * @param string $message
      */
-    protected function getTestPageUrl($path)
+    protected function skipOnSauceLabs($message = 'Not supported by SauceLabs')
     {
-        return 'http://localhost:8000/' . $path;
+        if (getenv('SAUCELABS')) {
+            $this->markTestSkipped($message);
+        }
     }
 }
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index b7a7eb183..51be6e13a 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -28,7 +28,7 @@ class WebDriverTimeoutsTest extends WebDriverTestCase
 {
     public function testShouldFailGettingDelayedElementWithoutWait()
     {
-        $this->driver->get($this->getTestPath('delayed_element.html'));
+        $this->driver->get($this->getTestPageUrl('delayed_element.html'));
 
         $this->setExpectedException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('delayed'));
@@ -39,7 +39,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
      */
     public function testShouldGetDelayedElementWithImplicitWait()
     {
-        $this->driver->get($this->getTestPath('delayed_element.html'));
+        $this->driver->get($this->getTestPageUrl('delayed_element.html'));
 
         $this->driver->manage()->timeouts()->implicitlyWait(1);
         $element = $this->driver->findElement(WebDriverBy::id('delayed'));

From 87ec0a905e74b3054ba6eda6aad9941caf4b7c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 10 Feb 2017 18:00:44 +0100
Subject: [PATCH 322/784] Extend wait as an attempt to make the script more
 stable in slower network environments...

---
 tests/functional/RemoteWebDriverTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 0f38d0f3c..858bcd786 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -162,14 +162,14 @@ public function testShouldExecuteScriptAndDoNotBlockExecution()
         $this->driver->executeScript('
             setTimeout(
                 function(){document.getElementById("id_test").innerHTML = "Text changed by script"},
-                250
+                500
             )');
 
         // Make sure the script don't block the test execution
         $this->assertSame('Test by ID', $element->getText());
 
         // If we wait, the script should be executed
-        usleep(300000); // wait 300 ms
+        usleep(550000); // wait 550 ms
         $this->assertSame('Text changed by script', $element->getText());
     }
 

From 91c98338ea4638890f6d29e662e048c747b9cf41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 11 Feb 2017 14:40:41 +0100
Subject: [PATCH 323/784] Enable sauce connect addon only on SauceLabs builds

This will improve performace of other builds, also otherwise we reach the SauceLabs concurrency tunel limit.
---
 .travis.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7229a2c3..c2aa30aa9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,12 +20,24 @@ matrix:
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
       before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+      addons:
+        sauce_connect: true
+        jwt:
+          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="45.0" PLATFORM="Linux"
       before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+      addons:
+        sauce_connect: true
+        jwt:
+          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
       before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+      addons:
+        sauce_connect: true
+        jwt:
+          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
     # Add PHP 7 build to check codestyle only in PHP 7 build
     - php: 7.0
@@ -79,6 +91,3 @@ addons:
   apt:
     packages:
       - oracle-java8-installer
-  sauce_connect: true
-  jwt:
-    secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=

From 6f3e3403cf8e9215203ec05a7bddbd3c4cda251c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 11 Feb 2017 20:41:58 +0100
Subject: [PATCH 324/784] Install Firefox only on Firefox build (to not slow
 down other builds)

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c2aa30aa9..f8fc22fe6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,8 @@ matrix:
     # Add build to run tests against Firefox inside Travis environment (other runs are agains HtmlUnit by default)
     - php: 7.0
       env: BROWSER_NAME="firefox"
+      addons:
+        firefox: "latest-esr"
 
     # Build with lowest possible dependencies
     - php: 7.0
@@ -87,7 +89,6 @@ after_success:
   - travis_retry php vendor/bin/coveralls -v
 
 addons:
-  firefox: "latest-esr"
   apt:
     packages:
       - oracle-java8-installer

From a59ed83f5079fdefa75cf4ac694325b4ef699180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 22 Feb 2017 23:14:33 +0000
Subject: [PATCH 325/784] Upgrade to Selenium 3.1.0

---
 .travis.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8fc22fe6..b771dd496 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,9 @@ matrix:
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "latest-esr"
+        apt:
+          packages:
+            - oracle-java8-installer
 
     # Build with lowest possible dependencies
     - php: 7.0
@@ -68,13 +71,8 @@ install:
 
 before_script:
   - sh -e /etc/init.d/xvfb start
-  # TODO: upgrade to Selenium 3.0.2 (with latest HtmlUnit) once released, as HtmlUnit in 3.0.1 is broken
-  - if [ ! -f jar/selenium-server-standalone-2.53.1.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar; fi
-  - if [ ! -f jar/htmlunit-driver-standalone-2.20.jar ]; then wget -q -t 3 -P jar https://github.com/SeleniumHQ/htmlunit-driver/releases/download/2.20/htmlunit-driver-standalone-2.20.jar; fi
-  # Temporarily run HtmlUnit from standalone jar file (it was not part of Selenium server standalone in version 2.53)
-  - java -cp "jar/selenium-server-standalone-2.53.1.jar:jar/htmlunit-driver-standalone-2.20.jar" org.openqa.grid.selenium.GridLauncher -log ./logs/selenium.log &
-  # TODO: use this after upgrade to Selenium 3.0.2
-  #- /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.0.2.jar -log selenium.log &
+  - if [ ! -f jar/selenium-server-standalone-3.1.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar; fi
+  - /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
   - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
   - php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 

From 8900b1fc26f071724c04774ea129ddfc402684f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 23 Feb 2017 19:03:54 +0000
Subject: [PATCH 326/784] Identify SauceLabs tests by name and tags

---
 tests/functional/WebDriverTestCase.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 62f98b5d1..3673d0a8e 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -87,6 +87,8 @@ protected function setUpSauceLabs()
         $this->desiredCapabilities->setBrowserName(getenv('BROWSER_NAME'));
         $this->desiredCapabilities->setVersion(getenv('VERSION'));
         $this->desiredCapabilities->setPlatform(getenv('PLATFORM'));
+        $this->desiredCapabilities->setCapability('name', get_class($this) . '::' . $this->getName());
+        $this->desiredCapabilities->setCapability('tags', [get_class($this)]);
 
         if (getenv('TRAVIS_JOB_NUMBER')) {
             $this->desiredCapabilities->setCapability('tunnel-identifier', getenv('TRAVIS_JOB_NUMBER'));

From bab090739c5bbc7d6c4efc8da1505665b15ca144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 23 Feb 2017 20:04:13 +0000
Subject: [PATCH 327/784] Report test results to saucelabs API to show the
 results on their dashboard

---
 composer.json                                 |  2 +-
 phpunit.xml.dist                              |  5 ++
 .../ReportSauceLabsStatusListener.php         | 88 +++++++++++++++++++
 tests/functional/WebDriverTestCase.php        | 16 +++-
 4 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/ReportSauceLabsStatusListener.php

diff --git a/composer.json b/composer.json
index 3523361f9..a80697c47 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Facebook\\WebDriver\\": "tests/unit"
+      "Facebook\\WebDriver\\": ["tests/unit", "tests/functional"]
     },
     "classmap": ["tests/functional/"]
   }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 894ba470a..430a8fb5c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -29,4 +29,9 @@
             <directory suffix=".php">./lib</directory>
         </whitelist>
     </filter>
+
+    <listeners>
+        <listener class="Facebook\WebDriver\ReportSauceLabsStatusListener"/>
+    </listeners>
+
 </phpunit>
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
new file mode 100644
index 000000000..b88b1cdf7
--- /dev/null
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -0,0 +1,88 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+class ReportSauceLabsStatusListener extends \PHPUnit_Framework_BaseTestListener
+{
+    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    {
+        if (!$test instanceof WebDriverTestCase || !$test->driver instanceof RemoteWebDriver) {
+            return;
+        }
+
+        /** @var WebDriverTestCase $test */
+        if (!$test->isSauceLabsBuild()) {
+            return;
+        }
+
+        $testStatus = $test->getStatus();
+
+        if ($this->testWasSkippedOrIncomplete($testStatus)) {
+            return;
+        }
+
+        $endpointUrl = sprintf(
+            'https://saucelabs.com/rest/v1/%s/jobs/%s',
+            getenv('SAUCE_USERNAME'),
+            $test->driver->getSessionID()
+        );
+
+        $data = [
+            'passed' => ($testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_PASSED),
+            'custom-data' => ['message' => $test->getStatusMessage()],
+        ];
+
+        $this->submitToSauceLabs($endpointUrl, $data);
+    }
+
+    /**
+     * @param int $testStatus
+     * @return bool
+     */
+    private function testWasSkippedOrIncomplete($testStatus)
+    {
+        if ($testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
+            || $testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $url
+     * @param array $data
+     */
+    private function submitToSauceLabs($url, array $data)
+    {
+        $curl = curl_init($url);
+        curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
+        curl_setopt($curl, CURLOPT_USERPWD, getenv('SAUCE_USERNAME') . ':' . getenv('SAUCE_ACCESS_KEY'));
+        curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
+
+        curl_exec($curl);
+
+        if (curl_errno($curl)) {
+            throw new \Exception(sprintf('Error publishing test results to SauceLabs: %s', curl_error($curl)));
+        }
+
+        curl_close($curl);
+    }
+}
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 3673d0a8e..a2639bae7 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -25,12 +25,12 @@
  */
 class WebDriverTestCase extends \PHPUnit_Framework_TestCase
 {
+    /** @var RemoteWebDriver $driver */
+    public $driver;
     /** @var bool Indicate whether WebDriver should be created on setUp */
     protected $createWebDriver = true;
     /** @var string */
     protected $serverUrl = 'http://localhost:4444/wd/hub';
-    /** @var RemoteWebDriver $driver */
-    protected $driver;
     /** @var DesiredCapabilities */
     protected $desiredCapabilities;
 
@@ -38,7 +38,7 @@ protected function setUp()
     {
         $this->desiredCapabilities = new DesiredCapabilities();
 
-        if (getenv('SAUCELABS')) {
+        if ($this->isSauceLabsBuild()) {
             $this->setUpSauceLabs();
         } else {
             if (getenv('BROWSER_NAME')) {
@@ -66,6 +66,14 @@ protected function tearDown()
         }
     }
 
+    /**
+     * @return bool
+     */
+    public function isSauceLabsBuild()
+    {
+        return getenv('SAUCELABS') ? true : false;
+    }
+
     /**
      * Get the URL of given test HTML on running webserver.
      *
@@ -101,7 +109,7 @@ protected function setUpSauceLabs()
      */
     protected function skipOnSauceLabs($message = 'Not supported by SauceLabs')
     {
-        if (getenv('SAUCELABS')) {
+        if ($this->isSauceLabsBuild()) {
             $this->markTestSkipped($message);
         }
     }

From 1cdbf31156271381c65eab169923c3f744648a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 24 Feb 2017 00:36:39 +0000
Subject: [PATCH 328/784] Extend wait once more to make the script more stable
 in slower network environments like with SauceLabs

---
 tests/functional/RemoteWebDriverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 858bcd786..52f1d9cb7 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -169,7 +169,7 @@ function(){document.getElementById("id_test").innerHTML = "Text changed by scrip
         $this->assertSame('Test by ID', $element->getText());
 
         // If we wait, the script should be executed
-        usleep(550000); // wait 550 ms
+        usleep(1000000); // wait 1000 ms
         $this->assertSame('Text changed by script', $element->getText());
     }
 

From 3c4c512e15011b674bb9f409ef365854ed7bd3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 24 Feb 2017 11:17:29 +0000
Subject: [PATCH 329/784] Do not even start (ie. exclude) tests not working on
 saucelabs, instead of skipping them

---
 .travis.yml                              |  3 ++-
 tests/functional/RemoteWebDriverTest.php |  6 ++----
 tests/functional/WebDriverTestCase.php   | 10 ----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b771dd496..353936986 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,8 @@ before_script:
   - php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
 script:
-  - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml
+  - if [ -n "$SAUCELABS" ]; then EXTRA_PARAMS="--exclude-group exclude-saucelabs"; fi
+  - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
 after_script:
   - cat ./logs/selenium.log
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 52f1d9cb7..7b60b69d7 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -75,12 +75,11 @@ public function testShouldGetSessionId()
     }
 
     /**
+     * @group exclude-saucelabs
      * @covers ::getAllSessions
      */
     public function testShouldGetAllSessions()
     {
-        $this->skipOnSauceLabs('getAllSessions() is not supported on SauceLabs');
-
         $sessions = RemoteWebDriver::getAllSessions($this->serverUrl);
 
         $this->assertInternalType('array', $sessions);
@@ -92,14 +91,13 @@ public function testShouldGetAllSessions()
     }
 
     /**
+     * @group exclude-saucelabs
      * @covers ::getAllSessions
      * @covers ::getCommandExecutor
      * @covers ::quit
      */
     public function testShouldQuitAndUnsetExecutor()
     {
-        $this->skipOnSauceLabs('getAllSessions() is not supported on SauceLabs');
-
         $this->assertCount(1, RemoteWebDriver::getAllSessions($this->serverUrl));
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index a2639bae7..84883574a 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -103,14 +103,4 @@ protected function setUpSauceLabs()
             $this->desiredCapabilities->setCapability('build', getenv('TRAVIS_JOB_NUMBER'));
         }
     }
-
-    /**
-     * @param string $message
-     */
-    protected function skipOnSauceLabs($message = 'Not supported by SauceLabs')
-    {
-        if ($this->isSauceLabsBuild()) {
-            $this->markTestSkipped($message);
-        }
-    }
 }

From 6fb60b020e39b89dc3e913c294bc780bf545b9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 26 Feb 2017 18:45:37 +0000
Subject: [PATCH 330/784] Add travis and saucelabs badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index d2a8d6132..cfdf0bc3b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
+[![Travis Build](https://img.shields.io/travis/facebook/php-webdriver/community.svg?style=flat-square)](https://travis-ci.org/facebook/php-webdriver)
+[![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
 [![Total Downloads](https://img.shields.io/packagist/dt/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
 [![License](https://img.shields.io/packagist/l/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
 

From 75af11ac9661ff76cf857ead31b30cfac9528ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 6 Mar 2017 21:49:43 +0000
Subject: [PATCH 331/784] Do not throw fatal error when null is passed to
 sendKeys (fixes #419)

---
 CHANGELOG.md                                  |  3 ++
 lib/Interactions/WebDriverCompositeAction.php |  2 +-
 lib/WebDriverKeys.php                         | 12 +++--
 tests/unit/WebDriverKeysTest.php              | 54 +++++++++++++++++++
 4 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 tests/unit/WebDriverKeysTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b99a4f66..87407e0c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
 - `ext-zip` is now specified as required dependency in composer.json (but the extension was already required by the code, though).
 
+### Fixed
+- Do not throw fatal error when `null` is passed to `sendKeys()`.
+
 ## 1.3.0 - 2017-01-13
 ### Added
 - Added `getCapabilities()` method of `RemoteWebDriver`, to retrieve actual capabilities acknowledged by the remote driver on startup.
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index 75b879082..75a4837e1 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -23,7 +23,7 @@
 class WebDriverCompositeAction implements WebDriverAction
 {
     /**
-     * @var array
+     * @var WebDriverAction[]
      */
     private $actions = [];
 
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 57d37c1eb..c25748e8c 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -88,24 +88,28 @@ class WebDriverKeys
 
     /**
      * Encode input of `sendKeys()`.
-     * @param string|array $keys
+     * @param string|array|int|float $keys
      * @return array
      */
     public static function encode($keys)
     {
         if (is_numeric($keys)) {
-            $keys = '' . $keys;
+            $keys = (string) $keys;
         }
 
         if (is_string($keys)) {
             $keys = [$keys];
         }
 
+        if (!is_array($keys)) {
+            return [];
+        }
+
         $encoded = [];
         foreach ($keys as $key) {
             if (is_array($key)) {
-                // handle modified keys
-                $key = implode('', $key) . self::NULL;
+                // handle key modifiers
+                $key = implode('', $key) . self::NULL; // the NULL clears the input state (eg. previous modifiers)
             }
             $encoded[] = (string) $key;
         }
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
new file mode 100644
index 000000000..9a205c7de
--- /dev/null
+++ b/tests/unit/WebDriverKeysTest.php
@@ -0,0 +1,54 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+/**
+ * @covers Facebook\WebDriver\WebDriverKeys
+ */
+class WebDriverKeysTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideKeys
+     * @param mixed $keys
+     * @param array $expectedOutput
+     */
+    public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
+    {
+        $this->assertSame($expectedOutput, WebDriverKeys::encode($keys));
+    }
+
+    /**
+     * @return array[]
+     */
+    public function provideKeys()
+    {
+        return [
+            'empty string' => ['', ['']],
+            'simple string' => ['foo', ['foo']],
+            'string as an array' => [['foo'], ['foo']],
+            'string with modifier as an array' => [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::SHIFT, 'foo']],
+            'string with concatenated modifier' => [[WebDriverKeys::SHIFT . 'foo'], [WebDriverKeys::SHIFT . 'foo']],
+            'simple numeric value' => [3, ['3']],
+            'multiple numeric values' => [[1, 3.33], ['1', '3.33']],
+            'multiple mixed values ' => [['foo', WebDriverKeys::END, '1.234'], ['foo', WebDriverKeys::END, '1.234']],
+            'array of strings with modifiers should separate them with NULL character' => [
+                [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::META, 'bar']],
+                [WebDriverKeys::SHIFT . 'foo' . WebDriverKeys::NULL, WebDriverKeys::META . 'bar' . WebDriverKeys::NULL],
+            ],
+            'null' => [null, []],
+        ];
+    }
+}

From ecc272a4ece0975ee320e87e2ed5f5ee737cfdf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Mar 2017 10:28:01 +0000
Subject: [PATCH 332/784] Add composer scripts for simple codestyle check/fix

---
 .travis.yml     |  4 +---
 CONTRIBUTING.md | 21 +++++++++++++++++----
 composer.json   | 10 ++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 353936986..2eaa8fd02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,9 +48,7 @@ matrix:
     - php: 7.0
       env: CHECK_CODESTYLE=1
       before_script: ~
-      script:
-        - ./vendor/bin/php-cs-fixer fix --diff --dry-run
-        - ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/
+      script: composer codestyle:check
       after_script: ~
       after_success: ~
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a73c9eafd..3bea30bba 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,15 +29,28 @@ To execute all tests simply run:
 If you want to execute just the unit tests, run:
 
     ./vendor/bin/phpunit --testsuite unit
+
+For the functional tests you must first [download](http://selenium-release.storage.googleapis.com/index.html) and start
+the selenium standalone server, start the local PHP server which will serve the test pages and then run the `functional`
+test suite:
+
+    java -jar selenium-server-standalone-2.53.1.jar -log selenium.log &
+    php -S localhost:8000 -t tests/functional/web/ &
+    ./vendor/bin/phpunit --testsuite functional
     
-For the functional tests you must first download and start the selenium server, then run the `functional` test suite:
+The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in eg. Firefox,
+simply set the `BROWSER` environment variable:
 
-    java -jar selenium-server-standalone-2.48.2.jar -log selenium.log &
+    ...
+    export BROWSER_NAME="firefox"
     ./vendor/bin/phpunit --testsuite functional
 
 ### Check coding style
 
 Your code-style should comply with [PSR-2](http://www.php-fig.org/psr/psr-2/). To make sure your code matches this requirement run:
 
-    ./vendor/bin/php-cs-fixer fix --diff --dry-run
-    ./vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/
+    composer codestyle:check
+
+To auto-fix the codestyle simply run:
+
+    composer codestyle:fix
diff --git a/composer.json b/composer.json
index a80697c47..24825d658 100644
--- a/composer.json
+++ b/composer.json
@@ -33,5 +33,15 @@
       "Facebook\\WebDriver\\": ["tests/unit", "tests/functional"]
     },
     "classmap": ["tests/functional/"]
+  },
+  "scripts": {
+    "codestyle:check": [
+      "vendor/bin/php-cs-fixer fix --diff --dry-run",
+      "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
+    ],
+    "codestyle:fix": [
+      "vendor/bin/php-cs-fixer fix --diff || exit 0",
+      "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
+    ]
   }
 }

From b10102f60f097108d783aa97fa5f3186a146c961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 11 Mar 2017 22:46:23 +0000
Subject: [PATCH 333/784] Deprecate isJavascriptEnabled method.

See https://github.com/SeleniumHQ/selenium/commit/5b0f88ef3256595148b357dec6209735cab25bea
---
 CHANGELOG.md                       | 1 +
 lib/Remote/DesiredCapabilities.php | 2 ++
 lib/WebDriverCapabilities.php      | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87407e0c1..b63abff80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Cookies should now be set using `Cookie` value object instead of an array when passed to to `addCookie()` method of `WebDriverOptions`.
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
 - `ext-zip` is now specified as required dependency in composer.json (but the extension was already required by the code, though).
+- Deprecate `WebDriverCapabilities::isJavascriptEnabled()` method.
 
 ### Fixed
 - Do not throw fatal error when `null` is passed to `sendKeys()`.
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 94d8e1de2..3990343af 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -123,6 +123,8 @@ public function is($capability_name)
     }
 
     /**
+     * @todo Remove in next major release (BC)
+     * @deprecated All browsers are always JS enabled except HtmlUnit and it's not meaningful to disable JS execution.
      * @return bool Whether javascript is enabled.
      */
     public function isJavascriptEnabled()
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index b489a1e6e..9ac851d90 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -45,6 +45,8 @@ public function getVersion();
     public function is($capability_name);
 
     /**
+     * @todo Remove in next major release (BC)
+     * @deprecated All browsers are always JS enabled except HtmlUnit and it's not meaningful to disable JS execution.
      * @return bool Whether javascript is enabled.
      */
     public function isJavascriptEnabled();

From 89a6ce780387202ccbdb511eab613a5691613034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 16 Mar 2017 13:02:52 +0000
Subject: [PATCH 334/784] Workaround in example script for Selenium bug (fixes
 #402)

---
 example.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/example.php b/example.php
index 7bebd10b5..263d0c1d6 100644
--- a/example.php
+++ b/example.php
@@ -13,8 +13,8 @@
 $capabilities = DesiredCapabilities::firefox();
 $driver = RemoteWebDriver::create($host, $capabilities, 5000);
 
-// navigate to 'http://docs.seleniumhq.org/'
-$driver->get('http://docs.seleniumhq.org/');
+// navigate to 'http://www.seleniumhq.org/'
+$driver->get('http://www.seleniumhq.org/');
 
 // adding cookie
 $driver->manage()->deleteAllCookies();
@@ -31,17 +31,24 @@
 );
 $link->click();
 
+// wait until the page is loaded
+$driver->wait()->until(
+    WebDriverExpectedCondition::titleContains('About')
+);
+
 // print the title of the current page
 echo "The title is '" . $driver->getTitle() . "'\n";
 
 // print the URI of the current page
 echo "The current URI is '" . $driver->getCurrentURL() . "'\n";
 
-// Search 'php' in the search box
-$input = $driver->findElement(
-    WebDriverBy::id('q')
-);
-$input->sendKeys('php')->submit();
+// write 'php' in the search box
+$driver->findElement(WebDriverBy::id('q'))
+    ->sendKeys('php');
+
+// submit the form
+$driver->findElement(WebDriverBy::id('submit'))
+    ->click(); // submit() does not work in Selenium 3 because of bug https://github.com/SeleniumHQ/selenium/issues/3398
 
 // wait at most 10 seconds until at least one result is shown
 $driver->wait(10)->until(

From f6ae7db59f4be0a5a8f791448c72d9d4d920e514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 16 Mar 2017 14:44:20 +0000
Subject: [PATCH 335/784] Use previous Firefox ESR, as new ESR is based on
 Firefox 52 (which requires Geckodriver)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2eaa8fd02..a42bfbe20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
     - php: 7.0
       env: BROWSER_NAME="firefox"
       addons:
-        firefox: "latest-esr"
+        firefox: "45.8.0esr"
         apt:
           packages:
             - oracle-java8-installer

From 4f141e058d55ebd762c11201ac129c7cb98bd925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 18 Mar 2017 12:00:54 +0000
Subject: [PATCH 336/784] Remove Firefox 45 build, bacause it is unstable and
 slow

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a42bfbe20..0c987bc87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,6 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.0
-      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="45.0" PLATFORM="Linux"
-      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
-      addons:
-        sauce_connect: true
-        jwt:
-          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
       before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &

From 48b9c7aebed26b252ead3e15a621db46b405fd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 18 Mar 2017 12:57:15 +0000
Subject: [PATCH 337/784] Setup branch alias to allow simplier installation of
 development versions

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 24825d658..1381c13d5 100644
--- a/composer.json
+++ b/composer.json
@@ -43,5 +43,10 @@
       "vendor/bin/php-cs-fixer fix --diff || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ]
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-community": "1.4-dev"
+    }
   }
 }

From 51ef9da2b689d2680ad006d4cc3c9ec95977e015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 19 Mar 2017 11:17:02 +0000
Subject: [PATCH 338/784] Rename textToBePresentInElementValue expected
 condition to make its name systematic with other conditions

---
 CHANGELOG.md                                  |  1 +
 lib/WebDriverExpectedCondition.php            | 14 ++++++++
 tests/unit/WebDriverExpectedConditionTest.php | 35 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b63abff80..2f6b5e772 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
 - `ext-zip` is now specified as required dependency in composer.json (but the extension was already required by the code, though).
 - Deprecate `WebDriverCapabilities::isJavascriptEnabled()` method.
+- Deprecate `textToBePresentInElementValue` expected condition in favor of `elementValueContains`.
 
 ### Fixed
 - Do not throw fatal error when `null` is passed to `sendKeys()`.
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 58ba939e9..347a5d28a 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -292,11 +292,25 @@ function (WebDriver $driver) use ($by, $regexp) {
     /**
      * An expectation for checking if the given text is present in the specified elements value attribute.
      *
+     * @codeCoverageIgnore
+     * @deprecated Use WebDriverExpectedCondition::elementValueContains() instead
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element value.
      * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in value attribute.
      */
     public static function textToBePresentInElementValue(WebDriverBy $by, $text)
+    {
+        return self::elementValueContains($by, $text);
+    }
+
+    /**
+     * An expectation for checking if the given text is present in the specified elements value attribute.
+     *
+     * @param WebDriverBy $by The locator used to find the element.
+     * @param string $text The text to be presented in the element value.
+     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in value attribute.
+     */
+    public static function elementValueContains(WebDriverBy $by, $text)
     {
         return new static(
             function (WebDriver $driver) use ($by, $text) {
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 93d98b392..c2605a97d 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -292,6 +292,41 @@ public function testShouldDetectElementTextMatchesCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
+    public function testShouldDetectElementValueContainsCondition()
+    {
+        // Set-up the consecutive calls to apply() as follows:
+        // Call #1: throws NoSuchElementException
+        // Call #2: return Element, but getAttribute will throw StaleElementReferenceException
+        // Call #3: return Element, getAttribute('value') will return not-matching text
+        // Call #4: return Element, getAttribute('value') will return matching text
+
+        $element = $this->createRemoteWebElementMock();
+
+        $element->expects($this->at(0))
+            ->method('getAttribute')
+            ->with('value')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $element->expects($this->at(1))
+            ->method('getAttribute')
+            ->with('value')
+            ->willReturn('wrong text');
+
+        $element->expects($this->at(2))
+            ->method('getAttribute')
+            ->with('value')
+            ->willReturn('matching text');
+
+        $this->setupDriverToReturnElementAfterAnException($element, 4);
+
+        $condition = WebDriverExpectedCondition::elementValueContains(
+            WebDriverBy::cssSelector('.foo'),
+            'matching'
+        );
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
     public function testShouldDetectNumberOfWindowsToBeCondition()
     {
         $this->driverMock->expects($this->any())

From 7a855dd1b82d350e4fff9509b5031b37bcd0434f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 19 Mar 2017 11:17:30 +0000
Subject: [PATCH 339/784] Add UT for invisibilityOfElementLocated expected
 contition

---
 tests/unit/WebDriverExpectedConditionTest.php | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index c2605a97d..e786167a8 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -185,6 +185,73 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
+    public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException()
+    {
+        $element = $this->createRemoteWebElementMock();
+
+        $this->driverMock->expects($this->at(0))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $element->expects($this->at(0))
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $this->driverMock->expects($this->at(1))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willThrowException(new NoSuchElementException(''));
+
+        $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
+    public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElementReferenceException()
+    {
+        $element = $this->createRemoteWebElementMock();
+
+        $this->driverMock->expects($this->exactly(2))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $element->expects($this->at(0))
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $element->expects($this->at(1))
+            ->method('isDisplayed')
+            ->willThrowException(new StaleElementReferenceException(''));
+
+        $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
+    public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElementBecamesInvisible()
+    {
+        $element = $this->createRemoteWebElementMock();
+
+        $this->driverMock->expects($this->exactly(2))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $element->expects($this->at(0))
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $element->expects($this->at(1))
+            ->method('isDisplayed')
+            ->willReturn(false);
+
+        $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertTrue($this->wait->until($condition));
+    }
+
     public function testShouldDetectVisibilityOfCondition()
     {
         $element = $this->createRemoteWebElementMock();

From 3ea034c056189e11c0ce7985332a9f4b5b2b5db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 22 Mar 2017 11:55:12 +0100
Subject: [PATCH 340/784] Release version 1.4.0

---
 CHANGELOG.md  | 2 ++
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f6b5e772..89c93fadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.4.0 - 2017-03-22
 ### Changed
 - Cookies should now be set using `Cookie` value object instead of an array when passed to to `addCookie()` method of `WebDriverOptions`.
 - Cookies retrieved using `getCookieNamed()` and `getCookies()` methods of `WebDriverOptions` are now encapsulated in `Cookie` object instead of an plain array. The object implements `ArrayAccess` interface to provide backward compatibility.
diff --git a/composer.json b/composer.json
index 1381c13d5..0a87cb3ed 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-community": "1.4-dev"
+      "dev-community": "1.5-dev"
     }
   }
 }

From 905b0e3ea21286d7839c939ae0a70ff47c20c34c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 24 Apr 2017 23:25:02 +0200
Subject: [PATCH 341/784] Update https link

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3bea30bba..6c59bbe84 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ send a pull request (see bellow) with your contribution.
 4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
 5. Submit your [pull request](https://github.com/facebook/php-webdriver/pulls) against community branch
  
-Note before any pull request can be accepted, a [Contributors Licensing Agreement](http://developers.facebook.com/opensource/cla) must be signed.
+Note before any pull request can be accepted, a [Contributors Licensing Agreement](https://developers.facebook.com/opensource/cla) must be signed.
 
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)

From d06347f10ef20989f1fe705b7692c23a4ebe00dc Mon Sep 17 00:00:00 2001
From: toniperic <toniperic@users.noreply.github.com>
Date: Thu, 27 Apr 2017 10:13:47 +0200
Subject: [PATCH 342/784] Correct constant checking

Prior to this change I would be getting `Constant CURLOPT_CONNECTTIMEOUT_MS already defined` since PHP would try to re-define a constant.
---
 lib/Net/URLChecker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 575daac56..00ad62593 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -66,7 +66,7 @@ private function getHTTPResponseCode($url)
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         // The PHP doc indicates that CURLOPT_CONNECTTIMEOUT_MS constant is added in cURL 7.16.2
         // available since PHP 5.2.3.
-        if (!defined(CURLOPT_CONNECTTIMEOUT_MS)) {
+        if (!defined('CURLOPT_CONNECTTIMEOUT_MS')) {
             define('CURLOPT_CONNECTTIMEOUT_MS', 156);  // default value for CURLOPT_CONNECTTIMEOUT_MS
         }
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);

From 94f64e54e50b2b4b0883d25aefb743d006eaa98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 28 Apr 2017 12:37:04 +0200
Subject: [PATCH 343/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89c93fadd..9a4410c09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- Do not throw notice `Constant CURLOPT_CONNECTTIMEOUT_MS already defined`.
 
 ## 1.4.0 - 2017-03-22
 ### Changed

From 75c22b51131ed6b11276672a8a39b5b7976c0ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 28 Apr 2017 02:52:01 +0200
Subject: [PATCH 344/784] Make sure sudo mode is disabled in all travis builds

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0c987bc87..1c2146bb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ php:
   - 7.0
   - 7.1
 
+sudo: false
+
 matrix:
   include:
     # Add build to run tests against Firefox inside Travis environment (other runs are agains HtmlUnit by default)

From 4a3bb63e73b9e30f6ac601a7b237a44d3c07f1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 28 Apr 2017 12:30:57 +0200
Subject: [PATCH 345/784] Print logs in travis only if created

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c2146bb3..c957fd41e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,8 +74,8 @@ script:
   - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
 after_script:
-  - cat ./logs/selenium.log
-  - cat ./logs/php-server.log
+  - if [ -f ./logs/selenium.log ]; then cat ./logs/selenium.log; fi
+  - if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
 
 after_success:
   - travis_retry php vendor/bin/coveralls -v

From 66e37cfb00b698bfc96dd47f71ae1bd4659e6bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 28 Apr 2017 15:07:40 +0200
Subject: [PATCH 346/784] Bind PHP server to 127.0.0.1 to overcome Bad Gateway
 error when using 'localhost'

---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c957fd41e..5c5ca4c0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,14 +26,18 @@ matrix:
     # Saucelabs builds
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
-      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+      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"
       addons:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.0
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
-      before_script: php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+      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"
       addons:
         sauce_connect: true
         jwt:
@@ -66,8 +70,9 @@ before_script:
   - sh -e /etc/init.d/xvfb start
   - if [ ! -f jar/selenium-server-standalone-3.1.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar; fi
   - /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
-  - until $(echo | nc localhost 4444); do sleep 1; echo waiting for selenium-server...; done
-  - php -S localhost:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+  - 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"
 
 script:
   - if [ -n "$SAUCELABS" ]; then EXTRA_PARAMS="--exclude-group exclude-saucelabs"; fi

From eadb0b7a7c3e6578185197fd40158b08c3164c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 28 Apr 2017 16:54:49 +0200
Subject: [PATCH 347/784] Release version 1.4.1

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a4410c09..c7d018435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.4.1 - 2017-04-28
 ### Fixed
 - Do not throw notice `Constant CURLOPT_CONNECTTIMEOUT_MS already defined`.
 

From 10c8c8449713fc79a672b2636e10284ab92b110e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 21 Jun 2017 11:15:17 +0200
Subject: [PATCH 348/784] Add LICENCE.md

---
 LICENCE.md | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 LICENCE.md

diff --git a/LICENCE.md b/LICENCE.md
new file mode 100644
index 000000000..0b3f67bd7
--- /dev/null
+++ b/LICENCE.md
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2004-present Facebook
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.

From 8fee7dceac5e3f867fe91d45743e3bc74b3b6efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Aug 2017 21:37:11 +0200
Subject: [PATCH 349/784] Build on PHP 7.1 by default

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5c5ca4c0e..fde500451 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ sudo: false
 
 matrix:
   include:
-    # Add build to run tests against Firefox inside Travis environment (other runs are agains HtmlUnit by default)
-    - php: 7.0
+    # Add build to run tests against Firefox inside Travis environment (other runs are against HtmlUnit by default)
+    - php: 7.1
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
@@ -20,11 +20,11 @@ matrix:
             - oracle-java8-installer
 
     # Build with lowest possible dependencies
-    - php: 7.0
+    - php: 7.1
       env: dependencies="--prefer-lowest"
 
     # Saucelabs builds
-    - php: 7.0
+    - php: 7.1
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -33,7 +33,7 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.0
+    - php: 7.1
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -43,8 +43,8 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    # Add PHP 7 build to check codestyle only in PHP 7 build
-    - php: 7.0
+    # Codestyle check build
+    - php: 7.1
       env: CHECK_CODESTYLE=1
       before_script: ~
       script: composer codestyle:check

From 6a3b3520d85c63434f00eb15bd4eebfcc0d5e750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Aug 2017 21:38:09 +0200
Subject: [PATCH 350/784] Build on Ubuntu Trusty, so we don't need to install
 Java 8 by ourselves

---
 .travis.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fde500451..5ae58d50e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: php
 
+dist: trusty
+
 php:
   - 5.5
   - 5.6
@@ -15,9 +17,6 @@ matrix:
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
-        apt:
-          packages:
-            - oracle-java8-installer
 
     # Build with lowest possible dependencies
     - php: 7.1
@@ -69,7 +68,7 @@ install:
 before_script:
   - sh -e /etc/init.d/xvfb start
   - if [ ! -f jar/selenium-server-standalone-3.1.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar; fi
-  - /usr/lib/jvm/java-8-oracle/bin/java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
+  - java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
   - 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"
@@ -84,8 +83,3 @@ after_script:
 
 after_success:
   - travis_retry php vendor/bin/coveralls -v
-
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer

From 3289cd39ab82d53b09853d98cf5bb780685eb791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Aug 2017 21:49:57 +0200
Subject: [PATCH 351/784] Add headless chrome travis build

---
 .travis.yml                             | 24 ++++++++++++++++--------
 tests/functional/WebDriverAlertTest.php |  6 ++++++
 tests/functional/WebDriverTestCase.php  |  7 +++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ae58d50e..b12b404db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: php
-
+sudo: false
 dist: trusty
 
 php:
@@ -8,16 +8,26 @@ php:
   - 7.0
   - 7.1
 
-sudo: false
+env:
+  global:
+    - DISPLAY=:99.0
+    - BROWSER_NAME="htmlunit"
+    - CHROMEDRIVER_VERSION="2.31"
 
 matrix:
   include:
-    # Add build to run tests against Firefox inside Travis environment (other runs are against HtmlUnit by default)
+    # Add build to run tests against Firefox inside Travis environment
     - php: 7.1
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
+    # Add build to run tests against Chrome inside Travis environment
+    - php: 7.1
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
+      addons:
+        chrome: beta
+
     # Build with lowest possible dependencies
     - php: 7.1
       env: dependencies="--prefer-lowest"
@@ -50,10 +60,6 @@ matrix:
       after_script: ~
       after_success: ~
 
-env:
-  global:
-    - DISPLAY=:99.0
-
 cache:
   directories:
     - $HOME/.composer/cache
@@ -66,9 +72,11 @@ install:
   - travis_retry composer update --no-interaction $dependencies
 
 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=./chromedriver/chromedriver; fi
   - sh -e /etc/init.d/xvfb start
   - if [ ! -f jar/selenium-server-standalone-3.1.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar; fi
-  - java -Dwebdriver.firefox.marionette=false -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
+  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
   - 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/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index eddf3a9ae..61126b9bd 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -25,6 +25,12 @@ class WebDriverAlertTest extends WebDriverTestCase
 {
     protected function setUp()
     {
+        if (getenv('CHROME_HEADLESS') === '1') {
+            // Alerts in headless mode should be available in next Chrome version (61), see:
+            // https://bugs.chromium.org/p/chromium/issues/detail?id=718235
+            $this->markTestSkipped('Alerts not yet supported by headless Chrome');
+        }
+
         parent::setUp();
 
         $this->driver->get($this->getTestPageUrl('alert.html'));
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 84883574a..0c11e3fb8 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Exception\NoSuchWindowException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
@@ -47,6 +48,12 @@ protected function setUp()
                 $browserName = WebDriverBrowserType::HTMLUNIT;
             }
 
+            if ($browserName === WebDriverBrowserType::CHROME) {
+                $chromeOptions = new ChromeOptions();
+                $chromeOptions->addArguments(['--headless', 'window-size=1024,768']);
+                $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
+            }
+
             $this->desiredCapabilities->setBrowserName($browserName);
         }
 

From 23b1d70c7671443ed686313f71c5ae293e676d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Aug 2017 22:43:45 +0200
Subject: [PATCH 352/784] Upgrade Selenium server in Travis buils to 3.4.0

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b12b404db..68db86dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,8 +75,8 @@ 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=./chromedriver/chromedriver; fi
   - sh -e /etc/init.d/xvfb start
-  - if [ ! -f jar/selenium-server-standalone-3.1.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.1/selenium-server-standalone-3.1.0.jar; fi
-  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.1.0.jar -log ./logs/selenium.log &
+  - if [ ! -f jar/selenium-server-standalone-3.4.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar; fi
+  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.4.0.jar -log ./logs/selenium.log &
   - 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"

From 5f5d0fd96e984d31d80ec06e866ff126dfce496e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 5 Aug 2017 01:40:55 +0200
Subject: [PATCH 353/784] Add MS Edge build on SauceLabs

---
 .travis.yml                                   | 13 +++++-
 tests/functional/FileUploadTest.php           | 14 ++----
 .../RemoteWebDriverFindElementTest.php        |  2 +-
 tests/functional/RemoteWebElementTest.php     | 10 ++++-
 tests/functional/WebDriverSelectTest.php      | 44 +++++++++++++++++--
 5 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68db86dfb..65e48e036 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,6 +51,15 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+    - php: 7.1
+      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="15.15063" 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"
+      addons:
+        sauce_connect: true
+        jwt:
+          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
     # Codestyle check build
     - php: 7.1
@@ -82,7 +91,9 @@ before_script:
   - until $(echo | nc localhost 8000); do sleep 1; echo waiting for PHP server on port 8000...; done; echo "PHP server started"
 
 script:
-  - if [ -n "$SAUCELABS" ]; then EXTRA_PARAMS="--exclude-group exclude-saucelabs"; fi
+  - if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
+  - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
+  - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
   - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
 after_script:
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index ef6cf1bb2..e88139953 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -23,6 +23,10 @@
  */
 class FileUploadTest extends WebDriverTestCase
 {
+    /**
+     * @group exclude-edge
+     * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6052385/
+     */
     public function testShouldUploadAFile()
     {
         $this->driver->get($this->getTestPageUrl('upload.html'));
@@ -50,16 +54,6 @@ public function testShouldUploadAFile()
         $this->assertSame('10', $uploadedFileSize);
     }
 
-    public function xtestUselessFileDetectorSendKeys()
-    {
-        $this->driver->get($this->getTestPageUrl('upload.html'));
-
-        $file_input = $this->driver->findElement(WebDriverBy::id('upload'));
-        $file_input->sendKeys($this->getTestFilePath());
-
-        $this->assertEquals($this->getTestFilePath(), $file_input->getAttribute('value'));
-    }
-
     private function getTestFilePath()
     {
         return __DIR__ . '/Fixtures/FileUploadTestFile.txt';
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 808763bad..004a554b8 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -28,7 +28,7 @@ public function testShouldThrowExceptionOfElementCannotBeFound()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
 
-        $this->setExpectedException(NoSuchElementException::class, 'Unable to locate element');
+        $this->setExpectedException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('not_existing'));
     }
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 26d13f6e2..643e2a336 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -22,6 +22,8 @@ class RemoteWebElementTest extends WebDriverTestCase
 {
     /**
      * @covers ::getText
+     * @group exclude-edge
+     * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/5569343/
      */
     public function testShouldGetText()
     {
@@ -90,8 +92,11 @@ public function testShouldGetCssValue()
         $this->assertSame('solid', $elementWithBorder->getCSSValue('border-left-style'));
         $this->assertSame('none', $elementWithoutBorder->getCSSValue('border-left-style'));
 
-        $this->assertSame('rgba(0, 0, 0, 1)', $elementWithBorder->getCSSValue('border-left-color'));
-        $this->assertSame('rgba(0, 0, 0, 1)', $elementWithoutBorder->getCSSValue('border-left-color'));
+        // Browser could report color in either rgb (like MS Edge) or rgba (like everyone else)
+        $this->assertRegExp(
+            '/rgba?\(0, 0, 0(, 1)?\)/',
+            $elementWithBorder->getCSSValue('border-left-color')
+        );
     }
 
     /**
@@ -206,6 +211,7 @@ public function testShouldSelectedInputsOrOptions()
 
     /**
      * @covers ::submit
+     * @group exclude-edge
      */
     public function testShouldSubmitFormBySubmitEventOnForm()
     {
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index ac32cbca7..33ebe38f9 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -129,6 +129,10 @@ public function testShouldSelectOptionOfSimpleSelectByIndex()
         $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
     public function testShouldSelectOptionOfMultipleSelectByIndex()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -171,6 +175,10 @@ public function testShouldSelectOptionOfSimpleSelectByValue()
         $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
     public function testShouldSelectOptionOfMultipleSelectByValue()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -213,6 +221,10 @@ public function testShouldSelectOptionOfSimpleSelectByVisibleText()
         $this->assertSame('fifth', $select->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
     public function testShouldSelectOptionOfMultipleSelectByVisibleText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -255,6 +267,10 @@ public function testShouldSelectOptionOfSimpleSelectByVisiblePartialText()
         $this->assertSame('fourth', $select->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
     public function testShouldSelectOptionOfMultipleSelectByVisiblePartialText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -298,6 +314,10 @@ public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
         $select->deselectAll();
     }
 
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
     public function testShouldDeselectAllOptionsOnMultipleSelect()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
@@ -312,7 +332,11 @@ public function testShouldDeselectAllOptionsOnMultipleSelect()
         $this->assertCount(0, $select->getAllSelectedOptions());
     }
 
-    public function testShouldDeselectOptionByIndex()
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
+    public function testShouldDeselectOptionOnMultipleSelectByIndex()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // index 3
@@ -336,7 +360,11 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
         $select->deselectByIndex(0);
     }
 
-    public function testShouldDeselectOptionByValue()
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
+    public function testShouldDeselectOptionOnMultipleSelectByValue()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('third');
@@ -360,7 +388,11 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
         $select->deselectByValue('first');
     }
 
-    public function testShouldDeselectOptionByVisibleText()
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
+    public function testShouldDeselectOptionOnMultipleSelectByVisibleText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'
@@ -386,7 +418,11 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
         $select->deselectByVisibleText('First');
     }
 
-    public function testShouldDeselectOptionByVisiblePartialText()
+    /**
+     * @group exclude-edge
+     * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
+     */
+    public function testShouldDeselectOptionOnMultipleSelectByVisiblePartialText()
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'

From 735a6156617d62fe95ed20e6d038daa22b98e74b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 5 Aug 2017 15:20:28 +0200
Subject: [PATCH 354/784] Extend connection timeout, because Edge is slow...

---
 tests/functional/RemoteWebDriverCreateTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 95ff4851c..466e1601c 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -29,7 +29,7 @@ class RemoteWebDriverCreateTest extends WebDriverTestCase
 
     public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
     {
-        $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities, 10000, 13370);
+        $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities, 30000, 33370);
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 

From cb1f8bd54058ff3ded938e811d50e72e6c3a13ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Aug 2017 22:20:51 +0200
Subject: [PATCH 355/784] Drop PHP 5.5 support

---
 .travis.yml                                           | 1 -
 CHANGELOG.md                                          | 2 ++
 lib/Support/Events/EventFiringWebDriver.php           | 5 ++---
 lib/Support/Events/EventFiringWebDriverNavigation.php | 5 ++---
 lib/Support/Events/EventFiringWebElement.php          | 6 +++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65e48e036..9b2b5894e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ sudo: false
 dist: trusty
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7d018435..182aeda87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Drop PHP 5.5 support, the minimal required version of PHP is now PHP 5.6.
 
 ## 1.4.1 - 2017-04-28
 ### Fixed
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index ffac00e5c..c129ef015 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -396,15 +396,14 @@ protected function newElement(WebDriverElement $element)
 
     /**
      * @param mixed $method
+     * @param mixed $arguments,...
      */
-    protected function dispatch($method)
+    protected function dispatch($method, ...$arguments)
     {
         if (!$this->dispatcher) {
             return;
         }
 
-        $arguments = func_get_args();
-        unset($arguments[0]);
         $this->dispatcher->dispatch($method, $arguments);
     }
 
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 5aeaf510b..0008ebbdc 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -149,15 +149,14 @@ public function to($url)
 
     /**
      * @param mixed $method
+     * @param mixed $arguments,...
      */
-    protected function dispatch($method)
+    protected function dispatch($method, ...$arguments)
     {
         if (!$this->dispatcher) {
             return;
         }
 
-        $arguments = func_get_args();
-        unset($arguments[0]);
         $this->dispatcher->dispatch($method, $arguments);
     }
 
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index f932b20a3..099bb3573 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -392,14 +392,14 @@ protected function dispatchOnException(WebDriverException $exception)
 
     /**
      * @param mixed $method
+     * @param mixed $arguments,...
      */
-    protected function dispatch($method)
+    protected function dispatch($method, ...$arguments)
     {
         if (!$this->dispatcher) {
             return;
         }
-        $arguments = func_get_args();
-        unset($arguments[0]);
+
         $this->dispatcher->dispatch($method, $arguments);
     }
 

From 1c5e7f08d670f1ad921d3425903f852204fd8977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 25 Aug 2017 20:29:48 +0200
Subject: [PATCH 356/784] Extend connection timeout further more to make
 SauceLabs tests hopefully more stable

---
 tests/functional/RemoteWebDriverCreateTest.php | 18 ++++++++++++++----
 tests/functional/WebDriverTestCase.php         | 11 ++++++++++-
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 466e1601c..3140b26b0 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -29,7 +29,12 @@ class RemoteWebDriverCreateTest extends WebDriverTestCase
 
     public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
     {
-        $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities, 30000, 33370);
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout
+        );
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 
@@ -51,8 +56,8 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
         $this->driver = RemoteWebDriver::create(
             $this->serverUrl,
             $this->desiredCapabilities,
-            null,
-            null,
+            $this->connectionTimeout,
+            $this->requestTimeout,
             null,
             null,
             $requiredCapabilities
@@ -64,7 +69,12 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
     public function testShouldCreateInstanceFromExistingSessionId()
     {
         // Create driver instance and load page "index.html"
-        $originalDriver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
+        $originalDriver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout
+        );
         $originalDriver->get($this->getTestPageUrl('index.html'));
         $this->assertContains('/index.html', $originalDriver->getCurrentURL());
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 0c11e3fb8..77a98f884 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -34,6 +34,10 @@ class WebDriverTestCase extends \PHPUnit_Framework_TestCase
     protected $serverUrl = 'http://localhost:4444/wd/hub';
     /** @var DesiredCapabilities */
     protected $desiredCapabilities;
+    /** @var int */
+    protected $connectionTimeout = 60000;
+    /** @var int */
+    protected $requestTimeout = 60000;
 
     protected function setUp()
     {
@@ -58,7 +62,12 @@ protected function setUp()
         }
 
         if ($this->createWebDriver) {
-            $this->driver = RemoteWebDriver::create($this->serverUrl, $this->desiredCapabilities);
+            $this->driver = RemoteWebDriver::create(
+                $this->serverUrl,
+                $this->desiredCapabilities,
+                $this->connectionTimeout,
+                $this->requestTimeout
+            );
         }
     }
 

From 3581da1e816335f09b3508c6d64baf2a91512cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 31 Aug 2017 17:13:20 +0200
Subject: [PATCH 357/784] Use only PHPUnit 5.4+, drop deprecated calls

---
 composer.json                                 |  4 +-
 .../RemoteWebDriverFindElementTest.php        |  2 +-
 tests/functional/WebDriverAlertTest.php       |  2 +-
 tests/functional/WebDriverSelectTest.php      | 66 +++++++------------
 tests/functional/WebDriverTimeoutsTest.php    |  2 +-
 tests/unit/CookieTest.php                     |  3 +-
 tests/unit/WebDriverOptionsTest.php           |  6 +-
 7 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/composer.json b/composer.json
index 0a87cb3ed..cbf3155a9 100644
--- a/composer.json
+++ b/composer.json
@@ -11,13 +11,13 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": "^5.5 || ~7.0",
+    "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1",
     "ext-curl": "*",
     "ext-zip": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.6.* || ~5.0",
+    "phpunit/phpunit": "^5.4",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 004a554b8..106d5d90f 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -28,7 +28,7 @@ public function testShouldThrowExceptionOfElementCannotBeFound()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
 
-        $this->setExpectedException(NoSuchElementException::class);
+        $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('not_existing'));
     }
 
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 61126b9bd..08d8ef73c 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -48,7 +48,7 @@ public function testShouldAcceptAlert()
 
         $this->driver->switchTo()->alert()->accept();
 
-        $this->setExpectedException(NoAlertOpenException::class);
+        $this->expectException(NoAlertOpenException::class);
         $this->driver->switchTo()->alert()->accept();
     }
 
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 33ebe38f9..9cd6cf250 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -51,10 +51,8 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
     {
         $notSelectElement = $this->driver->findElement(WebDriverBy::cssSelector('textarea'));
 
-        $this->setExpectedException(
-            UnexpectedTagNameException::class,
-            'Element should have been "select" but was "textarea"'
-        );
+        $this->expectException(UnexpectedTagNameException::class);
+        $this->expectExceptionMessage('Element should have been "select" but was "textarea"');
         new WebDriverSelect($notSelectElement);
     }
 
@@ -109,10 +107,8 @@ public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultiple
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'No options are selected'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('No options are selected');
         $select->getFirstSelectedOption();
     }
 
@@ -155,10 +151,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with index: 1337'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with index: 1337');
         $select->selectByIndex(1337);
     }
 
@@ -201,10 +195,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with value: 1337'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with value: 1337');
         $select->selectByValue(1337);
     }
 
@@ -247,10 +239,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with text: second'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with text: second');
         $select->selectByVisibleText('second'); // the option is "This is second option"
     }
 
@@ -296,10 +286,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSel
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with text: Not existing option'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with text: Not existing option');
         $select->selectByVisiblePartialText('Not existing option');
     }
 
@@ -307,10 +295,8 @@ public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect all options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect all options of a multi-select');
         $select->deselectAll();
     }
 
@@ -353,10 +339,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByIndex(0);
     }
 
@@ -381,10 +365,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByValue('first');
     }
 
@@ -411,10 +393,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByVisibleText('First');
     }
 
@@ -447,10 +427,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartia
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByVisiblePartialText('First');
     }
 
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 51be6e13a..47edc886d 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -30,7 +30,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
     {
         $this->driver->get($this->getTestPageUrl('delayed_element.html'));
 
-        $this->setExpectedException(NoSuchElementException::class);
+        $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('delayed'));
     }
 
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 0742a0789..ccf2a1e6f 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -146,7 +146,8 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
     public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)
     {
         if ($expectedMessage) {
-            $this->setExpectedException(\InvalidArgumentException::class, $expectedMessage);
+            $this->expectException(\InvalidArgumentException::class);
+            $this->expectExceptionMessage($expectedMessage);
         }
 
         $cookie = new Cookie($name, $value);
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 5e335854f..8bc47b96f 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -88,10 +88,8 @@ public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
 
         $options = new WebDriverOptions($this->executor);
 
-        $this->setExpectedException(
-            \InvalidArgumentException::class,
-            'Cookie must be set from instance of Cookie class or from array.'
-        );
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cookie must be set from instance of Cookie class or from array.');
         $options->addCookie($notCookie);
     }
 

From 11b1d4dcf40a0b382acb9322358cea2d97679d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 31 Aug 2017 16:47:09 +0200
Subject: [PATCH 358/784] Add functional tests for findElement for child
 elements

---
 .../RemoteWebDriverFindElementTest.php        |  4 +-
 tests/functional/RemoteWebElementTest.php     | 52 +++++++++++++++++++
 tests/functional/web/index.html               |  5 ++
 tests/unit/Remote/RemoteWebElementTest.php    | 36 +++++++++++++
 4 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/Remote/RemoteWebElementTest.php

diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 106d5d90f..46affc025 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -24,7 +24,7 @@
  */
 class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
-    public function testShouldThrowExceptionOfElementCannotBeFound()
+    public function testShouldThrowExceptionIfElementCannotBeFound()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
 
@@ -58,7 +58,7 @@ public function testShouldFindMultipleElements()
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
 
         $this->assertInternalType('array', $elements);
-        $this->assertCount(3, $elements);
+        $this->assertCount(5, $elements);
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
     }
 }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 643e2a336..51f414a93 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+
 /**
  * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
  */
@@ -282,4 +285,53 @@ public function testShouldCompareEqualsElement()
         $this->assertFalse($firstElement->equals($differentElement));
         $this->assertFalse($differentElement->equals($againTheFirstElement));
     }
+
+    /**
+     * @covers ::findElement
+     */
+    public function testShouldThrowExceptionIfChildElementCannotBeFound()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+
+        $this->expectException(NoSuchElementException::class);
+        $element->findElement(WebDriverBy::id('not_existing'));
+    }
+
+    public function testShouldFindChildElementIfExistsOnAPage()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+
+        $childElement = $element->findElement(WebDriverBy::cssSelector('li'));
+
+        $this->assertInstanceOf(RemoteWebElement::class, $childElement);
+        $this->assertSame('li', $childElement->getTagName());
+        $this->assertSame('First', $childElement->getText());
+    }
+
+    public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+
+        $childElements = $element->findElements(WebDriverBy::cssSelector('not_existing'));
+
+        $this->assertInternalType('array', $childElements);
+        $this->assertCount(0, $childElements);
+    }
+
+    public function testShouldFindMultipleChildElements()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+
+        $allElements = $this->driver->findElements(WebDriverBy::cssSelector('li'));
+        $childElements = $element->findElements(WebDriverBy::cssSelector('li'));
+
+        $this->assertInternalType('array', $childElements);
+        $this->assertCount(5, $allElements); // there should be 5 <li> elements on page
+        $this->assertCount(3, $childElements); // but we should find only subelements of one <ul>
+        $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $childElements);
+    }
 }
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 8e314f798..1a92f255e 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -30,6 +30,11 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     <li>Third</li>
 </ul>
 
+<ul class="other-list">
+    <li>Foo</li>
+    <li>Bar</li>
+</ul>
+
 <p id="text-simple" role="note" style="height: 5em; border: 1px solid black;">Foo bar text</p>
 <p id="text-with-spaces">
     Multiple       spaces   are
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
new file mode 100644
index 000000000..45c057751
--- /dev/null
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -0,0 +1,36 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+/**
+ * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
+ *
+ * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
+ */
+class RemoteWebElementTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::__construct
+     * @covers ::getId
+     */
+    public function testShouldConstructNewInstance()
+    {
+        $executeMethod = $this->createMock(RemoteExecuteMethod::class);
+        $element = new RemoteWebElement($executeMethod, 333);
+
+        $this->assertSame(333, $element->getID());
+    }
+}

From e8ebc12da32a019612e8874c7e81a884535d1894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 5 Sep 2017 23:37:38 +0200
Subject: [PATCH 359/784] Improve code-coverage settings

---
 lib/Firefox/FirefoxDriver.php              | 3 +++
 lib/Firefox/FirefoxPreferences.php         | 2 ++
 lib/Remote/DriverCommand.php               | 2 ++
 lib/Remote/WebDriverBrowserType.php        | 4 +++-
 lib/Remote/WebDriverCapabilityType.php     | 2 ++
 lib/WebDriverPlatform.php                  | 2 ++
 tests/functional/RemoteWebDriverTest.php   | 6 ++----
 tests/functional/WebDriverTimeoutsTest.php | 2 ++
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 9e0751238..f2883e642 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Firefox;
 
+/**
+ * @codeCoverageIgnore
+ */
 class FirefoxDriver
 {
     const PROFILE = 'firefox_profile';
diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
index b869a2667..be1199c24 100644
--- a/lib/Firefox/FirefoxPreferences.php
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -18,6 +18,8 @@
 /**
  * Constants of common Firefox profile preferences (about:config values).
  * @see http://kb.mozillazine.org/Firefox_:_FAQs_:_About:config_Entries
+ *
+ * @codeCoverageIgnore
  */
 class FirefoxPreferences
 {
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 1b86c71c6..c69052030 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -17,6 +17,8 @@
 
 /**
  * This list of command defined in the WebDriver json wire protocol.
+ *
+ * @codeCoverageIgnore
  */
 class DriverCommand
 {
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 5dd61505e..53b6ab977 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -16,7 +16,9 @@
 namespace Facebook\WebDriver\Remote;
 
 /**
- * All the browsers supported by selenium
+ * All the browsers supported by selenium.
+ *
+ * @codeCoverageIgnore
  */
 class WebDriverBrowserType
 {
diff --git a/lib/Remote/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
index 131b16561..c452e771c 100644
--- a/lib/Remote/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -17,6 +17,8 @@
 
 /**
  * WebDriverCapabilityType contains all constants defined in the WebDriver Wire Protocol.
+ *
+ * @codeCoverageIgnore
  */
 class WebDriverCapabilityType
 {
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index bb1923556..5609eb0b8 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -17,6 +17,8 @@
 
 /**
  * The platforms supported by WebDriver.
+ *
+ * @codeCoverageIgnore
  */
 class WebDriverPlatform
 {
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 7b60b69d7..006b17c7b 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -45,10 +45,7 @@ public function testShouldGetCurrentUrl()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
 
-        $this->assertContains(
-            '/index.html',
-            $this->driver->getCurrentURL()
-        );
+        $this->assertStringEndsWith('/index.html', $this->driver->getCurrentURL());
     }
 
     /**
@@ -173,6 +170,7 @@ function(){document.getElementById("id_test").innerHTML = "Text changed by scrip
 
     /**
      * @covers ::executeAsyncScript
+     * @covers Facebook\WebDriver\WebDriverTimeouts::setScriptTimeout
      */
     public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
     {
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 47edc886d..808a494ab 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -36,6 +36,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
 
     /**
      * @covers ::implicitlyWait
+     * @covers ::__construct
      */
     public function testShouldGetDelayedElementWithImplicitWait()
     {
@@ -49,6 +50,7 @@ public function testShouldGetDelayedElementWithImplicitWait()
 
     /**
      * @covers ::pageLoadTimeout
+     * @covers ::__construct
      */
     public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
     {

From 7672fe48b2c11784e71156108ae5b3568d31278c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 6 Sep 2017 01:18:38 +0200
Subject: [PATCH 360/784] Add functional tests for WebDriverNavigation

---
 lib/WebDriverNavigation.php                  |  1 +
 tests/functional/WebDriverNavigationTest.php | 85 ++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 tests/functional/WebDriverNavigationTest.php

diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index ccc8cee30..6de59b035 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -75,6 +75,7 @@ public function refresh()
     /**
      * Navigate to the given URL.
      *
+     * @see WebDriver::get()
      * @param string $url
      * @return WebDriverNavigation The instance.
      */
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
new file mode 100644
index 000000000..4f7dba252
--- /dev/null
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -0,0 +1,85 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+/**
+ * @coversDefaultClass Facebook\WebDriver\WebDriverNavigation
+ */
+class WebDriverNavigationTest extends WebDriverTestCase
+{
+    /**
+     * @covers ::to
+     * @covers ::__construct
+     */
+    public function testShouldNavigateToUrl()
+    {
+        $this->driver->navigate()->to($this->getTestPageUrl('index.html'));
+
+        $this->assertStringEndsWith('/index.html', $this->driver->getCurrentURL());
+    }
+
+    /**
+     * @covers ::back
+     * @covers ::forward
+     */
+    public function testShouldNavigateBackAndForward()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
+
+        $linkElement->click();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::urlContains('form.html')
+        );
+
+        $this->driver->navigate()->back();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::urlContains('index.html')
+        );
+
+        $this->driver->navigate()->forward();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::urlContains('form.html')
+        );
+    }
+
+    /**
+     * @covers ::refresh
+     */
+    public function testShouldRefreshPage()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        // Change input element content, to make sure it was refreshed (=> cleared to original value)
+        $inputElement = $this->driver->findElement(WebDriverBy::name('test_name'));
+        $inputElementOriginalValue = $inputElement->getAttribute('value');
+        $inputElement->clear()->sendKeys('New value');
+        $this->assertSame('New value', $inputElement->getAttribute('value'));
+
+        $this->driver->navigate()->refresh();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::stalenessOf($inputElement)
+        );
+
+        $inputElementAfterRefresh = $this->driver->findElement(WebDriverBy::name('test_name'));
+
+        $this->assertSame($inputElementOriginalValue, $inputElementAfterRefresh->getAttribute('value'));
+    }
+}

From 61f547414294b8188e149594486d1a91d0f7c8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 17 Sep 2017 09:54:20 +0200
Subject: [PATCH 361/784] Add symfony/var-dumper dev dependency for easier
 development

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index cbf3155a9..8eff450f7 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
-    "satooshi/php-coveralls": "^1.0"
+    "satooshi/php-coveralls": "^1.0",
+    "symfony/var-dumper": "^3.3"
   },
   "autoload": {
     "psr-4": {

From 944c76eb61403ee9479a58285c4cd2abae00526e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 13 Oct 2017 23:59:03 +0200
Subject: [PATCH 362/784] Update readme - passThrough mode, mention Java 8 is
 required for Selenium server

---
 README.md | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index cfdf0bc3b..5b331d349 100644
--- a/README.md
+++ b/README.md
@@ -39,10 +39,14 @@ Then install the library:
 
 All you need as the server for this client is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
 
-Download and run that file, replacing # with the current server version.
+Download and run that file, replacing # with the current server version. Keep in mind you must have Java 8+ installed to start this command.
 
     java -jar selenium-server-standalone-#.jar
 
+When using Selenium server 3.5 and newer with some remote end clients (eg. Firefox with Geckodriver), you MUST disable so called "pass-through" mode, so that remote browser's protocol is translated to the protocol supported by php-webdriver (see [issue #469](https://github.com/facebook/php-webdriver/issues/469)):
+
+    java -jar selenium-server-standalone-#.jar -enablePassThrough false
+
 Then when you create a session, be sure to pass the url to where your server is running.
 
 ```php
@@ -50,19 +54,23 @@ Then when you create a session, be sure to pass the url to where your server is
 $host = 'http://localhost:4444/wd/hub'; // this is the default
 ```
 
-* Launch Firefox:
+##### Launch Firefox
+
+Make sure to have latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases) installed.
+
+```php
+$driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
+```
 
-    ```php
-    $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
-    ```
+##### Launch Chrome
 
-* Launch Chrome:
+Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) installed.
 
-    ```php
-    $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
-    ```
+```php
+$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+```
 
-You can also customize the desired capabilities:
+##### You can also customize the desired capabilities
 
 ```php
 $desired_capabilities = DesiredCapabilities::firefox();

From 4c2710810148b8c266ced5aad55ac4ad70a36aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 14 Oct 2017 03:50:51 +0200
Subject: [PATCH 363/784] Add functional tests for basic actions (click, double
 click etc.)

---
 lib/Interactions/WebDriverCompositeAction.php |   2 +-
 tests/functional/WebDriverActionsTest.php     | 140 ++++++++++++++++++
 tests/functional/web/events.html              |  86 +++++++++++
 tests/functional/web/index.html               |   2 +
 4 files changed, 229 insertions(+), 1 deletion(-)
 create mode 100644 tests/functional/WebDriverActionsTest.php
 create mode 100644 tests/functional/web/events.html

diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index 75a4837e1..d4ca94c5d 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -51,7 +51,7 @@ public function getNumberOfActions()
     }
 
     /**
-     * Perform the seqeunce of actions.
+     * Perform the sequence of actions.
      */
     public function perform()
     {
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
new file mode 100644
index 000000000..173f7794c
--- /dev/null
+++ b/tests/functional/WebDriverActionsTest.php
@@ -0,0 +1,140 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+/**
+ * @coversDefaultClass Facebook\WebDriver\Interactions\WebDriverActions
+ */
+class WebDriverActionsTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPageUrl('events.html'));
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::click
+     * @covers ::perform
+     */
+    public function testShouldClickOnElement()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $element = $this->driver->findElement(WebDriverBy::id('item-1'));
+
+        $this->driver->action()
+            ->click($element)
+            ->perform();
+
+        $this->assertSame(
+            ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
+            $this->retrieveLoggedEvents()
+        );
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::clickAndHold
+     * @covers ::release
+     * @covers ::perform
+     */
+    public function testShouldClickAndHoldOnElementAndRelease()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $element = $this->driver->findElement(WebDriverBy::id('item-1'));
+
+        $this->driver->action()
+            ->clickAndHold($element)
+            ->release()
+            ->perform();
+
+        $this->assertSame(
+            ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
+            $this->retrieveLoggedEvents()
+        );
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::contextClick
+     * @covers ::perform
+     */
+    public function testShouldContextClickOnElement()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::MICROSOFT_EDGE) {
+            $this->markTestSkipped('Getting stuck in EdgeDriver');
+        }
+
+        $element = $this->driver->findElement(WebDriverBy::id('item-2'));
+
+        $this->driver->action()
+            ->contextClick($element)
+            ->perform();
+
+        $loggedEvents = $this->retrieveLoggedEvents();
+
+        $this->assertContains('mousedown item-2', $loggedEvents);
+        $this->assertContains('mouseup item-2', $loggedEvents);
+        $this->assertContains('contextmenu item-2', $loggedEvents);
+    }
+
+    /**
+     * @covers ::__construct
+     * @covers ::doubleClick
+     * @covers ::perform
+     */
+    public function testShouldDoubleClickOnElement()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $element = $this->driver->findElement(WebDriverBy::id('item-3'));
+
+        $this->driver->action()
+            ->doubleClick($element)
+            ->perform();
+
+        $this->assertSame(
+            ['mouseover item-3', 'mousedown item-3', 'mouseup item-3', 'click item-3', 'dblclick item-3'],
+            $this->retrieveLoggedEvents()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('log'));
+
+        return explode("\n", $logElement->getText());
+    }
+}
diff --git a/tests/functional/web/events.html b/tests/functional/web/events.html
new file mode 100644
index 000000000..e915a89a0
--- /dev/null
+++ b/tests/functional/web/events.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Events</title>
+    <style>
+        ul.active {
+            background-color: red;
+            font-style: italic;
+        }
+    </style>
+</head>
+<body>
+
+<ul id="target"
+    style="border: 1px solid black; height: 8em;"
+    ondragover="handleDragover(event);"
+    ondrop="handleDrop(event);"
+    ondragenter="handleDragenter(event);"
+    ondragleave="handleDragleave(event);"
+>
+
+</ul>
+
+<ul>
+    <li id="item-1" draggable="true">First item</li>
+    <li id="item-2" draggable="true">Second item</li>
+    <li id="item-3" draggable="true">Third item</li>
+</ul>
+
+<pre id="log" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
+
+<script>
+    function logEvent(event) {
+        var logElement = document.getElementById('log');
+        logElement.innerHTML += '<strong>' + event.type + '</strong> <span>' + event.target.id +'</span><br>';
+        logElement.scrollTop = logElement.scrollHeight;
+        console.log(event);
+    }
+
+    function handleDragenter(e) {
+        logEvent(e);
+        e.target.classList.add('active');
+    }
+
+    function handleDragleave(e) {
+        logEvent(e);
+        e.target.classList.remove('active');
+    }
+
+    function handleDragover(e) {
+        e.preventDefault();
+    }
+
+    function handleDrop(e) {
+        logEvent(e);
+        e.preventDefault();
+
+        var data = e.dataTransfer.getData('text');
+        e.target.appendChild(document.getElementById(data));
+        e.target.classList.remove('active');
+    }
+
+    var lis = document.querySelectorAll('ul > li'), el = null;
+    for (var i = 0; i < lis.length; i++) {
+        el = lis[i];
+
+        el.addEventListener(
+            'dragstart',
+            function (e) {
+                logEvent(e);
+                e.dataTransfer.setData('text/plain', e.target.id);
+            }
+        );
+
+        el.addEventListener('click', logEvent);
+        el.addEventListener('contextmenu', logEvent);
+        el.addEventListener('dblclick', logEvent);
+        el.addEventListener('mouseover', logEvent);
+        el.addEventListener('mousedown', logEvent);
+        el.addEventListener('mouseup', logEvent);
+    }
+</script>
+
+</body>
+</html>
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 1a92f255e..cf5b9c6c1 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -18,6 +18,8 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     <a href="http://github.com/slow_loading.html" id="a-slow-loading">Slow loading page</a>
     |
     <a href="http://github.com/alert.html" id="a-alerts">Javascript alerts</a>
+    |
+    <a href="http://github.com/events.html" id="a-drag">Events</a>
 
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>

From cae27962e3b1e4fae70c951769c00204bd927eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Oct 2017 23:05:52 +0200
Subject: [PATCH 364/784] Add tests for ChromeDriverService and ChromeDriver

---
 .travis.yml                                   | 12 ++-
 .../Chrome/ChromeDriverServiceTest.php        | 82 +++++++++++++++++++
 tests/functional/Chrome/ChromeDriverTest.php  | 60 ++++++++++++++
 3 files changed, 151 insertions(+), 3 deletions(-)
 create mode 100644 tests/functional/Chrome/ChromeDriverServiceTest.php
 create mode 100644 tests/functional/Chrome/ChromeDriverTest.php

diff --git a/.travis.yml b/.travis.yml
index 9b2b5894e..7484f1cfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,13 @@ matrix:
 
     # Build with lowest possible dependencies
     - php: 7.1
-      env: dependencies="--prefer-lowest"
+      env: DEPENDENCIES="--prefer-lowest"
+
+    # Chrome on Travis build with lowest possible dependencies
+    - php: 7.1
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" DEPENDENCIES="--prefer-lowest"
+      addons:
+        chrome: beta
 
     # Saucelabs builds
     - php: 7.1
@@ -77,11 +83,11 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - travis_retry composer update --no-interaction $dependencies
+  - travis_retry composer update --no-interaction $DEPENDENCIES
 
 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=./chromedriver/chromedriver; fi
+  - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
   - sh -e /etc/init.d/xvfb start
   - if [ ! -f jar/selenium-server-standalone-3.4.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar; fi
   - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.4.0.jar -log ./logs/selenium.log &
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
new file mode 100644
index 000000000..6f6073fda
--- /dev/null
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -0,0 +1,82 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Chrome;
+
+/**
+ * @group exclude-saucelabs
+ * @covers Facebook\WebDriver\Chrome\ChromeDriverService
+ * @covers Facebook\WebDriver\Remote\Service\DriverService
+ */
+class ChromeDriverServiceTest extends \PHPUnit_Framework_TestCase
+{
+    protected function setUp()
+    {
+        if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
+            $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
+        }
+    }
+
+    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
+    {
+        // The createDefaultService() method expect path to the executable to be present in the environment variable
+        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . getenv('CHROMEDRIVER_PATH'));
+
+        $driverService = ChromeDriverService::createDefaultService();
+
+        $this->assertSame('http://localhost:9515/', $driverService->getURL());
+
+        $this->assertInstanceOf(ChromeDriverService::class, $driverService->start());
+        $this->assertTrue($driverService->isRunning());
+
+        $this->assertInstanceOf(ChromeDriverService::class, $driverService->start());
+
+        $this->assertInstanceOf(ChromeDriverService::class, $driverService->stop());
+        $this->assertFalse($driverService->isRunning());
+
+        $this->assertInstanceOf(ChromeDriverService::class, $driverService->stop());
+    }
+
+    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
+    {
+        $driverService = new ChromeDriverService(getenv('CHROMEDRIVER_PATH'), 9515, ['--port=9515']);
+
+        $this->assertSame('http://localhost:9515/', $driverService->getURL());
+
+        $driverService->start();
+        $this->assertTrue($driverService->isRunning());
+
+        $driverService->stop();
+        $this->assertFalse($driverService->isRunning());
+    }
+
+    public function testShouldThrowExceptionIfExecutableCannotBeFound()
+    {
+        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=/not/existing');
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('\'/not/existing\' is not a file.');
+        ChromeDriverService::createDefaultService();
+    }
+
+    public function testShouldThrowExceptionIfExecutableIsNotExecutable()
+    {
+        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . __FILE__);
+
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('is not executable');
+        ChromeDriverService::createDefaultService();
+    }
+}
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
new file mode 100644
index 000000000..f3567d9d7
--- /dev/null
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -0,0 +1,60 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+
+/**
+ * @group exclude-saucelabs
+ * @covers Facebook\WebDriver\Chrome\ChromeDriver
+ */
+class ChromeDriverTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var ChromeDriver */
+    protected $driver;
+
+    protected function setUp()
+    {
+        if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
+            $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
+        }
+    }
+
+    protected function tearDown()
+    {
+        if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor() !== null) {
+            $this->driver->quit();
+        }
+    }
+
+    public function testShouldStartChromeDriver()
+    {
+        // The createDefaultService() method expect path to the executable to be present in the environment variable
+        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . getenv('CHROMEDRIVER_PATH'));
+
+        $this->driver = ChromeDriver::start();
+
+        $this->assertInstanceOf(ChromeDriver::class, $this->driver);
+        $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
+
+        $this->driver->get('http://localhost:8000/');
+
+        $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
+
+        $this->driver->quit();
+    }
+}

From 2b1d15359f88ea246d4a18f5dda4cbdeec48eb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Oct 2017 10:14:17 +0200
Subject: [PATCH 365/784] Bump sebastian/environment version to fix
 code-coverage in lowest dependencies build

See https://github.com/sebastianbergmann/phpunit/issues/1976
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8eff450f7..6203b6238 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,11 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^5.4",
+    "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
-    "satooshi/php-coveralls": "^1.0",
+    "php-coveralls/php-coveralls": "^1.0.2",
     "symfony/var-dumper": "^3.3"
   },
   "autoload": {

From c85b872ba733b303ca363ecf27f87ae45a543b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Oct 2017 15:17:50 +0200
Subject: [PATCH 366/784] Bump guzzle version to fix coveralls in lowest
 dependencies build

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 6203b6238..6b7685be9 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
     "php-coveralls/php-coveralls": "^1.0.2",
+    "guzzle/guzzle": "^3.4.1",
     "symfony/var-dumper": "^3.3"
   },
   "autoload": {

From f6e0ad46640248112b636593d59db8032fa13c73 Mon Sep 17 00:00:00 2001
From: VolCh <chernyshev.vladimir@pdffiller.team>
Date: Thu, 2 Nov 2017 19:07:27 +0200
Subject: [PATCH 367/784] Fix code style

---
 lib/WebDriverSelectInterface.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/WebDriverSelectInterface.php b/lib/WebDriverSelectInterface.php
index bd4db90e4..030a783e9 100644
--- a/lib/WebDriverSelectInterface.php
+++ b/lib/WebDriverSelectInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\NoSuchElementException;

From f1fe0398401a364f62362d1d17ecbf1560277f35 Mon Sep 17 00:00:00 2001
From: VolCh <chernyshev.vladimir@pdffiller.team>
Date: Fri, 3 Nov 2017 10:41:52 +0200
Subject: [PATCH 368/784] Fix code style

---
 lib/WebDriverDimension.php         | 2 +-
 lib/WebDriverExpectedCondition.php | 4 ++--
 lib/WebDriverPoint.php             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 111a77821..308c1990f 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -65,7 +65,7 @@ public function getWidth()
      * @param WebDriverDimension $dimension The dimension to be compared with.
      * @return bool Whether the height and the width are the same as the instance.
      */
-    public function equals(WebDriverDimension $dimension)
+    public function equals(self $dimension)
     {
         return $this->height === $dimension->getHeight() && $this->width === $dimension->getWidth();
     }
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 347a5d28a..bce6bfee4 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -453,7 +453,7 @@ function () use ($element) {
      * @return WebDriverExpectedCondition<mixed> Condition returns the return value of the getApply() of the given
      * condition.
      */
-    public static function refreshed(WebDriverExpectedCondition $condition)
+    public static function refreshed(self $condition)
     {
         return new static(
             function (WebDriver $driver) use ($condition) {
@@ -558,7 +558,7 @@ function (WebDriver $driver) use ($expectedNumberOfWindows) {
      * @param WebDriverExpectedCondition $condition The condition to be negated.
      * @return mixed The negation of the result of the given condition.
      */
-    public static function not(WebDriverExpectedCondition $condition)
+    public static function not(self $condition)
     {
         return new static(
             function (WebDriver $driver) use ($condition) {
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index e12977b22..4e2dbd211 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -85,7 +85,7 @@ public function moveBy($x_offset, $y_offset)
      * @param WebDriverPoint $point The point to be compared with.
      * @return bool Whether the x and y coordinates are the same as the instance.
      */
-    public function equals(WebDriverPoint $point)
+    public function equals(self $point)
     {
         return $this->x === $point->getX() &&
         $this->y === $point->getY();

From 4eee996a85b6fee638f5f95990c95f8832a18755 Mon Sep 17 00:00:00 2001
From: Quentin Headen <qheaden@phaseshiftsoftware.com>
Date: Tue, 7 Nov 2017 04:37:32 +0000
Subject: [PATCH 369/784] Add
 WebDriverExpectedCondition::visibilityOfAnyElementsLocated

---
 CHANGELOG.md                                  |  3 ++
 lib/WebDriverExpectedCondition.php            | 29 ++++++++++++++++++
 tests/unit/WebDriverExpectedConditionTest.php | 30 +++++++++++++++++++
 3 files changed, 62 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 182aeda87..c8b503b1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Drop PHP 5.5 support, the minimal required version of PHP is now PHP 5.6.
 
+### Added
+- Added a visibilityOfAnyElementsLocated method to WebDriverExpectedCondition.
+
 ## 1.4.1 - 2017-04-28
 ### Fixed
 - Do not throw notice `Constant CURLOPT_CONNECTTIMEOUT_MS already defined`.
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index bce6bfee4..433ee1a3a 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -193,6 +193,35 @@ function (WebDriver $driver) use ($by) {
         );
     }
 
+    /**
+     * An expectation for checking than at least one element in an array of elements is present on the
+     * DOM of a page and visible.
+     * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
+     *
+     * @param WebDriverBy $by The located used to find the element.
+     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the elements that are located and visible.
+     */
+    public static function visibilityOfAnyElementLocated(WebDriverBy $by)
+    {
+        return new static(
+            function (WebDriver $driver) use ($by) {
+                $elements = $driver->findElements($by);
+                $visibleElements = [];
+
+                foreach ($elements as $element) {
+                    try {
+                        if ($element->isDisplayed()) {
+                            $visibleElements[] = $element;
+                        }
+                    } catch (StateElementReferenceException $e) {
+                    }
+                }
+
+                return count($visibleElements) > 0 ? $visibleElements : null;
+            }
+        );
+    }
+
     /**
      * An expectation for checking that an element, known to be present on the DOM of a page, is visible.
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index e786167a8..603829c02 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -185,6 +185,36 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
+    public function testShouldDetectVisibilityOfAnyElementLocated()
+    {
+        $elementList = [
+            $this->createRemoteWebElementMock(),
+            $this->createRemoteWebElementMock(),
+            $this->createRemoteWebElementMock(),
+        ];
+
+        $elementList[0]->expects($this->once())
+            ->method('isDisplayed')
+            ->willReturn(false);
+
+        $elementList[1]->expects($this->once())
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $elementList[2]->expects($this->once())
+            ->method('isDisplayed')
+            ->willReturn(true);
+
+        $this->driverMock->expects($this->once())
+            ->method('findElements')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($elementList);
+
+        $condition = WebDriverExpectedCondition::visibilityOfAnyElementLocated(WebDriverBy::cssSelector('.foo'));
+
+        $this->assertSame([$elementList[1], $elementList[2]], $this->wait->until($condition));
+    }
+
     public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException()
     {
         $element = $this->createRemoteWebElementMock();

From 017b8d7daee5c070235b8c74d335180f2bd15aa2 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sat, 4 Nov 2017 17:27:25 -0200
Subject: [PATCH 370/784] Use namespaces for PHPUnit forward compatiblitiy

---
 composer.json                                                 | 2 +-
 tests/functional/Chrome/ChromeDriverServiceTest.php           | 4 +++-
 tests/functional/Chrome/ChromeDriverTest.php                  | 3 ++-
 tests/functional/ReportSauceLabsStatusListener.php            | 3 ++-
 tests/functional/WebDriverTestCase.php                        | 3 ++-
 tests/unit/CookieTest.php                                     | 4 +++-
 tests/unit/Exception/WebDriverExceptionTest.php               | 4 +++-
 .../Internal/WebDriverButtonReleaseActionTest.php             | 3 ++-
 tests/unit/Interactions/Internal/WebDriverClickActionTest.php | 3 ++-
 .../Interactions/Internal/WebDriverClickAndHoldActionTest.php | 3 ++-
 .../Interactions/Internal/WebDriverContextClickActionTest.php | 3 ++-
 tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php | 4 +++-
 .../Interactions/Internal/WebDriverDoubleClickActionTest.php  | 3 ++-
 .../unit/Interactions/Internal/WebDriverKeyDownActionTest.php | 3 ++-
 tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php | 3 ++-
 .../Interactions/Internal/WebDriverMouseMoveActionTest.php    | 3 ++-
 .../Internal/WebDriverMouseToOffsetActionTest.php             | 3 ++-
 .../Interactions/Internal/WebDriverSendKeysActionTest.php     | 3 ++-
 tests/unit/Remote/DesiredCapabilitiesTest.php                 | 3 ++-
 tests/unit/Remote/HttpCommandExecutorTest.php                 | 3 ++-
 tests/unit/Remote/RemoteWebDriverTest.php                     | 3 ++-
 tests/unit/Remote/RemoteWebElementTest.php                    | 4 +++-
 tests/unit/Remote/WebDriverCommandTest.php                    | 4 +++-
 tests/unit/Support/XPathEscaperTest.php                       | 4 +++-
 tests/unit/WebDriverExpectedConditionTest.php                 | 3 ++-
 tests/unit/WebDriverKeysTest.php                              | 4 +++-
 tests/unit/WebDriverOptionsTest.php                           | 3 ++-
 27 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/composer.json b/composer.json
index 6b7685be9..94b7f8a36 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "ext-zip": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.4",
+    "phpunit/phpunit": "^5.7",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 6f6073fda..bc1a1b92f 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -15,12 +15,14 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @group exclude-saucelabs
  * @covers Facebook\WebDriver\Chrome\ChromeDriverService
  * @covers Facebook\WebDriver\Remote\Service\DriverService
  */
-class ChromeDriverServiceTest extends \PHPUnit_Framework_TestCase
+class ChromeDriverServiceTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index f3567d9d7..476033839 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -17,12 +17,13 @@
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @group exclude-saucelabs
  * @covers Facebook\WebDriver\Chrome\ChromeDriver
  */
-class ChromeDriverTest extends \PHPUnit_Framework_TestCase
+class ChromeDriverTest extends TestCase
 {
     /** @var ChromeDriver */
     protected $driver;
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index b88b1cdf7..f2a3c9f7d 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -16,8 +16,9 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use PHPUnit\Framework\BaseTestListener;
 
-class ReportSauceLabsStatusListener extends \PHPUnit_Framework_BaseTestListener
+class ReportSauceLabsStatusListener extends BaseTestListener
 {
     public function endTest(\PHPUnit_Framework_Test $test, $time)
     {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 77a98f884..4abaf7c03 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -20,11 +20,12 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use PHPUnit\Framework\TestCase;
 
 /**
  * The base class for test cases.
  */
-class WebDriverTestCase extends \PHPUnit_Framework_TestCase
+class WebDriverTestCase extends TestCase
 {
     /** @var RemoteWebDriver $driver */
     public $driver;
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index ccf2a1e6f..5fc62fb6c 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -15,10 +15,12 @@
 
 namespace Facebook\WebDriver;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers Facebook\WebDriver\Cookie
  */
-class CookieTest extends \PHPUnit_Framework_TestCase
+class CookieTest extends TestCase
 {
     public function testShouldSetAllProperties()
     {
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index 1dfd94fac..f9aadd207 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class WebDriverExceptionTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverExceptionTest extends TestCase
 {
     public function testShouldStoreResultsOnInstantiation()
     {
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index f2bb1b647..db8574a0b 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverButtonReleaseActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverButtonReleaseActionTest extends TestCase
 {
     /** @var WebDriverButtonReleaseAction */
     private $webDriverButtonReleaseAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index fdb868141..8041d7ae7 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverClickActionTest extends TestCase
 {
     /** @var WebDriverClickAction */
     private $webDriverClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index eb3f4bc6f..ebe933f8c 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverClickAndHoldActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverClickAndHoldActionTest extends TestCase
 {
     /** @var WebDriverClickAndHoldAction */
     private $webDriverClickAndHoldAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index e9162f239..67ca63e4c 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverContextClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverContextClickActionTest extends TestCase
 {
     /** @var WebDriverContextClickAction */
     private $webDriverContextClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index d782edf8c..209daa63f 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-class WebDriverCoordinatesTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverCoordinatesTest extends TestCase
 {
     public function testConstruct()
     {
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index acd74550f..86710d330 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverDoubleClickActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverDoubleClickActionTest extends TestCase
 {
     /** @var WebDriverDoubleClickAction */
     private $webDriverDoubleClickAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 267b58b3e..a03791fd9 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverKeyDownActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeyDownActionTest extends TestCase
 {
     /** @var WebDriverKeyDownAction */
     private $webDriverKeyDownAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 970a35b0f..7ebc17ac0 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverKeyUpActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeyUpActionTest extends TestCase
 {
     /** @var WebDriverKeyUpAction */
     private $webDriverKeyUpAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 565530ad8..584231f9d 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverMouseMoveActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverMouseMoveActionTest extends TestCase
 {
     /** @var WebDriverMouseMoveAction */
     private $webDriverMouseMoveAction;
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index d2d5286a1..a055c746d 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -17,8 +17,9 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverMouseToOffsetActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverMouseToOffsetActionTest extends TestCase
 {
     /**
      * @type WebDriverMoveToOffsetAction
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index 9b06b3df7..22cb47e9d 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -18,8 +18,9 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
 
-class WebDriverSendKeysActionTest extends \PHPUnit_Framework_TestCase
+class WebDriverSendKeysActionTest extends TestCase
 {
     /** @var WebDriverSendKeysAction */
     private $webDriverSendKeysAction;
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index dacdcd139..559a21f7f 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -19,8 +19,9 @@
 use Facebook\WebDriver\Firefox\FirefoxPreferences;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
 use Facebook\WebDriver\WebDriverPlatform;
+use PHPUnit\Framework\TestCase;
 
-class DesiredCapabilitiesTest extends \PHPUnit_Framework_TestCase
+class DesiredCapabilitiesTest extends TestCase
 {
     public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
     {
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 63d004e6b..a3810e731 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -16,8 +16,9 @@
 namespace Facebook\WebDriver\Remote;
 
 use phpmock\phpunit\PHPMock;
+use PHPUnit\Framework\TestCase;
 
-class HttpCommandExecutorTest extends \PHPUnit_Framework_TestCase
+class HttpCommandExecutorTest extends TestCase
 {
     use PHPMock;
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 48b149f84..c8fee7e5d 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -19,13 +19,14 @@
 use Facebook\WebDriver\WebDriverNavigation;
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
  * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
  */
-class RemoteWebDriverTest extends \PHPUnit_Framework_TestCase
+class RemoteWebDriverTest extends TestCase
 {
     /** @var RemoteWebDriver */
     private $driver;
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
index 45c057751..80bc92931 100644
--- a/tests/unit/Remote/RemoteWebElementTest.php
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -15,12 +15,14 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
  * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
  */
-class RemoteWebElementTest extends \PHPUnit_Framework_TestCase
+class RemoteWebElementTest extends TestCase
 {
     /**
      * @covers ::__construct
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 9993c6ce5..2e1a0ad9f 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Remote;
 
-class WebDriverCommandTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class WebDriverCommandTest extends TestCase
 {
     public function testShouldSetOptionsUsingConstructor()
     {
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index 21ac4aea0..96853ed4f 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -15,7 +15,9 @@
 
 namespace Facebook\WebDriver\Support;
 
-class XPathEscaperTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class XPathEscaperTest extends TestCase
 {
     /**
      * @dataProvider xpathProvider
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index e786167a8..1860e4585 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -20,11 +20,12 @@
 use Facebook\WebDriver\Remote\RemoteExecuteMethod;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\RemoteWebElement;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Facebook\WebDriver\WebDriverExpectedCondition
  */
-class WebDriverExpectedConditionTest extends \PHPUnit_Framework_TestCase
+class WebDriverExpectedConditionTest extends TestCase
 {
     /** @var RemoteWebDriver|\PHPUnit_Framework_MockObject_MockObject */
     private $driverMock;
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index 9a205c7de..a309402b8 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -15,10 +15,12 @@
 
 namespace Facebook\WebDriver;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @covers Facebook\WebDriver\WebDriverKeys
  */
-class WebDriverKeysTest extends \PHPUnit_Framework_TestCase
+class WebDriverKeysTest extends TestCase
 {
     /**
      * @dataProvider provideKeys
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 8bc47b96f..07c721c48 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -17,11 +17,12 @@
 
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @covers Facebook\WebDriver\WebDriverOptions
  */
-class WebDriverOptionsTest extends \PHPUnit_Framework_TestCase
+class WebDriverOptionsTest extends TestCase
 {
     /** @var ExecuteMethod|\PHPUnit_Framework_MockObject_MockObject */
     private $executor;

From d3af34e78f8ca4edc7cff3dbcfbe8c0219d43c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 8 Nov 2017 13:45:10 +0100
Subject: [PATCH 371/784] Avoid useless test warning on PHPUnit 6

---
 tests/unit/CookieTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 5fc62fb6c..43215acb8 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -145,7 +145,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
      * @param string $domain
      * @param string $expectedMessage
      */
-    public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)
+    public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage)
     {
         if ($expectedMessage) {
             $this->expectException(\InvalidArgumentException::class);
@@ -156,6 +156,8 @@ public function testShouldValidateCookie($name, $value, $domain, $expectedMessag
         if ($domain !== null) {
             $cookie->setDomain($domain);
         }
+
+        $this->assertInstanceOf(Cookie::class, $cookie);
     }
 
     /**

From 1bb077b2fd7273569f63293bf623406d8a6c3cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Re=C3=A9nse?= <therinsem@hotmail.com>
Date: Tue, 6 Jun 2017 19:19:18 +0200
Subject: [PATCH 372/784] Fix typo in isJavascriptEnabled

---
 lib/Remote/DesiredCapabilities.php            | 2 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 3990343af..940fcf98c 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -145,7 +145,7 @@ public function setJavascriptEnabled($enabled)
         $browser = $this->getBrowserName();
         if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
             throw new Exception(
-                'isJavascriptEnable() is a htmlunit-only option. ' .
+                'isJavascriptEnabled() is a htmlunit-only option. ' .
                 'See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#read-write-capabilities.'
             );
         }
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index dacdcd139..1edea2522 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -63,7 +63,7 @@ public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage isJavascriptEnable() is a htmlunit-only option
+     * @expectedExceptionMessage isJavascriptEnabled() is a htmlunit-only option
      */
     public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
     {

From b643bf3a465ca8eec35c781e8ac8c40d003e3151 Mon Sep 17 00:00:00 2001
From: VolCh <volch5@gmail.com>
Date: Sat, 4 Nov 2017 15:52:32 +0200
Subject: [PATCH 373/784] Extract DriverService::createProcess()

---
 lib/Remote/Service/DriverService.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index c15ef94f9..e3fea5823 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -81,12 +81,7 @@ public function start()
             return $this;
         }
 
-        $processBuilder = (new ProcessBuilder())
-            ->setPrefix($this->executable)
-            ->setArguments($this->args)
-            ->addEnvironmentVariables($this->environment);
-
-        $this->process = $processBuilder->getProcess();
+        $this->process = $this->createProcess();
         $this->process->start();
 
         $checker = new URLChecker();
@@ -144,4 +139,17 @@ protected static function checkExecutable($executable)
 
         return $executable;
     }
+
+    /**
+     * @return Process
+     */
+    private function createProcess()
+    {
+        $processBuilder = (new ProcessBuilder())
+            ->setPrefix($this->executable)
+            ->setArguments($this->args)
+            ->addEnvironmentVariables($this->environment);
+
+        return $processBuilder->getProcess();
+    }
 }

From 3a2ecdf0e4a10b9e4c91e3aece999fbf6ccb1776 Mon Sep 17 00:00:00 2001
From: VolCh <volch5@gmail.com>
Date: Sat, 4 Nov 2017 16:13:40 +0200
Subject: [PATCH 374/784] Enable beta stability for project development only

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 94b7f8a36..8392c5738 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
     "forum": "https://www.facebook.com/groups/phpwebdriver/",
     "source": "https://github.com/facebook/php-webdriver"
   },
+  "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1",

From a19477c5a1177ef5da36884b7144232ba5a65d4d Mon Sep 17 00:00:00 2001
From: VolCh <volch5@gmail.com>
Date: Sat, 4 Nov 2017 16:16:11 +0200
Subject: [PATCH 375/784] Allow Symfony 4 and avoid deprecation warning with
 Symfony 3.4

---
 composer.json                        |  4 ++--
 lib/Remote/Service/DriverService.php | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 8392c5738..069cb6df5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
   "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
-    "symfony/process": "^2.8 || ^3.1",
+    "symfony/process": "^2.8 || ^3.1 || ^4.0",
     "ext-curl": "*",
     "ext-zip": "*"
   },
@@ -25,7 +25,7 @@
     "php-mock/php-mock-phpunit": "^1.1",
     "php-coveralls/php-coveralls": "^1.0.2",
     "guzzle/guzzle": "^3.4.1",
-    "symfony/var-dumper": "^3.3"
+    "symfony/var-dumper": "^3.3 || ^4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index e3fea5823..eabf24e7a 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -145,11 +145,20 @@ protected static function checkExecutable($executable)
      */
     private function createProcess()
     {
-        $processBuilder = (new ProcessBuilder())
-            ->setPrefix($this->executable)
-            ->setArguments($this->args)
-            ->addEnvironmentVariables($this->environment);
+        // BC: ProcessBuilder deprecated since Symfony 3.4 and removed in Symfony 4.0.
+        if (class_exists(ProcessBuilder::class)
+            && false === mb_strpos('@deprecated', (new \ReflectionClass(ProcessBuilder::class))->getDocComment())
+        ) {
+            $processBuilder = (new ProcessBuilder())
+                ->setPrefix($this->executable)
+                ->setArguments($this->args)
+                ->addEnvironmentVariables($this->environment);
+
+            return $processBuilder->getProcess();
+        }
+        // Safe to use since Symfony 3.3
+        $commandLine = array_merge([$this->executable], $this->args);
 
-        return $processBuilder->getProcess();
+        return new Process($commandLine, null, $this->environment);
     }
 }

From 8d08a8d34ab20e3663ac2c1ff88e30edbc25a287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 15 Nov 2017 02:04:18 +0100
Subject: [PATCH 376/784] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8b503b1d..0d71ee44d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,10 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Changed
 - Drop PHP 5.5 support, the minimal required version of PHP is now PHP 5.6.
+- Allow installation of Symfony 4 components.
 
 ### Added
-- Added a visibilityOfAnyElementsLocated method to WebDriverExpectedCondition.
+- Add a `visibilityOfAnyElementsLocated()` method to `WebDriverExpectedCondition`.
 
 ## 1.4.1 - 2017-04-28
 ### Fixed

From 86b5ca2f67173c9d34340845dd690149c886a605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 15 Nov 2017 12:08:09 +0100
Subject: [PATCH 377/784] Release version 1.5.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d71ee44d..3f42c31ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.5.0 - 2017-11-15
 ### Changed
 - Drop PHP 5.5 support, the minimal required version of PHP is now PHP 5.6.
 - Allow installation of Symfony 4 components.

From d9623ed86e1f4b88609ff0dd054b62682c2419e4 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Sun, 26 Nov 2017 16:25:29 -0800
Subject: [PATCH 378/784] Link to COC from `CONTRIBUTING.md`

We are about to add a `CODE_OF_CONDUCT.md` doc and it makes sense to surface it here.
---
 CONTRIBUTING.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c59bbe84..d7b93736c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,6 +5,9 @@ We love to have your help to make php-webdriver better!
 Feel free to open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem, or
 send a pull request (see bellow) with your contribution.
 
+## Code of Conduct
+The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
+
 ## Workflow when contributing a patch
 
 1. Fork the project on GitHub

From 90c7dcbff5a545d63520c83ab490d6e24ad9ba3a Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Sun, 26 Nov 2017 16:27:33 -0800
Subject: [PATCH 379/784] Add `CODE_OF_CONDUCT.md`

In the past Facebook didn't promote including a Code of Conduct when creating new projects, and many projects skipped this important document. Let's fix it. :)

**why make this change?:**
Facebook Open Source provides a Code of Conduct statement for all
projects to follow, to promote a welcoming and safe open source community.

Exposing the COC via a separate markdown file is a standard being
promoted by Github via the Community Profile in order to meet their Open
Source Guide's recommended community standards.

As you can see, adding this file will improve [the php-webdriver community profile](https://github.com/facebook/php-webdriver/community)
checklist and increase the visibility of our COC.

**test plan:**
Viewing it on my branch -
(Flarnie will insert screenshots)

**issue:**
internal task t23481323
---
 CODE_OF_CONDUCT.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..0a45f9bd5
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.

From 52052a7e21075653de8a8b449097d16461ce5bc2 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Thu, 30 Nov 2017 19:13:05 -0200
Subject: [PATCH 380/784] Test against PHP 7.2

---
 .travis.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7484f1cfc..81266034f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 env:
   global:
@@ -16,29 +17,29 @@ env:
 matrix:
   include:
     # Add build to run tests against Firefox inside Travis environment
-    - php: 7.1
+    - php: 7.2
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
     # Add build to run tests against Chrome inside Travis environment
-    - php: 7.1
+    - php: 7.2
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
       addons:
         chrome: beta
 
     # Build with lowest possible dependencies
-    - php: 7.1
+    - php: 7.2
       env: DEPENDENCIES="--prefer-lowest"
 
     # Chrome on Travis build with lowest possible dependencies
-    - php: 7.1
+    - php: 7.2
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" DEPENDENCIES="--prefer-lowest"
       addons:
         chrome: beta
 
     # Saucelabs builds
-    - php: 7.1
+    - php: 7.2
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -47,7 +48,7 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.1
+    - php: 7.2
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -56,7 +57,7 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.1
+    - php: 7.2
       env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="15.15063" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -67,7 +68,7 @@ matrix:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
     # Codestyle check build
-    - php: 7.1
+    - php: 7.2
       env: CHECK_CODESTYLE=1
       before_script: ~
       script: composer codestyle:check

From d7cabc7fd357c1d8ccf43b5dbfb2116a74a193e0 Mon Sep 17 00:00:00 2001
From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Wed, 6 Dec 2017 05:31:52 -0200
Subject: [PATCH 381/784] Use assertArrayNotHasKey

---
 tests/unit/CookieTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 43215acb8..ade9af68f 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -79,7 +79,7 @@ public function testShouldProvideArrayAccessToProperties(Cookie $cookie)
         $cookie->offsetSet('domain', 'bar.com');
         $this->assertSame('bar.com', $cookie['domain']);
         $cookie->offsetUnset('domain');
-        $this->assertFalse(isset($cookie['domain']));
+        $this->assertArrayNotHasKey('domain', $cookie);
     }
 
     public function testShouldBeCreatableFromAnArrayWithBasicValues()
@@ -94,23 +94,23 @@ public function testShouldBeCreatableFromAnArrayWithBasicValues()
         $this->assertSame('cookieName', $cookie['name']);
         $this->assertSame('someValue', $cookie['value']);
 
-        $this->assertFalse(isset($cookie['path']));
+        $this->assertArrayNotHasKey('path', $cookie);
         $this->assertNull($cookie['path']);
         $this->assertNull($cookie->getPath());
 
-        $this->assertFalse(isset($cookie['domain']));
+        $this->assertArrayNotHasKey('domain', $cookie);
         $this->assertNull($cookie['domain']);
         $this->assertNull($cookie->getDomain());
 
-        $this->assertFalse(isset($cookie['expiry']));
+        $this->assertArrayNotHasKey('expiry', $cookie);
         $this->assertNull($cookie['expiry']);
         $this->assertNull($cookie->getExpiry());
 
-        $this->assertFalse(isset($cookie['secure']));
+        $this->assertArrayNotHasKey('secure', $cookie);
         $this->assertNull($cookie['secure']);
         $this->assertNull($cookie->isSecure());
 
-        $this->assertFalse(isset($cookie['httpOnly']));
+        $this->assertArrayNotHasKey('httpOnly', $cookie);
         $this->assertNull($cookie['httpOnly']);
         $this->assertNull($cookie->isHttpOnly());
     }

From 5f41a0bbec16fc719712089fc12399b0c1342f59 Mon Sep 17 00:00:00 2001
From: Dmitry Matora <dmitry.matora@gmail.com>
Date: Fri, 3 Nov 2017 20:29:01 +0300
Subject: [PATCH 382/784] Implemented timeout support. Solves #496

---
 lib/Remote/RemoteWebDriver.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f8b8e5e6e..3a8d3563f 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -139,11 +139,20 @@ public static function create(
      *
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param string $session_id The existing session id
+     * @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
      * @return RemoteWebDriver
      */
-    public static function createBySessionID($session_id, $selenium_server_url = 'http://localhost:4444/wd/hub')
+    public static function createBySessionID($session_id, $selenium_server_url = 'http://localhost:4444/wd/hub', $connection_timeout_in_ms = null, $request_timeout_in_ms = null)
     {
+
         $executor = new HttpCommandExecutor($selenium_server_url);
+        if ($connection_timeout_in_ms !== null) {
+            $executor->setConnectionTimeout($connection_timeout_in_ms);
+        }
+        if ($request_timeout_in_ms !== null) {
+            $executor->setRequestTimeout($request_timeout_in_ms);
+        }
 
         return new static($executor, $session_id);
     }

From 21b62c4ceec300bbe63482c9027e3fc639aed3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 6 Dec 2017 18:35:19 +0100
Subject: [PATCH 383/784] Update chagnelog

---
 CHANGELOG.md                   |  2 ++
 lib/Remote/RemoteWebDriver.php | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f42c31ef..a3adb0988 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- Connection and request timeouts could be specified also when creating RemoteWebDriver from existing session ID.
 
 ## 1.5.0 - 2017-11-15
 ### Changed
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 3a8d3563f..becab6b98 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -85,7 +85,7 @@ protected function __construct(
      * @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
      * @param string|null $http_proxy The proxy to tunnel requests to the remote Selenium WebDriver through
-     * @param int|null $http_proxy_port The proxy  port to tunnel requests to the remote Selenium WebDriver through
+     * @param int|null $http_proxy_port The proxy port to tunnel requests to the remote Selenium WebDriver through
      * @param DesiredCapabilities $required_capabilities The required capabilities
      * @return RemoteWebDriver
      */
@@ -143,9 +143,12 @@ public static function create(
      * @param int|null $request_timeout_in_ms Set the maximum time of a request to remote Selenium WebDriver server
      * @return RemoteWebDriver
      */
-    public static function createBySessionID($session_id, $selenium_server_url = 'http://localhost:4444/wd/hub', $connection_timeout_in_ms = null, $request_timeout_in_ms = null)
-    {
-
+    public static function createBySessionID(
+        $session_id,
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null
+    ) {
         $executor = new HttpCommandExecutor($selenium_server_url);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);

From 32d5b8d8ba1161bff5838ebc70689560f6964211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 7 Dec 2017 00:35:05 +0100
Subject: [PATCH 384/784] Fix ChromeDriver declaration to match the parent
 class

---
 lib/Chrome/ChromeDriver.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 8ba76583c..832ca17a8 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -82,13 +82,16 @@ public static function create(
      *
      * @param string $session_id The existing session id
      * @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
      * @throws WebDriverException
      * @return RemoteWebDriver|void
      */
     public static function createBySessionID(
         $session_id,
-        $selenium_server_url = 'http://localhost:4444/wd/hub'
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }

From 6baf65f9c62378a775900da2c6168888649b6f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Dec 2017 12:19:10 +0100
Subject: [PATCH 385/784] Upgrade php-coveralls to v 2.0.0

---
 .travis.yml   | 2 +-
 composer.json | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7484f1cfc..18db2fc36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,4 +106,4 @@ after_script:
   - if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
 
 after_success:
-  - travis_retry php vendor/bin/coveralls -v
+  - travis_retry php vendor/bin/php-coveralls -v
diff --git a/composer.json b/composer.json
index 069cb6df5..6aa6ef61b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,7 @@
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
-    "php-coveralls/php-coveralls": "^1.0.2",
-    "guzzle/guzzle": "^3.4.1",
+    "php-coveralls/php-coveralls": "^2.0",
     "symfony/var-dumper": "^3.3 || ^4.0"
   },
   "autoload": {

From cec193f66be978d107ad50112d1ad4546b255e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 Dec 2017 01:04:31 +0100
Subject: [PATCH 386/784] Use PHPStan for static analysis

---
 .travis.yml                                           |  5 ++++-
 composer.json                                         |  3 +++
 lib/Firefox/FirefoxProfile.php                        |  2 +-
 lib/Support/Events/EventFiringWebDriver.php           |  6 +++---
 lib/Support/Events/EventFiringWebDriverNavigation.php |  2 +-
 lib/Support/Events/EventFiringWebElement.php          |  2 +-
 lib/WebDriverExpectedCondition.php                    |  4 ++--
 lib/WebDriverHasInputDevices.php                      |  2 +-
 phpstan.neon                                          | 10 ++++++++++
 tests/functional/WebDriverByTest.php                  |  4 ++--
 10 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 phpstan.neon

diff --git a/.travis.yml b/.travis.yml
index 18db2fc36..07687e845 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,10 @@ matrix:
     - php: 7.1
       env: CHECK_CODESTYLE=1
       before_script: ~
-      script: composer codestyle:check
+      script:
+        - composer require phpstan/phpstan-shim # Not part of require-dev, because it won't install on PHP 5.6
+        - composer analyze
+        - composer codestyle:check
       after_script: ~
       after_success: ~
 
diff --git a/composer.json b/composer.json
index 6aa6ef61b..c865ad691 100644
--- a/composer.json
+++ b/composer.json
@@ -45,6 +45,9 @@
     "codestyle:fix": [
       "vendor/bin/php-cs-fixer fix --diff || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
+    ],
+    "analyze": [
+      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
   },
   "extra": {
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 8086198ca..b9d36b30e 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -110,7 +110,7 @@ public function setPreference($key, $value)
     }
 
     /**
-     * @param $key
+     * @param mixed $key
      * @return mixed
      */
     public function getPreference($key)
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index c129ef015..5a75dbe1f 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -133,7 +133,7 @@ public function findElement(WebDriverBy $by)
     }
 
     /**
-     * @param       $script
+     * @param string $script
      * @param array $arguments
      * @throws WebDriverException
      * @return mixed
@@ -161,7 +161,7 @@ public function executeScript($script, array $arguments = [])
     }
 
     /**
-     * @param       $script
+     * @param string $script
      * @param array $arguments
      * @throws WebDriverException
      * @return mixed
@@ -396,7 +396,7 @@ protected function newElement(WebDriverElement $element)
 
     /**
      * @param mixed $method
-     * @param mixed $arguments,...
+     * @param mixed ...$arguments
      */
     protected function dispatch($method, ...$arguments)
     {
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 0008ebbdc..7d8920eb1 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -149,7 +149,7 @@ public function to($url)
 
     /**
      * @param mixed $method
-     * @param mixed $arguments,...
+     * @param mixed ...$arguments
      */
     protected function dispatch($method, ...$arguments)
     {
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 099bb3573..9595953cf 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -392,7 +392,7 @@ protected function dispatchOnException(WebDriverException $exception)
 
     /**
      * @param mixed $method
-     * @param mixed $arguments,...
+     * @param mixed ...$arguments
      */
     protected function dispatch($method, ...$arguments)
     {
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 433ee1a3a..d9ceb5dde 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -213,7 +213,7 @@ function (WebDriver $driver) use ($by) {
                         if ($element->isDisplayed()) {
                             $visibleElements[] = $element;
                         }
-                    } catch (StateElementReferenceException $e) {
+                    } catch (StaleElementReferenceException $e) {
                     }
                 }
 
@@ -399,7 +399,7 @@ function (WebDriver $driver) use ($by) {
     /**
      * An expectation for checking that an element with text is either invisible or not present on the DOM.
      *
-     * @param WebdriverBy $by The locator used to find the element.
+     * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text of the element.
      * @return WebDriverExpectedCondition<bool> Condition returns whether the text is found in the element located.
      */
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 93e42a30a..7cb1992eb 100644
--- a/lib/WebDriverHasInputDevices.php
+++ b/lib/WebDriverHasInputDevices.php
@@ -21,7 +21,7 @@
 interface WebDriverHasInputDevices
 {
     /**
-     * @return WebDriverKeyBoard
+     * @return WebDriverKeyboard
      */
     public function getKeyboard();
 
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 000000000..7023c466e
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,10 @@
+parameters:
+	ignoreErrors:
+		- '#Class Symfony\\Component\\Process\\ProcessBuilder not found.#'
+		- '#Instantiated class Symfony\\Component\\Process\\ProcessBuilder not found.#'
+		- '#Call to method setPrefix\(\) on an unknown class Symfony\\Component\\Process\\ProcessBuilder#'
+        # To be fixed:
+		- '#Call to an undefined method RecursiveIteratorIterator::getSubPathName\(\)#'
+		- '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
+		- '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
+		- '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 43d8c0457..534b145f0 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -25,8 +25,8 @@ class WebDriverByTest extends WebDriverTestCase
 {
     /**
      * @dataProvider textElementsProvider
-     * @param $webDriverByLocatorMethod
-     * @param $webDriverByLocatorValue
+     * @param string $webDriverByLocatorMethod
+     * @param string $webDriverByLocatorValue
      * @param string $expectedText
      * @param string $expectedAttributeValue
      */

From cc69cf0bbd807be3b8111098e03c46621d47e695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 Dec 2017 01:06:04 +0100
Subject: [PATCH 387/784] Use createMock shortcut contained in new PHPUnit

---
 tests/unit/WebDriverExpectedConditionTest.php | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index c4d734015..abcd5537b 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -34,11 +34,7 @@ class WebDriverExpectedConditionTest extends TestCase
 
     protected function setUp()
     {
-        // TODO: replace with createMock() once PHP 5.5 support is dropped
-        $this->driverMock = $this
-            ->getMockBuilder(RemoteWebDriver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->driverMock = $this->createMock(RemoteWebDriver::class);
         $this->wait = new WebDriverWait($this->driverMock, 1, 1);
     }
 
@@ -141,7 +137,7 @@ public function testShouldDetectPresenceOfElementLocatedCondition()
 
     public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->at(0))
             ->method('findElements')
@@ -166,7 +162,7 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         // Call #3: return Element, but isDisplayed will return false
         // Call #4: return Element, isDisplayed will true and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('isDisplayed')
             ->willThrowException(new StaleElementReferenceException(''));
@@ -189,9 +185,9 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
     public function testShouldDetectVisibilityOfAnyElementLocated()
     {
         $elementList = [
-            $this->createRemoteWebElementMock(),
-            $this->createRemoteWebElementMock(),
-            $this->createRemoteWebElementMock(),
+            $this->createMock(RemoteWebElement::class),
+            $this->createMock(RemoteWebElement::class),
+            $this->createMock(RemoteWebElement::class),
         ];
 
         $elementList[0]->expects($this->once())
@@ -218,7 +214,7 @@ public function testShouldDetectVisibilityOfAnyElementLocated()
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->at(0))
             ->method('findElement')
@@ -241,7 +237,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchEle
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElementReferenceException()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
@@ -263,7 +259,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElem
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElementBecamesInvisible()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
@@ -285,7 +281,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElement
 
     public function testShouldDetectVisibilityOfCondition()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('isDisplayed')
             ->willReturn(false);
@@ -307,7 +303,7 @@ public function testShouldDetectElementTextContainsCondition()
         // Call #3: return Element, but getText will throw StaleElementReferenceException
         // Call #4: return Element, getText will return new text and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('getText')
             ->willReturn('this is an old text');
@@ -335,7 +331,7 @@ public function testShouldDetectElementTextIsCondition()
         // Call #3: return Element, getText will return not-matching text
         // Call #4: return Element, getText will return new text and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('getText')
             ->willThrowException(new StaleElementReferenceException(''));
@@ -366,7 +362,7 @@ public function testShouldDetectElementTextMatchesCondition()
         // Call #3: return Element, getText will return not-matching text
         // Call #4: return Element, getText will return matching text
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $element->expects($this->at(0))
             ->method('getText')
@@ -398,7 +394,7 @@ public function testShouldDetectElementValueContainsCondition()
         // Call #3: return Element, getAttribute('value') will return not-matching text
         // Call #4: return Element, getAttribute('value') will return matching text
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $element->expects($this->at(0))
             ->method('getAttribute')
@@ -456,17 +452,4 @@ private function setupDriverToReturnElementAfterAnException($element, $expectedN
                 ->willReturn($element);
         }
     }
-
-    /**
-     * @todo Replace with createMock() once PHP 5.5 support is dropped
-     * @return \PHPUnit_Framework_MockObject_MockObject|RemoteWebElement
-     */
-    private function createRemoteWebElementMock()
-    {
-        return $this->getMockBuilder(RemoteWebElement::class)
-            ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->getMock();
-    }
 }

From 4962d348f5e71c284bebc59ab7dd54607518ee4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 Dec 2017 01:07:34 +0100
Subject: [PATCH 388/784] Use absolute FQCN in  annotation

---
 tests/functional/Chrome/ChromeDriverServiceTest.php | 4 ++--
 tests/functional/Chrome/ChromeDriverTest.php        | 2 +-
 tests/functional/FileUploadTest.php                 | 4 ++--
 tests/functional/RemoteWebDriverCreateTest.php      | 4 ++--
 tests/functional/RemoteWebDriverFindElementTest.php | 2 +-
 tests/functional/RemoteWebDriverTest.php            | 4 ++--
 tests/functional/RemoteWebElementTest.php           | 2 +-
 tests/functional/WebDriverActionsTest.php           | 2 +-
 tests/functional/WebDriverAlertTest.php             | 2 +-
 tests/functional/WebDriverByTest.php                | 2 +-
 tests/functional/WebDriverNavigationTest.php        | 2 +-
 tests/functional/WebDriverSelectTest.php            | 4 ++--
 tests/functional/WebDriverTimeoutsTest.php          | 2 +-
 tests/unit/CookieTest.php                           | 2 +-
 tests/unit/Remote/RemoteWebDriverTest.php           | 2 +-
 tests/unit/Remote/RemoteWebElementTest.php          | 2 +-
 tests/unit/WebDriverExpectedConditionTest.php       | 2 +-
 tests/unit/WebDriverKeysTest.php                    | 2 +-
 tests/unit/WebDriverOptionsTest.php                 | 2 +-
 19 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index bc1a1b92f..781a68bae 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -19,8 +19,8 @@
 
 /**
  * @group exclude-saucelabs
- * @covers Facebook\WebDriver\Chrome\ChromeDriverService
- * @covers Facebook\WebDriver\Remote\Service\DriverService
+ * @covers \Facebook\WebDriver\Chrome\ChromeDriverService
+ * @covers \Facebook\WebDriver\Remote\Service\DriverService
  */
 class ChromeDriverServiceTest extends TestCase
 {
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 476033839..b8066156e 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -21,7 +21,7 @@
 
 /**
  * @group exclude-saucelabs
- * @covers Facebook\WebDriver\Chrome\ChromeDriver
+ * @covers \Facebook\WebDriver\Chrome\ChromeDriver
  */
 class ChromeDriverTest extends TestCase
 {
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index e88139953..5b2f6d2d3 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -18,8 +18,8 @@
 use Facebook\WebDriver\Remote\LocalFileDetector;
 
 /**
- * @covers Facebook\WebDriver\Remote\LocalFileDetector
- * @covers Facebook\WebDriver\Remote\RemoteWebElement
+ * @covers \Facebook\WebDriver\Remote\LocalFileDetector
+ * @covers \Facebook\WebDriver\Remote\RemoteWebElement
  */
 class FileUploadTest extends WebDriverTestCase
 {
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 3140b26b0..f9d7e809e 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -20,8 +20,8 @@
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 
 /**
- * @covers Facebook\WebDriver\Remote\RemoteWebDriver
- * @covers Facebook\WebDriver\Remote\HttpCommandExecutor
+ * @covers \Facebook\WebDriver\Remote\RemoteWebDriver
+ * @covers \Facebook\WebDriver\Remote\HttpCommandExecutor
  */
 class RemoteWebDriverCreateTest extends WebDriverTestCase
 {
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 46affc025..eea14b6e5 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -20,7 +20,7 @@
 
 /**
  * Tests for findElement() and findElements() method of RemoteWebDriver.
- * @covers Facebook\WebDriver\Remote\RemoteWebDriver
+ * @covers \Facebook\WebDriver\Remote\RemoteWebDriver
  */
 class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 006b17c7b..440776ad5 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -20,7 +20,7 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
+ * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebDriver
  */
 class RemoteWebDriverTest extends WebDriverTestCase
 {
@@ -170,7 +170,7 @@ function(){document.getElementById("id_test").innerHTML = "Text changed by scrip
 
     /**
      * @covers ::executeAsyncScript
-     * @covers Facebook\WebDriver\WebDriverTimeouts::setScriptTimeout
+     * @covers \Facebook\WebDriver\WebDriverTimeouts::setScriptTimeout
      */
     public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
     {
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 51f414a93..d4614a431 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -19,7 +19,7 @@
 use Facebook\WebDriver\Remote\RemoteWebElement;
 
 /**
- * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
+ * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebElement
  */
 class RemoteWebElementTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 173f7794c..188c76cd9 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -18,7 +18,7 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @coversDefaultClass Facebook\WebDriver\Interactions\WebDriverActions
+ * @coversDefaultClass \Facebook\WebDriver\Interactions\WebDriverActions
  */
 class WebDriverActionsTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 08d8ef73c..163bee157 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -19,7 +19,7 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @covers Facebook\WebDriver\WebDriverAlert
+ * @covers \Facebook\WebDriver\WebDriverAlert
  */
 class WebDriverAlertTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 534b145f0..028db7920 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -19,7 +19,7 @@
 
 /**
  * Tests for locator strategies provided by WebDriverBy.
- * @covers Facebook\WebDriver\WebDriverBy
+ * @covers \Facebook\WebDriver\WebDriverBy
  */
 class WebDriverByTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index 4f7dba252..d3aaebcb6 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -16,7 +16,7 @@
 namespace Facebook\WebDriver;
 
 /**
- * @coversDefaultClass Facebook\WebDriver\WebDriverNavigation
+ * @coversDefaultClass \Facebook\WebDriver\WebDriverNavigation
  */
 class WebDriverNavigationTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 9cd6cf250..37ad416af 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -20,8 +20,8 @@
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
- * @covers Facebook\WebDriver\WebDriverSelect
- * @covers Facebook\WebDriver\Exception\UnexpectedTagNameException
+ * @covers \Facebook\WebDriver\WebDriverSelect
+ * @covers \Facebook\WebDriver\Exception\UnexpectedTagNameException
  */
 class WebDriverSelectTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 808a494ab..69d143cc4 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -22,7 +22,7 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @coversDefaultClass Facebook\WebDriver\WebDriverTimeouts
+ * @coversDefaultClass \Facebook\WebDriver\WebDriverTimeouts
  */
 class WebDriverTimeoutsTest extends WebDriverTestCase
 {
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index ade9af68f..3a0679d2c 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -18,7 +18,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Facebook\WebDriver\Cookie
+ * @covers \Facebook\WebDriver\Cookie
  */
 class CookieTest extends TestCase
 {
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index c8fee7e5d..c5e397e00 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -24,7 +24,7 @@
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
- * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebDriver
+ * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebDriver
  */
 class RemoteWebDriverTest extends TestCase
 {
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
index 80bc92931..e1b0a2b47 100644
--- a/tests/unit/Remote/RemoteWebElementTest.php
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -20,7 +20,7 @@
 /**
  * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
  *
- * @coversDefaultClass Facebook\WebDriver\Remote\RemoteWebElement
+ * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebElement
  */
 class RemoteWebElementTest extends TestCase
 {
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index abcd5537b..8cd4203a9 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -23,7 +23,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Facebook\WebDriver\WebDriverExpectedCondition
+ * @covers \Facebook\WebDriver\WebDriverExpectedCondition
  */
 class WebDriverExpectedConditionTest extends TestCase
 {
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index a309402b8..71fef3b9e 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -18,7 +18,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Facebook\WebDriver\WebDriverKeys
+ * @covers \Facebook\WebDriver\WebDriverKeys
  */
 class WebDriverKeysTest extends TestCase
 {
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 07c721c48..dd7494c67 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -20,7 +20,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers Facebook\WebDriver\WebDriverOptions
+ * @covers \Facebook\WebDriver\WebDriverOptions
  */
 class WebDriverOptionsTest extends TestCase
 {

From bc2b2d520ac8dfb6576b2c86d00999538c4c57d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 Dec 2017 01:19:25 +0100
Subject: [PATCH 389/784] Lint PHP files

---
 composer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c865ad691..aaff428b5 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,8 @@
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
     "php-coveralls/php-coveralls": "^2.0",
-    "symfony/var-dumper": "^3.3 || ^4.0"
+    "symfony/var-dumper": "^3.3 || ^4.0",
+    "jakub-onderka/php-parallel-lint": "^0.9.2"
   },
   "autoload": {
     "psr-4": {
@@ -47,6 +48,7 @@
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ],
     "analyze": [
+      "vendor/bin/parallel-lint -j 10 ./lib ./tests",
       "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
   },

From 0750ede674372496e7564882e7d673265b35f055 Mon Sep 17 00:00:00 2001
From: Alexandr Motuzov <alexandr_nv@list.ru>
Date: Fri, 29 Dec 2017 23:03:50 +0500
Subject: [PATCH 390/784] Add `ext-mbstring` to requirements

`mb_strpos` function is used in several places in the project. Many features will not work without `ext-mbstring` installed.
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aaff428b5..a96b82fe5 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
     "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1 || ^4.0",
     "ext-curl": "*",
-    "ext-zip": "*"
+    "ext-zip": "*",
+    "ext-mbstring": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7",

From 7c69d51ed8b2ce845b4b39fe01b822628f429587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 2 Jan 2018 12:32:43 +0100
Subject: [PATCH 391/784] Remove xdebug to spped up codestyle check build

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 07687e845..1c6c75cd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,8 @@ matrix:
     # Codestyle check build
     - php: 7.1
       env: CHECK_CODESTYLE=1
+      before_install:
+        - phpenv config-rm xdebug.ini
       before_script: ~
       script:
         - composer require phpstan/phpstan-shim # Not part of require-dev, because it won't install on PHP 5.6
@@ -82,10 +84,8 @@ cache:
     - $HOME/.composer/cache
     - jar
 
-before_install:
-  - travis_retry composer self-update
-
 install:
+  - travis_retry composer self-update
   - travis_retry composer update --no-interaction $DEPENDENCIES
 
 before_script:

From fda6f7f6d45ed5baa2f6ce2cd9ba3d57e165b42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 14 Jan 2018 00:21:39 +0100
Subject: [PATCH 392/784] Use a workaround for Chrome crashing on startup on
 Travis

https://github.com/SeleniumHQ/selenium/issues/4961
---
 tests/functional/Chrome/ChromeDriverTest.php | 9 ++++++++-
 tests/functional/WebDriverTestCase.php       | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index b8066156e..89eb766cd 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use PHPUnit\Framework\TestCase;
@@ -47,7 +48,13 @@ public function testShouldStartChromeDriver()
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . getenv('CHROMEDRIVER_PATH'));
 
-        $this->driver = ChromeDriver::start();
+        // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
+        $chromeOptions = new ChromeOptions();
+        $chromeOptions->addArguments(['--no-sandbox']);
+        $desiredCapabilities = DesiredCapabilities::chrome();
+        $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
+
+        $this->driver = ChromeDriver::start($desiredCapabilities);
 
         $this->assertInstanceOf(ChromeDriver::class, $this->driver);
         $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 4abaf7c03..e9714a87c 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -55,7 +55,8 @@ protected function setUp()
 
             if ($browserName === WebDriverBrowserType::CHROME) {
                 $chromeOptions = new ChromeOptions();
-                $chromeOptions->addArguments(['--headless', 'window-size=1024,768']);
+                // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
+                $chromeOptions->addArguments(['--headless', 'window-size=1024,768', '--no-sandbox']);
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
             }
 

From 21412fe9ce48ec8c23508879b73d78aa36c038ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 14 Jan 2018 00:25:19 +0100
Subject: [PATCH 393/784] Update Chromedriver and use stable chrome in Travis
 builds

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c6c75cd9..3ee125011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
   global:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
-    - CHROMEDRIVER_VERSION="2.31"
+    - CHROMEDRIVER_VERSION="2.35"
 
 matrix:
   include:
@@ -25,7 +25,7 @@ matrix:
     - php: 7.1
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
       addons:
-        chrome: beta
+        chrome: stable
 
     # Build with lowest possible dependencies
     - php: 7.1
@@ -35,7 +35,7 @@ matrix:
     - php: 7.1
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" DEPENDENCIES="--prefer-lowest"
       addons:
-        chrome: beta
+        chrome: stable
 
     # Saucelabs builds
     - php: 7.1

From 04b741060ea0f4fc0a4e3822a10b461005362a52 Mon Sep 17 00:00:00 2001
From: Stephanyan <rabena.stephane@gmail.com>
Date: Thu, 8 Feb 2018 22:53:17 +0100
Subject: [PATCH 394/784] Add .vscode folder to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 42ef8b562..deb25f3ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ logs/
 *~
 *.swp
 .idea
+.vscode

From 5c724f1b73e20a8241179df36db1b636170cd405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 16 Feb 2018 00:33:29 +0000
Subject: [PATCH 395/784] Remove invalid phpDoc return tags

---
 lib/WebDriverExpectedCondition.php | 58 ++++++++++++++----------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index d9ceb5dde..505474dfd 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -51,7 +51,7 @@ public function getApply()
      * An expectation for checking the title of a page.
      *
      * @param string $title The expected title, which must be an exact match.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title equals given string.
+     * @return static Condition returns whether current page title equals given string.
      */
     public static function titleIs($title)
     {
@@ -66,7 +66,7 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking substring of a page Title.
      *
      * @param string $title The expected substring of Title.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title contains given string.
+     * @return static Condition returns whether current page title contains given string.
      */
     public static function titleContains($title)
     {
@@ -81,8 +81,7 @@ function (WebDriver $driver) use ($title) {
      * An expectation for checking current page title matches the given regular expression.
      *
      * @param string $titleRegexp The regular expression to test against.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current page title matches the regular
-     * expression.
+     * @return static Condition returns whether current page title matches the regular expression.
      */
     public static function titleMatches($titleRegexp)
     {
@@ -97,7 +96,7 @@ function (WebDriver $driver) use ($titleRegexp) {
      * An expectation for checking the URL of a page.
      *
      * @param string $url The expected URL, which must be an exact match.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL equals given one.
+     * @return static Condition returns whether current URL equals given one.
      */
     public static function urlIs($url)
     {
@@ -112,7 +111,7 @@ function (WebDriver $driver) use ($url) {
      * An expectation for checking substring of the URL of a page.
      *
      * @param string $url The expected substring of the URL
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL contains given string.
+     * @return static Condition returns whether current URL contains given string.
      */
     public static function urlContains($url)
     {
@@ -127,7 +126,7 @@ function (WebDriver $driver) use ($url) {
      * An expectation for checking current page URL matches the given regular expression.
      *
      * @param string $urlRegexp The regular expression to test against.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether current URL matches the regular expression.
+     * @return static Condition returns whether current URL matches the regular expression.
      */
     public static function urlMatches($urlRegexp)
     {
@@ -143,7 +142,7 @@ function (WebDriver $driver) use ($urlRegexp) {
      * This does not necessarily mean that the element is visible.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the element which is located.
+     * @return static Condition returns the WebDriverElement which is located.
      */
     public static function presenceOfElementLocated(WebDriverBy $by)
     {
@@ -158,7 +157,7 @@ function (WebDriver $driver) use ($by) {
      * An expectation for checking that there is at least one element present on a web page.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<array> Condition returns  an array of WebDriverElements once they are located.
+     * @return static Condition return an array of WebDriverElement once they are located.
      */
     public static function presenceOfAllElementsLocatedBy(WebDriverBy $by)
     {
@@ -176,7 +175,7 @@ function (WebDriver $driver) use ($by) {
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the element which is located and visible.
+     * @return static Condition returns the WebDriverElement which is located and visible.
      */
     public static function visibilityOfElementLocated(WebDriverBy $by)
     {
@@ -199,7 +198,7 @@ function (WebDriver $driver) use ($by) {
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverBy $by The located used to find the element.
-     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the elements that are located and visible.
+     * @return static Condition returns the array of WebDriverElement that are located and visible.
      */
     public static function visibilityOfAnyElementLocated(WebDriverBy $by)
     {
@@ -227,8 +226,7 @@ function (WebDriver $driver) use ($by) {
      * Visibility means that the element is not only displayed but also has a height and width that is greater than 0.
      *
      * @param WebDriverElement $element The element to be checked.
-     * @return WebDriverExpectedCondition<WebDriverElement> Condition returns the same WebDriverElement once it is
-     * visible.
+     * @return static Condition returns the same WebDriverElement once it is visible.
      */
     public static function visibilityOf(WebDriverElement $element)
     {
@@ -247,7 +245,7 @@ function () use ($element) {
      * @deprecated Use WebDriverExpectedCondition::elementTextContains() instead
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in the element.
+     * @return static Condition returns whether the text is present in the element.
      */
     public static function textToBePresentInElement(WebDriverBy $by, $text)
     {
@@ -260,7 +258,7 @@ public static function textToBePresentInElement(WebDriverBy $by, $text)
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the partial text is present in the element.
+     * @return static Condition returns whether the partial text is present in the element.
      */
     public static function elementTextContains(WebDriverBy $by, $text)
     {
@@ -283,7 +281,7 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The expected text of the element.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the element has text value equal to given one.
+     * @return static Condition returns whether the element has text value equal to given one.
      */
     public static function elementTextIs(WebDriverBy $by, $text)
     {
@@ -303,7 +301,7 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $regexp The regular expression to test against.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the element has text value equal to given one.
+     * @return static Condition returns whether the element has text value equal to given one.
      */
     public static function elementTextMatches(WebDriverBy $by, $regexp)
     {
@@ -325,7 +323,7 @@ function (WebDriver $driver) use ($by, $regexp) {
      * @deprecated Use WebDriverExpectedCondition::elementValueContains() instead
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element value.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in value attribute.
+     * @return static Condition returns whether the text is present in value attribute.
      */
     public static function textToBePresentInElementValue(WebDriverBy $by, $text)
     {
@@ -337,7 +335,7 @@ public static function textToBePresentInElementValue(WebDriverBy $by, $text)
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text to be presented in the element value.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is present in value attribute.
+     * @return static Condition returns whether the text is present in value attribute.
      */
     public static function elementValueContains(WebDriverBy $by, $text)
     {
@@ -359,8 +357,7 @@ function (WebDriver $driver) use ($by, $text) {
      *
      * @param string $frame_locator The locator used to find the iFrame
      *   expected to be either the id or name value of the i/frame
-     * @return WebDriverExpectedCondition<WebDriver|bool> Condition returns object focused on new frame when frame is
-     * found, false otherwise.
+     * @return static Condition returns object focused on new frame when frame is found, false otherwise.
      */
     public static function frameToBeAvailableAndSwitchToIt($frame_locator)
     {
@@ -379,7 +376,7 @@ function (WebDriver $driver) use ($frame_locator) {
      * An expectation for checking that an element is either invisible or not present on the DOM.
      *
      * @param WebDriverBy $by The locator used to find the element.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether no visible element located.
+     * @return static Condition returns whether no visible element located.
      */
     public static function invisibilityOfElementLocated(WebDriverBy $by)
     {
@@ -401,7 +398,7 @@ function (WebDriver $driver) use ($by) {
      *
      * @param WebDriverBy $by The locator used to find the element.
      * @param string $text The text of the element.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the text is found in the element located.
+     * @return static Condition returns whether the text is found in the element located.
      */
     public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
     {
@@ -422,8 +419,7 @@ function (WebDriver $driver) use ($by, $text) {
      * An expectation for checking an element is visible and enabled such that you can click it.
      *
      * @param WebDriverBy $by The locator used to find the element
-     * @return WebDriverExpectedCondition<WebDriverElement> Condition return the WebDriverElement once it is located,
-     * visible and clickable.
+     * @return static Condition return the WebDriverElement once it is located, visible and clickable.
      */
     public static function elementToBeClickable(WebDriverBy $by)
     {
@@ -453,7 +449,7 @@ function (WebDriver $driver) use ($visibility_of_element_located) {
      * Wait until an element is no longer attached to the DOM.
      *
      * @param WebDriverElement $element The element to wait for.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is still attached to the DOM.
+     * @return static Condition returns whether the element is still attached to the DOM.
      */
     public static function stalenessOf(WebDriverElement $element)
     {
@@ -479,8 +475,7 @@ function () use ($element) {
      * the condition is checked.
      *
      * @param WebDriverExpectedCondition $condition The condition wrapped.
-     * @return WebDriverExpectedCondition<mixed> Condition returns the return value of the getApply() of the given
-     * condition.
+     * @return static Condition returns the return value of the getApply() of the given condition.
      */
     public static function refreshed(self $condition)
     {
@@ -499,7 +494,7 @@ function (WebDriver $driver) use ($condition) {
      * An expectation for checking if the given element is selected.
      *
      * @param mixed $element_or_by Either the element or the locator.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is selected.
+     * @return static Condition returns whether the element is selected.
      */
     public static function elementToBeSelected($element_or_by)
     {
@@ -514,7 +509,7 @@ public static function elementToBeSelected($element_or_by)
      *
      * @param mixed $element_or_by Either the element or the locator.
      * @param bool $selected The required state.
-     * @return WebDriverExpectedCondition<bool> Condition returns whether the element is selected.
+     * @return static Condition returns whether the element is selected.
      */
     public static function elementSelectionStateToBe($element_or_by, $selected)
     {
@@ -544,8 +539,7 @@ function (WebDriver $driver) use ($element_or_by, $selected) {
     /**
      * An expectation for whether an alert() box is present.
      *
-     * @return WebDriverExpectedCondition<?WebDriverAlert> Condition returns WebDriverAlert if alert() is present,
-     * null otherwise.
+     * @return static Condition returns WebDriverAlert if alert() is present, null otherwise.
      */
     public static function alertIsPresent()
     {

From 372fcba2b549a2f7a982e5eacb45614961dcddd5 Mon Sep 17 00:00:00 2001
From: Antonin Rykalsky <antonin.rykalsky@dixonscarphone.com>
Date: Mon, 12 Feb 2018 12:58:01 +0100
Subject: [PATCH 396/784] Disable sending Expect header in POST requests

---
 lib/Remote/HttpCommandExecutor.php            |  6 +++++
 .../ReportSauceLabsStatusListener.php         |  2 ++
 tests/unit/Remote/HttpCommandExecutorTest.php | 26 ++++++++++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 09bf000d0..6a795080c 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -263,6 +263,12 @@ public function execute(WebDriverCommand $command)
             curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
         }
 
+        if (in_array($http_method, ['POST', 'PUT'])) {
+            // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
+            // https://tools.ietf.org/html/rfc7231#section-5.1.1
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, ['Expect:']);
+        }
+
         $encoded_params = null;
 
         if ($http_method === 'POST' && $params && is_array($params)) {
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index f2a3c9f7d..8d25b76ff 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -77,6 +77,8 @@ private function submitToSauceLabs($url, array $data)
         curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
         curl_setopt($curl, CURLOPT_USERPWD, getenv('SAUCE_USERNAME') . ':' . getenv('SAUCE_ACCESS_KEY'));
         curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
+        // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
+        curl_setopt($curl, CURLOPT_HTTPHEADER, ['Expect:']);
 
         curl_exec($curl);
 
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index a3810e731..5519fa0e4 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -34,19 +34,32 @@ public function setUp()
      * @dataProvider commandProvider
      * @param int $command
      * @param array $params
+     * @param bool $shouldResetExpectHeader
      * @param string $expectedUrl
      * @param string $expectedPostData
      */
-    public function testShouldSendRequestToAssembledUrl($command, array $params, $expectedUrl, $expectedPostData)
-    {
+    public function testShouldSendRequestToAssembledUrl(
+        $command,
+        array $params,
+        $shouldResetExpectHeader,
+        $expectedUrl,
+        $expectedPostData
+    ) {
         $command = new WebDriverCommand('foo-123', $command, $params);
 
         $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
         $curlSetoptMock->expects($this->at(0))
             ->with($this->anything(), CURLOPT_URL, $expectedUrl);
 
-        $curlSetoptMock->expects($this->at(2))
-            ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+        if ($shouldResetExpectHeader) {
+            $curlSetoptMock->expects($this->at(2))
+                ->with($this->anything(), CURLOPT_HTTPHEADER, ['Expect:']);
+            $curlSetoptMock->expects($this->at(3))
+                ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+        } else {
+            $curlSetoptMock->expects($this->at(2))
+                ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+        }
 
         $curlExecMock = $this->getFunctionMock(__NAMESPACE__, 'curl_exec');
         $curlExecMock->expects($this->once())
@@ -64,30 +77,35 @@ public function commandProvider()
             'POST command having :id placeholder in url' => [
                 DriverCommand::SEND_KEYS_TO_ELEMENT,
                 ['value' => 'submitted-value', ':id' => '1337'],
+                true,
                 'http://localhost:4444/session/foo-123/element/1337/value',
                 '{"value":"submitted-value"}',
             ],
             'POST command without :id placeholder in url' => [
                 DriverCommand::TOUCH_UP,
                 ['x' => 3, 'y' => 6],
+                true,
                 'http://localhost:4444/session/foo-123/touch/up',
                 '{"x":3,"y":6}',
             ],
             'Extra useless placeholder parameter should be removed' => [
                 DriverCommand::TOUCH_UP,
                 ['x' => 3, 'y' => 6, ':useless' => 'foo'],
+                true,
                 'http://localhost:4444/session/foo-123/touch/up',
                 '{"x":3,"y":6}',
             ],
             'DELETE command' => [
                 DriverCommand::DELETE_COOKIE,
                 [':name' => 'cookie-name'],
+                false,
                 'http://localhost:4444/session/foo-123/cookie/cookie-name',
                 null,
             ],
             'GET command without session in URL' => [
                 DriverCommand::GET_ALL_SESSIONS,
                 [],
+                false,
                 'http://localhost:4444/sessions',
                 null,
             ],

From 42e7b6554f30689baf43827b791a678b2f7ecc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 17 Feb 2018 01:19:28 +0000
Subject: [PATCH 397/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3adb0988..67969e3f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Connection and request timeouts could be specified also when creating RemoteWebDriver from existing session ID.
 
+### Changed
+- Disable sending 'Expect: 100-Continue' header with POST requests, as they may more easily fail when sending via eg. squid proxy.
+
 ## 1.5.0 - 2017-11-15
 ### Changed
 - Drop PHP 5.5 support, the minimal required version of PHP is now PHP 5.6.

From 2d40e31c8911c4e0e9df43ca771623266bb978da Mon Sep 17 00:00:00 2001
From: Drew Budwin <drew@budw.in>
Date: Fri, 2 Feb 2018 18:37:19 -0500
Subject: [PATCH 398/784] Update PHPDoc for functions that return static
 instances of a class

Previously, functions that contained functionality similar to `return new static(...)` had their `@return` PHPDoc tag to specify the class name like `@return SomeClass` where the preferred documentation should be `@return static`.

Some support for this decision:
https://github.com/phpDocumentor/fig-standards/blob/master/proposed/phpdoc.md#keyword
https://netbeans.org/bugzilla/show_bug.cgi?id=196565
https://blog.madewithlove.be/post/return-types/
---
 CHANGELOG.md                                 |  1 +
 lib/Chrome/ChromeDriver.php                  |  3 +++
 lib/Chrome/ChromeDriverService.php           |  3 +++
 lib/Remote/DesiredCapabilities.php           | 24 ++++++++++----------
 lib/Remote/RemoteWebDriver.php               |  4 ++--
 lib/Remote/RemoteWebElement.php              |  2 +-
 lib/Support/Events/EventFiringWebElement.php |  2 +-
 lib/WebDriverBy.php                          | 16 ++++++-------
 lib/WebDriverExpectedCondition.php           |  2 +-
 9 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3adb0988..0b7288a90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Added
 - Connection and request timeouts could be specified also when creating RemoteWebDriver from existing session ID.
+- Update PHPDoc for functions that return static instances of a class.
 
 ## 1.5.0 - 2017-11-15
 ### Changed
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 832ca17a8..107854b4a 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -24,6 +24,9 @@
 
 class ChromeDriver extends RemoteWebDriver
 {
+    /**
+     * @return static
+     */
     public static function start(DesiredCapabilities $desired_capabilities = null, ChromeDriverService $service = null)
     {
         if ($desired_capabilities === null) {
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index 90b3d24f7..c9525126d 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -22,6 +22,9 @@ class ChromeDriverService extends DriverService
     // The environment variable storing the path to the chrome driver executable.
     const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
 
+    /**
+     * @return static
+     */
     public static function createDefaultService()
     {
         $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 940fcf98c..0e1a1ab25 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -178,7 +178,7 @@ public function toArray()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function android()
     {
@@ -189,7 +189,7 @@ public static function android()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function chrome()
     {
@@ -200,7 +200,7 @@ public static function chrome()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function firefox()
     {
@@ -218,7 +218,7 @@ public static function firefox()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function htmlUnit()
     {
@@ -229,7 +229,7 @@ public static function htmlUnit()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function htmlUnitWithJS()
     {
@@ -242,7 +242,7 @@ public static function htmlUnitWithJS()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function internetExplorer()
     {
@@ -253,7 +253,7 @@ public static function internetExplorer()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function microsoftEdge()
     {
@@ -264,7 +264,7 @@ public static function microsoftEdge()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function iphone()
     {
@@ -275,7 +275,7 @@ public static function iphone()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function ipad()
     {
@@ -286,7 +286,7 @@ public static function ipad()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function opera()
     {
@@ -297,7 +297,7 @@ public static function opera()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function safari()
     {
@@ -308,7 +308,7 @@ public static function safari()
     }
 
     /**
-     * @return DesiredCapabilities
+     * @return static
      */
     public static function phantomjs()
     {
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index becab6b98..1487689ec 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -87,7 +87,7 @@ protected function __construct(
      * @param string|null $http_proxy The proxy to tunnel requests to the remote Selenium WebDriver through
      * @param int|null $http_proxy_port The proxy port to tunnel requests to the remote Selenium WebDriver through
      * @param DesiredCapabilities $required_capabilities The required capabilities
-     * @return RemoteWebDriver
+     * @return static
      */
     public static function create(
         $selenium_server_url = 'http://localhost:4444/wd/hub',
@@ -141,7 +141,7 @@ public static function create(
      * @param string $session_id The existing session id
      * @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
-     * @return RemoteWebDriver
+     * @return static
      */
     public static function createBySessionID(
         $session_id,
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 17fa258c4..26936d8b9 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -408,7 +408,7 @@ public function equals(WebDriverElement $other)
      *
      * @param string $id
      *
-     * @return RemoteWebElement
+     * @return static
      */
     protected function newElement($id)
     {
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 9595953cf..8df5cbb78 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -405,7 +405,7 @@ protected function dispatch($method, ...$arguments)
 
     /**
      * @param WebDriverElement $element
-     * @return EventFiringWebElement
+     * @return static
      */
     protected function newElement(WebDriverElement $element)
     {
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index f882683b3..822a5c5fc 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -60,7 +60,7 @@ public function getValue()
      * names are not permitted.
      *
      * @param string $class_name
-     * @return WebDriverBy
+     * @return static
      */
     public static function className($class_name)
     {
@@ -71,7 +71,7 @@ public static function className($class_name)
      * Locates elements matching a CSS selector.
      *
      * @param string $css_selector
-     * @return WebDriverBy
+     * @return static
      */
     public static function cssSelector($css_selector)
     {
@@ -82,7 +82,7 @@ public static function cssSelector($css_selector)
      * Locates elements whose ID attribute matches the search value.
      *
      * @param string $id
-     * @return WebDriverBy
+     * @return static
      */
     public static function id($id)
     {
@@ -93,7 +93,7 @@ public static function id($id)
      * Locates elements whose NAME attribute matches the search value.
      *
      * @param string $name
-     * @return WebDriverBy
+     * @return static
      */
     public static function name($name)
     {
@@ -104,7 +104,7 @@ public static function name($name)
      * Locates anchor elements whose visible text matches the search value.
      *
      * @param string $link_text
-     * @return WebDriverBy
+     * @return static
      */
     public static function linkText($link_text)
     {
@@ -116,7 +116,7 @@ public static function linkText($link_text)
      * value.
      *
      * @param string $partial_link_text
-     * @return WebDriverBy
+     * @return static
      */
     public static function partialLinkText($partial_link_text)
     {
@@ -127,7 +127,7 @@ public static function partialLinkText($partial_link_text)
      * Locates elements whose tag name matches the search value.
      *
      * @param string $tag_name
-     * @return WebDriverBy
+     * @return static
      */
     public static function tagName($tag_name)
     {
@@ -138,7 +138,7 @@ public static function tagName($tag_name)
      * Locates elements matching an XPath expression.
      *
      * @param string $xpath
-     * @return WebDriverBy
+     * @return static
      */
     public static function xpath($xpath)
     {
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 505474dfd..15c7b3d2d 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -564,7 +564,7 @@ function (WebDriver $driver) {
      * An expectation checking the number of opened windows.
      *
      * @param int $expectedNumberOfWindows
-     * @return WebDriverExpectedCondition
+     * @return static
      */
     public static function numberOfWindowsToBe($expectedNumberOfWindows)
     {

From c4dcacf1978e680573042823606a40c1f990dd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 25 Feb 2018 17:45:57 +0000
Subject: [PATCH 399/784] Describe a bit more how to use php-webdriver with
 Firefox

---
 README.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 5b331d349..9bbb228c6 100644
--- a/README.md
+++ b/README.md
@@ -43,9 +43,7 @@ Download and run that file, replacing # with the current server version. Keep in
 
     java -jar selenium-server-standalone-#.jar
 
-When using Selenium server 3.5 and newer with some remote end clients (eg. Firefox with Geckodriver), you MUST disable so called "pass-through" mode, so that remote browser's protocol is translated to the protocol supported by php-webdriver (see [issue #469](https://github.com/facebook/php-webdriver/issues/469)):
-
-    java -jar selenium-server-standalone-#.jar -enablePassThrough false
+(Please see note below when using Firefox.)
 
 Then when you create a session, be sure to pass the url to where your server is running.
 
@@ -58,6 +56,13 @@ $host = 'http://localhost:4444/wd/hub'; // this is the default
 
 Make sure to have latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases) installed.
 
+Because Firefox (and Geckodriver) only supports new W3C WebDriver protocol (which is yet to be implemented by php-wedbriver - see [issue #469](https://github.com/facebook/php-webdriver/issues/469)),
+the protocols must be translated by Selenium server - this feature is *partially* available in Selenium server version 3.5.0-3.8.1 and you can enable it like this:
+
+    java -jar selenium-server-standalone-3.8.1.jar -enablePassThrough false
+
+Now you can start Firefox from your code:
+
 ```php
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
 ```

From a6d99922c0c9812ee4a663b5796be734b5a40257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 9 Mar 2018 11:10:25 +0100
Subject: [PATCH 400/784] Add missing required extensions to composer.json

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a96b82fe5..5e5fce576 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,8 @@
     "symfony/process": "^2.8 || ^3.1 || ^4.0",
     "ext-curl": "*",
     "ext-zip": "*",
-    "ext-mbstring": "*"
+    "ext-mbstring": "*",
+    "ext-json": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.7",
@@ -28,6 +29,9 @@
     "symfony/var-dumper": "^3.3 || ^4.0",
     "jakub-onderka/php-parallel-lint": "^0.9.2"
   },
+  "suggest": {
+    "ext-SimpleXML": "For Firefox profile creation"
+  },
   "autoload": {
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"

From 17881d2832df05301185b3ae96081f25c484d12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 9 Mar 2018 11:13:31 +0100
Subject: [PATCH 401/784] Prefer Chrome in example script

---
 example.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/example.php b/example.php
index 263d0c1d6..513b918b3 100644
--- a/example.php
+++ b/example.php
@@ -1,5 +1,6 @@
 <?php
 // An example of using php-webdriver.
+// Do not forget to run composer install before and also have Selenium server started and listening on port 4444.
 
 namespace Facebook\WebDriver;
 
@@ -8,13 +9,13 @@
 
 require_once('vendor/autoload.php');
 
-// start Firefox with 5 second timeout
+// start Chrome with 5 second timeout
 $host = 'http://localhost:4444/wd/hub'; // this is the default
-$capabilities = DesiredCapabilities::firefox();
+$capabilities = DesiredCapabilities::chrome();
 $driver = RemoteWebDriver::create($host, $capabilities, 5000);
 
 // navigate to 'http://www.seleniumhq.org/'
-$driver->get('http://www.seleniumhq.org/');
+$driver->get('https://www.seleniumhq.org/');
 
 // adding cookie
 $driver->manage()->deleteAllCookies();
@@ -57,5 +58,5 @@
     )
 );
 
-// close the Firefox
+// close the browser
 $driver->quit();

From d4d655e958658eb0ab0050aea8f4d6c11f471c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 9 Mar 2018 11:28:50 +0100
Subject: [PATCH 402/784] Remove workaround for selenium bug
 https://github.com/SeleniumHQ/selenium/issues/3398

---
 example.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/example.php b/example.php
index 513b918b3..2a9d0b298 100644
--- a/example.php
+++ b/example.php
@@ -45,11 +45,8 @@
 
 // write 'php' in the search box
 $driver->findElement(WebDriverBy::id('q'))
-    ->sendKeys('php');
-
-// submit the form
-$driver->findElement(WebDriverBy::id('submit'))
-    ->click(); // submit() does not work in Selenium 3 because of bug https://github.com/SeleniumHQ/selenium/issues/3398
+    ->sendKeys('php') // fill the search box
+    ->submit(); // submit the whole form
 
 // wait at most 10 seconds until at least one result is shown
 $driver->wait(10)->until(

From bc08cfaddb1bb1a1f25d1981c637b92fa9d3d6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 9 Mar 2018 11:38:17 +0100
Subject: [PATCH 403/784] Suggest Chrome on the first place in readme

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9bbb228c6..c0bd89d1f 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,14 @@ Then when you create a session, be sure to pass the url to where your server is
 $host = 'http://localhost:4444/wd/hub'; // this is the default
 ```
 
+##### Launch Chrome
+
+Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) installed.
+
+```php
+$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+```
+
 ##### Launch Firefox
 
 Make sure to have latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases) installed.
@@ -67,14 +75,6 @@ Now you can start Firefox from your code:
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
 ```
 
-##### Launch Chrome
-
-Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) installed.
-
-```php
-$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
-```
-
 ##### You can also customize the desired capabilities
 
 ```php

From 50be1fdd1d69119f7b6ad95f983a27b2b61f387b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 12 Mar 2018 16:34:11 +0100
Subject: [PATCH 404/784] PHPDoc: WebDriverElement::getAttribute may return
 null

---
 lib/WebDriverElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 2505368b3..7253cb238 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -38,7 +38,7 @@ public function click();
      * Get the value of a the given attribute of the element.
      *
      * @param string $attribute_name The name of the attribute.
-     * @return string The value of the attribute.
+     * @return string|null The value of the attribute.
      */
     public function getAttribute($attribute_name);
 

From cb4696490461d95c80784eb8e45008a296663092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 13 Mar 2018 10:21:01 +0100
Subject: [PATCH 405/784] Remove useless parenthesis in WebDriverSelect (minor)

---
 lib/WebDriverSelect.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index abe6b54fe..1dfbe268b 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -39,7 +39,7 @@ public function __construct(WebDriverElement $element)
         }
         $this->element = $element;
         $value = $element->getAttribute('multiple');
-        $this->isMulti = ($value === 'true');
+        $this->isMulti = $value === 'true';
     }
 
     public function isMultiple()

From cbcc53cd9c53a1e3ea91947fac8a730b7dd39e8f Mon Sep 17 00:00:00 2001
From: Antonin Rykalsky <antonin.rykalsky@dixonscarphone.com>
Date: Tue, 13 Mar 2018 15:07:32 +0100
Subject: [PATCH 406/784] Fix other http headers being not sent in case of
 adding Except header

---
 lib/Remote/HttpCommandExecutor.php            | 18 +++++++++---------
 tests/unit/Remote/HttpCommandExecutorTest.php | 12 +++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 6a795080c..f584324b7 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -26,6 +26,11 @@
  */
 class HttpCommandExecutor implements WebDriverCommandExecutor
 {
+    const DEFAULT_HTTP_HEADERS = [
+        'Content-Type: application/json;charset=UTF-8',
+        'Accept: application/json',
+    ];
+
     /**
      * @see https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol#command-reference
      */
@@ -169,14 +174,7 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
 
         curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
-        curl_setopt(
-            $this->curl,
-            CURLOPT_HTTPHEADER,
-            [
-                'Content-Type: application/json;charset=UTF-8',
-                'Accept: application/json',
-            ]
-        );
+        curl_setopt($this->curl, CURLOPT_HTTPHEADER, static::DEFAULT_HTTP_HEADERS);
         $this->setRequestTimeout(30000);
         $this->setConnectionTimeout(30000);
     }
@@ -266,7 +264,9 @@ public function execute(WebDriverCommand $command)
         if (in_array($http_method, ['POST', 'PUT'])) {
             // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
             // https://tools.ietf.org/html/rfc7231#section-5.1.1
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, ['Expect:']);
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array_merge(static::DEFAULT_HTTP_HEADERS, ['Expect:']));
+        } else {
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, static::DEFAULT_HTTP_HEADERS);
         }
 
         $encoded_params = null;
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 5519fa0e4..d6aae04b2 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -53,11 +53,21 @@ public function testShouldSendRequestToAssembledUrl(
 
         if ($shouldResetExpectHeader) {
             $curlSetoptMock->expects($this->at(2))
-                ->with($this->anything(), CURLOPT_HTTPHEADER, ['Expect:']);
+                ->with(
+                    $this->anything(),
+                    CURLOPT_HTTPHEADER,
+                    ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json', 'Expect:']
+                );
             $curlSetoptMock->expects($this->at(3))
                 ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
         } else {
             $curlSetoptMock->expects($this->at(2))
+                ->with(
+                    $this->anything(),
+                    CURLOPT_HTTPHEADER,
+                    ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json']
+                );
+            $curlSetoptMock->expects($this->at(3))
                 ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
         }
 

From 8d368c65e6503aef11c545b1ec0cfb883b42b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Wed, 14 Mar 2018 22:44:11 +0100
Subject: [PATCH 407/784] Add more php-cs-fixer rules

---
 .php_cs.dist                                  | 5 +++++
 tests/unit/Remote/DesiredCapabilitiesTest.php | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index d95f9d0fc..48aa29de7 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -12,6 +12,7 @@ return PhpCsFixer\Config::create()
         'cast_spaces' => true,
         'concat_space' => ['spacing' => 'one'],
         'function_typehint_space' => true,
+        'general_phpdoc_annotation_remove' => ['author'],
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
         'mb_str_functions' => true,
@@ -50,6 +51,9 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
+        'php_unit_expectation' => true,
+        'php_unit_mock' => true,
+        'php_unit_no_expectation_annotation' => true,
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
@@ -73,6 +77,7 @@ return PhpCsFixer\Config::create()
         'unary_operator_spaces' => true,
         'visibility_required' => true,
         'whitespace_after_comma_in_array' => true,
+        'yoda_style' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 7d39c3675..6e14ef044 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -62,12 +62,11 @@ public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
         $this->assertSame(333, $capabilities->getVersion());
     }
 
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage isJavascriptEnabled() is a htmlunit-only option
-     */
     public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('isJavascriptEnabled() is a htmlunit-only option');
+
         $capabilities = new DesiredCapabilities();
         $capabilities->setBrowserName(WebDriverBrowserType::FIREFOX);
         $capabilities->setJavascriptEnabled(false);

From 316dd0b7c056694a056bfc4e5217896eec2d1fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 14 Mar 2018 23:32:35 +0100
Subject: [PATCH 408/784] Use udiff format in php-cs-fixer for more readable
 diffs

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5e5fce576..2a9929725 100644
--- a/composer.json
+++ b/composer.json
@@ -45,11 +45,11 @@
   },
   "scripts": {
     "codestyle:check": [
-      "vendor/bin/php-cs-fixer fix --diff --dry-run",
+      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
     ],
     "codestyle:fix": [
-      "vendor/bin/php-cs-fixer fix --diff || exit 0",
+      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff -vvv || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ],
     "analyze": [

From 8a2df15749421bd6685b87c4574ad3c283d9d057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 16 Mar 2018 10:28:07 +0100
Subject: [PATCH 409/784] Fix @see in WebDriverOptions::addCookie

---
 lib/WebDriverOptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 9791b9f1c..a610a9e6a 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -37,7 +37,7 @@ public function __construct(ExecuteMethod $executor)
     /**
      * Add a specific cookie.
      *
-     * @see Facebook\WebDriver\Cookie for description of possible cookie properties
+     * @see Cookie for description of possible cookie properties
      * @param Cookie|array $cookie Cookie object. May be also created from array for compatibility reasons.
      * @return WebDriverOptions The current instance.
      */

From c95385adff0858e21446be5b49474056c1c06164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Fri, 16 Mar 2018 15:54:52 +0100
Subject: [PATCH 410/784] Fix the PHPDoc's types of Cookie.php

---
 lib/Cookie.php           | 10 +++++-----
 lib/WebDriverOptions.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 0434a128b..57ec7e13a 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -104,7 +104,7 @@ public function setPath($path)
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getPath()
     {
@@ -126,7 +126,7 @@ public function setDomain($domain)
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getDomain()
     {
@@ -144,7 +144,7 @@ public function setExpiry($expiry)
     }
 
     /**
-     * @return int
+     * @return int|null
      */
     public function getExpiry()
     {
@@ -162,7 +162,7 @@ public function setSecure($secure)
     }
 
     /**
-     * @return bool
+     * @return bool|null
      */
     public function isSecure()
     {
@@ -180,7 +180,7 @@ public function setHttpOnly($httpOnly)
     }
 
     /**
-     * @return bool
+     * @return bool|null
      */
     public function isHttpOnly()
     {
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index a610a9e6a..bec7fd18b 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -90,7 +90,7 @@ public function deleteCookieNamed($name)
      * Get the cookie with a given name.
      *
      * @param string $name
-     * @return Cookie The cookie, or null if no cookie with the given name is presented.
+     * @return Cookie|null The cookie, or null if no cookie with the given name is presented.
      */
     public function getCookieNamed($name)
     {

From 933a114472777c72f781166ce4bccd29d61abe7b Mon Sep 17 00:00:00 2001
From: agentFinland <agentFinland@gmail.com>
Date: Tue, 10 Apr 2018 12:13:13 -0700
Subject: [PATCH 411/784] Clarified README (#557)

* Clarified README

- simplified some word choice for those new to the project and non-primary English speakers
- corrected grammar
- removed unnecessary words (clutter)
- corrected sentence fragments
- corrected improper verb choices
- added extra headers to clarify purpose of each set of steps
- rearranged some sentences so the focus of the sentence came earlier and/or became the subject
---
 README.md | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index c0bd89d1f..b25bee453 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,12 @@ by the Selenium server and will also implement the [W3C WebDriver](https://w3c.g
 The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
 [Selenium project](https://github.com/SeleniumHQ/selenium/).
 
-**This is new version of PHP client, rewritten from scratch starting 2013.**
+**As of 2013, this PHP client has been rewritten from scratch.**
 Using the old version? Check out [Adam Goucher's fork](https://github.com/Element-34/php-webdriver) of it.
 
 Looking for API documentation of php-webdriver? See [https://facebook.github.io/php-webdriver/](https://facebook.github.io/php-webdriver/latest/)
 
-Any complaint, question, idea? You can post it on the user group https://www.facebook.com/groups/phpwebdriver/.
+Any complaints, questions, or ideas? Post them in the user group https://www.facebook.com/groups/phpwebdriver/.
 
 ## Installation
 
@@ -37,15 +37,19 @@ Then install the library:
 
 ## Getting started
 
-All you need as the server for this client is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
+### Start Server
 
-Download and run that file, replacing # with the current server version. Keep in mind you must have Java 8+ installed to start this command.
+The required server is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
+
+Download and run the server by replacing # with the current server version. Keep in mind **you must have Java 8+ installed to run this command**.
 
     java -jar selenium-server-standalone-#.jar
 
-(Please see note below when using Firefox.)
+**NOTE:** If using Firefox, see alternate command below.
+
+### Create a Browser Session
 
-Then when you create a session, be sure to pass the url to where your server is running.
+When creating a browser session, be sure to pass the url of your running server.
 
 ```php
 // This would be the url of the host running the server-standalone.jar
@@ -54,7 +58,7 @@ $host = 'http://localhost:4444/wd/hub'; // this is the default
 
 ##### Launch Chrome
 
-Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) installed.
+Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) versions installed.
 
 ```php
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
@@ -64,8 +68,8 @@ $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
 
 Make sure to have latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases) installed.
 
-Because Firefox (and Geckodriver) only supports new W3C WebDriver protocol (which is yet to be implemented by php-wedbriver - see [issue #469](https://github.com/facebook/php-webdriver/issues/469)),
-the protocols must be translated by Selenium server - this feature is *partially* available in Selenium server version 3.5.0-3.8.1 and you can enable it like this:
+Because Firefox (and Geckodriver) only support the new W3C WebDriver protocol (which is yet to be implemented by php-webdriver - see [issue #469](https://github.com/facebook/php-webdriver/issues/469)),
+the protocols must be translated by Selenium Server - this feature is *partially* available in Selenium Server versions 3.5.0-3.8.1 and you can enable it like this:
 
     java -jar selenium-server-standalone-3.8.1.jar -enablePassThrough false
 
@@ -75,7 +79,7 @@ Now you can start Firefox from your code:
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
 ```
 
-##### You can also customize the desired capabilities
+### Customize Desired Capabilities
 
 ```php
 $desired_capabilities = DesiredCapabilities::firefox();
@@ -85,7 +89,7 @@ $driver = RemoteWebDriver::create($host, $desired_capabilities);
 
 * See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities for more details.
 
-* Above snippets are not intended to be a working example by simply copy pasting. See [example.php](example.php) for working example.
+**NOTE:** Above snippets are not intended to be a working example by simply copy-pasting. See [example.php](example.php) for working example.
 
 ## Changelog
 For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
@@ -98,22 +102,21 @@ You may also want to check out the Selenium [docs](http://docs.seleniumhq.org/do
 
 ## Testing framework integration
 
-To take advantage of automatized testing you will most probably want to integrate php-webdriver to your testing framework.
-There are some project already providing this:
+To take advantage of automatized testing you may want to integrate php-webdriver to your testing framework.
+There are some projects already providing this:
 
-- [Steward](https://github.com/lmc-eu/steward) integrates php-webdriver directly to [PHPUnit](https://phpunit.de/), also providers parallelization.
-- [Codeception](http://codeception.com) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](http://codeception.com/docs/modules/WebDriver).
-- You can also check out this [blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration.
+- [Steward](https://github.com/lmc-eu/steward) integrates php-webdriver directly to [PHPUnit](https://phpunit.de/), and provides parallelization
+- [Codeception](http://codeception.com) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](http://codeception.com/docs/modules/WebDriver)
+- You can also check out this [blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration
 
 ## Support
 
-We have a great community willing to try and help you!
+We have a great community willing to help you!
 
-- **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contributing to the communal discussion and support.
-- **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow.
-- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as an new issue.
+- **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contribute to communal discussion and support
+- **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow
+- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as an new issue
 
 ## Contributing
 
-We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information
-about contributing and developing php-webdriver.
+We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information about contributing and developing php-webdriver.

From f9a1a6ba4f57be77cc92122ae13df3dad6d3191e Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Wed, 16 May 2018 10:34:50 -0700
Subject: [PATCH 412/784] Update changelog for release

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b76cce76d..0f3088da9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+---
+
+## 1.6.0 - 2018-05-16
 ### Added
 - Connection and request timeouts could be specified also when creating RemoteWebDriver from existing session ID.
 - Update PHPDoc for functions that return static instances of a class.

From a1784b20ea64afdb0613e5164b3cb42773df4578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 28 May 2018 16:32:37 +0200
Subject: [PATCH 413/784] Update Selenium to 3.8.1 and Chromedriver to 2.38

---
 .travis.yml                              | 6 +++---
 tests/functional/RemoteWebDriverTest.php | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3c9c5c1a3..4a2cada83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
   global:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
-    - CHROMEDRIVER_VERSION="2.35"
+    - CHROMEDRIVER_VERSION="2.38"
 
 matrix:
   include:
@@ -93,8 +93,8 @@ 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
   - sh -e /etc/init.d/xvfb start
-  - if [ ! -f jar/selenium-server-standalone-3.4.0.jar ]; then wget -q -t 3 -P jar https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar; fi
-  - java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$CHROMEDRIVER_PATH" -jar jar/selenium-server-standalone-3.4.0.jar -log ./logs/selenium.log &
+  - 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 &
   - 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/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 440776ad5..818a9da5a 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -84,7 +84,6 @@ public function testShouldGetAllSessions()
 
         $this->assertArrayHasKey('capabilities', $sessions[0]);
         $this->assertArrayHasKey('id', $sessions[0]);
-        $this->assertArrayHasKey('class', $sessions[0]);
     }
 
     /**

From 6c885357678c692ee76d97d21ba03fbfbd19b46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 29 May 2018 15:03:45 +0200
Subject: [PATCH 414/784] Add utility classes to interact with checkboxes and
 radio buttons (#545)

* Add an utility class to manipulate checkboxes and radio buttons
---
 lib/AbstractWebDriverCheckboxOrRadio.php      | 248 ++++++++++++++++++
 lib/WebDriverCheckboxes.php                   |  66 +++++
 lib/WebDriverRadios.php                       |  65 +++++
 tests/functional/WebDriverCheckboxesTest.php  | 197 ++++++++++++++
 tests/functional/WebDriverRadiosTest.php      | 184 +++++++++++++
 tests/functional/web/form_checkbox_radio.html |  43 +++
 6 files changed, 803 insertions(+)
 create mode 100644 lib/AbstractWebDriverCheckboxOrRadio.php
 create mode 100644 lib/WebDriverCheckboxes.php
 create mode 100644 lib/WebDriverRadios.php
 create mode 100644 tests/functional/WebDriverCheckboxesTest.php
 create mode 100644 tests/functional/WebDriverRadiosTest.php
 create mode 100644 tests/functional/web/form_checkbox_radio.html

diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
new file mode 100644
index 000000000..46288592b
--- /dev/null
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -0,0 +1,248 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnexpectedTagNameException;
+use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Support\XPathEscaper;
+
+/**
+ * Provides helper methods for checkboxes and radio buttons.
+ */
+abstract class AbstractWebDriverCheckboxOrRadio implements WebDriverSelectInterface
+{
+    /** @var WebDriverElement */
+    protected $element;
+
+    /** @var string */
+    protected $type;
+
+    /** @var string */
+    protected $name;
+
+    public function __construct(WebDriverElement $element)
+    {
+        $tagName = $element->getTagName();
+        if ($tagName !== 'input') {
+            throw new UnexpectedTagNameException('input', $tagName);
+        }
+
+        $this->name = $element->getAttribute('name');
+        if ($this->name === null) {
+            throw new WebDriverException('The input does not have a "name" attribute.');
+        }
+
+        $this->element = $element;
+    }
+
+    public function getOptions()
+    {
+        return $this->getRelatedElements();
+    }
+
+    public function getAllSelectedOptions()
+    {
+        $selectedElement = [];
+        foreach ($this->getRelatedElements() as $element) {
+            if ($element->isSelected()) {
+                $selectedElement[] = $element;
+
+                if (!$this->isMultiple()) {
+                    return $selectedElement;
+                }
+            }
+        }
+
+        return $selectedElement;
+    }
+
+    public function getFirstSelectedOption()
+    {
+        foreach ($this->getRelatedElements() as $element) {
+            if ($element->isSelected()) {
+                return $element;
+            }
+        }
+
+        throw new NoSuchElementException(
+            sprintf('No %s are selected', 'radio' === $this->type ? 'radio buttons' : 'checkboxes')
+        );
+    }
+
+    public function selectByIndex($index)
+    {
+        $this->byIndex($index);
+    }
+
+    public function selectByValue($value)
+    {
+        $this->byValue($value);
+    }
+
+    public function selectByVisibleText($text)
+    {
+        $this->byVisibleText($text);
+    }
+
+    public function selectByVisiblePartialText($text)
+    {
+        $this->byVisibleText($text, true);
+    }
+
+    /**
+     * Selects or deselects a checkbox or a radio button by its value.
+     *
+     * @param string $value
+     * @param bool $select
+     * @throws NoSuchElementException
+     */
+    protected function byValue($value, $select = true)
+    {
+        $matched = false;
+        foreach ($this->getRelatedElements($value) as $element) {
+            $select ? $this->selectOption($element) : $this->deselectOption($element);
+            if (!$this->isMultiple()) {
+                return;
+            }
+
+            $matched = true;
+        }
+
+        if (!$matched) {
+            throw new NoSuchElementException(
+                sprintf('Cannot locate %s with value: %s', $this->type, $value)
+            );
+        }
+    }
+
+    /**
+     * Selects or deselects a checkbox or a radio button by its index.
+     *
+     * @param int $index
+     * @param bool $select
+     * @throws NoSuchElementException
+     */
+    protected function byIndex($index, $select = true)
+    {
+        $elements = $this->getRelatedElements();
+        if (!isset($elements[$index])) {
+            throw new NoSuchElementException(sprintf('Cannot locate %s with index: %d', $this->type, $index));
+        }
+
+        $select ? $this->selectOption($elements[$index]) : $this->deselectOption($elements[$index]);
+    }
+
+    /**
+     * Selects or deselects a checkbox or a radio button by its visible text.
+     *
+     * @param string $text
+     * @param bool $partial
+     * @param bool $select
+     */
+    protected function byVisibleText($text, $partial = false, $select = true)
+    {
+        foreach ($this->getRelatedElements() as $element) {
+            $normalizeFilter = sprintf(
+                $partial ? 'contains(normalize-space(.), %s)' : 'normalize-space(.) = %s',
+                XPathEscaper::escapeQuotes($text)
+            );
+
+            $xpath = 'ancestor::label';
+            $xpathNormalize = sprintf('%s[%s]', $xpath, $normalizeFilter);
+
+            $id = $element->getAttribute('id');
+            if ($id !== null) {
+                $idFilter = sprintf('@for = %s', XPathEscaper::escapeQuotes($id));
+
+                $xpath .= sprintf(' | //label[%s]', $idFilter);
+                $xpathNormalize .= sprintf(' | //label[%s and %s]', $idFilter, $normalizeFilter);
+            }
+
+            try {
+                $element->findElement(WebDriverBy::xpath($xpathNormalize));
+            } catch (NoSuchElementException $e) {
+                if ($partial) {
+                    continue;
+                }
+
+                try {
+                    // Since the mechanism of getting the text in xpath is not the same as
+                    // webdriver, use the expensive getText() to check if nothing is matched.
+                    if ($text !== $element->findElement(WebDriverBy::xpath($xpath))->getText()) {
+                        continue;
+                    }
+                } catch (NoSuchElementException $e) {
+                    continue;
+                }
+            }
+
+            $select ? $this->selectOption($element) : $this->deselectOption($element);
+            if (!$this->isMultiple()) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Gets checkboxes or radio buttons with the same name.
+     *
+     * @param string|null $value
+     * @return WebDriverElement[]
+     */
+    protected function getRelatedElements($value = null)
+    {
+        $valueSelector = $value ? sprintf(' and @value = %s', XPathEscaper::escapeQuotes($value)) : '';
+        $formId = $this->element->getAttribute('form');
+        if ($formId === null) {
+            $form = $this->element->findElement(WebDriverBy::xpath('ancestor::form'));
+
+            $formId = $form->getAttribute('id');
+            if ($formId === '') {
+                return $form->findElements(WebDriverBy::xpath(
+                    sprintf('.//input[@name = %s%s]', XPathEscaper::escapeQuotes($this->name), $valueSelector)
+                ));
+            }
+        }
+
+        return $this->element->findElements(WebDriverBy::xpath(sprintf(
+            '//form[@id = %1$s]//input[@name = %2$s%3$s] | //input[@form = %1$s and @name = %2$s%3$s]',
+            XPathEscaper::escapeQuotes($formId),
+            XPathEscaper::escapeQuotes($this->name),
+            $valueSelector
+        )));
+    }
+
+    /**
+     * Selects a checkbox or a radio button.
+     */
+    protected function selectOption(WebDriverElement $element)
+    {
+        if (!$element->isSelected()) {
+            $element->click();
+        }
+    }
+
+    /**
+     * Deselects a checkbox or a radio button.
+     */
+    protected function deselectOption(WebDriverElement $element)
+    {
+        if ($element->isSelected()) {
+            $element->click();
+        }
+    }
+}
diff --git a/lib/WebDriverCheckboxes.php b/lib/WebDriverCheckboxes.php
new file mode 100644
index 000000000..1ac00093d
--- /dev/null
+++ b/lib/WebDriverCheckboxes.php
@@ -0,0 +1,66 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+
+/**
+ * Provides helper methods for checkboxes.
+ */
+class WebDriverCheckboxes extends AbstractWebDriverCheckboxOrRadio
+{
+    public function __construct(WebDriverElement $element)
+    {
+        parent::__construct($element);
+
+        $this->type = $element->getAttribute('type');
+        if ($this->type !== 'checkbox') {
+            throw new WebDriverException('The input must be of type "checkbox".');
+        }
+    }
+
+    public function isMultiple()
+    {
+        return true;
+    }
+
+    public function deselectAll()
+    {
+        foreach ($this->getRelatedElements() as $checkbox) {
+            $this->deselectOption($checkbox);
+        }
+    }
+
+    public function deselectByIndex($index)
+    {
+        $this->byIndex($index, false);
+    }
+
+    public function deselectByValue($value)
+    {
+        $this->byValue($value, false);
+    }
+
+    public function deselectByVisibleText($text)
+    {
+        $this->byVisibleText($text, false, false);
+    }
+
+    public function deselectByVisiblePartialText($text)
+    {
+        $this->byVisibleText($text, true, false);
+    }
+}
diff --git a/lib/WebDriverRadios.php b/lib/WebDriverRadios.php
new file mode 100644
index 000000000..d6a4d2ac7
--- /dev/null
+++ b/lib/WebDriverRadios.php
@@ -0,0 +1,65 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\Exception\WebDriverException;
+
+/**
+ * Provides helper methods for radio buttons.
+ */
+class WebDriverRadios extends AbstractWebDriverCheckboxOrRadio
+{
+    public function __construct(WebDriverElement $element)
+    {
+        parent::__construct($element);
+
+        $this->type = $element->getAttribute('type');
+        if ($this->type !== 'radio') {
+            throw new WebDriverException('The input must be of type "radio".');
+        }
+    }
+
+    public function isMultiple()
+    {
+        return false;
+    }
+
+    public function deselectAll()
+    {
+        throw new UnsupportedOperationException('You cannot deselect radio buttons');
+    }
+
+    public function deselectByIndex($index)
+    {
+        throw new UnsupportedOperationException('You cannot deselect radio buttons');
+    }
+
+    public function deselectByValue($value)
+    {
+        throw new UnsupportedOperationException('You cannot deselect radio buttons');
+    }
+
+    public function deselectByVisibleText($text)
+    {
+        throw new UnsupportedOperationException('You cannot deselect radio buttons');
+    }
+
+    public function deselectByVisiblePartialText($text)
+    {
+        throw new UnsupportedOperationException('You cannot deselect radio buttons');
+    }
+}
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
new file mode 100644
index 000000000..3bf8ccffd
--- /dev/null
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -0,0 +1,197 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+
+class WebDriverCheckboxesTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPageUrl('form_checkbox_radio.html'));
+    }
+
+    public function testIsMultiple()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $this->assertTrue($c->isMultiple());
+    }
+
+    public function testGetOptions()
+    {
+        $c = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//form[2]//input[@type="checkbox"]'))
+        );
+        $this->assertNotEmpty($c->getOptions());
+    }
+
+    public function testGetFirstSelectedOption()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $c->selectByValue('j2a');
+        $this->assertSame('j2a', $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testSelectByValue()
+    {
+        $selectedOptions = ['j2b', 'j2c'];
+
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        foreach ($selectedOptions as $index => $selectedOption) {
+            $c->selectByValue($selectedOption);
+        }
+
+        $selectedValues = [];
+        foreach ($c->getAllSelectedOptions() as $option) {
+            $selectedValues[] = $option->getAttribute('value');
+        }
+        $this->assertSame($selectedOptions, $selectedValues);
+    }
+
+    public function testSelectByValueInvalid()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate checkbox with value: notexist');
+        $c->selectByValue('notexist');
+    }
+
+    public function testSelectByIndex()
+    {
+        $selectedOptions = [1 => 'j2b', 2 => 'j2c'];
+
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        foreach ($selectedOptions as $index => $selectedOption) {
+            $c->selectByIndex($index);
+        }
+
+        $selectedValues = [];
+        foreach ($c->getAllSelectedOptions() as $option) {
+            $selectedValues[] = $option->getAttribute('value');
+        }
+        $this->assertSame(array_values($selectedOptions), $selectedValues);
+    }
+
+    public function testSelectByIndexInvalid()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate checkbox with index: ' . PHP_INT_MAX);
+        $c->selectByIndex(PHP_INT_MAX);
+    }
+
+    /**
+     * @dataProvider selectByVisibleTextDataProvider
+     *
+     * @param string $text
+     * @param string $value
+     */
+    public function testSelectByVisibleText($text, $value)
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $c->selectByVisibleText($text);
+        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    /**
+     * @return array
+     */
+    public function selectByVisibleTextDataProvider()
+    {
+        return [
+            ['J 2 B', 'j2b'],
+            ['J2C', 'j2c'],
+        ];
+    }
+
+    /**
+     * @dataProvider selectByVisiblePartialTextDataProvider
+     *
+     * @param string $text
+     * @param string $value
+     */
+    public function testSelectByVisiblePartialText($text, $value)
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $c->selectByVisiblePartialText($text);
+        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    /**
+     * @return array
+     */
+    public function selectByVisiblePartialTextDataProvider()
+    {
+        return [
+            ['2 B', 'j2b'],
+            ['2C', 'j2c'],
+        ];
+    }
+
+    public function testDeselectAll()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $c->selectByIndex(0);
+        $this->assertCount(1, $c->getAllSelectedOptions());
+        $c->deselectAll();
+        $this->assertEmpty($c->getAllSelectedOptions());
+    }
+
+    public function testDeselectByIndex()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $c->selectByIndex(0);
+        $this->assertCount(1, $c->getAllSelectedOptions());
+        $c->deselectByIndex(0);
+        $this->assertEmpty($c->getAllSelectedOptions());
+    }
+
+    public function testDeselectByValue()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $c->selectByValue('j2a');
+        $this->assertCount(1, $c->getAllSelectedOptions());
+        $c->deselectByValue('j2a');
+        $this->assertEmpty($c->getAllSelectedOptions());
+    }
+
+    public function testDeselectByVisibleText()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $c->selectByVisibleText('J 2 B');
+        $this->assertCount(1, $c->getAllSelectedOptions());
+        $c->deselectByVisibleText('J 2 B');
+        $this->assertEmpty($c->getAllSelectedOptions());
+    }
+
+    public function testDeselectByVisiblePartialText()
+    {
+        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+
+        $c->selectByVisiblePartialText('2C');
+        $this->assertCount(1, $c->getAllSelectedOptions());
+        $c->deselectByVisiblePartialText('2C');
+        $this->assertEmpty($c->getAllSelectedOptions());
+    }
+}
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
new file mode 100644
index 000000000..f28417ac4
--- /dev/null
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -0,0 +1,184 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchElementException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
+
+class WebDriverRadiosTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPageUrl('form_checkbox_radio.html'));
+    }
+
+    public function testIsMultiple()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $this->assertFalse($c->isMultiple());
+    }
+
+    public function testGetOptions()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $values = [];
+        foreach ($c->getOptions() as $option) {
+            $values[] = $option->getAttribute('value');
+        }
+
+        $this->assertSame(['j3a', 'j3b', 'j3c'], $values);
+    }
+
+    public function testGetFirstSelectedOption()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $c->selectByValue('j3a');
+        $this->assertSame('j3a', $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testSelectByValue()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $c->selectByValue('j3b');
+
+        $selectedOptions = $c->getAllSelectedOptions();
+        $this->assertCount(1, $selectedOptions);
+        $this->assertSame('j3b', $selectedOptions[0]->getAttribute('value'));
+    }
+
+    public function testSelectByValueInvalid()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate radio with value: notexist');
+        $c->selectByValue('notexist');
+    }
+
+    public function testSelectByIndex()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $c->selectByIndex(1);
+
+        $allSelectedOptions = $c->getAllSelectedOptions();
+        $this->assertCount(1, $allSelectedOptions);
+        $this->assertSame('j3b', $allSelectedOptions[0]->getAttribute('value'));
+    }
+
+    public function testSelectByIndexInvalid()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate radio with index: ' . PHP_INT_MAX);
+        $c->selectByIndex(PHP_INT_MAX);
+    }
+
+    /**
+     * @dataProvider selectByVisibleTextDataProvider
+     *
+     * @param string $text
+     * @param string $value
+     */
+    public function testSelectByVisibleText($text, $value)
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $c->selectByVisibleText($text);
+        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    /**
+     * @return array
+     */
+    public function selectByVisibleTextDataProvider()
+    {
+        return [
+            ['J 3 B', 'j3b'],
+            ['J3C', 'j3c'],
+        ];
+    }
+
+    /**
+     * @dataProvider selectByVisiblePartialTextDataProvider
+     *
+     * @param string $text
+     * @param string $value
+     */
+    public function testSelectByVisiblePartialText($text, $value)
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $c->selectByVisiblePartialText($text);
+        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    /**
+     * @return array
+     */
+    public function selectByVisiblePartialTextDataProvider()
+    {
+        return [
+            ['3 B', 'j3b'],
+            ['3C', 'j3c'],
+        ];
+    }
+
+    public function testDeselectAllRadio()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You cannot deselect radio buttons');
+        $c->deselectAll();
+    }
+
+    public function testDeselectByIndexRadio()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You cannot deselect radio buttons');
+        $c->deselectByIndex(0);
+    }
+
+    public function testDeselectByValueRadio()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You cannot deselect radio buttons');
+        $c->deselectByValue('val');
+    }
+
+    public function testDeselectByVisibleTextRadio()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You cannot deselect radio buttons');
+        $c->deselectByVisibleText('AB');
+    }
+
+    public function testDeselectByVisiblePartialTextRadio()
+    {
+        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You cannot deselect radio buttons');
+        $c->deselectByVisiblePartialText('AB');
+    }
+}
diff --git a/tests/functional/web/form_checkbox_radio.html b/tests/functional/web/form_checkbox_radio.html
new file mode 100644
index 000000000..b51dcfe47
--- /dev/null
+++ b/tests/functional/web/form_checkbox_radio.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Form</title>
+</head>
+<body>
+<form id="another-form" method="POST">
+    <input name="j1">
+    <input type="checkbox" name="j2" value="j2a">
+
+    <label>
+        J         2
+   B
+
+        <input type="checkbox" name="j2" value="j2b">
+    </label>
+
+    <input type="radio" name="j3" value="j3a">
+
+    <label>
+        J
+
+            3
+   B
+
+        <input type="radio" name="j3" value="j3b">
+    </label>
+
+    <input type="submit" value="OK">
+</form>
+
+<label for="j2c">J2C</label>
+<input type="checkbox" form="another-form" name="j2" value="j2c" id="j2c">
+
+<label for="j3c">J3C</label>
+<input type="radio" form="another-form" name="j3" value="j3c" id="j3c">
+
+<form>
+    <input type="checkbox" name="single-cb">
+</form>
+</body>
+</html>

From ce44465b74b1707a7e76b4f70f7d2fee6014ce94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 29 May 2018 15:17:26 +0200
Subject: [PATCH 415/784] Update changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f3088da9..95a4c6c73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-
----
+### Added
+- `WebDriverCheckboxes` and `WebDriverRadios` helper classes to simplify interaction with checkboxes and radio buttons.
 
 ## 1.6.0 - 2018-05-16
 ### Added

From 37c7b04a453d88d79e41e8ac4425603a04d17fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sat, 16 Jun 2018 14:26:38 +0200
Subject: [PATCH 416/784] Fix the name of a env var in CONTRIBUTING.md (#583)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7b93736c..1a01c7adb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ test suite:
     ./vendor/bin/phpunit --testsuite functional
     
 The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in eg. Firefox,
-simply set the `BROWSER` environment variable:
+simply set the `BROWSER_NAME` environment variable:
 
     ...
     export BROWSER_NAME="firefox"

From be2985897851adca3e941d8c07c28512e24ee4a1 Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Thu, 18 Oct 2018 13:53:38 -0700
Subject: [PATCH 417/784] Renamed license file.

---
 LICENCE.md => LICENSE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENCE.md => LICENSE.md (100%)

diff --git a/LICENCE.md b/LICENSE.md
similarity index 100%
rename from LICENCE.md
rename to LICENSE.md

From e020ae2811098d55cce705c66c52f1a4fbf2f9df Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Thu, 18 Oct 2018 13:58:23 -0700
Subject: [PATCH 418/784] Added copyright headers to 2 codefiles

---
 example.php         | 14 ++++++++++++++
 tests/bootstrap.php | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/example.php b/example.php
index 2a9d0b298..f1109ed54 100644
--- a/example.php
+++ b/example.php
@@ -1,4 +1,18 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
 // An example of using php-webdriver.
 // Do not forget to run composer install before and also have Selenium server started and listening on port 4444.
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f9e62ac66..801396034 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,2 +1,16 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
 require_once __DIR__ . '/../vendor/autoload.php';

From e16be1e23396da1cc234fffeb5a95ef429ea7746 Mon Sep 17 00:00:00 2001
From: Fosco Marotto <gfosco@gmail.com>
Date: Thu, 18 Oct 2018 14:14:22 -0700
Subject: [PATCH 419/784] Added a few more copyright headers.

---
 lib/Exception/IndexOutOfBoundsException.php | 13 +++++++++++++
 lib/Exception/NoCollectionException.php     | 13 +++++++++++++
 lib/Exception/NoStringException.php         | 13 +++++++++++++
 lib/WebDriverSelectInterface.php            | 13 +++++++++++++
 tests/functional/web/slow_pixel.png.php     | 13 +++++++++++++
 tests/functional/web/submit.php             | 16 +++++++++++++++-
 tests/functional/web/upload.php             | 16 +++++++++++++++-
 7 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
index ad52d21e9..de166b61e 100644
--- a/lib/Exception/IndexOutOfBoundsException.php
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -1,4 +1,17 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
index ec6335cdb..e287e3434 100644
--- a/lib/Exception/NoCollectionException.php
+++ b/lib/Exception/NoCollectionException.php
@@ -1,4 +1,17 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
index 790898607..f7ac2f0e2 100644
--- a/lib/Exception/NoStringException.php
+++ b/lib/Exception/NoStringException.php
@@ -1,4 +1,17 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
 
diff --git a/lib/WebDriverSelectInterface.php b/lib/WebDriverSelectInterface.php
index 030a783e9..830416a51 100644
--- a/lib/WebDriverSelectInterface.php
+++ b/lib/WebDriverSelectInterface.php
@@ -1,4 +1,17 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
 
diff --git a/tests/functional/web/slow_pixel.png.php b/tests/functional/web/slow_pixel.png.php
index d95805e21..6e822f899 100644
--- a/tests/functional/web/slow_pixel.png.php
+++ b/tests/functional/web/slow_pixel.png.php
@@ -1,4 +1,17 @@
 <?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
 
 sleep(5);
 
diff --git a/tests/functional/web/submit.php b/tests/functional/web/submit.php
index 4d8219ec5..7c75e0b2e 100644
--- a/tests/functional/web/submit.php
+++ b/tests/functional/web/submit.php
@@ -1,4 +1,18 @@
-<!DOCTYPE html>
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+?><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
diff --git a/tests/functional/web/upload.php b/tests/functional/web/upload.php
index 91a61bbcf..0bac36c3a 100644
--- a/tests/functional/web/upload.php
+++ b/tests/functional/web/upload.php
@@ -1,4 +1,18 @@
-<!DOCTYPE html>
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+?><!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">

From 799fc83fb9bb0f61bfcb725db336a955774c22c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 6 Jun 2019 18:10:13 +0200
Subject: [PATCH 420/784] Improve test stability on SauceLabs; simplify
 doubleClick test to make it temporarily, as this action is not part of W3C
 WebDriver

---
 .travis.yml                                |  2 +-
 tests/functional/RemoteWebDriverTest.php   | 26 +++++++++++++++-------
 tests/functional/WebDriverActionsTest.php  |  5 +----
 tests/functional/WebDriverTestCase.php     |  4 ++--
 tests/functional/WebDriverTimeoutsTest.php |  4 ++--
 tests/functional/web/delayed_element.html  |  2 +-
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a2cada83..a268f0b4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,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="16.16299" 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"
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 818a9da5a..d996d304a 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -145,6 +145,7 @@ public function testShouldCloseWindow()
 
     /**
      * @covers ::executeScript
+     * @group exclude-saucelabs
      */
     public function testShouldExecuteScriptAndDoNotBlockExecution()
     {
@@ -153,17 +154,18 @@ public function testShouldExecuteScriptAndDoNotBlockExecution()
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
 
+        $start = microtime(true);
         $this->driver->executeScript('
             setTimeout(
-                function(){document.getElementById("id_test").innerHTML = "Text changed by script"},
-                500
+                function(){document.getElementById("id_test").innerHTML = "Text changed by script";},
+                250
             )');
+        $end = microtime(true);
 
-        // Make sure the script don't block the test execution
-        $this->assertSame('Test by ID', $element->getText());
+        $this->assertLessThan(250, $end - $start, 'executeScript() should not block execution');
 
-        // If we wait, the script should be executed
-        usleep(1000000); // wait 1000 ms
+        // If we wait, the script should be executed and its value changed
+        usleep(300000); // wait 300 ms
         $this->assertSame('Text changed by script', $element->getText());
     }
 
@@ -180,6 +182,7 @@ public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
 
+        $start = microtime(true);
         $this->driver->executeAsyncScript(
             'var callback = arguments[arguments.length - 1];
             setTimeout(
@@ -190,6 +193,13 @@ function(){
                 250
             );'
         );
+        $end = microtime(true);
+
+        $this->assertGreaterThan(
+            0.250,
+            $end - $start,
+            'executeAsyncScript() should block execution until callback() is called'
+        );
 
         // The result must be immediately available, as the executeAsyncScript should block the execution until the
         // callback is called.
@@ -204,7 +214,7 @@ public function testShouldTakeScreenshot()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
         }
 
@@ -227,7 +237,7 @@ public function testShouldSaveScreenshotToFile()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
         }
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 188c76cd9..3df984810 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -122,10 +122,7 @@ public function testShouldDoubleClickOnElement()
             ->doubleClick($element)
             ->perform();
 
-        $this->assertSame(
-            ['mouseover item-3', 'mousedown item-3', 'mouseup item-3', 'click item-3', 'dblclick item-3'],
-            $this->retrieveLoggedEvents()
-        );
+        $this->assertContains('dblclick item-3', $this->retrieveLoggedEvents());
     }
 
     /**
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index e9714a87c..5fe6a7e8a 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -44,7 +44,7 @@ protected function setUp()
     {
         $this->desiredCapabilities = new DesiredCapabilities();
 
-        if ($this->isSauceLabsBuild()) {
+        if (static::isSauceLabsBuild()) {
             $this->setUpSauceLabs();
         } else {
             if (getenv('BROWSER_NAME')) {
@@ -87,7 +87,7 @@ protected function tearDown()
     /**
      * @return bool
      */
-    public function isSauceLabsBuild()
+    public static function isSauceLabsBuild()
     {
         return getenv('SAUCELABS') ? true : false;
     }
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 69d143cc4..733be545c 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -42,7 +42,7 @@ public function testShouldGetDelayedElementWithImplicitWait()
     {
         $this->driver->get($this->getTestPageUrl('delayed_element.html'));
 
-        $this->driver->manage()->timeouts()->implicitlyWait(1);
+        $this->driver->manage()->timeouts()->implicitlyWait(2);
         $element = $this->driver->findElement(WebDriverBy::id('delayed'));
 
         $this->assertInstanceOf(RemoteWebElement::class, $element);
@@ -54,7 +54,7 @@ public function testShouldGetDelayedElementWithImplicitWait()
      */
     public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
     {
-        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
diff --git a/tests/functional/web/delayed_element.html b/tests/functional/web/delayed_element.html
index b0f057a9a..4572cd342 100644
--- a/tests/functional/web/delayed_element.html
+++ b/tests/functional/web/delayed_element.html
@@ -12,7 +12,7 @@
     setTimeout(function () {
         var wrapper = document.getElementById("wrapper");
         wrapper.innerHTML = '<div id="delayed">Element appearing after 500ms</div>';
-    }, 500);
+    }, 1500);
 </script>
 
 </body>

From 6d488eacd23db77822a748725a1c9dafa6d0221e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 8 Jun 2019 12:33:18 +0200
Subject: [PATCH 421/784] Force Chrome 74 on saucelabs, as 75 uses W3C protocol
 by default

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a268f0b4d..c97b22525 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
     - php: 7.2
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="latest" PLATFORM="Windows 10"
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.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"

From 5f7a311bde888283615e8b3767a92302c5e29515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 7 Jun 2019 17:29:22 +0200
Subject: [PATCH 422/784] Use PHP 7.3 as the main PHP version for travis builds

---
 .travis.yml | 55 +++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c97b22525..082a6efb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,11 @@ sudo: false
 dist: trusty
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - '7.2'
+  - '7.3'
 
 env:
   global:
@@ -16,30 +17,43 @@ env:
 
 matrix:
   include:
+    # Codestyle check build
+    - php: '7.3'
+      env: CHECK_CODESTYLE=1
+      before_install:
+        - phpenv config-rm xdebug.ini
+      before_script: ~
+      script:
+        - composer require phpstan/phpstan-shim # Not part of require-dev, because it won't install on PHP 5.6
+        - composer analyze
+        - composer codestyle:check
+      after_script: ~
+      after_success: ~
+
+    # Build with lowest possible dependencies on lowest possible PHP
+    - php: '5.6'
+      env: DEPENDENCIES="--prefer-lowest"
+
     # Add build to run tests against Firefox inside Travis environment
-    - php: 7.2
+    - php: '7.3'
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
     # Add build to run tests against Chrome inside Travis environment
-    - php: 7.2
+    - php: '7.3'
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
       addons:
         chrome: stable
 
-    # Build with lowest possible dependencies
-    - php: 7.2
-      env: DEPENDENCIES="--prefer-lowest"
-
     # Chrome on Travis build with lowest possible dependencies
-    - php: 7.2
+    - php: '7.3'
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" DEPENDENCIES="--prefer-lowest"
       addons:
         chrome: stable
 
     # Saucelabs builds
-    - php: 7.2
+    - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -48,7 +62,7 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.2
+    - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -57,7 +71,7 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
-    - php: 7.2
+    - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="16.16299" PLATFORM="Windows 10"
       before_script:
         - php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -67,19 +81,6 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    # Codestyle check build
-    - php: 7.2
-      env: CHECK_CODESTYLE=1
-      before_install:
-        - phpenv config-rm xdebug.ini
-      before_script: ~
-      script:
-        - composer require phpstan/phpstan-shim # Not part of require-dev, because it won't install on PHP 5.6
-        - composer analyze
-        - composer codestyle:check
-      after_script: ~
-      after_success: ~
-
 cache:
   directories:
     - $HOME/.composer/cache

From 242fffeb4caf279a87f75a01b29a87e66a3e1a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 8 Jun 2019 15:02:51 +0200
Subject: [PATCH 423/784] Disable WebDriverSelectTest on saucelabs - it is too
 slow and has minimal value

---
 tests/functional/WebDriverCheckboxesTest.php | 4 ++++
 tests/functional/WebDriverRadiosTest.php     | 4 ++++
 tests/functional/WebDriverSelectTest.php     | 1 +
 3 files changed, 9 insertions(+)

diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 3bf8ccffd..128d298d5 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -17,6 +17,10 @@
 
 use Facebook\WebDriver\Exception\NoSuchElementException;
 
+/**
+ * @covers \Facebook\WebDriver\WebDriverCheckboxes
+ * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ */
 class WebDriverCheckboxesTest extends WebDriverTestCase
 {
     protected function setUp()
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index f28417ac4..2a1a9869d 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -18,6 +18,10 @@
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
+/**
+ * @covers \Facebook\WebDriver\WebDriverRadios
+ * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ */
 class WebDriverRadiosTest extends WebDriverTestCase
 {
     protected function setUp()
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 37ad416af..b25dd03af 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -20,6 +20,7 @@
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
+ * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\WebDriverSelect
  * @covers \Facebook\WebDriver\Exception\UnexpectedTagNameException
  */

From 9be6cbbd8006a24fb180df75cb4b9796a2aad770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 8 Jun 2019 15:42:49 +0200
Subject: [PATCH 424/784] Remove mostly redundant second lowest-deps build

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 082a6efb8..b3ee784e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,12 +46,6 @@ matrix:
       addons:
         chrome: stable
 
-    # Chrome on Travis build with lowest possible dependencies
-    - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" DEPENDENCIES="--prefer-lowest"
-      addons:
-        chrome: stable
-
     # Saucelabs builds
     - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"

From 0f3933c41606fd076d79ff064bc0def2b774e67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 8 Jun 2019 22:50:56 +0200
Subject: [PATCH 425/784] Disable default W3C protocol in Chrome 75+

---
 .travis.yml                        | 27 ++++++++++++++++++++++-----
 lib/Remote/HttpCommandExecutor.php |  5 +++++
 lib/Remote/RemoteWebDriver.php     | 14 ++++++++++++++
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b3ee784e8..b6850baf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ env:
   global:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
-    - CHROMEDRIVER_VERSION="2.38"
 
 matrix:
   include:
@@ -34,15 +33,21 @@ matrix:
     - php: '5.6'
       env: DEPENDENCIES="--prefer-lowest"
 
-    # Add build to run tests against Firefox inside Travis environment
+    # Firefox inside Travis environment
     - php: '7.3'
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
-    # Add build to run tests against Chrome inside Travis environment
+    # Stable Chrome + Chromedriver 74 inside Travis environment
     - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="74.0.3729.6"
+      addons:
+        chrome: stable
+
+    # Stable Chrome + Chromedriver 75+ inside Travis environment
+    - php: '7.3'
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="75.0.3770.8"
       addons:
         chrome: stable
 
@@ -56,8 +61,9 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+
     - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10"
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" # 74 is the last version which don't use W3C WebDriver by default
       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"
@@ -65,6 +71,17 @@ matrix:
         sauce_connect: true
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+
+    - php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="75.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"
+      addons:
+        sauce_connect: true
+        jwt:
+          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+
     - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="16.16299" PLATFORM="Windows 10"
       before_script:
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index f584324b7..1891fdb35 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -273,6 +273,11 @@ public function execute(WebDriverCommand $command)
 
         if ($http_method === 'POST' && $params && is_array($params)) {
             $encoded_params = json_encode($params);
+        } elseif ($http_method === 'POST' && $encoded_params === null) {
+            // Workaround for bug https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943 in Chrome 75.
+            // Chromedriver now erroneously does not allow POST body to be empty even for the JsonWire protocol.
+            // If the command POST is empty, here we send some dummy data as a workaround:
+            $encoded_params = json_encode(['_' => '_']);
         }
 
         curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 1487689ec..538ae282f 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
@@ -102,6 +103,19 @@ public static function create(
 
         $desired_capabilities = self::castToDesiredCapabilitiesObject($desired_capabilities);
 
+        // Hotfix: W3C WebDriver protocol is not yet supported by php-webdriver, so we must force Chromedriver to
+        // not use the W3C protocol by default (which is what Chromedriver does starting with version 75).
+        if ($desired_capabilities->getBrowserName() === WebDriverBrowserType::CHROME) {
+            $currentChromeOptions = $desired_capabilities->getCapability(ChromeOptions::CAPABILITY);
+            $chromeOptions = !empty($currentChromeOptions) ? $currentChromeOptions : new ChromeOptions();
+
+            if (!isset($chromeOptions->toArray()['w3c'])) {
+                $chromeOptions->setExperimentalOption('w3c', false);
+            }
+
+            $desired_capabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
+        }
+
         $executor = new HttpCommandExecutor($selenium_server_url, $http_proxy, $http_proxy_port);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);

From 550edf5a815694f60654a0a82d0bbe818eeb1514 Mon Sep 17 00:00:00 2001
From: JorisVanEijden <joris.vaneijden@gmail.com>
Date: Mon, 25 Feb 2019 12:38:04 +0100
Subject: [PATCH 426/784] Do not send null values in cookie array (fixes #626)

---
 lib/Cookie.php            | 50 ++++++++++++++++++++-------------------
 tests/unit/CookieTest.php | 22 +++++++++++++++++
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 57ec7e13a..216ac3033 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -27,15 +27,7 @@
 class Cookie implements \ArrayAccess
 {
     /** @var array */
-    protected $cookie = [
-        'name' => null,
-        'value' => null,
-        'path' => null,
-        'domain' => null,
-        'expiry' => null,
-        'secure' => null,
-        'httpOnly' => null,
-    ];
+    protected $cookie = [];
 
     /**
      * @param string $name The name of the cookie; may not be null or an empty string.
@@ -51,11 +43,17 @@ public function __construct($name, $value)
     }
 
     /**
-     * @param array $cookieArray
+     * @param array $cookieArray The cookie fields; must contain name and value.
      * @return Cookie
      */
     public static function createFromArray(array $cookieArray)
     {
+        if (!isset($cookieArray['name'])) {
+            throw new InvalidArgumentException('Cookie name should be set');
+        }
+        if (!isset($cookieArray['value'])) {
+            throw new InvalidArgumentException('Cookie value should be set');
+        }
         $cookie = new self($cookieArray['name'], $cookieArray['value']);
 
         if (isset($cookieArray['path'])) {
@@ -82,7 +80,7 @@ public static function createFromArray(array $cookieArray)
      */
     public function getName()
     {
-        return $this->cookie['name'];
+        return $this->offsetGet('name');
     }
 
     /**
@@ -90,7 +88,7 @@ public function getName()
      */
     public function getValue()
     {
-        return $this->cookie['value'];
+        return $this->offsetGet('value');
     }
 
     /**
@@ -100,7 +98,7 @@ public function getValue()
      */
     public function setPath($path)
     {
-        $this->cookie['path'] = $path;
+        $this->offsetSet('path', $path);
     }
 
     /**
@@ -108,7 +106,7 @@ public function setPath($path)
      */
     public function getPath()
     {
-        return $this->cookie['path'];
+        return $this->offsetGet('path');
     }
 
     /**
@@ -122,7 +120,7 @@ public function setDomain($domain)
             throw new InvalidArgumentException(sprintf('Cookie domain "%s" should not contain a port', $domain));
         }
 
-        $this->cookie['domain'] = $domain;
+        $this->offsetSet('domain', $domain);
     }
 
     /**
@@ -130,7 +128,7 @@ public function setDomain($domain)
      */
     public function getDomain()
     {
-        return $this->cookie['domain'];
+        return $this->offsetGet('domain');
     }
 
     /**
@@ -140,7 +138,7 @@ public function getDomain()
      */
     public function setExpiry($expiry)
     {
-        $this->cookie['expiry'] = (int) $expiry;
+        $this->offsetSet('expiry', (int) $expiry);
     }
 
     /**
@@ -148,7 +146,7 @@ public function setExpiry($expiry)
      */
     public function getExpiry()
     {
-        return $this->cookie['expiry'];
+        return $this->offsetGet('expiry');
     }
 
     /**
@@ -158,7 +156,7 @@ public function getExpiry()
      */
     public function setSecure($secure)
     {
-        $this->cookie['secure'] = $secure;
+        $this->offsetSet('secure', $secure);
     }
 
     /**
@@ -166,7 +164,7 @@ public function setSecure($secure)
      */
     public function isSecure()
     {
-        return $this->cookie['secure'];
+        return $this->offsetGet('secure');
     }
 
     /**
@@ -176,7 +174,7 @@ public function isSecure()
      */
     public function setHttpOnly($httpOnly)
     {
-        $this->cookie['httpOnly'] = $httpOnly;
+        $this->offsetSet('httpOnly', $httpOnly);
     }
 
     /**
@@ -184,7 +182,7 @@ public function setHttpOnly($httpOnly)
      */
     public function isHttpOnly()
     {
-        return $this->cookie['httpOnly'];
+        return $this->offsetGet('httpOnly');
     }
 
     /**
@@ -202,12 +200,16 @@ public function offsetExists($offset)
 
     public function offsetGet($offset)
     {
-        return $this->cookie[$offset];
+        return $this->offsetExists($offset) ? $this->cookie[$offset] : null;
     }
 
     public function offsetSet($offset, $value)
     {
-        $this->cookie[$offset] = $value;
+        if ($value === null) {
+            unset($this->cookie[$offset]);
+        } else {
+            $this->cookie[$offset] = $value;
+        }
     }
 
     public function offsetUnset($offset)
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 3a0679d2c..5fdb43038 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -62,6 +62,28 @@ public function testShouldBeConvertibleToArray(Cookie $cookie)
         );
     }
 
+    /**
+     * Test that there are no null values in the cookie array.
+     *
+     * Both JsonWireProtocol and w3c protocol say to leave an entry off
+     * rather than having a null value.
+     *
+     * https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol
+     * https://w3c.github.io/webdriver/#add-cookie
+     */
+    public function testShouldNotContainNullValues()
+    {
+        $cookie = new Cookie('cookieName', 'someValue');
+
+        $cookie->setHttpOnly(null);
+        $cookie->setPath(null);
+        $cookieArray = $cookie->toArray();
+
+        foreach ($cookieArray as $key => $value) {
+            $this->assertNotNull($value, $key . ' should not be null');
+        }
+    }
+
     /**
      * @depends testShouldSetAllProperties
      * @param Cookie $cookie

From d1ad0b14b4f34f3d3eca10c1587b991f612e6746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Jun 2019 13:28:48 +0200
Subject: [PATCH 427/784] Update changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95a4c6c73..e27bd1b89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,13 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - `WebDriverCheckboxes` and `WebDriverRadios` helper classes to simplify interaction with checkboxes and radio buttons.
 
+### Fixed
+- Stop sending null values in Cookie object, which is against the protocol and may cause request to remote ends to fail.
+
+### Changed
+- Force Chrome to not use W3C WebDriver protocol.
+- Add workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943) which breaks the protocol in Chromedriver 75.
+
 ## 1.6.0 - 2018-05-16
 ### Added
 - Connection and request timeouts could be specified also when creating RemoteWebDriver from existing session ID.

From 12ac107aba8af2cc08c549884f5a5844899509e9 Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Mon, 31 Dec 2018 02:23:12 +0200
Subject: [PATCH 428/784] Improved xpath matching related elements to handle
 input associated to different <form>

Added @form attribute check, because it's possible to put <input/> into a form which is not related to it, see MDN https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#form
---
 lib/AbstractWebDriverCheckboxOrRadio.php      | 17 +++++++++++------
 tests/functional/WebDriverCheckboxesTest.php  |  6 ++++++
 tests/functional/WebDriverRadiosTest.php      |  6 ++++++
 tests/functional/web/form_checkbox_radio.html | 14 +++++++++++++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index 46288592b..f70a2ef04 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -218,12 +218,17 @@ protected function getRelatedElements($value = null)
             }
         }
 
-        return $this->element->findElements(WebDriverBy::xpath(sprintf(
-            '//form[@id = %1$s]//input[@name = %2$s%3$s] | //input[@form = %1$s and @name = %2$s%3$s]',
-            XPathEscaper::escapeQuotes($formId),
-            XPathEscaper::escapeQuotes($this->name),
-            $valueSelector
-        )));
+        // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#form
+        return $this->element->findElements(
+            WebDriverBy::xpath(sprintf(
+                '//form[@id = %1$s]//input[@name = %2$s%3$s'
+                . ' and ((boolean(@form) = true() and @form = %1$s) or boolean(@form) = false())]'
+                . ' | //input[@form = %1$s and @name = %2$s%3$s]',
+                XPathEscaper::escapeQuotes($formId),
+                XPathEscaper::escapeQuotes($this->name),
+                $valueSelector
+            ))
+        );
     }
 
     /**
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 128d298d5..f7e1407b6 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -51,6 +51,12 @@ public function testGetFirstSelectedOption()
         $this->assertSame('j2a', $c->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    public function testGetFirstSelectedOptionWithSameNameDifferentForm()
+    {
+        $radio = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@id="j5b"]')));
+        $this->assertEquals('j5b', $radio->getFirstSelectedOption()->getAttribute('value'));
+    }
+
     public function testSelectByValue()
     {
         $selectedOptions = ['j2b', 'j2c'];
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 2a1a9869d..369717eb2 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -55,6 +55,12 @@ public function testGetFirstSelectedOption()
         $this->assertSame('j3a', $c->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    public function testGetFirstSelectedOptionWithSameNameDifferentForm()
+    {
+        $radio = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@id="j4b"]')));
+        $this->assertEquals('j4b', $radio->getFirstSelectedOption()->getAttribute('value'));
+    }
+
     public function testSelectByValue()
     {
         $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
diff --git a/tests/functional/web/form_checkbox_radio.html b/tests/functional/web/form_checkbox_radio.html
index b51dcfe47..1e13d74e4 100644
--- a/tests/functional/web/form_checkbox_radio.html
+++ b/tests/functional/web/form_checkbox_radio.html
@@ -27,6 +27,12 @@
         <input type="radio" name="j3" value="j3b">
     </label>
 
+    <label for="j4a">J4A</label>
+    <input type="radio" form="yet-another-form" name="j4" value="j4a" id="j4a" checked/>
+
+    <label for="j5a">J5A</label>
+    <input type="checkbox" form="yet-another-form" name="j5" value="j5a" id="j5a" checked/>
+
     <input type="submit" value="OK">
 </form>
 
@@ -36,7 +42,13 @@
 <label for="j3c">J3C</label>
 <input type="radio" form="another-form" name="j3" value="j3c" id="j3c">
 
-<form>
+<label for="j4b">J4B</label>
+<input type="radio" form="another-form" name="j4" value="j4b" id="j4b" checked>
+
+<label for="j5b">J5B</label>
+<input type="checkbox" form="another-form" name="j5" value="j5b" id="j5b" checked>
+
+<form id="yet-another-form">
     <input type="checkbox" name="single-cb">
 </form>
 </body>

From 87f9d0f4dbaf8ecf7c87415cccd3f00ea9e0311c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Jun 2019 13:06:00 +0200
Subject: [PATCH 429/784] Improve readability of tests by structuring theme
 more in arrange-act-assert way

---
 tests/functional/WebDriverCheckboxesTest.php  | 139 +++++++++++-------
 tests/functional/WebDriverRadiosTest.php      |  73 ++++-----
 tests/functional/web/form_checkbox_radio.html |  18 ++-
 3 files changed, 137 insertions(+), 93 deletions(-)

diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index f7e1407b6..a37fde342 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -32,42 +32,55 @@ protected function setUp()
 
     public function testIsMultiple()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
-        $this->assertTrue($c->isMultiple());
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
+
+        $this->assertTrue($checkboxes->isMultiple());
     }
 
     public function testGetOptions()
     {
-        $c = new WebDriverCheckboxes(
+        $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//form[2]//input[@type="checkbox"]'))
         );
-        $this->assertNotEmpty($c->getOptions());
+
+        $this->assertNotEmpty($checkboxes->getOptions());
     }
 
     public function testGetFirstSelectedOption()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
-        $c->selectByValue('j2a');
-        $this->assertSame('j2a', $c->getFirstSelectedOption()->getAttribute('value'));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
+
+        $checkboxes->selectByValue('j2a');
+
+        $this->assertSame('j2a', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testGetFirstSelectedOptionWithSameNameDifferentForm()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm()
     {
-        $radio = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@id="j5b"]')));
-        $this->assertEquals('j5b', $radio->getFirstSelectedOption()->getAttribute('value'));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@id="j5b"]'))
+        );
+
+        $this->assertEquals('j5b', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
     public function testSelectByValue()
     {
         $selectedOptions = ['j2b', 'j2c'];
 
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
         foreach ($selectedOptions as $index => $selectedOption) {
-            $c->selectByValue($selectedOption);
+            $checkboxes->selectByValue($selectedOption);
         }
 
         $selectedValues = [];
-        foreach ($c->getAllSelectedOptions() as $option) {
+        foreach ($checkboxes->getAllSelectedOptions() as $option) {
             $selectedValues[] = $option->getAttribute('value');
         }
         $this->assertSame($selectedOptions, $selectedValues);
@@ -75,24 +88,28 @@ public function testSelectByValue()
 
     public function testSelectByValueInvalid()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
         $this->expectException(NoSuchElementException::class);
         $this->expectExceptionMessage('Cannot locate checkbox with value: notexist');
-        $c->selectByValue('notexist');
+        $checkboxes->selectByValue('notexist');
     }
 
     public function testSelectByIndex()
     {
         $selectedOptions = [1 => 'j2b', 2 => 'j2c'];
 
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
         foreach ($selectedOptions as $index => $selectedOption) {
-            $c->selectByIndex($index);
+            $checkboxes->selectByIndex($index);
         }
 
         $selectedValues = [];
-        foreach ($c->getAllSelectedOptions() as $option) {
+        foreach ($checkboxes->getAllSelectedOptions() as $option) {
             $selectedValues[] = $option->getAttribute('value');
         }
         $this->assertSame(array_values($selectedOptions), $selectedValues);
@@ -100,11 +117,13 @@ public function testSelectByIndex()
 
     public function testSelectByIndexInvalid()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
         $this->expectException(NoSuchElementException::class);
         $this->expectExceptionMessage('Cannot locate checkbox with index: ' . PHP_INT_MAX);
-        $c->selectByIndex(PHP_INT_MAX);
+        $checkboxes->selectByIndex(PHP_INT_MAX);
     }
 
     /**
@@ -115,9 +134,13 @@ public function testSelectByIndexInvalid()
      */
     public function testSelectByVisibleText($text, $value)
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
-        $c->selectByVisibleText($text);
-        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
+
+        $checkboxes->selectByVisibleText($text);
+
+        $this->assertSame($value, $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
     /**
@@ -139,9 +162,13 @@ public function selectByVisibleTextDataProvider()
      */
     public function testSelectByVisiblePartialText($text, $value)
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
-        $c->selectByVisiblePartialText($text);
-        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
+
+        $checkboxes->selectByVisiblePartialText($text);
+
+        $this->assertSame($value, $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
     /**
@@ -157,51 +184,61 @@ public function selectByVisiblePartialTextDataProvider()
 
     public function testDeselectAll()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
-        $c->selectByIndex(0);
-        $this->assertCount(1, $c->getAllSelectedOptions());
-        $c->deselectAll();
-        $this->assertEmpty($c->getAllSelectedOptions());
+        $checkboxes->selectByIndex(0);
+        $this->assertCount(1, $checkboxes->getAllSelectedOptions());
+        $checkboxes->deselectAll();
+        $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
     public function testDeselectByIndex()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
-        $c->selectByIndex(0);
-        $this->assertCount(1, $c->getAllSelectedOptions());
-        $c->deselectByIndex(0);
-        $this->assertEmpty($c->getAllSelectedOptions());
+        $checkboxes->selectByIndex(0);
+        $this->assertCount(1, $checkboxes->getAllSelectedOptions());
+        $checkboxes->deselectByIndex(0);
+        $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
     public function testDeselectByValue()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
-        $c->selectByValue('j2a');
-        $this->assertCount(1, $c->getAllSelectedOptions());
-        $c->deselectByValue('j2a');
-        $this->assertEmpty($c->getAllSelectedOptions());
+        $checkboxes->selectByValue('j2a');
+        $this->assertCount(1, $checkboxes->getAllSelectedOptions());
+        $checkboxes->deselectByValue('j2a');
+        $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
     public function testDeselectByVisibleText()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
-        $c->selectByVisibleText('J 2 B');
-        $this->assertCount(1, $c->getAllSelectedOptions());
-        $c->deselectByVisibleText('J 2 B');
-        $this->assertEmpty($c->getAllSelectedOptions());
+        $checkboxes->selectByVisibleText('J 2 B');
+        $this->assertCount(1, $checkboxes->getAllSelectedOptions());
+        $checkboxes->deselectByVisibleText('J 2 B');
+        $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
     public function testDeselectByVisiblePartialText()
     {
-        $c = new WebDriverCheckboxes($this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]')));
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
+        );
 
-        $c->selectByVisiblePartialText('2C');
-        $this->assertCount(1, $c->getAllSelectedOptions());
-        $c->deselectByVisiblePartialText('2C');
-        $this->assertEmpty($c->getAllSelectedOptions());
+        $checkboxes->selectByVisiblePartialText('2C');
+        $this->assertCount(1, $checkboxes->getAllSelectedOptions());
+        $checkboxes->deselectByVisiblePartialText('2C');
+        $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 }
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 369717eb2..2350a401d 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -33,15 +33,16 @@ protected function setUp()
 
     public function testIsMultiple()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $this->assertFalse($c->isMultiple());
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $this->assertFalse($radios->isMultiple());
     }
 
     public function testGetOptions()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $values = [];
-        foreach ($c->getOptions() as $option) {
+        foreach ($radios->getOptions() as $option) {
             $values[] = $option->getAttribute('value');
         }
 
@@ -50,53 +51,57 @@ public function testGetOptions()
 
     public function testGetFirstSelectedOption()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $c->selectByValue('j3a');
-        $this->assertSame('j3a', $c->getFirstSelectedOption()->getAttribute('value'));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+
+        $radios->selectByValue('j3a');
+
+        $this->assertSame('j3a', $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testGetFirstSelectedOptionWithSameNameDifferentForm()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm()
     {
         $radio = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@id="j4b"]')));
+
         $this->assertEquals('j4b', $radio->getFirstSelectedOption()->getAttribute('value'));
     }
 
     public function testSelectByValue()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $c->selectByValue('j3b');
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios->selectByValue('j3b');
+
+        $selectedOptions = $radios->getAllSelectedOptions();
 
-        $selectedOptions = $c->getAllSelectedOptions();
         $this->assertCount(1, $selectedOptions);
         $this->assertSame('j3b', $selectedOptions[0]->getAttribute('value'));
     }
 
     public function testSelectByValueInvalid()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(NoSuchElementException::class);
         $this->expectExceptionMessage('Cannot locate radio with value: notexist');
-        $c->selectByValue('notexist');
+        $radios->selectByValue('notexist');
     }
 
     public function testSelectByIndex()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $c->selectByIndex(1);
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios->selectByIndex(1);
 
-        $allSelectedOptions = $c->getAllSelectedOptions();
+        $allSelectedOptions = $radios->getAllSelectedOptions();
         $this->assertCount(1, $allSelectedOptions);
         $this->assertSame('j3b', $allSelectedOptions[0]->getAttribute('value'));
     }
 
     public function testSelectByIndexInvalid()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(NoSuchElementException::class);
         $this->expectExceptionMessage('Cannot locate radio with index: ' . PHP_INT_MAX);
-        $c->selectByIndex(PHP_INT_MAX);
+        $radios->selectByIndex(PHP_INT_MAX);
     }
 
     /**
@@ -107,9 +112,9 @@ public function testSelectByIndexInvalid()
      */
     public function testSelectByVisibleText($text, $value)
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $c->selectByVisibleText($text);
-        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios->selectByVisibleText($text);
+        $this->assertSame($value, $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
     /**
@@ -131,9 +136,9 @@ public function selectByVisibleTextDataProvider()
      */
     public function testSelectByVisiblePartialText($text, $value)
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
-        $c->selectByVisiblePartialText($text);
-        $this->assertSame($value, $c->getFirstSelectedOption()->getAttribute('value'));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios->selectByVisiblePartialText($text);
+        $this->assertSame($value, $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
     /**
@@ -149,46 +154,46 @@ public function selectByVisiblePartialTextDataProvider()
 
     public function testDeselectAllRadio()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(UnsupportedOperationException::class);
         $this->expectExceptionMessage('You cannot deselect radio buttons');
-        $c->deselectAll();
+        $radios->deselectAll();
     }
 
     public function testDeselectByIndexRadio()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(UnsupportedOperationException::class);
         $this->expectExceptionMessage('You cannot deselect radio buttons');
-        $c->deselectByIndex(0);
+        $radios->deselectByIndex(0);
     }
 
     public function testDeselectByValueRadio()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(UnsupportedOperationException::class);
         $this->expectExceptionMessage('You cannot deselect radio buttons');
-        $c->deselectByValue('val');
+        $radios->deselectByValue('val');
     }
 
     public function testDeselectByVisibleTextRadio()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(UnsupportedOperationException::class);
         $this->expectExceptionMessage('You cannot deselect radio buttons');
-        $c->deselectByVisibleText('AB');
+        $radios->deselectByVisibleText('AB');
     }
 
     public function testDeselectByVisiblePartialTextRadio()
     {
-        $c = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->expectException(UnsupportedOperationException::class);
         $this->expectExceptionMessage('You cannot deselect radio buttons');
-        $c->deselectByVisiblePartialText('AB');
+        $radios->deselectByVisiblePartialText('AB');
     }
 }
diff --git a/tests/functional/web/form_checkbox_radio.html b/tests/functional/web/form_checkbox_radio.html
index 1e13d74e4..3e7c2a19a 100644
--- a/tests/functional/web/form_checkbox_radio.html
+++ b/tests/functional/web/form_checkbox_radio.html
@@ -5,7 +5,7 @@
     <title>Form</title>
 </head>
 <body>
-<form id="another-form" method="POST">
+<form id="main-form" method="POST">
     <input name="j1">
     <input type="checkbox" name="j2" value="j2a">
 
@@ -27,28 +27,30 @@
         <input type="radio" name="j3" value="j3b">
     </label>
 
+    <!-- Following elements #j4a and #j4b are associated with another-form, even though they are inside main-form tag -->
     <label for="j4a">J4A</label>
-    <input type="radio" form="yet-another-form" name="j4" value="j4a" id="j4a" checked/>
+    <input type="radio" form="another-form" name="j4" value="j4a" id="j4a" checked/>
 
     <label for="j5a">J5A</label>
-    <input type="checkbox" form="yet-another-form" name="j5" value="j5a" id="j5a" checked/>
+    <input type="checkbox" form="another-form" name="j5" value="j5a" id="j5a" checked/>
 
     <input type="submit" value="OK">
 </form>
 
+<!-- Following elements are associated with main-form, even though they are not inside its tag -->
 <label for="j2c">J2C</label>
-<input type="checkbox" form="another-form" name="j2" value="j2c" id="j2c">
+<input type="checkbox" form="main-form" name="j2" value="j2c" id="j2c">
 
 <label for="j3c">J3C</label>
-<input type="radio" form="another-form" name="j3" value="j3c" id="j3c">
+<input type="radio" form="main-form" name="j3" value="j3c" id="j3c">
 
 <label for="j4b">J4B</label>
-<input type="radio" form="another-form" name="j4" value="j4b" id="j4b" checked>
+<input type="radio" form="main-form" name="j4" value="j4b" id="j4b" checked>
 
 <label for="j5b">J5B</label>
-<input type="checkbox" form="another-form" name="j5" value="j5b" id="j5b" checked>
+<input type="checkbox" form="main-form" name="j5" value="j5b" id="j5b" checked>
 
-<form id="yet-another-form">
+<form id="another-form">
     <input type="checkbox" name="single-cb">
 </form>
 </body>

From e8accbdea92c617e0bfea7bcd5aea522e0c19c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Jun 2019 13:20:45 +0200
Subject: [PATCH 430/784] Extend testcases to cover also form without id

---
 tests/functional/WebDriverCheckboxesTest.php  |  9 +++++++++
 tests/functional/WebDriverRadiosTest.php      | 13 +++++++++++--
 tests/functional/web/form_checkbox_radio.html | 12 ++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index a37fde342..48b72a53c 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -68,6 +68,15 @@ public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociate
         $this->assertEquals('j5b', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId()
+    {
+        $checkboxes = new WebDriverCheckboxes(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@id="j5d"]'))
+        );
+
+        $this->assertEquals('j5c', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
+    }
+
     public function testSelectByValue()
     {
         $selectedOptions = ['j2b', 'j2c'];
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 2350a401d..4d659772b 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -60,9 +60,18 @@ public function testGetFirstSelectedOption()
 
     public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm()
     {
-        $radio = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@id="j4b"]')));
+        $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@id="j4b"]')));
 
-        $this->assertEquals('j4b', $radio->getFirstSelectedOption()->getAttribute('value'));
+        $this->assertEquals('j4b', $radios->getFirstSelectedOption()->getAttribute('value'));
+    }
+
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId()
+    {
+        $radios = new WebDriverRadios(
+            $this->driver->findElement(WebDriverBy::xpath('//input[@id="j4c"]'))
+        );
+
+        $this->assertEquals('j4c', $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
     public function testSelectByValue()
diff --git a/tests/functional/web/form_checkbox_radio.html b/tests/functional/web/form_checkbox_radio.html
index 3e7c2a19a..fe59896d9 100644
--- a/tests/functional/web/form_checkbox_radio.html
+++ b/tests/functional/web/form_checkbox_radio.html
@@ -53,5 +53,17 @@
 <form id="another-form">
     <input type="checkbox" name="single-cb">
 </form>
+
+<!-- Form without id -->
+<form>
+    <label for="j5c">J5C</label>
+    <input type="checkbox" name="j5" value="j5c" id="j5c" checked/>
+    <label for="j5d">J5D</label>
+    <input type="checkbox" name="j5" value="j5d" id="j5d" checked/>
+
+    <label for="j4c">J4C</label>
+    <input type="radio" name="j4" value="j4c" id="j4c" checked>
+</form>
+
 </body>
 </html>

From 9a52b1ac036743c31bc127fd7f2f4710e2bc968a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Jun 2019 16:32:25 +0200
Subject: [PATCH 431/784] Release version 1.7.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e27bd1b89..9b5487916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.7.0 - 2019-06-10
 ### Added
 - `WebDriverCheckboxes` and `WebDriverRadios` helper classes to simplify interaction with checkboxes and radio buttons.
 

From ec7ce5b611e3a73eb789c783760487c89b4999a1 Mon Sep 17 00:00:00 2001
From: Lctrs <jerome@prmntr.me>
Date: Tue, 11 Jun 2019 11:47:33 +0200
Subject: [PATCH 432/784] Do not fail if ChromeOptions is already an array

DesiredCapabilities::toArray() is a mutable operation which can lead to undesirable side effect of converting ChromeOptions to an array.
---
 lib/Remote/DesiredCapabilities.php             |  1 +
 lib/Remote/RemoteWebDriver.php                 |  4 +++-
 tests/functional/RemoteWebDriverCreateTest.php | 13 +++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 0e1a1ab25..533c8873a 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -156,6 +156,7 @@ public function setJavascriptEnabled($enabled)
     }
 
     /**
+     * @todo Remove side-effects - not change ie. ChromeOptions::CAPABILITY from instance of ChromeOptions to an array
      * @return array
      */
     public function toArray()
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 538ae282f..af729f16e 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -109,8 +109,10 @@ public static function create(
             $currentChromeOptions = $desired_capabilities->getCapability(ChromeOptions::CAPABILITY);
             $chromeOptions = !empty($currentChromeOptions) ? $currentChromeOptions : new ChromeOptions();
 
-            if (!isset($chromeOptions->toArray()['w3c'])) {
+            if ($chromeOptions instanceof ChromeOptions && !isset($chromeOptions->toArray()['w3c'])) {
                 $chromeOptions->setExperimentalOption('w3c', false);
+            } elseif (is_array($chromeOptions) && !isset($chromeOptions['w3c'])) {
+                $chromeOptions['w3c'] = false;
             }
 
             $desired_capabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index f9d7e809e..90c072922 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -49,6 +49,19 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
     }
 
+    public function testShouldAcceprCapabilitiesAsAnArray()
+    {
+        // Method has a side-effect of converting whole content of desiredCapabilities to an array
+        $this->desiredCapabilities->toArray();
+
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout
+        );
+    }
+
     public function testShouldCreateWebDriverWithRequiredCapabilities()
     {
         $requiredCapabilities = new DesiredCapabilities();

From f650ee73645a3e95fb0567b25d4f33c13664cbde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 Jun 2019 11:32:08 +0200
Subject: [PATCH 433/784] Do not send w3c capability as a workaround for
 browsestack schema validation (fixes #644)

---
 lib/Remote/RemoteWebDriver.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index af729f16e..71f45704e 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -105,7 +105,9 @@ public static function create(
 
         // Hotfix: W3C WebDriver protocol is not yet supported by php-webdriver, so we must force Chromedriver to
         // not use the W3C protocol by default (which is what Chromedriver does starting with version 75).
-        if ($desired_capabilities->getBrowserName() === WebDriverBrowserType::CHROME) {
+        if ($desired_capabilities->getBrowserName() === WebDriverBrowserType::CHROME
+            && mb_strpos($selenium_server_url, 'browserstack') === false // see https://github.com/facebook/php-webdriver/issues/644
+        ) {
             $currentChromeOptions = $desired_capabilities->getCapability(ChromeOptions::CAPABILITY);
             $chromeOptions = !empty($currentChromeOptions) ? $currentChromeOptions : new ChromeOptions();
 

From e43de70f3c7166169d0f14a374505392734160e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 13 Jun 2019 10:02:18 +0200
Subject: [PATCH 434/784] Release version 1.7.1

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b5487916..a5e4ca748 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 1.7.1 - 2019-06-13
+### Fixed
+- Error `Call to a member function toArray()` if capabilities were already converted to an array.
+- Temporarily do not send capabilities to disable W3C WebDriver protocol when BrowserStack hub is used.
+
 ## 1.7.0 - 2019-06-10
 ### Added
 - `WebDriverCheckboxes` and `WebDriverRadios` helper classes to simplify interaction with checkboxes and radio buttons.

From 3f73de8364e7285115750e7e47b9a27e08c730d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Jun 2019 11:33:44 +0200
Subject: [PATCH 435/784] Revert Chromedriver bug workaround, which is fixed in
 Chromedriver 75.0.3770.90

---
 .travis.yml                        | 2 +-
 CHANGELOG.md                       | 3 +++
 lib/Remote/HttpCommandExecutor.php | 5 -----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6850baf1..ac6cc1e24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ matrix:
 
     # Stable Chrome + Chromedriver 75+ inside Travis environment
     - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="75.0.3770.8"
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="75.0.3770.90"
       addons:
         chrome: stable
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e4ca748..f1e733516 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Changed
+- Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
+
 ## 1.7.1 - 2019-06-13
 ### Fixed
 - Error `Call to a member function toArray()` if capabilities were already converted to an array.
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 1891fdb35..f584324b7 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -273,11 +273,6 @@ public function execute(WebDriverCommand $command)
 
         if ($http_method === 'POST' && $params && is_array($params)) {
             $encoded_params = json_encode($params);
-        } elseif ($http_method === 'POST' && $encoded_params === null) {
-            // Workaround for bug https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943 in Chrome 75.
-            // Chromedriver now erroneously does not allow POST body to be empty even for the JsonWire protocol.
-            // If the command POST is empty, here we send some dummy data as a workaround:
-            $encoded_params = json_encode(['_' => '_']);
         }
 
         curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);

From 4f8b32289daa41c9c96b6a9dbfcb352a24e5af1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 1 Nov 2019 19:16:13 +0000
Subject: [PATCH 436/784] Download latest chromedriver without a need of manual
 version bumping

---
 .travis.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac6cc1e24..37dfc2cf1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,15 +39,9 @@ matrix:
       addons:
         firefox: "45.8.0esr"
 
-    # Stable Chrome + Chromedriver 74 inside Travis environment
+    # Stable Chrome + Chromedriver inside Travis environment
     - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="74.0.3729.6"
-      addons:
-        chrome: stable
-
-    # Stable Chrome + Chromedriver 75+ inside Travis environment
-    - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1" CHROMEDRIVER_VERSION="75.0.3770.90"
+      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
       addons:
         chrome: stable
 
@@ -102,7 +96,7 @@ install:
   - travis_retry composer update --no-interaction $DEPENDENCIES
 
 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 mkdir chromedriver; CHROMEDRIVER_VERSION=$(wget -qO- "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"); 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
   - 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

From 87be63361d6670b8110b7d084887746b1adc685b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 9 Apr 2018 16:25:57 +0200
Subject: [PATCH 437/784] W3C-compatible implementation

---
 .travis.yml                                   |  12 +-
 CONTRIBUTING.md                               |  10 +-
 lib/AbstractWebDriverCheckboxOrRadio.php      |   2 +-
 lib/Cookie.php                                |   8 +-
 lib/Exception/WebDriverException.php          |  50 ++++-
 lib/Interactions/WebDriverActions.php         |   1 -
 lib/Remote/DriverCommand.php                  |   4 +
 lib/Remote/HttpCommandExecutor.php            |  63 ++++++-
 lib/Remote/JsonWireCompat.php                 | 102 ++++++++++
 lib/Remote/RemoteMouse.php                    | 174 +++++++++++++++++-
 lib/Remote/RemoteTargetLocator.php            |   4 +-
 lib/Remote/RemoteWebDriver.php                |  82 ++++++---
 lib/Remote/RemoteWebElement.php               | 112 ++++++++---
 lib/WebDriverDimension.php                    |  12 +-
 lib/WebDriverOptions.php                      |   9 +-
 lib/WebDriverPoint.php                        |   4 +-
 lib/WebDriverTimeouts.php                     |  34 +++-
 .../functional/RemoteWebDriverCreateTest.php  |   5 +-
 .../RemoteWebDriverFindElementTest.php        |  20 ++
 tests/functional/RemoteWebDriverTest.php      |  23 ++-
 tests/functional/RemoteWebElementTest.php     |   4 +
 tests/functional/WebDriverActionsTest.php     |  24 ++-
 tests/functional/WebDriverTestCase.php        |   7 +-
 tests/functional/web/escape_css.html          |  14 ++
 tests/functional/web/upload.html              |   2 +-
 25 files changed, 699 insertions(+), 83 deletions(-)
 create mode 100644 lib/Remote/JsonWireCompat.php
 create mode 100644 tests/functional/web/escape_css.html

diff --git a/.travis.yml b/.travis.yml
index 37dfc2cf1..47ddb461e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,11 +34,21 @@ matrix:
       env: DEPENDENCIES="--prefer-lowest"
 
     # Firefox inside Travis environment
-    - php: '7.3'
+    - name: 'Firefox 45 on Travis (OSS protocol)'
+      php: '7.3'
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
+    # Firefox with Geckodriver (W3C mode) inside Travis environment
+    - name: 'Firefox latest on Travis (W3C protocol)'
+      php: 7.3
+      env:
+        - BROWSER_NAME="firefox"
+        - GECKODRIVER="1"
+      addons:
+        firefox: latest
+
     # Stable Chrome + Chromedriver inside Travis environment
     - php: '7.3'
       env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a01c7adb..741a140a9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,10 +37,10 @@ For the functional tests you must first [download](http://selenium-release.stora
 the selenium standalone server, start the local PHP server which will serve the test pages and then run the `functional`
 test suite:
 
-    java -jar selenium-server-standalone-2.53.1.jar -log selenium.log &
+    java -jar selenium-server-standalone-3.9.1.jar -log selenium.log &
     php -S localhost:8000 -t tests/functional/web/ &
     ./vendor/bin/phpunit --testsuite functional
-    
+
 The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in eg. Firefox,
 simply set the `BROWSER_NAME` environment variable:
 
@@ -48,6 +48,12 @@ simply set the `BROWSER_NAME` environment variable:
     export BROWSER_NAME="firefox"
     ./vendor/bin/phpunit --testsuite functional
 
+To test with Geckodriver, [download](https://github.com/mozilla/geckodriver/releases) and start the server, then run:
+
+    export GECKODRIVER=1
+    export BROWSER_NAME=firefox
+    ./vendor/bin/phpunit --testsuite functional
+
 ### Check coding style
 
 Your code-style should comply with [PSR-2](http://www.php-fig.org/psr/psr-2/). To make sure your code matches this requirement run:
diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index f70a2ef04..1268ce7c0 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -211,7 +211,7 @@ protected function getRelatedElements($value = null)
             $form = $this->element->findElement(WebDriverBy::xpath('ancestor::form'));
 
             $formId = $form->getAttribute('id');
-            if ($formId === '') {
+            if (!$formId) {
                 return $form->findElements(WebDriverBy::xpath(
                     sprintf('.//input[@name = %s%s]', XPathEscaper::escapeQuotes($this->name), $valueSelector)
                 ));
diff --git a/lib/Cookie.php b/lib/Cookie.php
index 216ac3033..170b46486 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -190,7 +190,13 @@ public function isHttpOnly()
      */
     public function toArray()
     {
-        return $this->cookie;
+        $cookie = $this->cookie;
+        if (!isset($cookie['secure'])) {
+            // Passing a boolean value for the "secure" flag is mandatory when using geckodriver
+            $cookie['secure'] = false;
+        }
+
+        return $cookie;
     }
 
     public function offsetExists($offset)
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index 8545729ad..b17b2f70f 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -42,7 +42,7 @@ public function getResults()
     /**
      * Throw WebDriverExceptions based on WebDriver status code.
      *
-     * @param int $status_code
+     * @param int|string $status_code
      * @param string $message
      * @param mixed $results
      *
@@ -85,6 +85,54 @@ public function getResults()
      */
     public static function throwException($status_code, $message, $results)
     {
+        if (is_string($status_code)) {
+            // see https://w3c.github.io/webdriver/webdriver-spec.html#handling-errors
+            switch ($status_code) {
+                case 'no such element':
+                    throw new NoSuchElementException($message, $results);
+                case 'no such frame':
+                    throw new NoSuchFrameException($message, $results);
+                case 'unknown command':
+                    throw new UnknownCommandException($message, $results);
+                case 'stale element reference':
+                    throw new StaleElementReferenceException($message, $results);
+                case 'invalid element state':
+                    throw new InvalidElementStateException($message, $results);
+                case 'unknown error':
+                    throw new UnknownServerException($message, $results);
+                case 'unsupported operation':
+                    throw new ExpectedException($message, $results);
+                case 'element not interactable':
+                    throw new ElementNotSelectableException($message, $results);
+                case 'no such window':
+                    throw new NoSuchDocumentException($message, $results);
+                case 'javascript error':
+                    throw new UnexpectedJavascriptException($message, $results);
+                case 'timeout':
+                    throw new TimeOutException($message, $results);
+                case 'no such window':
+                    throw new NoSuchWindowException($message, $results);
+                case 'invalid cookie domain':
+                    throw new InvalidCookieDomainException($message, $results);
+                case 'unable to set cookie':
+                    throw new UnableToSetCookieException($message, $results);
+                case 'unexpected alert open':
+                    throw new UnexpectedAlertOpenException($message, $results);
+                case 'no such alert':
+                    throw new NoAlertOpenException($message, $results);
+                case 'script timeout':
+                    throw new ScriptTimeoutException($message, $results);
+                case 'invalid selector':
+                    throw new InvalidSelectorException($message, $results);
+                case 'session not created':
+                    throw new SessionNotCreatedException($message, $results);
+                case 'move target out of bounds':
+                    throw new MoveTargetOutOfBoundsException($message, $results);
+                default:
+                    throw new UnrecognizedExceptionException($message, $results);
+            }
+        }
+
         switch ($status_code) {
             case 1:
                 throw new IndexOutOfBoundsException($message, $results);
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index e97796854..66ac7c1ab 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -25,7 +25,6 @@
 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\WebDriverElement;
 use Facebook\WebDriver\WebDriverHasInputDevices;
 
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index c69052030..fd24a691c 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -146,6 +146,10 @@ class DriverCommand
     const GET_NETWORK_CONNECTION = 'getNetworkConnection';
     const SET_NETWORK_CONNECTION = 'setNetworkConnection';
 
+    // W3C specific
+    const ACTIONS = 'actions';
+    const GET_ELEMENT_PROPERTY = 'getElementProperty';
+
     private function __construct()
     {
     }
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index f584324b7..c783b2892 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -137,6 +137,29 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::TOUCH_SCROLL => ['method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'],
         DriverCommand::TOUCH_UP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/up'],
     ];
+    /**
+     * @var array Will be merged with $commands
+     */
+    protected static $w3cCompliantCommands = [
+        DriverCommand::ACCEPT_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/accept'],
+        DriverCommand::ACTIONS => ['method' => 'POST', 'url' => '/session/:sessionId/actions'],
+        DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
+        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
+        DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window'],
+        DriverCommand::GET_ELEMENT_LOCATION => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
+        DriverCommand::GET_ELEMENT_PROPERTY => [
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/property/:name',
+        ],
+        DriverCommand::GET_ELEMENT_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
+        DriverCommand::GET_WINDOW_HANDLES => ['method' => 'GET', 'url' => '/session/:sessionId/window/handles'],
+        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
+        DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert/text'],
+        DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+    ];
     /**
      * @var string
      */
@@ -145,6 +168,10 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
      * @var resource
      */
     protected $curl;
+    /**
+     * @var bool
+     */
+    protected $w3cCompliant = true;
 
     /**
      * @param string $url
@@ -153,6 +180,8 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
      */
     public function __construct($url, $http_proxy = null, $http_proxy_port = null)
     {
+        self::$w3cCompliantCommands = array_merge(self::$commands, self::$w3cCompliantCommands);
+
         $this->url = $url;
         $this->curl = curl_init();
 
@@ -179,6 +208,11 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
         $this->setConnectionTimeout(30000);
     }
 
+    public function disableW3CCompliance()
+    {
+        $this->w3cCompliant = false;
+    }
+
     /**
      * Set timeout for the connect phase
      *
@@ -226,11 +260,19 @@ public function setRequestTimeout($timeout_in_ms)
      */
     public function execute(WebDriverCommand $command)
     {
-        if (!isset(self::$commands[$command->getName()])) {
-            throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
+        $commandName = $command->getName();
+        if (!isset(self::$commands[$commandName])) {
+            if ($this->w3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
+                throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
+            }
+        }
+
+        if ($this->w3cCompliant) {
+            $raw = self::$w3cCompliantCommands[$command->getName()];
+        } else {
+            $raw = self::$commands[$command->getName()];
         }
 
-        $raw = self::$commands[$command->getName()];
         $http_method = $raw['method'];
         $url = $raw['url'];
         $url = str_replace(':sessionId', $command->getSessionID(), $url);
@@ -317,12 +359,23 @@ public function execute(WebDriverCommand $command)
         }
 
         $sessionId = null;
-        if (is_array($results) && array_key_exists('sessionId', $results)) {
+        if (is_array($value) && array_key_exists('sessionId', $value)) {
+            // W3C's WebDriver
+            $sessionId = $value['sessionId'];
+        } elseif (is_array($results) && array_key_exists('sessionId', $results)) {
+            // Legacy JsonWire
             $sessionId = $results['sessionId'];
         }
 
+        // @see https://w3c.github.io/webdriver/webdriver-spec.html#handling-errors
+        if (isset($value['error'])) {
+            // W3C's WebDriver
+            WebDriverException::throwException($value['error'], $message, $results);
+        }
+
         $status = isset($results['status']) ? $results['status'] : 0;
-        if ($status != 0) {
+        if ($status !== 0) {
+            // Legacy JsonWire
             WebDriverException::throwException($status, $message, $results);
         }
 
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
new file mode 100644
index 000000000..78b9cba0e
--- /dev/null
+++ b/lib/Remote/JsonWireCompat.php
@@ -0,0 +1,102 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+use Facebook\WebDriver\WebDriverBy;
+
+/**
+ * Compatibility layer between W3C's WebDriver and the legacy JsonWire protocol.
+ *
+ * @internal
+ */
+abstract class JsonWireCompat
+{
+    /**
+     * Element identifier defined in the W3C's WebDriver protocol.
+     *
+     * @see https://w3c.github.io/webdriver/webdriver-spec.html#elements
+     */
+    const WEB_DRIVER_ELEMENT_IDENTIFIER = 'element-6066-11e4-a52e-4f735466cecf';
+
+    public static function getElement(array $rawElement)
+    {
+        if (array_key_exists(self::WEB_DRIVER_ELEMENT_IDENTIFIER, $rawElement)) {
+            // W3C's WebDriver
+            return $rawElement[self::WEB_DRIVER_ELEMENT_IDENTIFIER];
+        }
+
+        // Legacy JsonWire
+        return $rawElement['ELEMENT'];
+    }
+
+    /**
+     * @param WebDriverBy $by
+     * @param bool $w3cCompliant
+     *
+     * @return array
+     */
+    public static function getUsing(WebDriverBy $by, $w3cCompliant)
+    {
+        $mechanism = $by->getMechanism();
+        $value = $by->getValue();
+
+        if ($w3cCompliant) {
+            switch ($mechanism) {
+                // Convert to CSS selectors
+                case 'class name':
+                    $mechanism = 'css selector';
+                    $value = sprintf('.%s', self::escapeSelector($value));
+                    break;
+                case 'id':
+                    $mechanism = 'css selector';
+                    $value = sprintf('#%s', self::escapeSelector($value));
+                    break;
+                case 'name':
+                    $mechanism = 'css selector';
+                    $value = sprintf('[name=\'%s\']', self::escapeSelector($value));
+                    break;
+            }
+        }
+
+        return ['using' => $mechanism, 'value' => $value];
+    }
+
+    /**
+     * Escapes a CSS selector.
+     *
+     * Code adapted from the Zend Escaper project.
+     *
+     * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+     * @see https://github.com/zendframework/zend-escaper/blob/master/src/Escaper.php
+     *
+     * @param string $selector
+     * @return string
+     */
+    private static function escapeSelector($selector)
+    {
+        return preg_replace_callback('/[^a-z0-9]/iSu', function ($matches) {
+            $chr = $matches[0];
+            if (mb_strlen($chr) == 1) {
+                $ord = ord($chr);
+            } else {
+                $chr = mb_convert_encoding($chr, 'UTF-32BE', 'UTF-8');
+                $ord = hexdec(bin2hex($chr));
+            }
+
+            return sprintf('\\%X ', $ord);
+        }, $selector);
+    }
+}
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 48c578df7..aa0d59829 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -27,13 +27,19 @@ class RemoteMouse implements WebDriverMouse
      * @var RemoteExecuteMethod
      */
     private $executor;
+    /**
+     * @var bool
+     */
+    private $w3cCompliant;
 
     /**
      * @param RemoteExecuteMethod $executor
+     * @param bool $w3cCompliant
      */
-    public function __construct(RemoteExecuteMethod $executor)
+    public function __construct(RemoteExecuteMethod $executor, $w3cCompliant = false)
     {
         $this->executor = $executor;
+        $this->w3cCompliant = $w3cCompliant;
     }
 
     /**
@@ -43,6 +49,22 @@ public function __construct(RemoteExecuteMethod $executor)
      */
     public function click(WebDriverCoordinates $where = null)
     {
+        if ($this->w3cCompliant) {
+            $moveAction = $where ? [$this->createMoveAction($where)] : [];
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => array_merge($moveAction, $this->createClickActions()),
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
             'button' => 0,
@@ -58,6 +80,33 @@ public function click(WebDriverCoordinates $where = null)
      */
     public function contextClick(WebDriverCoordinates $where = null)
     {
+        if ($this->w3cCompliant) {
+            $moveAction = $where ? [$this->createMoveAction($where)] : [];
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => array_merge($moveAction, [
+                            [
+                                'type' => 'pointerDown',
+                                'duration' => 0,
+                                'button' => 2,
+                            ],
+                            [
+                                'type' => 'pointerUp',
+                                'duration' => 0,
+                                'button' => 2,
+                            ],
+                        ]),
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
             'button' => 2,
@@ -73,6 +122,23 @@ public function contextClick(WebDriverCoordinates $where = null)
      */
     public function doubleClick(WebDriverCoordinates $where = null)
     {
+        if ($this->w3cCompliant) {
+            $clickActions = $this->createClickActions();
+            $moveAction = null === $where ? [] : [$this->createMoveAction($where)];
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => array_merge($moveAction, $clickActions, $clickActions),
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::DOUBLE_CLICK);
 
@@ -86,6 +152,28 @@ public function doubleClick(WebDriverCoordinates $where = null)
      */
     public function mouseDown(WebDriverCoordinates $where = null)
     {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => [
+                            $this->createMoveAction($where),
+                            [
+                                'type' => 'pointerDown',
+                                'duration' => 0,
+                                'button' => 0,
+                            ],
+                        ],
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::MOUSE_DOWN);
 
@@ -104,6 +192,21 @@ public function mouseMove(
         $x_offset = null,
         $y_offset = null
     ) {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => [$this->createMoveAction($where, $x_offset, $y_offset)],
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $params = [];
         if ($where !== null) {
             $params['element'] = $where->getAuxiliary();
@@ -114,6 +217,7 @@ public function mouseMove(
         if ($y_offset !== null) {
             $params['yoffset'] = $y_offset;
         }
+
         $this->executor->execute(DriverCommand::MOVE_TO, $params);
 
         return $this;
@@ -126,6 +230,29 @@ public function mouseMove(
      */
     public function mouseUp(WebDriverCoordinates $where = null)
     {
+        if ($this->w3cCompliant) {
+            $moveAction = $where ? [$this->createMoveAction($where)] : [];
+
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'pointer',
+                        'id' => 'mouse',
+                        'parameters' => ['pointerType' => 'mouse'],
+                        'actions' => array_merge($moveAction, [
+                            [
+                                'type' => 'pointerDown',
+                                'duration' => 0,
+                                'button' => 0,
+                            ],
+                        ]),
+                    ],
+                ],
+            ]);
+
+            return $this;
+        }
+
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::MOUSE_UP);
 
@@ -141,4 +268,49 @@ protected function moveIfNeeded(WebDriverCoordinates $where = null)
             $this->mouseMove($where);
         }
     }
+
+    /**
+     * @param WebDriverCoordinates $where
+     * @param int|null $x_offset
+     * @param int|null $y_offset
+     *
+     * @return array
+     */
+    private function createMoveAction(
+        WebDriverCoordinates $where = null,
+        $x_offset = null,
+        $y_offset = null
+    ) {
+        $move_action = [
+            'type' => 'pointerMove',
+            'duration' => 0,
+            'x' => $x_offset === null ? 0 : $x_offset,
+            'y' => $y_offset === null ? 0 : $y_offset,
+        ];
+
+        if ($where !== null) {
+            $move_action['origin'] = [JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $where->getAuxiliary()];
+        }
+
+        return $move_action;
+    }
+
+    /**
+     * @return array
+     */
+    private function createClickActions()
+    {
+        return [
+            [
+                'type' => 'pointerDown',
+                'duration' => 0,
+                'button' => 0,
+            ],
+            [
+                'type' => 'pointerUp',
+                'duration' => 0,
+                'button' => 0,
+            ],
+        ];
+    }
 }
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 5c218075d..55a879c0d 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -112,6 +112,8 @@ public function activeElement()
         $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT, []);
         $method = new RemoteExecuteMethod($this->driver);
 
-        return new RemoteWebElement($method, $response['ELEMENT']);
+        $w3cCompliant = $this->driver instanceof RemoteWebDriver ? $this->driver->isW3cCompliant() : false;
+
+        return new RemoteWebElement($method, JsonWireCompat::getElement($response), $w3cCompliant);
     }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 71f45704e..6d3a7d833 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -59,19 +59,26 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
      * @var RemoteExecuteMethod
      */
     protected $executeMethod;
+    /**
+     * @var bool
+     */
+    protected $w3cCompliant;
 
     /**
      * @param HttpCommandExecutor $commandExecutor
      * @param string $sessionId
      * @param WebDriverCapabilities|null $capabilities
+     * @param bool $w3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
      */
     protected function __construct(
         HttpCommandExecutor $commandExecutor,
         $sessionId,
-        WebDriverCapabilities $capabilities = null
+        WebDriverCapabilities $capabilities = null,
+        $w3cCompliant = false
     ) {
         $this->executor = $commandExecutor;
         $this->sessionID = $sessionId;
+        $this->w3cCompliant = $w3cCompliant;
 
         if ($capabilities !== null) {
             $this->capabilities = $capabilities;
@@ -88,6 +95,7 @@ protected function __construct(
      * @param string|null $http_proxy The proxy to tunnel requests to the remote Selenium WebDriver through
      * @param int|null $http_proxy_port The proxy port to tunnel requests to the remote Selenium WebDriver through
      * @param DesiredCapabilities $required_capabilities The required capabilities
+     *
      * @return static
      */
     public static function create(
@@ -99,6 +107,7 @@ public static function create(
         $http_proxy_port = null,
         DesiredCapabilities $required_capabilities = null
     ) {
+        // BC layer to not break the method signature
         $selenium_server_url = preg_replace('#/+$#', '', $selenium_server_url);
 
         $desired_capabilities = self::castToDesiredCapabilitiesObject($desired_capabilities);
@@ -128,23 +137,43 @@ public static function create(
             $executor->setRequestTimeout($request_timeout_in_ms);
         }
 
+        // W3C
+        $parameters = [
+            'capabilities' => [
+                'firstMatch' => [$desired_capabilities->toArray()],
+            ],
+        ];
+
+        // Legacy protocol
+        if (null !== $required_capabilities && $required_capabilities_array = $required_capabilities->toArray()) {
+            $parameters['capabilities']['alwaysMatch'] = $required_capabilities_array;
+        }
+
         if ($required_capabilities !== null) {
             // TODO: Selenium (as of v3.0.1) does accept requiredCapabilities only as a property of desiredCapabilities.
-            // This will probably change in future with the W3C WebDriver spec, but is the only way how to pass these
-            // values now.
+            // This has changed with the W3C WebDriver spec, but is the only way how to pass these
+            // values with the legacy protocol.
             $desired_capabilities->setCapability('requiredCapabilities', $required_capabilities->toArray());
         }
 
+        $parameters['desiredCapabilities'] = $desired_capabilities->toArray();
+
         $command = new WebDriverCommand(
             null,
             DriverCommand::NEW_SESSION,
-            ['desiredCapabilities' => $desired_capabilities->toArray()]
+            $parameters
         );
 
         $response = $executor->execute($command);
-        $returnedCapabilities = new DesiredCapabilities($response->getValue());
+        $value = $response->getValue();
+
+        if (!$w3c_compliant = isset($value['capabilities'])) {
+            $executor->disableW3CCompliance();
+        }
 
-        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities);
+        $returnedCapabilities = new DesiredCapabilities($w3c_compliant ? $value['capabilities'] : $value);
+
+        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities, $w3c_compliant);
 
         return $driver;
     }
@@ -167,7 +196,9 @@ public static function createBySessionID(
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null
     ) {
-        $executor = new HttpCommandExecutor($selenium_server_url);
+        // BC layer to not break the method signature
+        $w3c_compliant = func_num_args() > 3 ? func_get_arg(3) : false;
+        $executor = new HttpCommandExecutor($selenium_server_url, null, null);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);
         }
@@ -175,7 +206,7 @@ public static function createBySessionID(
             $executor->setRequestTimeout($request_timeout_in_ms);
         }
 
-        return new static($executor, $session_id);
+        return new static($executor, $session_id, null, $w3c_compliant);
     }
 
     /**
@@ -199,13 +230,12 @@ public function close()
      */
     public function findElement(WebDriverBy $by)
     {
-        $params = ['using' => $by->getMechanism(), 'value' => $by->getValue()];
         $raw_element = $this->execute(
             DriverCommand::FIND_ELEMENT,
-            $params
+            JsonWireCompat::getUsing($by, $this->w3cCompliant)
         );
 
-        return $this->newElement($raw_element['ELEMENT']);
+        return $this->newElement(JsonWireCompat::getElement($raw_element));
     }
 
     /**
@@ -217,15 +247,14 @@ public function findElement(WebDriverBy $by)
      */
     public function findElements(WebDriverBy $by)
     {
-        $params = ['using' => $by->getMechanism(), 'value' => $by->getValue()];
         $raw_elements = $this->execute(
             DriverCommand::FIND_ELEMENTS,
-            $params
+            JsonWireCompat::getUsing($by, $this->w3cCompliant)
         );
 
         $elements = [];
         foreach ($raw_elements as $raw_element) {
-            $elements[] = $this->newElement($raw_element['ELEMENT']);
+            $elements[] = $this->newElement(JsonWireCompat::getElement($raw_element));
         }
 
         return $elements;
@@ -399,7 +428,7 @@ public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
      */
     public function manage()
     {
-        return new WebDriverOptions($this->getExecuteMethod());
+        return new WebDriverOptions($this->getExecuteMethod(), $this->w3cCompliant);
     }
 
     /**
@@ -430,7 +459,7 @@ public function switchTo()
     public function getMouse()
     {
         if (!$this->mouse) {
-            $this->mouse = new RemoteMouse($this->getExecuteMethod());
+            $this->mouse = new RemoteMouse($this->getExecuteMethod(), $this->w3cCompliant);
         }
 
         return $this->mouse;
@@ -541,7 +570,7 @@ public function getCapabilities()
      */
     public static function getAllSessions($selenium_server_url = 'http://localhost:4444/wd/hub', $timeout_in_ms = 30000)
     {
-        $executor = new HttpCommandExecutor($selenium_server_url);
+        $executor = new HttpCommandExecutor($selenium_server_url, null, null);
         $executor->setConnectionTimeout($timeout_in_ms);
 
         $command = new WebDriverCommand(
@@ -570,6 +599,15 @@ public function execute($command_name, $params = [])
         return null;
     }
 
+    /**
+     * @internal
+     * @return bool
+     */
+    public function isW3cCompliant()
+    {
+        return $this->w3cCompliant;
+    }
+
     /**
      * Prepare arguments for JavaScript injection
      *
@@ -581,9 +619,11 @@ protected function prepareScriptArguments(array $arguments)
         $args = [];
         foreach ($arguments as $key => $value) {
             if ($value instanceof WebDriverElement) {
-                $args[$key] = ['ELEMENT' => $value->getID()];
+                $args[$key] = [
+                    $this->w3cCompliant ? JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER : 'ELEMENT' => $value->getID(),
+                ];
             } else {
-                if (is_array($value)) {
+                if (\is_array($value)) {
                     $value = $this->prepareScriptArguments($value);
                 }
                 $args[$key] = $value;
@@ -613,7 +653,7 @@ protected function getExecuteMethod()
      */
     protected function newElement($id)
     {
-        return new RemoteWebElement($this->getExecuteMethod(), $id);
+        return new RemoteWebElement($this->getExecuteMethod(), $id, $this->w3cCompliant);
     }
 
     /**
@@ -629,7 +669,7 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
             return new DesiredCapabilities();
         }
 
-        if (is_array($desired_capabilities)) {
+        if (\is_array($desired_capabilities)) {
             return new DesiredCapabilities($desired_capabilities);
         }
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 26936d8b9..b07b18227 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
@@ -42,16 +43,22 @@ class RemoteWebElement implements WebDriverElement, WebDriverLocatable
      * @var UselessFileDetector
      */
     protected $fileDetector;
+    /**
+     * @var bool
+     */
+    protected $w3cCompliant;
 
     /**
      * @param RemoteExecuteMethod $executor
      * @param string $id
+     * @param bool $w3cCompliant
      */
-    public function __construct(RemoteExecuteMethod $executor, $id)
+    public function __construct(RemoteExecuteMethod $executor, $id, $w3cCompliant = false)
     {
         $this->executor = $executor;
         $this->id = $id;
         $this->fileDetector = new UselessFileDetector();
+        $this->w3cCompliant = $w3cCompliant;
     }
 
     /**
@@ -66,6 +73,23 @@ public function clear()
             [':id' => $this->id]
         );
 
+        if ($this->w3cCompliant) {
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [[
+                    'type' => 'key',
+                    'id' => 'keyboard',
+                    'actions' => [
+                        ['type' => 'keyDown' , 'value' => WebDriverKeys::CONTROL],
+                        ['type' => 'keyDown' , 'value' => 'a'],
+                        ['type' => 'keyUp' , 'value' => WebDriverKeys::CONTROL],
+                        ['type' => 'keyUp' , 'value' => 'a'],
+                        ['type' => 'keyDown' , 'value' => WebDriverKeys::BACKSPACE],
+                        ['type' => 'keyUp' , 'value' => WebDriverKeys::BACKSPACE],
+                    ],
+                ]],
+            ]);
+        }
+
         return $this;
     }
 
@@ -94,17 +118,15 @@ public function click()
      */
     public function findElement(WebDriverBy $by)
     {
-        $params = [
-            'using' => $by->getMechanism(),
-            'value' => $by->getValue(),
-            ':id' => $this->id,
-        ];
+        $params = JsonWireCompat::getUsing($by, $this->w3cCompliant);
+        $params[':id'] = $this->id;
+
         $raw_element = $this->executor->execute(
             DriverCommand::FIND_CHILD_ELEMENT,
             $params
         );
 
-        return $this->newElement($raw_element['ELEMENT']);
+        return $this->newElement(JsonWireCompat::getElement($raw_element));
     }
 
     /**
@@ -117,11 +139,8 @@ public function findElement(WebDriverBy $by)
      */
     public function findElements(WebDriverBy $by)
     {
-        $params = [
-            'using' => $by->getMechanism(),
-            'value' => $by->getValue(),
-            ':id' => $this->id,
-        ];
+        $params = JsonWireCompat::getUsing($by, $this->w3cCompliant);
+        $params[':id'] = $this->id;
         $raw_elements = $this->executor->execute(
             DriverCommand::FIND_CHILD_ELEMENTS,
             $params
@@ -129,7 +148,7 @@ public function findElements(WebDriverBy $by)
 
         $elements = [];
         foreach ($raw_elements as $raw_element) {
-            $elements[] = $this->newElement($raw_element['ELEMENT']);
+            $elements[] = $this->newElement(JsonWireCompat::getElement($raw_element));
         }
 
         return $elements;
@@ -148,10 +167,23 @@ public function getAttribute($attribute_name)
             ':id' => $this->id,
         ];
 
-        return $this->executor->execute(
-            DriverCommand::GET_ELEMENT_ATTRIBUTE,
-            $params
-        );
+        if ($this->w3cCompliant && ($attribute_name === 'value' || $attribute_name === 'index')) {
+            $value = $this->executor->execute(DriverCommand::GET_ELEMENT_PROPERTY, $params);
+
+            if ($value === true) {
+                return 'true';
+            }
+
+            if ($value === false) {
+                return 'false';
+            }
+
+            if ($value !== null) {
+                return (string) $value;
+            }
+        }
+
+        return $this->executor->execute(DriverCommand::GET_ELEMENT_ATTRIBUTE, $params);
     }
 
     /**
@@ -325,20 +357,37 @@ public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
         if ($local_file === null) {
+            if ($this->w3cCompliant) {
+                $params = [
+                    'text' => (string) $value,
+                    ':id' => $this->id,
+                ];
+            } else {
+                $params = [
+                    'value' => WebDriverKeys::encode($value),
+                    ':id' => $this->id,
+                ];
+            }
+
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+
+            return $this;
+        }
+
+        if ($this->w3cCompliant) {
             $params = [
-                'value' => WebDriverKeys::encode($value),
+                'text' => $local_file,
                 ':id' => $this->id,
             ];
-            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
         } else {
-            $remote_path = $this->upload($local_file);
             $params = [
-                'value' => WebDriverKeys::encode($remote_path),
+                'value' => WebDriverKeys::encode($this->upload($local_file)),
                 ':id' => $this->id,
             ];
-            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
         }
 
+        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+
         return $this;
     }
 
@@ -371,6 +420,19 @@ public function setFileDetector(FileDetector $detector)
      */
     public function submit()
     {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
+                // cannot call the submit method directly in case an input of this form is named "submit"
+                'script' => sprintf(
+                    'return Object.getPrototypeOf(%1$s).submit.call(%1$s);',
+                    'form' === $this->getTagName() ? 'arguments[0]' : 'arguments[0].form'
+                ),
+                'args' => [[JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $this->id]],
+            ]);
+
+            return $this;
+        }
+
         $this->executor->execute(
             DriverCommand::SUBMIT_ELEMENT,
             [':id' => $this->id]
@@ -397,6 +459,10 @@ public function getID()
      */
     public function equals(WebDriverElement $other)
     {
+        if ($this->w3cCompliant) {
+            throw new UnsupportedOperationException('"elementEquals" is not supported by the W3C specification');
+        }
+
         return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, [
             ':id' => $this->id,
             ':other' => $other->getID(),
@@ -412,7 +478,7 @@ public function equals(WebDriverElement $other)
      */
     protected function newElement($id)
     {
-        return new static($this->executor, $id);
+        return new static($this->executor, $id, $this->w3cCompliant);
     }
 
     /**
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 308c1990f..81a223989 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -21,17 +21,17 @@
 class WebDriverDimension
 {
     /**
-     * @var int
+     * @var int|float
      */
     private $height;
     /**
-     * @var int
+     * @var int|float
      */
     private $width;
 
     /**
-     * @param int $width
-     * @param int $height
+     * @param int|float $width
+     * @param int|float $height
      */
     public function __construct($width, $height)
     {
@@ -46,7 +46,7 @@ public function __construct($width, $height)
      */
     public function getHeight()
     {
-        return $this->height;
+        return (int) $this->height;
     }
 
     /**
@@ -56,7 +56,7 @@ public function getHeight()
      */
     public function getWidth()
     {
-        return $this->width;
+        return (int) $this->width;
     }
 
     /**
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index bec7fd18b..4c584bd07 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -28,10 +28,15 @@ class WebDriverOptions
      * @var ExecuteMethod
      */
     protected $executor;
+    /**
+     * @var bool
+     */
+    protected $w3cCompliant;
 
-    public function __construct(ExecuteMethod $executor)
+    public function __construct(ExecuteMethod $executor, $w3cCompliant = false)
     {
         $this->executor = $executor;
+        $this->w3cCompliant = $w3cCompliant;
     }
 
     /**
@@ -128,7 +133,7 @@ public function getCookies()
      */
     public function timeouts()
     {
-        return new WebDriverTimeouts($this->executor);
+        return new WebDriverTimeouts($this->executor, $this->w3cCompliant);
     }
 
     /**
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 4e2dbd211..9600af9d8 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -36,7 +36,7 @@ public function __construct($x, $y)
      */
     public function getX()
     {
-        return $this->x;
+        return (int) $this->x;
     }
 
     /**
@@ -46,7 +46,7 @@ public function getX()
      */
     public function getY()
     {
-        return $this->y;
+        return (int) $this->y;
     }
 
     /**
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 6903f7080..eeba9a10e 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -27,10 +27,15 @@ class WebDriverTimeouts
      * @var ExecuteMethod
      */
     protected $executor;
+    /**
+     * @var bool
+     */
+    protected $w3cCompliant;
 
-    public function __construct(ExecuteMethod $executor)
+    public function __construct(ExecuteMethod $executor, $w3cCompliant = false)
     {
         $this->executor = $executor;
+        $this->w3cCompliant = $w3cCompliant;
     }
 
     /**
@@ -41,6 +46,15 @@ public function __construct(ExecuteMethod $executor)
      */
     public function implicitlyWait($seconds)
     {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(
+                DriverCommand::IMPLICITLY_WAIT,
+                ['implicit' => $seconds * 1000]
+            );
+
+            return $this;
+        }
+
         $this->executor->execute(
             DriverCommand::IMPLICITLY_WAIT,
             ['ms' => $seconds * 1000]
@@ -57,6 +71,15 @@ public function implicitlyWait($seconds)
      */
     public function setScriptTimeout($seconds)
     {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(
+                DriverCommand::SET_SCRIPT_TIMEOUT,
+                ['script' => $seconds * 1000]
+            );
+
+            return $this;
+        }
+
         $this->executor->execute(
             DriverCommand::SET_SCRIPT_TIMEOUT,
             ['ms' => $seconds * 1000]
@@ -73,6 +96,15 @@ public function setScriptTimeout($seconds)
      */
     public function pageLoadTimeout($seconds)
     {
+        if ($this->w3cCompliant) {
+            $this->executor->execute(
+                DriverCommand::SET_SCRIPT_TIMEOUT,
+                ['pageLoad' => $seconds * 1000]
+            );
+
+            return $this;
+        }
+
         $this->executor->execute(DriverCommand::SET_TIMEOUT, [
             'type' => 'page load',
             'ms' => $seconds * 1000,
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 90c072922..a2f6e9d0f 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -33,7 +33,10 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
             $this->serverUrl,
             $this->desiredCapabilities,
             $this->connectionTimeout,
-            $this->requestTimeout
+            $this->requestTimeout,
+            null,
+            null,
+            null
         );
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index eea14b6e5..066179f1f 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -61,4 +61,24 @@ public function testShouldFindMultipleElements()
         $this->assertCount(5, $elements);
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
     }
+
+    public function testEscapeCssSelector()
+    {
+        if (getenv('GECKODRIVER') !== '1') {
+            $this->markTestSkipped(
+                'CSS selectors containing special characters are not supported by the legacy protocol'
+            );
+        }
+
+        $this->driver->get($this->getTestPageUrl('escape_css.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('.fo\'oo'));
+        $this->assertSame('Foo', $element->getText());
+
+        $element = $this->driver->findElement(WebDriverBy::className('#ba\'r'));
+        $this->assertSame('Bar', $element->getText());
+
+        $element = $this->driver->findElement(WebDriverBy::name('.#ba\'z'));
+        $this->assertSame('Baz', $element->getText());
+    }
 }
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index d996d304a..9105aa93f 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -77,7 +77,11 @@ public function testShouldGetSessionId()
      */
     public function testShouldGetAllSessions()
     {
-        $sessions = RemoteWebDriver::getAllSessions($this->serverUrl);
+        if (getenv('GECKODRIVER') === '1') {
+            $this->markTestSkipped('"getAllSessions" is not supported by the W3C specification');
+        }
+
+        $sessions = RemoteWebDriver::getAllSessions($this->serverUrl, 30000);
 
         $this->assertInternalType('array', $sessions);
         $this->assertCount(1, $sessions);
@@ -94,12 +98,22 @@ public function testShouldGetAllSessions()
      */
     public function testShouldQuitAndUnsetExecutor()
     {
-        $this->assertCount(1, RemoteWebDriver::getAllSessions($this->serverUrl));
+        if (getenv('GECKODRIVER') === '1') {
+            $this->markTestSkipped('"getAllSessions" is not supported by the W3C specification');
+        }
+
+        $this->assertCount(
+            1,
+            RemoteWebDriver::getAllSessions($this->serverUrl, 30000)
+        );
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
 
         $this->driver->quit();
 
-        $this->assertCount(0, RemoteWebDriver::getAllSessions($this->serverUrl));
+        $this->assertCount(
+            0,
+            RemoteWebDriver::getAllSessions($this->serverUrl, 30000)
+        );
         $this->assertNull($this->driver->getCommandExecutor());
     }
 
@@ -136,6 +150,9 @@ public function testShouldCloseWindow()
         $this->driver->get($this->getTestPageUrl('open_new_window.html'));
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
 
+        // Mandatory for Geckodriver
+        $this->driver->wait()->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
+
         $this->assertCount(2, $this->driver->getWindowHandles());
 
         $this->driver->close();
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index d4614a431..a4684ace3 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -272,6 +272,10 @@ public function testShouldSubmitFormByClickOnSubmitInput()
      */
     public function testShouldCompareEqualsElement()
     {
+        if (getenv('GECKODRIVER') === '1') {
+            $this->markTestSkipped('"equals" is not supported by the W3C specification');
+        }
+
         $this->driver->get($this->getTestPageUrl('index.html'));
 
         $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 3df984810..b2bd51835 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -46,10 +46,16 @@ public function testShouldClickOnElement()
             ->click($element)
             ->perform();
 
-        $this->assertSame(
-            ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
-            $this->retrieveLoggedEvents()
-        );
+        $logs = ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'];
+        $loggedEvents = $this->retrieveLoggedEvents();
+
+        if ('1' === getenv('GECKODRIVER')) {
+            $loggedEvents = array_slice($loggedEvents, 0, count($logs));
+            // Firefox sometimes triggers some extra events
+            // it's not related to Geckodriver, it's Firefox's own behavior
+        }
+
+        $this->assertSame($logs, $loggedEvents);
     }
 
     /**
@@ -71,10 +77,12 @@ public function testShouldClickAndHoldOnElementAndRelease()
             ->release()
             ->perform();
 
-        $this->assertSame(
-            ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
-            $this->retrieveLoggedEvents()
-        );
+        if ('1' === getenv('GECKODRIVER')) {
+            $logs = ['mouseover item-1', 'mousedown item-1', 'dragstart item-1'];
+        } else {
+            $logs = ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'];
+        }
+        $this->assertSame($logs, $this->retrieveLoggedEvents());
     }
 
     /**
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5fe6a7e8a..7a0f8af23 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -58,6 +58,8 @@ protected function setUp()
                 // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
                 $chromeOptions->addArguments(['--headless', 'window-size=1024,768', '--no-sandbox']);
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
+            } elseif (getenv('GECKODRIVER') === '1') {
+                $this->serverUrl = 'http://localhost:4444/';
             }
 
             $this->desiredCapabilities->setBrowserName($browserName);
@@ -68,7 +70,10 @@ protected function setUp()
                 $this->serverUrl,
                 $this->desiredCapabilities,
                 $this->connectionTimeout,
-                $this->requestTimeout
+                $this->requestTimeout,
+                null,
+                null,
+                null
             );
         }
     }
diff --git a/tests/functional/web/escape_css.html b/tests/functional/web/escape_css.html
new file mode 100644
index 000000000..48213084a
--- /dev/null
+++ b/tests/functional/web/escape_css.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Test CSS selector escaping</title>
+</head>
+<body>
+
+<div id=".fo'oo">Foo</div>
+<div class="#ba'r">Bar</div>
+<div name=".#ba'z">Baz</div>
+
+</body>
+</html>
diff --git a/tests/functional/web/upload.html b/tests/functional/web/upload.html
index 65a622c50..6762873c3 100644
--- a/tests/functional/web/upload.html
+++ b/tests/functional/web/upload.html
@@ -8,7 +8,7 @@
     <form method="post" action="http://github.com/upload.php" enctype="multipart/form-data">
         <p>
             <label for="upload">Select a file to upload:</label>
-            <input type="file" name="upload" id="upload"  />
+            <input type="file" name="upload" id="upload" />
         </p>
         <p>
             <input type="submit" name="submit" value="Submit"/>

From 4a65bed00dd2bdbbfa81206590df29d2060221c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 20 Aug 2019 16:18:50 +0200
Subject: [PATCH 438/784] Add back Geckodriver to the Travis matrix

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 47ddb461e..906951171 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,9 +108,14 @@ install:
 before_script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; CHROMEDRIVER_VERSION=$(wget -qO- "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"); 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 [ "$GECKODRIVER" = "1" ]; then mkdir geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz; tar xzf geckodriver-v0.24.0-linux64.tar.gz -C 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
+      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 &
+    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"
@@ -124,6 +129,7 @@ script:
 after_script:
   - if [ -f ./logs/selenium.log ]; then cat ./logs/selenium.log; fi
   - if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
+  - if [ -f ./logs/geckodriver.log ]; then cat ./logs/geckodriver.log; fi
 
 after_success:
   - travis_retry php vendor/bin/php-coveralls -v

From 5729355c5d37953d6a1a5a2f55afc7ba1c23bf57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Tue, 20 Aug 2019 17:06:26 +0200
Subject: [PATCH 439/784] Improve tests stability

---
 tests/functional/WebDriverActionsTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index b2bd51835..1f03c8899 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -78,11 +78,13 @@ public function testShouldClickAndHoldOnElementAndRelease()
             ->perform();
 
         if ('1' === getenv('GECKODRIVER')) {
-            $logs = ['mouseover item-1', 'mousedown item-1', 'dragstart item-1'];
+            $this->assertArraySubset(['mouseover item-1', 'mousedown item-1'], $this->retrieveLoggedEvents());
         } else {
-            $logs = ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'];
+            $this->assertSame(
+                ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
+                $this->retrieveLoggedEvents()
+            );
         }
-        $this->assertSame($logs, $this->retrieveLoggedEvents());
     }
 
     /**

From 721a7c2737ea8353c01e76ec7752aa0751e667eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 4 Nov 2019 19:36:50 +0000
Subject: [PATCH 440/784] Use latest geckodriver

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 906951171..950e8fe64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,7 +108,7 @@ install:
 before_script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; CHROMEDRIVER_VERSION=$(wget -qO- "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"); 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 [ "$GECKODRIVER" = "1" ]; then mkdir geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz; tar xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver; fi
+  - if [ "$GECKODRIVER" = "1" ]; then mkdir geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C 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
   - if [ "$GECKODRIVER" = "1" ]; then

From 71a6698227485b368d4212980ed9efcde15b292f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 5 Nov 2019 15:35:40 +0000
Subject: [PATCH 441/784] Make POST body always valid JSON in W3C mode

---
 lib/Remote/HttpCommandExecutor.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index c783b2892..8114d7817 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -313,8 +313,13 @@ public function execute(WebDriverCommand $command)
 
         $encoded_params = null;
 
-        if ($http_method === 'POST' && $params && is_array($params)) {
-            $encoded_params = json_encode($params);
+        if ($http_method === 'POST') {
+            if ($params && is_array($params)) {
+                $encoded_params = json_encode($params);
+            } elseif ($this->w3cCompliant) {
+                // POST body must be valid JSON in W3C, even if empty: https://www.w3.org/TR/webdriver/#processing-model
+                $encoded_params = '{}';
+            }
         }
 
         curl_setopt($this->curl, CURLOPT_POSTFIELDS, $encoded_params);

From 7119d7fc97c5291768cd8632a15bfa7d75bff145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 5 Nov 2019 15:37:36 +0000
Subject: [PATCH 442/784] Codestyle: unify casing in w3c methods

---
 lib/Remote/HttpCommandExecutor.php | 12 +++----
 lib/Remote/JsonWireCompat.php      |  8 ++---
 lib/Remote/RemoteMouse.php         | 20 ++++++------
 lib/Remote/RemoteTargetLocator.php |  4 +--
 lib/Remote/RemoteWebDriver.php     | 30 +++++++++---------
 lib/Remote/RemoteWebElement.php    | 50 ++++++++++++++++--------------
 lib/WebDriverOptions.php           |  8 ++---
 lib/WebDriverTimeouts.php          | 12 +++----
 8 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 8114d7817..b87c94069 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -171,7 +171,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
     /**
      * @var bool
      */
-    protected $w3cCompliant = true;
+    protected $isW3cCompliant = true;
 
     /**
      * @param string $url
@@ -208,9 +208,9 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
         $this->setConnectionTimeout(30000);
     }
 
-    public function disableW3CCompliance()
+    public function disableW3cCompliance()
     {
-        $this->w3cCompliant = false;
+        $this->isW3cCompliant = false;
     }
 
     /**
@@ -262,12 +262,12 @@ public function execute(WebDriverCommand $command)
     {
         $commandName = $command->getName();
         if (!isset(self::$commands[$commandName])) {
-            if ($this->w3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
+            if ($this->isW3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
                 throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
             }
         }
 
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $raw = self::$w3cCompliantCommands[$command->getName()];
         } else {
             $raw = self::$commands[$command->getName()];
@@ -316,7 +316,7 @@ public function execute(WebDriverCommand $command)
         if ($http_method === 'POST') {
             if ($params && is_array($params)) {
                 $encoded_params = json_encode($params);
-            } elseif ($this->w3cCompliant) {
+            } elseif ($this->isW3cCompliant) {
                 // POST body must be valid JSON in W3C, even if empty: https://www.w3.org/TR/webdriver/#processing-model
                 $encoded_params = '{}';
             }
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index 78b9cba0e..3488b8604 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -44,16 +44,16 @@ public static function getElement(array $rawElement)
 
     /**
      * @param WebDriverBy $by
-     * @param bool $w3cCompliant
+     * @param bool $isW3cCompliant
      *
      * @return array
      */
-    public static function getUsing(WebDriverBy $by, $w3cCompliant)
+    public static function getUsing(WebDriverBy $by, $isW3cCompliant)
     {
         $mechanism = $by->getMechanism();
         $value = $by->getValue();
 
-        if ($w3cCompliant) {
+        if ($isW3cCompliant) {
             switch ($mechanism) {
                 // Convert to CSS selectors
                 case 'class name':
@@ -89,7 +89,7 @@ private static function escapeSelector($selector)
     {
         return preg_replace_callback('/[^a-z0-9]/iSu', function ($matches) {
             $chr = $matches[0];
-            if (mb_strlen($chr) == 1) {
+            if (mb_strlen($chr) === 1) {
                 $ord = ord($chr);
             } else {
                 $chr = mb_convert_encoding($chr, 'UTF-32BE', 'UTF-8');
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index aa0d59829..4bd4a849b 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -30,16 +30,16 @@ class RemoteMouse implements WebDriverMouse
     /**
      * @var bool
      */
-    private $w3cCompliant;
+    private $isW3cCompliant;
 
     /**
      * @param RemoteExecuteMethod $executor
-     * @param bool $w3cCompliant
+     * @param bool $isW3cCompliant
      */
-    public function __construct(RemoteExecuteMethod $executor, $w3cCompliant = false)
+    public function __construct(RemoteExecuteMethod $executor, $isW3cCompliant = false)
     {
         $this->executor = $executor;
-        $this->w3cCompliant = $w3cCompliant;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -49,7 +49,7 @@ public function __construct(RemoteExecuteMethod $executor, $w3cCompliant = false
      */
     public function click(WebDriverCoordinates $where = null)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
             $this->executor->execute(DriverCommand::ACTIONS, [
                 'actions' => [
@@ -80,7 +80,7 @@ public function click(WebDriverCoordinates $where = null)
      */
     public function contextClick(WebDriverCoordinates $where = null)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
             $this->executor->execute(DriverCommand::ACTIONS, [
                 'actions' => [
@@ -122,7 +122,7 @@ public function contextClick(WebDriverCoordinates $where = null)
      */
     public function doubleClick(WebDriverCoordinates $where = null)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $clickActions = $this->createClickActions();
             $moveAction = null === $where ? [] : [$this->createMoveAction($where)];
             $this->executor->execute(DriverCommand::ACTIONS, [
@@ -152,7 +152,7 @@ public function doubleClick(WebDriverCoordinates $where = null)
      */
     public function mouseDown(WebDriverCoordinates $where = null)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(DriverCommand::ACTIONS, [
                 'actions' => [
                     [
@@ -192,7 +192,7 @@ public function mouseMove(
         $x_offset = null,
         $y_offset = null
     ) {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(DriverCommand::ACTIONS, [
                 'actions' => [
                     [
@@ -230,7 +230,7 @@ public function mouseMove(
      */
     public function mouseUp(WebDriverCoordinates $where = null)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
 
             $this->executor->execute(DriverCommand::ACTIONS, [
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 55a879c0d..8bd89ef44 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -112,8 +112,8 @@ public function activeElement()
         $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT, []);
         $method = new RemoteExecuteMethod($this->driver);
 
-        $w3cCompliant = $this->driver instanceof RemoteWebDriver ? $this->driver->isW3cCompliant() : false;
+        $isW3cCompliant = ($this->driver instanceof RemoteWebDriver) ? $this->driver->isW3cCompliant() : false;
 
-        return new RemoteWebElement($method, JsonWireCompat::getElement($response), $w3cCompliant);
+        return new RemoteWebElement($method, JsonWireCompat::getElement($response), $isW3cCompliant);
     }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 6d3a7d833..4d3573c0c 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -62,23 +62,23 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
     /**
      * @var bool
      */
-    protected $w3cCompliant;
+    protected $isW3cCompliant;
 
     /**
      * @param HttpCommandExecutor $commandExecutor
      * @param string $sessionId
      * @param WebDriverCapabilities|null $capabilities
-     * @param bool $w3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
+     * @param bool $isW3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
      */
     protected function __construct(
         HttpCommandExecutor $commandExecutor,
         $sessionId,
         WebDriverCapabilities $capabilities = null,
-        $w3cCompliant = false
+        $isW3cCompliant = false
     ) {
         $this->executor = $commandExecutor;
         $this->sessionID = $sessionId;
-        $this->w3cCompliant = $w3cCompliant;
+        $this->isW3cCompliant = $isW3cCompliant;
 
         if ($capabilities !== null) {
             $this->capabilities = $capabilities;
@@ -168,7 +168,7 @@ public static function create(
         $value = $response->getValue();
 
         if (!$w3c_compliant = isset($value['capabilities'])) {
-            $executor->disableW3CCompliance();
+            $executor->disableW3cCompliance();
         }
 
         $returnedCapabilities = new DesiredCapabilities($w3c_compliant ? $value['capabilities'] : $value);
@@ -232,7 +232,7 @@ public function findElement(WebDriverBy $by)
     {
         $raw_element = $this->execute(
             DriverCommand::FIND_ELEMENT,
-            JsonWireCompat::getUsing($by, $this->w3cCompliant)
+            JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
         return $this->newElement(JsonWireCompat::getElement($raw_element));
@@ -249,7 +249,7 @@ public function findElements(WebDriverBy $by)
     {
         $raw_elements = $this->execute(
             DriverCommand::FIND_ELEMENTS,
-            JsonWireCompat::getUsing($by, $this->w3cCompliant)
+            JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
         $elements = [];
@@ -428,7 +428,7 @@ public function wait($timeout_in_second = 30, $interval_in_millisecond = 250)
      */
     public function manage()
     {
-        return new WebDriverOptions($this->getExecuteMethod(), $this->w3cCompliant);
+        return new WebDriverOptions($this->getExecuteMethod(), $this->isW3cCompliant);
     }
 
     /**
@@ -459,7 +459,7 @@ public function switchTo()
     public function getMouse()
     {
         if (!$this->mouse) {
-            $this->mouse = new RemoteMouse($this->getExecuteMethod(), $this->w3cCompliant);
+            $this->mouse = new RemoteMouse($this->getExecuteMethod(), $this->isW3cCompliant);
         }
 
         return $this->mouse;
@@ -605,7 +605,7 @@ public function execute($command_name, $params = [])
      */
     public function isW3cCompliant()
     {
-        return $this->w3cCompliant;
+        return $this->isW3cCompliant;
     }
 
     /**
@@ -620,10 +620,12 @@ protected function prepareScriptArguments(array $arguments)
         foreach ($arguments as $key => $value) {
             if ($value instanceof WebDriverElement) {
                 $args[$key] = [
-                    $this->w3cCompliant ? JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER : 'ELEMENT' => $value->getID(),
+                    $this->isW3cCompliant ?
+                        JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER
+                        : 'ELEMENT' => $value->getID(),
                 ];
             } else {
-                if (\is_array($value)) {
+                if (is_array($value)) {
                     $value = $this->prepareScriptArguments($value);
                 }
                 $args[$key] = $value;
@@ -653,7 +655,7 @@ protected function getExecuteMethod()
      */
     protected function newElement($id)
     {
-        return new RemoteWebElement($this->getExecuteMethod(), $id, $this->w3cCompliant);
+        return new RemoteWebElement($this->getExecuteMethod(), $id, $this->isW3cCompliant);
     }
 
     /**
@@ -669,7 +671,7 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
             return new DesiredCapabilities();
         }
 
-        if (\is_array($desired_capabilities)) {
+        if (is_array($desired_capabilities)) {
             return new DesiredCapabilities($desired_capabilities);
         }
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index b07b18227..75dfa3ba2 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -46,19 +46,19 @@ class RemoteWebElement implements WebDriverElement, WebDriverLocatable
     /**
      * @var bool
      */
-    protected $w3cCompliant;
+    protected $isW3cCompliant;
 
     /**
      * @param RemoteExecuteMethod $executor
      * @param string $id
-     * @param bool $w3cCompliant
+     * @param bool $isW3cCompliant
      */
-    public function __construct(RemoteExecuteMethod $executor, $id, $w3cCompliant = false)
+    public function __construct(RemoteExecuteMethod $executor, $id, $isW3cCompliant = false)
     {
         $this->executor = $executor;
         $this->id = $id;
         $this->fileDetector = new UselessFileDetector();
-        $this->w3cCompliant = $w3cCompliant;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -73,20 +73,22 @@ public function clear()
             [':id' => $this->id]
         );
 
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(DriverCommand::ACTIONS, [
-                'actions' => [[
-                    'type' => 'key',
-                    'id' => 'keyboard',
-                    'actions' => [
-                        ['type' => 'keyDown' , 'value' => WebDriverKeys::CONTROL],
-                        ['type' => 'keyDown' , 'value' => 'a'],
-                        ['type' => 'keyUp' , 'value' => WebDriverKeys::CONTROL],
-                        ['type' => 'keyUp' , 'value' => 'a'],
-                        ['type' => 'keyDown' , 'value' => WebDriverKeys::BACKSPACE],
-                        ['type' => 'keyUp' , 'value' => WebDriverKeys::BACKSPACE],
+                'actions' => [
+                    [
+                        'type' => 'key',
+                        'id' => 'keyboard',
+                        'actions' => [
+                            ['type' => 'keyDown', 'value' => WebDriverKeys::CONTROL],
+                            ['type' => 'keyDown', 'value' => 'a'],
+                            ['type' => 'keyUp', 'value' => WebDriverKeys::CONTROL],
+                            ['type' => 'keyUp', 'value' => 'a'],
+                            ['type' => 'keyDown', 'value' => WebDriverKeys::BACKSPACE],
+                            ['type' => 'keyUp', 'value' => WebDriverKeys::BACKSPACE],
+                        ],
                     ],
-                ]],
+                ],
             ]);
         }
 
@@ -118,7 +120,7 @@ public function click()
      */
     public function findElement(WebDriverBy $by)
     {
-        $params = JsonWireCompat::getUsing($by, $this->w3cCompliant);
+        $params = JsonWireCompat::getUsing($by, $this->isW3cCompliant);
         $params[':id'] = $this->id;
 
         $raw_element = $this->executor->execute(
@@ -139,7 +141,7 @@ public function findElement(WebDriverBy $by)
      */
     public function findElements(WebDriverBy $by)
     {
-        $params = JsonWireCompat::getUsing($by, $this->w3cCompliant);
+        $params = JsonWireCompat::getUsing($by, $this->isW3cCompliant);
         $params[':id'] = $this->id;
         $raw_elements = $this->executor->execute(
             DriverCommand::FIND_CHILD_ELEMENTS,
@@ -167,7 +169,7 @@ public function getAttribute($attribute_name)
             ':id' => $this->id,
         ];
 
-        if ($this->w3cCompliant && ($attribute_name === 'value' || $attribute_name === 'index')) {
+        if ($this->isW3cCompliant && ($attribute_name === 'value' || $attribute_name === 'index')) {
             $value = $this->executor->execute(DriverCommand::GET_ELEMENT_PROPERTY, $params);
 
             if ($value === true) {
@@ -357,7 +359,7 @@ public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
         if ($local_file === null) {
-            if ($this->w3cCompliant) {
+            if ($this->isW3cCompliant) {
                 $params = [
                     'text' => (string) $value,
                     ':id' => $this->id,
@@ -374,7 +376,7 @@ public function sendKeys($value)
             return $this;
         }
 
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $params = [
                 'text' => $local_file,
                 ':id' => $this->id,
@@ -420,7 +422,7 @@ public function setFileDetector(FileDetector $detector)
      */
     public function submit()
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
                 // cannot call the submit method directly in case an input of this form is named "submit"
                 'script' => sprintf(
@@ -459,7 +461,7 @@ public function getID()
      */
     public function equals(WebDriverElement $other)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             throw new UnsupportedOperationException('"elementEquals" is not supported by the W3C specification');
         }
 
@@ -478,7 +480,7 @@ public function equals(WebDriverElement $other)
      */
     protected function newElement($id)
     {
-        return new static($this->executor, $id, $this->w3cCompliant);
+        return new static($this->executor, $id, $this->isW3cCompliant);
     }
 
     /**
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 4c584bd07..682918a17 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -31,12 +31,12 @@ class WebDriverOptions
     /**
      * @var bool
      */
-    protected $w3cCompliant;
+    protected $isW3cCompliant;
 
-    public function __construct(ExecuteMethod $executor, $w3cCompliant = false)
+    public function __construct(ExecuteMethod $executor, $isW3cCompliant = false)
     {
         $this->executor = $executor;
-        $this->w3cCompliant = $w3cCompliant;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -133,7 +133,7 @@ public function getCookies()
      */
     public function timeouts()
     {
-        return new WebDriverTimeouts($this->executor, $this->w3cCompliant);
+        return new WebDriverTimeouts($this->executor, $this->isW3cCompliant);
     }
 
     /**
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index eeba9a10e..5735cb48d 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -30,12 +30,12 @@ class WebDriverTimeouts
     /**
      * @var bool
      */
-    protected $w3cCompliant;
+    protected $isW3cCompliant;
 
-    public function __construct(ExecuteMethod $executor, $w3cCompliant = false)
+    public function __construct(ExecuteMethod $executor, $isW3cCompliant = false)
     {
         $this->executor = $executor;
-        $this->w3cCompliant = $w3cCompliant;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -46,7 +46,7 @@ public function __construct(ExecuteMethod $executor, $w3cCompliant = false)
      */
     public function implicitlyWait($seconds)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::IMPLICITLY_WAIT,
                 ['implicit' => $seconds * 1000]
@@ -71,7 +71,7 @@ public function implicitlyWait($seconds)
      */
     public function setScriptTimeout($seconds)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::SET_SCRIPT_TIMEOUT,
                 ['script' => $seconds * 1000]
@@ -96,7 +96,7 @@ public function setScriptTimeout($seconds)
      */
     public function pageLoadTimeout($seconds)
     {
-        if ($this->w3cCompliant) {
+        if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::SET_SCRIPT_TIMEOUT,
                 ['pageLoad' => $seconds * 1000]

From bd34170cb3c17322dbc785fede30b6c88ffd651c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 28 Oct 2019 18:21:02 +0100
Subject: [PATCH 443/784] Compatibility with Symfony 5

---
 CHANGELOG.md  | 1 +
 composer.json | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1e733516..e2662351d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
+- Allow installation of Symfony 5 components.
 
 ## 1.7.1 - 2019-06-13
 ### Fixed
diff --git a/composer.json b/composer.json
index 2a9929725..3a841a504 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
   "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
-    "symfony/process": "^2.8 || ^3.1 || ^4.0",
+    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0",
     "ext-curl": "*",
     "ext-zip": "*",
     "ext-mbstring": "*",
@@ -26,7 +26,7 @@
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",
     "php-coveralls/php-coveralls": "^2.0",
-    "symfony/var-dumper": "^3.3 || ^4.0",
+    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0",
     "jakub-onderka/php-parallel-lint": "^0.9.2"
   },
   "suggest": {

From e9277912d553971c2b73bf19df3fb44323f1f8b7 Mon Sep 17 00:00:00 2001
From: Mohammadreza Yektamaram <mr.yekta@yahoo.com>
Date: Tue, 1 Oct 2019 14:51:24 +0330
Subject: [PATCH 444/784] Minor grammar fixes

---
 README.md   | 2 +-
 example.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b25bee453..0fa9db31c 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ We have a great community willing to help you!
 
 - **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contribute to communal discussion and support
 - **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow
-- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as an new issue
+- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as a new issue
 
 ## Contributing
 
diff --git a/example.php b/example.php
index f1109ed54..4dbb93900 100644
--- a/example.php
+++ b/example.php
@@ -23,7 +23,7 @@
 
 require_once('vendor/autoload.php');
 
-// start Chrome with 5 second timeout
+// start Chrome with 5 seconds timeout
 $host = 'http://localhost:4444/wd/hub'; // this is the default
 $capabilities = DesiredCapabilities::chrome();
 $driver = RemoteWebDriver::create($host, $capabilities, 5000);

From a21b3c82dabb8a777e81aed5a8239cba67efc115 Mon Sep 17 00:00:00 2001
From: "Benjamin R. White" <ben@delt.as>
Date: Tue, 27 Feb 2018 17:21:16 +0000
Subject: [PATCH 445/784] Allow combined not() and presenceOfElementLocated()
 functionality

---
 CHANGELOG.md                                  |  3 +++
 lib/WebDriverExpectedCondition.php            |  9 ++++---
 tests/unit/WebDriverExpectedConditionTest.php | 24 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2662351d..bbd2f4d52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
 - Allow installation of Symfony 5 components.
 
+### Fixed
+- `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
+
 ## 1.7.1 - 2019-06-13
 ### Fixed
 - Error `Call to a member function toArray()` if capabilities were already converted to an array.
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 15c7b3d2d..4bab4707b 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -148,7 +148,11 @@ public static function presenceOfElementLocated(WebDriverBy $by)
     {
         return new static(
             function (WebDriver $driver) use ($by) {
-                return $driver->findElement($by);
+                try {
+                    return $driver->findElement($by);
+                } catch (NoSuchElementException $e) {
+                    return false;
+                }
             }
         );
     }
@@ -423,8 +427,7 @@ function (WebDriver $driver) use ($by, $text) {
      */
     public static function elementToBeClickable(WebDriverBy $by)
     {
-        $visibility_of_element_located =
-            self::visibilityOfElementLocated($by);
+        $visibility_of_element_located = self::visibilityOfElementLocated($by);
 
         return new static(
             function (WebDriver $driver) use ($visibility_of_element_located) {
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 8cd4203a9..6dde484ef 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -135,6 +135,28 @@ public function testShouldDetectPresenceOfElementLocatedCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
+    public function testShouldDetectNotPresenceOfElementLocatedCondition()
+    {
+        $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
+
+        $this->driverMock->expects($this->at(0))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturn($element);
+
+        $this->driverMock->expects($this->at(1))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willThrowException(new NoSuchElementException(''));
+
+        $condition = WebDriverExpectedCondition::not(
+            WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('.foo'))
+        );
+
+        $this->assertFalse(call_user_func($condition->getApply(), $this->driverMock));
+        $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
+    }
+
     public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
     {
         $element = $this->createMock(RemoteWebElement::class);
@@ -160,7 +182,7 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         // Call #1: throws NoSuchElementException
         // Call #2: return Element, but isDisplayed will throw StaleElementReferenceException
         // Call #3: return Element, but isDisplayed will return false
-        // Call #4: return Element, isDisplayed will true and condition will match
+        // Call #4: return Element, isDisplayed will return true and condition will match
 
         $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))

From 1f8d242f98310b12d8dbfc39859aad6b13f35708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Mon, 1 Oct 2018 12:16:55 +0200
Subject: [PATCH 446/784] Use polyfill-mbstring when ext-mbstring isn't
 available

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3a841a504..e5aef5a03 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,9 @@
   "require": {
     "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0",
+    "symfony/polyfill-mbstring": "^1.12",
     "ext-curl": "*",
     "ext-zip": "*",
-    "ext-mbstring": "*",
     "ext-json": "*"
   },
   "require-dev": {

From dc50f3f0fd5506230f4fcc48670bf1edcf1d65ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 00:04:33 +0100
Subject: [PATCH 447/784] Skipped tests must be completely excluded from
 Saucelabs to avoid starting the driver there, otherwise the build is not
 marked passed on Saucelabs dashboard

---
 tests/functional/RemoteWebDriverFindElementTest.php | 3 +++
 tests/functional/WebDriverActionsTest.php           | 1 +
 2 files changed, 4 insertions(+)

diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 066179f1f..2eb3e38c7 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -62,6 +62,9 @@ public function testShouldFindMultipleElements()
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
     }
 
+    /**
+     * @group exclude-saucelabs
+     */
     public function testEscapeCssSelector()
     {
         if (getenv('GECKODRIVER') !== '1') {
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 1f03c8899..07af88085 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -88,6 +88,7 @@ public function testShouldClickAndHoldOnElementAndRelease()
     }
 
     /**
+     * @group exclude-saucelabs
      * @covers ::__construct
      * @covers ::contextClick
      * @covers ::perform

From a29494a551b8efb8afef51dc4f7af2cb7af98d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 10 Nov 2019 23:01:03 +0100
Subject: [PATCH 448/784] Add Chromedriver Travis build (without Selenium
 server proxy)

---
 .travis.yml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 950e8fe64..986df3e31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,8 @@ env:
 matrix:
   include:
     # Codestyle check build
-    - php: '7.3'
+    - name: 'Code style and static analysis'
+      php: '7.3'
       env: CHECK_CODESTYLE=1
       before_install:
         - phpenv config-rm xdebug.ini
@@ -30,18 +31,19 @@ matrix:
       after_success: ~
 
     # Build with lowest possible dependencies on lowest possible PHP
-    - php: '5.6'
+    - name: 'Lowest dependencies build'
+      php: '5.6'
       env: DEPENDENCIES="--prefer-lowest"
 
     # Firefox inside Travis environment
-    - name: 'Firefox 45 on Travis (OSS protocol)'
+    - name: 'Firefox 45 on Travis (OSS protocol); via Selenium server'
       php: '7.3'
       env: BROWSER_NAME="firefox"
       addons:
         firefox: "45.8.0esr"
 
     # Firefox with Geckodriver (W3C mode) inside Travis environment
-    - name: 'Firefox latest on Travis (W3C protocol)'
+    - name: 'Firefox latest on Travis (W3C protocol); no Selenium server'
       php: 7.3
       env:
         - BROWSER_NAME="firefox"
@@ -49,9 +51,22 @@ matrix:
       addons:
         firefox: latest
 
-    # Stable Chrome + Chromedriver inside Travis environment
-    - php: '7.3'
-      env: BROWSER_NAME="chrome" CHROME_HEADLESS="1"
+    # Stable Chrome + Chromedriver inside Travis environment via Selenium server proxy
+    - name: 'Chrome stable on Travis; via Selenium server'
+      php: '7.3'
+      env:
+        - BROWSER_NAME="chrome"
+        - CHROME_HEADLESS="1"
+      addons:
+        chrome: stable
+
+    # Stable Chrome + Chromedriver inside Travis environment directly via Chromedriver
+    - name: 'Chrome stable on Travis; no Selenium server'
+      php: '7.3'
+      env:
+        - BROWSER_NAME="chrome"
+        - CHROME_HEADLESS="1"
+        - CHROMEDRIVER="1"
       addons:
         chrome: stable
 
@@ -113,6 +128,8 @@ before_script:
   - 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
   - if [ "$GECKODRIVER" = "1" ]; then
       geckodriver/geckodriver &> ./logs/geckodriver.log &
+    elif [ "$CHROMEDRIVER" = "1" ]; then
+      chromedriver/chromedriver --port=4444 --url-base=/wd/hub &> ./logs/chromedriver.log &
     else
       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 &
     fi
@@ -130,6 +147,7 @@ after_script:
   - if [ -f ./logs/selenium.log ]; then cat ./logs/selenium.log; fi
   - if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
   - if [ -f ./logs/geckodriver.log ]; then cat ./logs/geckodriver.log; fi
+  - if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
 
 after_success:
   - travis_retry php vendor/bin/php-coveralls -v

From 61ab881143846201c314bc9f9988a8831a75f26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 10 Nov 2019 23:51:18 +0100
Subject: [PATCH 449/784] Use newer Selenium server where possible

But we can easily update only to 3.14.0 (latest version which includes HtmlUnit). However update to 3.14.159 should be done soon (but HtmlUnit needs to be sideloaded).
---
 .travis.yml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 986df3e31..fc7368965 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
   global:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
+    - SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
 
 matrix:
   include:
@@ -36,9 +37,11 @@ matrix:
       env: DEPENDENCIES="--prefer-lowest"
 
     # Firefox inside Travis environment
-    - name: 'Firefox 45 on Travis (OSS protocol); via Selenium server'
+    - name: 'Firefox 45 on Travis (OSS protocol); via legacy Selenium server'
       php: '7.3'
-      env: BROWSER_NAME="firefox"
+      env:
+        - BROWSER_NAME="firefox"
+        - SELENIUM_SERVER="legacy"
       addons:
         firefox: "45.8.0esr"
 
@@ -114,7 +117,6 @@ matrix:
 cache:
   directories:
     - $HOME/.composer/cache
-    - jar
 
 install:
   - travis_retry composer self-update
@@ -123,15 +125,24 @@ install:
 before_script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; CHROMEDRIVER_VERSION=$(wget -qO- "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"); 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 [ "$GECKODRIVER" = "1" ]; then mkdir geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C 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
+  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver; fi
+  - sh -e /etc/init.d/xvfb start # TODO: start only when needed (ie. not in headless mode)
+  - if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
+      mkdir -p jar;
+      if [ "$SELENIUM_SERVER" = "legacy" ]; then
+        wget -q -t 3 -O jar/selenium-server-standalone.jar https://selenium-release.storage.googleapis.com/3.8/selenium-server-standalone-3.8.1.jar;
+      else
+        wget -q -t 3 -O jar/selenium-server-standalone.jar $SELENIUM_SERVER;
+      fi
+    fi
   - if [ "$GECKODRIVER" = "1" ]; then
       geckodriver/geckodriver &> ./logs/geckodriver.log &
     elif [ "$CHROMEDRIVER" = "1" ]; then
       chromedriver/chromedriver --port=4444 --url-base=/wd/hub &> ./logs/chromedriver.log &
+    elif [ "$SELENIUM_SERVER" = "legacy" ]; then
+      java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$PWD/chromedriver/chromedriver" -jar jar/selenium-server-standalone.jar -enablePassThrough false -log ./logs/selenium.log &
     else
-      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 &
+      java -Dwebdriver.chrome.driver="$PWD/chromedriver/chromedriver" -Dwebdriver.gecko.driver="$PWD/geckodriver/geckodriver" -jar jar/selenium-server-standalone.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 &

From a4b0d7130ed35c2083f62ae0bb135c563df68364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 10:21:11 +0100
Subject: [PATCH 450/784] Convert W3C invalid capabilities to corresponding
 ones

This avoids `Facebook\WebDriver\Exception\UnknownServerException: Illegal key values seen in w3c capabilities: [chromeOptions]` error with new Selenium server.

This conversion is necessary to maintain BC - simply renaming chromeOptions to goog:chromeOptions will break capabilities with Chromedriver <2.31.
---
 lib/Chrome/ChromeOptions.php   |  7 ++++++-
 lib/Remote/RemoteWebDriver.php | 32 ++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 901dc5388..949d6708b 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -25,9 +25,14 @@
 class ChromeOptions
 {
     /**
-     * The key of chrome options in desired capabilities.
+     * The key of chrome options desired capabilities (in legacy OSS JsonWire protocol)
+     * @deprecated
      */
     const CAPABILITY = 'chromeOptions';
+    /**
+     * The key of chrome options desired capabilities (in W3C compatible protocol)
+     */
+    const CAPABILITY_W3C = 'goog:chromeOptions';
     /**
      * @var array
      */
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 4d3573c0c..c87a572f9 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -140,15 +140,15 @@ public static function create(
         // W3C
         $parameters = [
             'capabilities' => [
-                'firstMatch' => [$desired_capabilities->toArray()],
+                'firstMatch' => [static::convertCapabilitiesToW3c($desired_capabilities->toArray())],
             ],
         ];
 
-        // Legacy protocol
-        if (null !== $required_capabilities && $required_capabilities_array = $required_capabilities->toArray()) {
-            $parameters['capabilities']['alwaysMatch'] = $required_capabilities_array;
+        if ($required_capabilities !== null && $required_capabilities_array = $required_capabilities->toArray()) {
+            $parameters['capabilities']['alwaysMatch'] = static::convertCapabilitiesToW3c($required_capabilities_array);
         }
 
+        // Legacy protocol
         if ($required_capabilities !== null) {
             // TODO: Selenium (as of v3.0.1) does accept requiredCapabilities only as a property of desiredCapabilities.
             // This has changed with the W3C WebDriver spec, but is the only way how to pass these
@@ -677,4 +677,28 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
 
         return $desired_capabilities;
     }
+
+    /**
+     * Convert keys invalid in W3C capabilities to corresponding ones for W3C.
+     *
+     * @param array $capabilitiesArray
+     * @return array
+     */
+    protected static function convertCapabilitiesToW3c(array $capabilitiesArray)
+    {
+        if (array_key_exists(ChromeOptions::CAPABILITY, $capabilitiesArray)) {
+            if (array_key_exists(ChromeOptions::CAPABILITY_W3C, $capabilitiesArray)) {
+                $capabilitiesArray[ChromeOptions::CAPABILITY_W3C] = array_merge(
+                    $capabilitiesArray[ChromeOptions::CAPABILITY],
+                    $capabilitiesArray[ChromeOptions::CAPABILITY_W3C]
+                );
+            } else {
+                $capabilitiesArray[ChromeOptions::CAPABILITY_W3C] = $capabilitiesArray[ChromeOptions::CAPABILITY];
+            }
+
+            unset($capabilitiesArray[ChromeOptions::CAPABILITY]);
+        }
+
+        return $capabilitiesArray;
+    }
 }

From 3597a6bcaddb2a462d71cf81620346892991ad47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 10:37:25 +0100
Subject: [PATCH 451/784] =?UTF-8?q?Enable=20W3C=20protocol=20for=20Chromed?=
 =?UTF-8?q?river=20=F0=9F=8E=89=20#469?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Until now, W3C was forcily disabled for Chromedriver using Capabilities on startup. As we now experimentaly support W3C protocol, this is no longer needed. If W3C is detected during initial handshake, the browser will be started using W3C dialect (otherwise it will use legacy OSS JsonWire protocol).
---
 lib/Remote/RemoteWebDriver.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index c87a572f9..d2e302f44 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -112,23 +112,6 @@ public static function create(
 
         $desired_capabilities = self::castToDesiredCapabilitiesObject($desired_capabilities);
 
-        // Hotfix: W3C WebDriver protocol is not yet supported by php-webdriver, so we must force Chromedriver to
-        // not use the W3C protocol by default (which is what Chromedriver does starting with version 75).
-        if ($desired_capabilities->getBrowserName() === WebDriverBrowserType::CHROME
-            && mb_strpos($selenium_server_url, 'browserstack') === false // see https://github.com/facebook/php-webdriver/issues/644
-        ) {
-            $currentChromeOptions = $desired_capabilities->getCapability(ChromeOptions::CAPABILITY);
-            $chromeOptions = !empty($currentChromeOptions) ? $currentChromeOptions : new ChromeOptions();
-
-            if ($chromeOptions instanceof ChromeOptions && !isset($chromeOptions->toArray()['w3c'])) {
-                $chromeOptions->setExperimentalOption('w3c', false);
-            } elseif (is_array($chromeOptions) && !isset($chromeOptions['w3c'])) {
-                $chromeOptions['w3c'] = false;
-            }
-
-            $desired_capabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
-        }
-
         $executor = new HttpCommandExecutor($selenium_server_url, $http_proxy, $http_proxy_port);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);

From a9685bf2aa22de07d97ca93ff452e5016ee3141d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 12:41:45 +0100
Subject: [PATCH 452/784] Add JsonWire travis build on Chromedriver to make
 sure we won't break the old protocol

---
 .travis.yml                            | 19 +++++++++++++++----
 tests/functional/WebDriverTestCase.php |  5 +++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fc7368965..4a8a268a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,8 +54,8 @@ matrix:
       addons:
         firefox: latest
 
-    # Stable Chrome + Chromedriver inside Travis environment via Selenium server proxy
-    - name: 'Chrome stable on Travis; via Selenium server'
+    # Stable Chrome + Chromedriver (W3C mode) inside Travis environment via Selenium server proxy
+    - name: 'Chrome stable on Travis (W3C protocol); via Selenium server'
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
@@ -63,8 +63,8 @@ matrix:
       addons:
         chrome: stable
 
-    # Stable Chrome + Chromedriver inside Travis environment directly via Chromedriver
-    - name: 'Chrome stable on Travis; no Selenium server'
+    # Stable Chrome + Chromedriver (W3C mode) inside Travis environment directly via Chromedriver
+    - name: 'Chrome stable on Travis (W3C protocol); no Selenium server'
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
@@ -73,6 +73,17 @@ matrix:
       addons:
         chrome: stable
 
+    # Stable Chrome + Chromedriver (JsonWire OSS mode) inside Travis environment directly via Chromedriver
+    - name: 'Chrome stable on Travis (OSS protocol); no Selenium server'
+      php: '7.3'
+      env:
+        - BROWSER_NAME="chrome"
+        - CHROME_HEADLESS="1"
+        - CHROMEDRIVER="1"
+        - DISABLE_W3C_PROTOCOL="1"
+      addons:
+        chrome: stable
+
     # Saucelabs builds
     - php: '7.3'
       env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 7a0f8af23..920eb86a7 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -57,6 +57,11 @@ protected function setUp()
                 $chromeOptions = new ChromeOptions();
                 // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
                 $chromeOptions->addArguments(['--headless', 'window-size=1024,768', '--no-sandbox']);
+
+                if (getenv('DISABLE_W3C_PROTOCOL')) {
+                    $chromeOptions->setExperimentalOption('w3c', false);
+                }
+
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
             } elseif (getenv('GECKODRIVER') === '1') {
                 $this->serverUrl = 'http://localhost:4444/';

From 041658be9e1284578f5fba1198b10dc8922ceb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 13:25:45 +0100
Subject: [PATCH 453/784] Improve W3C builds detection in conditionally-run
 tests

---
 .../RemoteWebDriverFindElementTest.php        |  8 +++---
 tests/functional/RemoteWebDriverTest.php      |  1 -
 tests/functional/RemoteWebElementTest.php     |  4 +--
 tests/functional/WebDriverActionsTest.php     |  4 +--
 tests/functional/WebDriverTestCase.php        | 26 +++++++++++++++++++
 5 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 2eb3e38c7..c5671b497 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -67,11 +67,9 @@ public function testShouldFindMultipleElements()
      */
     public function testEscapeCssSelector()
     {
-        if (getenv('GECKODRIVER') !== '1') {
-            $this->markTestSkipped(
-                'CSS selectors containing special characters are not supported by the legacy protocol'
-            );
-        }
+        self::skipForJsonWireProtocol(
+            'CSS selectors containing special characters are not supported by the legacy protocol'
+        );
 
         $this->driver->get($this->getTestPageUrl('escape_css.html'));
 
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 9105aa93f..72fc30505 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -150,7 +150,6 @@ public function testShouldCloseWindow()
         $this->driver->get($this->getTestPageUrl('open_new_window.html'));
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
 
-        // Mandatory for Geckodriver
         $this->driver->wait()->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
 
         $this->assertCount(2, $this->driver->getWindowHandles());
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index a4684ace3..52877dcda 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -272,9 +272,7 @@ public function testShouldSubmitFormByClickOnSubmitInput()
      */
     public function testShouldCompareEqualsElement()
     {
-        if (getenv('GECKODRIVER') === '1') {
-            $this->markTestSkipped('"equals" is not supported by the W3C specification');
-        }
+        self::skipForW3cProtocol('"equals" is not supported by the W3C specification');
 
         $this->driver->get($this->getTestPageUrl('index.html'));
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 07af88085..9798f6e5a 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -49,7 +49,7 @@ public function testShouldClickOnElement()
         $logs = ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'];
         $loggedEvents = $this->retrieveLoggedEvents();
 
-        if ('1' === getenv('GECKODRIVER')) {
+        if (getenv('GECKODRIVER') === '1') {
             $loggedEvents = array_slice($loggedEvents, 0, count($logs));
             // Firefox sometimes triggers some extra events
             // it's not related to Geckodriver, it's Firefox's own behavior
@@ -77,7 +77,7 @@ public function testShouldClickAndHoldOnElementAndRelease()
             ->release()
             ->perform();
 
-        if ('1' === getenv('GECKODRIVER')) {
+        if (self::isW3cProtocolBuild()) {
             $this->assertArraySubset(['mouseover item-1', 'mousedown item-1'], $this->retrieveLoggedEvents());
         } else {
             $this->assertSame(
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 920eb86a7..8b35a7700 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -102,6 +102,32 @@ public static function isSauceLabsBuild()
         return getenv('SAUCELABS') ? true : false;
     }
 
+    /**
+     * @return bool
+     */
+    public static function isW3cProtocolBuild()
+    {
+        return getenv('GECKODRIVER') === '1'
+            || (getenv('BROWSER_NAME') === 'chrome'
+                && getenv('DISABLE_W3C_PROTOCOL') !== '1'
+                && !self::isSauceLabsBuild());
+    }
+
+    public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
+    {
+        if (static::isW3cProtocolBuild()) {
+            static::markTestSkipped($message);
+        }
+    }
+
+    public static function skipForJsonWireProtocol($message = 'Not supported by JsonWire protocol')
+    {
+        if (getenv('GECKODRIVER') !== '1'
+            && (getenv('CHROMEDRIVER') !== '1' || getenv('DISABLE_W3C_PROTOCOL') === '1')) {
+            static::markTestSkipped($message);
+        }
+    }
+
     /**
      * Get the URL of given test HTML on running webserver.
      *

From d249dea3f0da638c2d44c028b4a5d9247cc2fa87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Nov 2019 16:36:05 +0100
Subject: [PATCH 454/784] Update changelog and readme to let the world know
 about W3C protocol experimental support

---
 CHANGELOG.md |  3 +++
 README.md    | 38 ++++++++++++++++++--------------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbd2f4d52..b83a21743 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Added
+- Experimental W3C WebDriver protocol support. The protocol will be used automatically when remote end (like Geckodriver, newer Chromedriver etc.) supports it.
+
 ### Changed
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
 - Allow installation of Symfony 5 components.
diff --git a/README.md b/README.md
index 0fa9db31c..71742583b 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,16 @@
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
 
-This library is compatible with Selenium server version 2.x and 3.x.
-It implements the [JsonWireProtocol](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol), which is currently supported
-by the Selenium server and will also implement the [W3C WebDriver](https://w3c.github.io/webdriver/webdriver-spec.html) specification in the future.
+This library is compatible with Selenium server version 2.x, 3.x and 4.x.
+
+The library supports [JsonWireProtocol](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol) and also
+implements **experimental support** of [W3C WebDriver](https://w3c.github.io/webdriver/webdriver-spec.html).
+The W3C WebDriver support is not yet full-featured, however it should allow to control Firefox via Geckodriver and new
+versions of Chrome and Chromedriver with just a slight limitations.
 
 The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
 [Selenium project](https://github.com/SeleniumHQ/selenium/).
 
-**As of 2013, this PHP client has been rewritten from scratch.**
-Using the old version? Check out [Adam Goucher's fork](https://github.com/Element-34/php-webdriver) of it.
-
 Looking for API documentation of php-webdriver? See [https://facebook.github.io/php-webdriver/](https://facebook.github.io/php-webdriver/latest/)
 
 Any complaints, questions, or ideas? Post them in the user group https://www.facebook.com/groups/phpwebdriver/.
@@ -41,24 +41,25 @@ Then install the library:
 
 The required server is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
 
-Download and run the server by replacing # with the current server version. Keep in mind **you must have Java 8+ installed to run this command**.
+Download and run the server by **replacing #** with the current server version. Keep in mind **you must have Java 8+ installed to run this command**.
 
     java -jar selenium-server-standalone-#.jar
 
-**NOTE:** If using Firefox, see alternate command below.
-
 ### Create a Browser Session
 
 When creating a browser session, be sure to pass the url of your running server.
 
 ```php
 // This would be the url of the host running the server-standalone.jar
-$host = 'http://localhost:4444/wd/hub'; // this is the default
+$host = 'http://localhost:4444/wd/hub'; // this is the default url and port where Selenium server starts
 ```
 
 ##### Launch Chrome
 
-Make sure to have latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) versions installed.
+Install latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
+
+The `chromedriver` binary must be placed in system `PATH` directory, otherwise you must provide the path when starting Selenium server
+(eg. `java -Dwebdriver.chrome.driver="/path/to/chromedriver" -jar selenium-server-standalone-#.jar`).
 
 ```php
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
@@ -66,14 +67,11 @@ $driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
 
 ##### Launch Firefox
 
-Make sure to have latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases) installed.
-
-Because Firefox (and Geckodriver) only support the new W3C WebDriver protocol (which is yet to be implemented by php-webdriver - see [issue #469](https://github.com/facebook/php-webdriver/issues/469)),
-the protocols must be translated by Selenium Server - this feature is *partially* available in Selenium Server versions 3.5.0-3.8.1 and you can enable it like this:
+Install latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases).
 
-    java -jar selenium-server-standalone-3.8.1.jar -enablePassThrough false
+The `geckodriver` binary must be placed in system `PATH` directory, otherwise you must provide the path when starting Selenium server
+(eg. `java -Dwebdriver.gecko.driver="/path/to/geckodriver" -jar selenium-server-standalone-#.jar`).
 
-Now you can start Firefox from your code:
 
 ```php
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
@@ -82,9 +80,9 @@ $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
 ### Customize Desired Capabilities
 
 ```php
-$desired_capabilities = DesiredCapabilities::firefox();
-$desired_capabilities->setCapability('acceptSslCerts', false);
-$driver = RemoteWebDriver::create($host, $desired_capabilities);
+$desiredCapabilities = DesiredCapabilities::firefox();
+$desiredCapabilities->setCapability('acceptSslCerts', false);
+$driver = RemoteWebDriver::create($host, $desiredCapabilities);
 ```
 
 * See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities for more details.

From 42f82dd233ea52f64f36f143a57c6d6df89c22c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 12 Nov 2019 23:54:22 +0100
Subject: [PATCH 455/784] Define branch alias for version 1.8

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e5aef5a03..a6aec98ae 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-community": "1.5-dev"
+      "dev-community": "1.8.x-dev"
     }
   }
 }

From a6cad80b88fcb3c3823afe85d653d0c46c05944c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 14 Nov 2019 19:10:16 +0100
Subject: [PATCH 456/784] Add convertor to W3C compatible capabilities (fixes
 #676, part of #469)

---
 lib/Remote/DesiredCapabilities.php            |  73 ++++++++++
 lib/Remote/RemoteWebDriver.php                |  31 +---
 tests/unit/Remote/DesiredCapabilitiesTest.php | 137 ++++++++++++++++++
 3 files changed, 213 insertions(+), 28 deletions(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 533c8873a..c78d2302b 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -178,6 +178,79 @@ public function toArray()
         return $this->capabilities;
     }
 
+    /**
+     * @return array
+     */
+    public function toW3cCompatibleArray()
+    {
+        $ossToW3c = [
+            WebDriverCapabilityType::PLATFORM => 'platformName',
+            WebDriverCapabilityType::VERSION => 'browserVersion',
+            WebDriverCapabilityType::ACCEPT_SSL_CERTS => 'acceptInsecureCerts',
+            ChromeOptions::CAPABILITY => ChromeOptions::CAPABILITY_W3C,
+        ];
+
+        $allowedW3cCapabilities = [
+            'browserName',
+            'browserVersion',
+            'platformName',
+            'acceptInsecureCerts',
+            'pageLoadStrategy',
+            'proxy',
+            'setWindowRect',
+            'timeouts',
+            'strictFileInteractability',
+            'unhandledPromptBehavior',
+        ];
+
+        $ossCapabilities = $this->toArray();
+        $w3cCapabilities = [];
+
+        foreach ($ossCapabilities as $capabilityKey => $capabilityValue) {
+            // Copy already W3C compatible capabilities
+            if (in_array($capabilityKey, $allowedW3cCapabilities, true)) {
+                $w3cCapabilities[$capabilityKey] = $capabilityValue;
+            }
+
+            // Convert capabilitites with changed name
+            if (array_key_exists($capabilityKey, $ossToW3c)) {
+                if ($capabilityKey === 'platform') {
+                    $w3cCapabilities[$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
+                } else {
+                    $w3cCapabilities[$ossToW3c[$capabilityKey]] = $capabilityValue;
+                }
+            }
+
+            // Copy vendor extensions
+            if (mb_strpos($capabilityKey, ':') !== false) {
+                $w3cCapabilities[$capabilityKey] = $capabilityValue;
+            }
+        }
+
+        // Convert ChromeOptions
+        if (array_key_exists(ChromeOptions::CAPABILITY, $ossCapabilities)) {
+            if (array_key_exists(ChromeOptions::CAPABILITY_W3C, $ossCapabilities)) {
+                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = array_merge_recursive(
+                    $ossCapabilities[ChromeOptions::CAPABILITY],
+                    $ossCapabilities[ChromeOptions::CAPABILITY_W3C]
+                );
+            } else {
+                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = $ossCapabilities[ChromeOptions::CAPABILITY];
+            }
+        }
+
+        // Convert Firefox profile
+        if (array_key_exists(FirefoxDriver::PROFILE, $ossCapabilities)) {
+            // Convert profile only if not already set in moz:firefoxOptions
+            if (!array_key_exists('moz:firefoxOptions', $ossCapabilities)
+                || !array_key_exists('profile', $ossCapabilities['moz:firefoxOptions'])) {
+                $w3cCapabilities['moz:firefoxOptions']['profile'] = $ossCapabilities[FirefoxDriver::PROFILE];
+            }
+        }
+
+        return $w3cCapabilities;
+    }
+
     /**
      * @return static
      */
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index d2e302f44..1762f44a8 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -15,7 +15,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
@@ -123,12 +122,12 @@ public static function create(
         // W3C
         $parameters = [
             'capabilities' => [
-                'firstMatch' => [static::convertCapabilitiesToW3c($desired_capabilities->toArray())],
+                'firstMatch' => [$desired_capabilities->toW3cCompatibleArray()],
             ],
         ];
 
-        if ($required_capabilities !== null && $required_capabilities_array = $required_capabilities->toArray()) {
-            $parameters['capabilities']['alwaysMatch'] = static::convertCapabilitiesToW3c($required_capabilities_array);
+        if ($required_capabilities !== null && !empty($required_capabilities->toArray())) {
+            $parameters['capabilities']['alwaysMatch'] = $required_capabilities->toW3cCompatibleArray();
         }
 
         // Legacy protocol
@@ -660,28 +659,4 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
 
         return $desired_capabilities;
     }
-
-    /**
-     * Convert keys invalid in W3C capabilities to corresponding ones for W3C.
-     *
-     * @param array $capabilitiesArray
-     * @return array
-     */
-    protected static function convertCapabilitiesToW3c(array $capabilitiesArray)
-    {
-        if (array_key_exists(ChromeOptions::CAPABILITY, $capabilitiesArray)) {
-            if (array_key_exists(ChromeOptions::CAPABILITY_W3C, $capabilitiesArray)) {
-                $capabilitiesArray[ChromeOptions::CAPABILITY_W3C] = array_merge(
-                    $capabilitiesArray[ChromeOptions::CAPABILITY],
-                    $capabilitiesArray[ChromeOptions::CAPABILITY_W3C]
-                );
-            } else {
-                $capabilitiesArray[ChromeOptions::CAPABILITY_W3C] = $capabilitiesArray[ChromeOptions::CAPABILITY];
-            }
-
-            unset($capabilitiesArray[ChromeOptions::CAPABILITY]);
-        }
-
-        return $capabilitiesArray;
-    }
 }
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 6e14ef044..4ef4a055a 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Firefox\FirefoxDriver;
 use Facebook\WebDriver\Firefox\FirefoxPreferences;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
@@ -130,4 +131,140 @@ public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrows
 
         $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
     }
+
+    /**
+     * @dataProvider provideW3cCapabilities
+     * @param DesiredCapabilities $inputJsonWireCapabilities
+     * @param array $expectedW3cCapabilities
+     */
+    public function testShouldConvertCapabilitiesToW3cCompatible(
+        DesiredCapabilities $inputJsonWireCapabilities,
+        array $expectedW3cCapabilities
+    ) {
+        $this->assertEquals(
+            $expectedW3cCapabilities,
+            $inputJsonWireCapabilities->toW3cCompatibleArray()
+        );
+    }
+
+    /**
+     * @return array[]
+     */
+    public function provideW3cCapabilities()
+    {
+        $chromeOptions = new ChromeOptions();
+        $chromeOptions->addArguments([
+            '--headless',
+        ]);
+
+        $firefoxProfileEncoded = (new FirefoxProfile())->encode();
+
+        return [
+            'changed name' => [
+                new DesiredCapabilities([
+                    WebDriverCapabilityType::BROWSER_NAME => WebDriverBrowserType::CHROME,
+                    WebDriverCapabilityType::VERSION => '67.0.1',
+                    WebDriverCapabilityType::PLATFORM => WebDriverPlatform::LINUX,
+                    WebDriverCapabilityType::ACCEPT_SSL_CERTS => true,
+                ]),
+                [
+                    'browserName' => 'chrome',
+                    'browserVersion' => '67.0.1',
+                    'platformName' => 'linux',
+                    'acceptInsecureCerts' => true,
+                ],
+            ],
+            'removed capabilitites' => [
+                new DesiredCapabilities([
+                    WebDriverCapabilityType::WEB_STORAGE_ENABLED => true,
+                    WebDriverCapabilityType::TAKES_SCREENSHOT => false,
+                ]),
+                [],
+            ],
+            'custom invalid capability should be removed' => [
+                new DesiredCapabilities([
+                    'customInvalidCapability' => 'shouldBeRemoved',
+                ]),
+                [],
+            ],
+            'already W3C capabilitites' => [
+                new DesiredCapabilities([
+                    'pageLoadStrategy' => 'eager',
+                    'strictFileInteractability' => false,
+                ]),
+                [
+                    'pageLoadStrategy' => 'eager',
+                    'strictFileInteractability' => false,
+                ],
+            ],
+            'custom vendor extension' => [
+                new DesiredCapabilities([
+                    'vendor:prefix' => 'vendor extension should be kept',
+                ]),
+                [
+                    'vendor:prefix' => 'vendor extension should be kept',
+                ],
+            ],
+            'chromeOptions should be converted' => [
+                new DesiredCapabilities([
+                    ChromeOptions::CAPABILITY => $chromeOptions,
+                ]),
+                [
+                    'goog:chromeOptions' => [
+                        'args' => ['--headless'],
+                        'binary' => '',
+                    ],
+                ],
+            ],
+            'chromeOptions should be merged if already defined' => [
+                new DesiredCapabilities([
+                    ChromeOptions::CAPABILITY => $chromeOptions,
+                    ChromeOptions::CAPABILITY_W3C => [
+                        'debuggerAddress' => '127.0.0.1:38947',
+                        'args' => ['window-size=1024,768'],
+                    ],
+                ]),
+                [
+                    'goog:chromeOptions' => [
+                        'args' => ['--headless', 'window-size=1024,768'],
+                        'binary' => '',
+                        'debuggerAddress' => '127.0.0.1:38947',
+                    ],
+                ],
+            ],
+            'firefox_profile should be converted' => [
+                new DesiredCapabilities([
+                    FirefoxDriver::PROFILE => $firefoxProfileEncoded,
+                ]),
+                [
+                    'moz:firefoxOptions' => [
+                        'profile' => $firefoxProfileEncoded,
+                    ],
+                ],
+            ],
+            'firefox_profile should not be overwritten if already present' => [
+                new DesiredCapabilities([
+                    FirefoxDriver::PROFILE => $firefoxProfileEncoded,
+                    'moz:firefoxOptions' => ['profile' => 'w3cProfile'],
+                ]),
+                [
+                    'moz:firefoxOptions' => [
+                        'profile' => 'w3cProfile',
+                    ],
+                ],
+            ],
+            'firefox_profile should be merged with moz:firefoxOptions if they already exists' => [
+                new DesiredCapabilities([
+                    FirefoxDriver::PROFILE => $firefoxProfileEncoded,
+                    'moz:firefoxOptions' => ['args' => ['-headless']],
+                ]),
+                [
+                    'moz:firefoxOptions' => [
+                        'profile' => $firefoxProfileEncoded,
+                        'args' => ['-headless'],
+                    ],
+                ],
+            ],
+        ];
+    }
 }

From f81659eaa82820b7a55be5ac173f56188af186c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 15 Nov 2019 00:39:53 +0100
Subject: [PATCH 457/784] Run geckodriver tests in headless mode

---
 tests/functional/WebDriverTestCase.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 8b35a7700..1f125634e 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -65,6 +65,10 @@ protected function setUp()
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
             } elseif (getenv('GECKODRIVER') === '1') {
                 $this->serverUrl = 'http://localhost:4444/';
+                $this->desiredCapabilities->setCapability(
+                    'moz:firefoxOptions',
+                    ['args' => ['-headless']]
+                );
             }
 
             $this->desiredCapabilities->setBrowserName($browserName);

From b4b82e2ccada9a7d251ae4703478e94b5b593370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 15 Nov 2019 00:38:54 +0100
Subject: [PATCH 458/784] Add W3C window size and position commands

---
 lib/Remote/HttpCommandExecutor.php       |  9 ++-
 tests/functional/WebDriverWindowTest.php | 81 ++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 tests/functional/WebDriverWindowTest.php

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index b87c94069..d137030a4 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -144,8 +144,9 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::ACCEPT_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/accept'],
         DriverCommand::ACTIONS => ['method' => 'POST', 'url' => '/session/:sessionId/actions'],
         DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
-        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
         DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
+        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window'],
         DriverCommand::GET_ELEMENT_LOCATION => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
         DriverCommand::GET_ELEMENT_PROPERTY => [
@@ -154,11 +155,15 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         ],
         DriverCommand::GET_ELEMENT_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
         DriverCommand::GET_WINDOW_HANDLES => ['method' => 'GET', 'url' => '/session/:sessionId/window/handles'],
-        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
+        DriverCommand::GET_WINDOW_POSITION => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
+        DriverCommand::GET_WINDOW_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
         DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::MAXIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/maximize'],
         DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::SET_WINDOW_SIZE => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
+        DriverCommand::SET_WINDOW_POSITION => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
     ];
     /**
      * @var string
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
new file mode 100644
index 000000000..ccf041b16
--- /dev/null
+++ b/tests/functional/WebDriverWindowTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+/**
+ * @covers \Facebook\WebDriver\WebDriverWindow
+ */
+class WebDriverWindowTest extends WebDriverTestCase
+{
+    public function testShouldGetPosition()
+    {
+        $position = $this->driver->manage()
+            ->window()
+            ->getPosition();
+
+        $this->assertGreaterThanOrEqual(0, $position->getX());
+        $this->assertGreaterThanOrEqual(0, $position->getY());
+    }
+
+    public function testShouldGetSize()
+    {
+        $size = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertGreaterThan(0, $size->getWidth());
+        $this->assertGreaterThan(0, $size->getHeight());
+    }
+
+    public function testShouldMaximizeWindow()
+    {
+        $sizeBefore = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->driver->manage()
+            ->window()
+            ->maximize();
+
+        $sizeAfter = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertGreaterThanOrEqual($sizeBefore->getWidth(), $sizeAfter->getWidth());
+        $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
+    }
+
+    public function testShouldSetSize()
+    {
+        $sizeBefore = $this->driver->manage()
+            ->window()
+            ->getSize();
+        $this->assertNotSame(500, $sizeBefore->getWidth());
+        $this->assertNotSame(666, $sizeBefore->getHeight());
+
+        $this->driver->manage()
+            ->window()
+            ->setSize(new WebDriverDimension(500, 666));
+
+        $sizeAfter = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertSame(500, $sizeAfter->getWidth());
+        $this->assertSame(666, $sizeAfter->getHeight());
+    }
+
+    public function testShouldSetWindowPosition()
+    {
+        $this->driver->manage()
+            ->window()
+            ->setPosition(new WebDriverPoint(33, 66));
+
+        $positionAfter = $this->driver->manage()
+            ->window()
+            ->getPosition();
+
+        $this->assertSame(33, $positionAfter->getX());
+        $this->assertSame(66, $positionAfter->getY());
+    }
+}

From c7ee5e1852b42d73bc597bb70a1b03344bdcb233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 15 Nov 2019 12:17:12 +0100
Subject: [PATCH 459/784] Exclude window tests on Saucelabs, because they are
 not sane

---
 tests/functional/WebDriverWindowTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index ccf041b16..8de61d3e8 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -7,6 +7,9 @@
  */
 class WebDriverWindowTest extends WebDriverTestCase
 {
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldGetPosition()
     {
         $position = $this->driver->manage()
@@ -45,6 +48,9 @@ public function testShouldMaximizeWindow()
         $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
     }
 
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldSetSize()
     {
         $sizeBefore = $this->driver->manage()

From e9f4ec88e7ed10388613aa8b05cf1e3f4d2231d3 Mon Sep 17 00:00:00 2001
From: Lctrs <jerome@prmntr.me>
Date: Fri, 22 Nov 2019 00:38:58 +0100
Subject: [PATCH 460/784] Download a compatible version of chromedriver with
 chrome

Following the [algorithm described on the official chromedriver website](https://chromedriver.chromium.org/downloads/version-selection) :

> Here are the steps to select the version of ChromeDriver to download:
>
> - First, find out which version of Chrome you are using. Let's say you have Chrome 72.0.3626.81.
> - Take the Chrome version number, remove the last part, and append the result to URL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_". For example, with Chrome version 72.0.3626.81, you'd get a URL "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_72.0.3626".
> - Use the URL created in the last step to retrieve a small file containing the version of ChromeDriver to use. For example, the above URL will get your a file containing "72.0.3626.69". (The actual number may change in the future, of course.)
> - Use the version number retrieved from the previous step to construct the URL to download ChromeDriver. With version 72.0.3626.69, the URL would be "https://chromedriver.storage.googleapis.com/index.html?path=72.0.3626.69/".
---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4a8a268a8..0340b80e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -134,7 +134,13 @@ install:
   - travis_retry composer update --no-interaction $DEPENDENCIES
 
 before_script:
-  - if [ "$BROWSER_NAME" = "chrome" ]; then mkdir chromedriver; CHROMEDRIVER_VERSION=$(wget -qO- "https://chromedriver.storage.googleapis.com/LATEST_RELEASE"); 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
+      mkdir chromedriver;
+      CHROME_VERSION=$(google-chrome --product-version);
+      CHROME_VERSION=${CHROME_VERSION%.*};
+      wget -q -t 3 https://chromedriver.storage.googleapis.com/$(curl -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_VERSION})/chromedriver_linux64.zip;
+      unzip chromedriver_linux64.zip -d chromedriver;
+    fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
   - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver; fi
   - sh -e /etc/init.d/xvfb start # TODO: start only when needed (ie. not in headless mode)

From ee14c4392399a9fc7b362f488226141ca67e8348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2019 13:14:34 +0100
Subject: [PATCH 461/784] Use W3C protocol on some Saucelabs builds

---
 .travis.yml                                | 20 +++++++------
 tests/functional/WebDriverTestCase.php     | 33 +++++++++++++++++-----
 tests/functional/WebDriverTimeoutsTest.php |  3 ++
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0340b80e7..2c80cbb18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,8 +85,9 @@ matrix:
         chrome: stable
 
     # Saucelabs builds
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Firefox 47, OSS protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1"
       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"
@@ -95,8 +96,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" # 74 is the last version which don't use W3C WebDriver by default
+    - name: 'Sauce Labs, Chrome 74, OSS protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1" # 74 is the last version which don't use W3C WebDriver by default
       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"
@@ -105,8 +107,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="75.0" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Chrome latest, W3C protocol'
+      php: '7.3'
+      env: SAUCELABS=1 BROWSER_NAME="chrome" 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"
@@ -115,8 +118,9 @@ matrix:
         jwt:
           secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
 
-    - php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="MicrosoftEdge" VERSION="16.16299" PLATFORM="Windows 10"
+    - name: 'Sauce Labs, Edge latest, W3C protocol'
+      php: '7.3'
+      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"
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 1f125634e..f012d9068 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -112,9 +112,8 @@ public static function isSauceLabsBuild()
     public static function isW3cProtocolBuild()
     {
         return getenv('GECKODRIVER') === '1'
-            || (getenv('BROWSER_NAME') === 'chrome'
-                && getenv('DISABLE_W3C_PROTOCOL') !== '1'
-                && !self::isSauceLabsBuild());
+            || (getenv('BROWSER_NAME') === 'chrome' && getenv('DISABLE_W3C_PROTOCOL') !== '1')
+            || getenv('BROWSER_NAME') === 'MicrosoftEdge';
     }
 
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
@@ -153,12 +152,32 @@ protected function setUpSauceLabs()
         $this->desiredCapabilities->setBrowserName(getenv('BROWSER_NAME'));
         $this->desiredCapabilities->setVersion(getenv('VERSION'));
         $this->desiredCapabilities->setPlatform(getenv('PLATFORM'));
-        $this->desiredCapabilities->setCapability('name', get_class($this) . '::' . $this->getName());
-        $this->desiredCapabilities->setCapability('tags', [get_class($this)]);
+        $name = get_class($this) . '::' . $this->getName();
+        $tags = [get_class($this)];
 
         if (getenv('TRAVIS_JOB_NUMBER')) {
-            $this->desiredCapabilities->setCapability('tunnel-identifier', getenv('TRAVIS_JOB_NUMBER'));
-            $this->desiredCapabilities->setCapability('build', getenv('TRAVIS_JOB_NUMBER'));
+            $tunnelIdentifier = getenv('TRAVIS_JOB_NUMBER');
+            $build = getenv('TRAVIS_JOB_NUMBER');
+        }
+
+        if (!getenv('DISABLE_W3C_PROTOCOL')) {
+            $sauceOptions = [
+                'name' => $name,
+                'tags' => $tags,
+            ];
+            if (isset($tunnelIdentifier, $build)) {
+                $sauceOptions['tunnelIdentifier'] = $tunnelIdentifier;
+                $sauceOptions['build'] = $build;
+            }
+            $this->desiredCapabilities->setCapability('sauce:options', (object) $sauceOptions);
+        } else {
+            $this->desiredCapabilities->setCapability('name', $name);
+            $this->desiredCapabilities->setCapability('tags', $tags);
+
+            if (isset($tunnelIdentifier, $build)) {
+                $this->desiredCapabilities->setCapability('tunnel-identifier', $tunnelIdentifier);
+                $this->desiredCapabilities->setCapability('build', $build);
+            }
         }
     }
 }
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 733be545c..cd3e10d99 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -26,6 +26,9 @@
  */
 class WebDriverTimeoutsTest extends WebDriverTestCase
 {
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldFailGettingDelayedElementWithoutWait()
     {
         $this->driver->get($this->getTestPageUrl('delayed_element.html'));

From a0d6be9a5fb351fe1a554bbd4f4a76f896727414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2019 13:23:30 +0100
Subject: [PATCH 462/784] Simplify builds

---
 .travis.yml                             | 3 ---
 tests/functional/WebDriverAlertTest.php | 6 ------
 tests/functional/WebDriverTestCase.php  | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2c80cbb18..9bb73cc1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
       addons:
         chrome: stable
 
@@ -68,7 +67,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
         - CHROMEDRIVER="1"
       addons:
         chrome: stable
@@ -78,7 +76,6 @@ matrix:
       php: '7.3'
       env:
         - BROWSER_NAME="chrome"
-        - CHROME_HEADLESS="1"
         - CHROMEDRIVER="1"
         - DISABLE_W3C_PROTOCOL="1"
       addons:
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 163bee157..b99dad1fa 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -25,12 +25,6 @@ class WebDriverAlertTest extends WebDriverTestCase
 {
     protected function setUp()
     {
-        if (getenv('CHROME_HEADLESS') === '1') {
-            // Alerts in headless mode should be available in next Chrome version (61), see:
-            // https://bugs.chromium.org/p/chromium/issues/detail?id=718235
-            $this->markTestSkipped('Alerts not yet supported by headless Chrome');
-        }
-
         parent::setUp();
 
         $this->driver->get($this->getTestPageUrl('alert.html'));
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index f012d9068..9b302a1f3 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -113,7 +113,7 @@ public static function isW3cProtocolBuild()
     {
         return getenv('GECKODRIVER') === '1'
             || (getenv('BROWSER_NAME') === 'chrome' && getenv('DISABLE_W3C_PROTOCOL') !== '1')
-            || getenv('BROWSER_NAME') === 'MicrosoftEdge';
+            || (self::isSauceLabsBuild() && getenv('DISABLE_W3C_PROTOCOL') !== '1');
     }
 
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')

From b54d50371b68926a60d2832db2ed94c1d3e95c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 23 Nov 2019 14:11:55 +0100
Subject: [PATCH 463/784] Skip tests utilizing xPath selectors, which are not
 properly supported in Edge

---
 tests/functional/WebDriverCheckboxesTest.php | 1 +
 tests/functional/WebDriverRadiosTest.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 48b72a53c..91513bd94 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -20,6 +20,7 @@
 /**
  * @covers \Facebook\WebDriver\WebDriverCheckboxes
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @group exclude-edge
  */
 class WebDriverCheckboxesTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 4d659772b..cf7b8378c 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -21,6 +21,7 @@
 /**
  * @covers \Facebook\WebDriver\WebDriverRadios
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @group exclude-edge
  */
 class WebDriverRadiosTest extends WebDriverTestCase
 {

From a419816547eed70cfcf54fd0763df33c94adcce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 23 Nov 2019 17:56:26 +0100
Subject: [PATCH 464/784] Skip file upload tests on Saucelabs, because W3C
 protocol does not support remote file upload

See https://github.com/w3c/webdriver/issues/1355
---
 lib/Remote/RemoteWebElement.php     | 27 ++++++++++++---------------
 tests/functional/FileUploadTest.php |  2 ++
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 75dfa3ba2..33286504b 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -358,6 +358,7 @@ public function isSelected()
     public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
+
         if ($local_file === null) {
             if ($this->isW3cCompliant) {
                 $params = [
@@ -370,22 +371,18 @@ public function sendKeys($value)
                     ':id' => $this->id,
                 ];
             }
-
-            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
-
-            return $this;
-        }
-
-        if ($this->isW3cCompliant) {
-            $params = [
-                'text' => $local_file,
-                ':id' => $this->id,
-            ];
         } else {
-            $params = [
-                'value' => WebDriverKeys::encode($this->upload($local_file)),
-                ':id' => $this->id,
-            ];
+            if ($this->isW3cCompliant) {
+                $params = [
+                    'text' => $local_file,
+                    ':id' => $this->id,
+                ];
+            } else {
+                $params = [
+                    'value' => WebDriverKeys::encode($this->upload($local_file)),
+                    ':id' => $this->id,
+                ];
+            }
         }
 
         $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 5b2f6d2d3..1029a2363 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -26,6 +26,8 @@ class FileUploadTest extends WebDriverTestCase
     /**
      * @group exclude-edge
      * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6052385/
+     * @group exclude-saucelabs
+     * W3C protocol does not support remote file upload: https://github.com/w3c/webdriver/issues/1355
      */
     public function testShouldUploadAFile()
     {

From 9d5623f40ab320601f8b2cee2bb463d722bb4393 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 25 Nov 2019 15:10:50 +0800
Subject: [PATCH 465/784] Fix mouseUp W3C action

---
 lib/Remote/RemoteMouse.php                |  2 +-
 tests/functional/WebDriverActionsTest.php | 24 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 4bd4a849b..6b7375834 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -241,7 +241,7 @@ public function mouseUp(WebDriverCoordinates $where = null)
                         'parameters' => ['pointerType' => 'mouse'],
                         'actions' => array_merge($moveAction, [
                             [
-                                'type' => 'pointerDown',
+                                'type' => 'pointerUp',
                                 'duration' => 0,
                                 'button' => 0,
                             ],
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 9798f6e5a..6799ef1d3 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -136,6 +136,30 @@ public function testShouldDoubleClickOnElement()
         $this->assertContains('dblclick item-3', $this->retrieveLoggedEvents());
     }
 
+    /**
+     * @covers ::__construct
+     * @covers ::dragAndDrop
+     * @covers ::perform
+     */
+    public function testShouldDragAndDrop()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $element = $this->driver->findElement(WebDriverBy::id('item-3'));
+        $target = $this->driver->findElement(WebDriverBy::id('item-1'));
+
+        $this->driver->action()
+            ->dragAndDrop($element, $target)
+            ->perform();
+
+        $this->assertContains('mouseover item-3', $this->retrieveLoggedEvents());
+        $this->assertContains('mousedown item-3', $this->retrieveLoggedEvents());
+        $this->assertContains('mouseover item-1', $this->retrieveLoggedEvents());
+        $this->assertContains('mouseup item-1', $this->retrieveLoggedEvents());
+    }
+
     /**
      * @return array
      */

From a94e33b99a8330c90c56128e430ffc55c507d304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 25 Nov 2019 17:13:57 +0100
Subject: [PATCH 466/784] Exclude unstable drag and drop test on SauceLabs

---
 tests/functional/WebDriverActionsTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 6799ef1d3..cb4359183 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -140,6 +140,7 @@ public function testShouldDoubleClickOnElement()
      * @covers ::__construct
      * @covers ::dragAndDrop
      * @covers ::perform
+     * @group exclude-saucelabs
      */
     public function testShouldDragAndDrop()
     {

From 574684f29b8d513ae213c4567f2f71da92734db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 24 Nov 2019 10:10:35 +0100
Subject: [PATCH 467/784] Add all W3C WebDriver exceptions

---
 .../ElementClickInterceptedException.php      | 24 +++++
 .../ElementNotInteractableException.php       | 23 +++++
 .../ElementNotSelectableException.php         |  5 +-
 lib/Exception/ElementNotVisibleException.php  |  3 +
 lib/Exception/ExpectedException.php           |  3 +
 .../IMEEngineActivationFailedException.php    |  3 +
 lib/Exception/IMENotAvailableException.php    |  3 +
 lib/Exception/IndexOutOfBoundsException.php   |  3 +
 .../InsecureCertificateException.php          | 24 +++++
 lib/Exception/InvalidArgumentException.php    | 23 +++++
 .../InvalidCookieDomainException.php          |  3 +
 lib/Exception/InvalidCoordinatesException.php |  3 +
 .../InvalidElementStateException.php          |  4 +
 lib/Exception/InvalidSelectorException.php    |  3 +
 lib/Exception/InvalidSessionIdException.php   | 24 +++++
 lib/Exception/JavascriptErrorException.php    | 23 +++++
 .../MoveTargetOutOfBoundsException.php        |  3 +
 lib/Exception/NoAlertOpenException.php        |  5 +-
 lib/Exception/NoCollectionException.php       |  3 +
 lib/Exception/NoScriptResultException.php     |  3 +
 lib/Exception/NoStringException.php           |  3 +
 lib/Exception/NoStringLengthException.php     |  3 +
 lib/Exception/NoStringWrapperException.php    |  3 +
 lib/Exception/NoSuchAlertException.php        | 23 +++++
 lib/Exception/NoSuchCollectionException.php   |  3 +
 lib/Exception/NoSuchCookieException.php       | 24 +++++
 lib/Exception/NoSuchDocumentException.php     |  5 +-
 lib/Exception/NoSuchDriverException.php       |  3 +
 lib/Exception/NoSuchElementException.php      |  3 +
 lib/Exception/NoSuchFrameException.php        |  3 +
 lib/Exception/NoSuchWindowException.php       |  3 +
 lib/Exception/NullPointerException.php        |  3 +
 lib/Exception/ScriptTimeoutException.php      |  3 +
 lib/Exception/SessionNotCreatedException.php  |  3 +
 .../StaleElementReferenceException.php        |  3 +
 lib/Exception/TimeoutException.php            | 23 +++++
 ...php => UnableToCaptureScreenException.php} |  5 +-
 lib/Exception/UnableToSetCookieException.php  |  3 +
 .../UnexpectedAlertOpenException.php          |  3 +
 .../UnexpectedJavascriptException.php         |  5 +-
 lib/Exception/UnknownCommandException.php     |  3 +
 lib/Exception/UnknownErrorException.php       | 23 +++++
 lib/Exception/UnknownMethodException.php      | 23 +++++
 lib/Exception/UnknownServerException.php      |  5 +-
 .../UnsupportedOperationException.php         |  3 +
 lib/Exception/WebDriverException.php          | 92 ++++++++++++-------
 lib/Exception/XPathLookupException.php        |  3 +
 lib/Net/URLChecker.php                        |  6 +-
 lib/WebDriverWait.php                         |  6 +-
 tests/functional/WebDriverAlertTest.php       |  8 +-
 tests/functional/WebDriverTimeoutsTest.php    |  6 +-
 .../unit/Exception/WebDriverExceptionTest.php | 49 ++++++++--
 52 files changed, 487 insertions(+), 55 deletions(-)
 create mode 100644 lib/Exception/ElementClickInterceptedException.php
 create mode 100644 lib/Exception/ElementNotInteractableException.php
 create mode 100644 lib/Exception/InsecureCertificateException.php
 create mode 100644 lib/Exception/InvalidArgumentException.php
 create mode 100644 lib/Exception/InvalidSessionIdException.php
 create mode 100644 lib/Exception/JavascriptErrorException.php
 create mode 100644 lib/Exception/NoSuchAlertException.php
 create mode 100644 lib/Exception/NoSuchCookieException.php
 create mode 100644 lib/Exception/TimeoutException.php
 rename lib/Exception/{TimeOutException.php => UnableToCaptureScreenException.php} (85%)
 create mode 100644 lib/Exception/UnknownErrorException.php
 create mode 100644 lib/Exception/UnknownMethodException.php

diff --git a/lib/Exception/ElementClickInterceptedException.php b/lib/Exception/ElementClickInterceptedException.php
new file mode 100644
index 000000000..e4b3a529e
--- /dev/null
+++ b/lib/Exception/ElementClickInterceptedException.php
@@ -0,0 +1,24 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * The Element Click command could not be completed because the element receiving the events is obscuring the element
+ * that was requested clicked.
+ */
+class ElementClickInterceptedException extends WebDriverException
+{
+}
diff --git a/lib/Exception/ElementNotInteractableException.php b/lib/Exception/ElementNotInteractableException.php
new file mode 100644
index 000000000..640a6a2a2
--- /dev/null
+++ b/lib/Exception/ElementNotInteractableException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * A command could not be completed because the element is not pointer- or keyboard interactable.
+ */
+class ElementNotInteractableException extends WebDriverException
+{
+}
diff --git a/lib/Exception/ElementNotSelectableException.php b/lib/Exception/ElementNotSelectableException.php
index 77c6accb0..35e4de13b 100644
--- a/lib/Exception/ElementNotSelectableException.php
+++ b/lib/Exception/ElementNotSelectableException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class ElementNotSelectableException extends WebDriverException
+/**
+ * @deprecated Use Facebook\WebDriver\Exception\ElementNotInteractableException
+ */
+class ElementNotSelectableException extends ElementNotInteractableException
 {
 }
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
index 2de5fd10c..1af6f5892 100644
--- a/lib/Exception/ElementNotVisibleException.php
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class ElementNotVisibleException extends WebDriverException
 {
 }
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
index 9c43f47e3..17fa2f2e9 100644
--- a/lib/Exception/ExpectedException.php
+++ b/lib/Exception/ExpectedException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class ExpectedException extends WebDriverException
 {
 }
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
index 6e372c313..89e91b9a0 100644
--- a/lib/Exception/IMEEngineActivationFailedException.php
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class IMEEngineActivationFailedException extends WebDriverException
 {
 }
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
index aeb78dc48..46720f9a4 100644
--- a/lib/Exception/IMENotAvailableException.php
+++ b/lib/Exception/IMENotAvailableException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class IMENotAvailableException extends WebDriverException
 {
 }
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
index de166b61e..5f7a7bf65 100644
--- a/lib/Exception/IndexOutOfBoundsException.php
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class IndexOutOfBoundsException extends WebDriverException
 {
 }
diff --git a/lib/Exception/InsecureCertificateException.php b/lib/Exception/InsecureCertificateException.php
new file mode 100644
index 000000000..393e75156
--- /dev/null
+++ b/lib/Exception/InsecureCertificateException.php
@@ -0,0 +1,24 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * Navigation caused the user agent to hit a certificate warning, which is usually the result of an expired
+ * or invalid TLS certificate.
+ */
+class InsecureCertificateException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidArgumentException.php b/lib/Exception/InvalidArgumentException.php
new file mode 100644
index 000000000..498adfd5f
--- /dev/null
+++ b/lib/Exception/InvalidArgumentException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * The arguments passed to a command are either invalid or malformed.
+ */
+class InvalidArgumentException extends WebDriverException
+{
+}
diff --git a/lib/Exception/InvalidCookieDomainException.php b/lib/Exception/InvalidCookieDomainException.php
index bae6c06db..5186539cd 100644
--- a/lib/Exception/InvalidCookieDomainException.php
+++ b/lib/Exception/InvalidCookieDomainException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * An illegal attempt was made to set a cookie under a different domain than the current page.
+ */
 class InvalidCookieDomainException extends WebDriverException
 {
 }
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
index 53e9e9ef9..058491702 100644
--- a/lib/Exception/InvalidCoordinatesException.php
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class InvalidCoordinatesException extends WebDriverException
 {
 }
diff --git a/lib/Exception/InvalidElementStateException.php b/lib/Exception/InvalidElementStateException.php
index 94ec58f1a..07552f136 100644
--- a/lib/Exception/InvalidElementStateException.php
+++ b/lib/Exception/InvalidElementStateException.php
@@ -15,6 +15,10 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command could not be completed because the element is in an invalid state, e.g. attempting to clear an element
+ * that isn’t both editable and resettable.
+ */
 class InvalidElementStateException extends WebDriverException
 {
 }
diff --git a/lib/Exception/InvalidSelectorException.php b/lib/Exception/InvalidSelectorException.php
index 530fba2f4..24ee46db5 100644
--- a/lib/Exception/InvalidSelectorException.php
+++ b/lib/Exception/InvalidSelectorException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * Argument was an invalid selector.
+ */
 class InvalidSelectorException extends WebDriverException
 {
 }
diff --git a/lib/Exception/InvalidSessionIdException.php b/lib/Exception/InvalidSessionIdException.php
new file mode 100644
index 000000000..406d29dee
--- /dev/null
+++ b/lib/Exception/InvalidSessionIdException.php
@@ -0,0 +1,24 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * Occurs if the given session id is not in the list of active sessions, meaning the session either does not exist
+ * or that it’s not active.
+ */
+class InvalidSessionIdException extends WebDriverException
+{
+}
diff --git a/lib/Exception/JavascriptErrorException.php b/lib/Exception/JavascriptErrorException.php
new file mode 100644
index 000000000..930d5c6dc
--- /dev/null
+++ b/lib/Exception/JavascriptErrorException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * An error occurred while executing JavaScript supplied by the user.
+ */
+class JavascriptErrorException extends WebDriverException
+{
+}
diff --git a/lib/Exception/MoveTargetOutOfBoundsException.php b/lib/Exception/MoveTargetOutOfBoundsException.php
index 7a96b5805..103058cff 100644
--- a/lib/Exception/MoveTargetOutOfBoundsException.php
+++ b/lib/Exception/MoveTargetOutOfBoundsException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * The target for mouse interaction is not in the browser’s viewport and cannot be brought into that viewport.
+ */
 class MoveTargetOutOfBoundsException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoAlertOpenException.php b/lib/Exception/NoAlertOpenException.php
index ebc19964e..59e4fedc4 100644
--- a/lib/Exception/NoAlertOpenException.php
+++ b/lib/Exception/NoAlertOpenException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoAlertOpenException extends WebDriverException
+/**
+ * @deprecated Use Facebook\WebDriver\Exception\NoSuchAlertException
+ */
+class NoAlertOpenException extends NoSuchAlertException
 {
 }
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
index e287e3434..e438551c1 100644
--- a/lib/Exception/NoCollectionException.php
+++ b/lib/Exception/NoCollectionException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoCollectionException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
index f86ca2215..d16442dbb 100644
--- a/lib/Exception/NoScriptResultException.php
+++ b/lib/Exception/NoScriptResultException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoScriptResultException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
index f7ac2f0e2..88de4619c 100644
--- a/lib/Exception/NoStringException.php
+++ b/lib/Exception/NoStringException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoStringException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
index 7047d72d3..3d72b9d30 100644
--- a/lib/Exception/NoStringLengthException.php
+++ b/lib/Exception/NoStringLengthException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoStringLengthException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
index d5f75efd0..08d97a1e5 100644
--- a/lib/Exception/NoStringWrapperException.php
+++ b/lib/Exception/NoStringWrapperException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoStringWrapperException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoSuchAlertException.php b/lib/Exception/NoSuchAlertException.php
new file mode 100644
index 000000000..2d504bb96
--- /dev/null
+++ b/lib/Exception/NoSuchAlertException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * An attempt was made to operate on a modal dialog when one was not open.
+ */
+class NoSuchAlertException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
index 9899cf2fe..ce357979d 100644
--- a/lib/Exception/NoSuchCollectionException.php
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoSuchCollectionException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoSuchCookieException.php b/lib/Exception/NoSuchCookieException.php
new file mode 100644
index 000000000..78b4434e2
--- /dev/null
+++ b/lib/Exception/NoSuchCookieException.php
@@ -0,0 +1,24 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * No cookie matching the given path name was found amongst the associated cookies of the current browsing context’s
+ * active document.
+ */
+class NoSuchCookieException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchDocumentException.php b/lib/Exception/NoSuchDocumentException.php
index f3bba91fd..509ec8585 100644
--- a/lib/Exception/NoSuchDocumentException.php
+++ b/lib/Exception/NoSuchDocumentException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class NoSuchDocumentException extends WebDriverException
+/**
+ * @deprecated Use Facebook\WebDriver\Exception\NoSuchWindowException
+ */
+class NoSuchDocumentException extends NoSuchWindowException
 {
 }
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
index c227d676a..66518987f 100644
--- a/lib/Exception/NoSuchDriverException.php
+++ b/lib/Exception/NoSuchDriverException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NoSuchDriverException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoSuchElementException.php b/lib/Exception/NoSuchElementException.php
index f8d730580..8e0f1d0cc 100644
--- a/lib/Exception/NoSuchElementException.php
+++ b/lib/Exception/NoSuchElementException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * An element could not be located on the page using the given search parameters.
+ */
 class NoSuchElementException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoSuchFrameException.php b/lib/Exception/NoSuchFrameException.php
index 7168c84a8..e7bd0b080 100644
--- a/lib/Exception/NoSuchFrameException.php
+++ b/lib/Exception/NoSuchFrameException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command to switch to a frame could not be satisfied because the frame could not be found.
+ */
 class NoSuchFrameException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NoSuchWindowException.php b/lib/Exception/NoSuchWindowException.php
index 142d32e64..6fdf9cb01 100644
--- a/lib/Exception/NoSuchWindowException.php
+++ b/lib/Exception/NoSuchWindowException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command to switch to a window could not be satisfied because the window could not be found.
+ */
 class NoSuchWindowException extends WebDriverException
 {
 }
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
index cbc373a87..512d9c5ff 100644
--- a/lib/Exception/NullPointerException.php
+++ b/lib/Exception/NullPointerException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class NullPointerException extends WebDriverException
 {
 }
diff --git a/lib/Exception/ScriptTimeoutException.php b/lib/Exception/ScriptTimeoutException.php
index ed4203656..77057e53a 100644
--- a/lib/Exception/ScriptTimeoutException.php
+++ b/lib/Exception/ScriptTimeoutException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A script did not complete before its timeout expired.
+ */
 class ScriptTimeoutException extends WebDriverException
 {
 }
diff --git a/lib/Exception/SessionNotCreatedException.php b/lib/Exception/SessionNotCreatedException.php
index f374141f1..0b727c45d 100644
--- a/lib/Exception/SessionNotCreatedException.php
+++ b/lib/Exception/SessionNotCreatedException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A new session could not be created.
+ */
 class SessionNotCreatedException extends WebDriverException
 {
 }
diff --git a/lib/Exception/StaleElementReferenceException.php b/lib/Exception/StaleElementReferenceException.php
index 2fbf99973..fda75af37 100644
--- a/lib/Exception/StaleElementReferenceException.php
+++ b/lib/Exception/StaleElementReferenceException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command failed because the referenced element is no longer attached to the DOM.
+ */
 class StaleElementReferenceException extends WebDriverException
 {
 }
diff --git a/lib/Exception/TimeoutException.php b/lib/Exception/TimeoutException.php
new file mode 100644
index 000000000..0b965d1d2
--- /dev/null
+++ b/lib/Exception/TimeoutException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * An operation did not complete before its timeout expired.
+ */
+class TimeoutException extends WebDriverException
+{
+}
diff --git a/lib/Exception/TimeOutException.php b/lib/Exception/UnableToCaptureScreenException.php
similarity index 85%
rename from lib/Exception/TimeOutException.php
rename to lib/Exception/UnableToCaptureScreenException.php
index f7443e3d5..b21b8bed3 100644
--- a/lib/Exception/TimeOutException.php
+++ b/lib/Exception/UnableToCaptureScreenException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class TimeOutException extends WebDriverException
+/**
+ * A screen capture was made impossible.
+ */
+class UnableToCaptureScreenException extends WebDriverException
 {
 }
diff --git a/lib/Exception/UnableToSetCookieException.php b/lib/Exception/UnableToSetCookieException.php
index 0a1edae94..5ea07f39e 100644
--- a/lib/Exception/UnableToSetCookieException.php
+++ b/lib/Exception/UnableToSetCookieException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command to set a cookie’s value could not be satisfied.
+ */
 class UnableToSetCookieException extends WebDriverException
 {
 }
diff --git a/lib/Exception/UnexpectedAlertOpenException.php b/lib/Exception/UnexpectedAlertOpenException.php
index 422255a77..ce2cf9da9 100644
--- a/lib/Exception/UnexpectedAlertOpenException.php
+++ b/lib/Exception/UnexpectedAlertOpenException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A modal dialog was open, blocking this operation.
+ */
 class UnexpectedAlertOpenException extends WebDriverException
 {
 }
diff --git a/lib/Exception/UnexpectedJavascriptException.php b/lib/Exception/UnexpectedJavascriptException.php
index 5cf8a8f92..706dade08 100644
--- a/lib/Exception/UnexpectedJavascriptException.php
+++ b/lib/Exception/UnexpectedJavascriptException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnexpectedJavascriptException extends WebDriverException
+/**
+ * @deprecated Use Facebook\WebDriver\Exception\JavascriptErrorException
+ */
+class UnexpectedJavascriptException extends JavascriptErrorException
 {
 }
diff --git a/lib/Exception/UnknownCommandException.php b/lib/Exception/UnknownCommandException.php
index 723d6dbef..5a928697b 100644
--- a/lib/Exception/UnknownCommandException.php
+++ b/lib/Exception/UnknownCommandException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * A command could not be executed because the remote end is not aware of it.
+ */
 class UnknownCommandException extends WebDriverException
 {
 }
diff --git a/lib/Exception/UnknownErrorException.php b/lib/Exception/UnknownErrorException.php
new file mode 100644
index 000000000..a186e13b1
--- /dev/null
+++ b/lib/Exception/UnknownErrorException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * An unknown error occurred in the remote end while processing the command.
+ */
+class UnknownErrorException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnknownMethodException.php b/lib/Exception/UnknownMethodException.php
new file mode 100644
index 000000000..bd50a83f2
--- /dev/null
+++ b/lib/Exception/UnknownMethodException.php
@@ -0,0 +1,23 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Exception;
+
+/**
+ * The requested command matched a known URL but did not match an method for that URL.
+ */
+class UnknownMethodException extends WebDriverException
+{
+}
diff --git a/lib/Exception/UnknownServerException.php b/lib/Exception/UnknownServerException.php
index c24b415ef..b8bba5d9f 100644
--- a/lib/Exception/UnknownServerException.php
+++ b/lib/Exception/UnknownServerException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
-class UnknownServerException extends WebDriverException
+/**
+ * @deprecated Use Facebook\WebDriver\Exception\UnknownErrorException
+ */
+class UnknownServerException extends UnknownErrorException
 {
 }
diff --git a/lib/Exception/UnsupportedOperationException.php b/lib/Exception/UnsupportedOperationException.php
index 64f8d1930..ce4517151 100644
--- a/lib/Exception/UnsupportedOperationException.php
+++ b/lib/Exception/UnsupportedOperationException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * Indicates that a command that should have executed properly cannot be supported for some reason.
+ */
 class UnsupportedOperationException extends WebDriverException
 {
 }
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index b17b2f70f..0f708a587 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -17,6 +17,9 @@
 
 use Exception;
 
+/**
+ * @see https://w3c.github.io/webdriver/#errors
+ */
 class WebDriverException extends Exception
 {
     private $results;
@@ -46,16 +49,22 @@ public function getResults()
      * @param string $message
      * @param mixed $results
      *
+     * @throws ElementClickInterceptedException
+     * @throws ElementNotInteractableException
      * @throws ElementNotSelectableException
      * @throws ElementNotVisibleException
      * @throws ExpectedException
      * @throws IMEEngineActivationFailedException
      * @throws IMENotAvailableException
      * @throws IndexOutOfBoundsException
+     * @throws InsecureCertificateException
+     * @throws InvalidArgumentException
      * @throws InvalidCookieDomainException
      * @throws InvalidCoordinatesException
      * @throws InvalidElementStateException
      * @throws InvalidSelectorException
+     * @throws InvalidSessionIdException
+     * @throws JavascriptErrorException
      * @throws MoveTargetOutOfBoundsException
      * @throws NoAlertOpenException
      * @throws NoCollectionException
@@ -63,7 +72,9 @@ public function getResults()
      * @throws NoStringException
      * @throws NoStringLengthException
      * @throws NoStringWrapperException
+     * @throws NoSuchAlertException
      * @throws NoSuchCollectionException
+     * @throws NoSuchCookieException
      * @throws NoSuchDocumentException
      * @throws NoSuchDriverException
      * @throws NoSuchElementException
@@ -73,61 +84,76 @@ public function getResults()
      * @throws ScriptTimeoutException
      * @throws SessionNotCreatedException
      * @throws StaleElementReferenceException
-     * @throws TimeOutException
+     * @throws TimeoutException
+     * @throws UnableToCaptureScreenException
      * @throws UnableToSetCookieException
      * @throws UnexpectedAlertOpenException
      * @throws UnexpectedJavascriptException
      * @throws UnknownCommandException
+     * @throws UnknownErrorException
+     * @throws UnknownMethodException
      * @throws UnknownServerException
      * @throws UnrecognizedExceptionException
-     * @throws WebDriverCurlException
+     * @throws UnsupportedOperationException
      * @throws XPathLookupException
      */
     public static function throwException($status_code, $message, $results)
     {
         if (is_string($status_code)) {
-            // see https://w3c.github.io/webdriver/webdriver-spec.html#handling-errors
+            // @see https://w3c.github.io/webdriver/#errors
             switch ($status_code) {
+                case 'element click intercepted':
+                    throw new ElementClickInterceptedException($message, $results);
+                case 'element not interactable':
+                    throw new ElementNotInteractableException($message, $results);
+                case 'insecure certificate':
+                    throw new InsecureCertificateException($message, $results);
+                case 'invalid argument':
+                    throw new InvalidArgumentException($message, $results);
+                case 'invalid cookie domain':
+                    throw new InvalidCookieDomainException($message, $results);
+                case 'invalid element state':
+                    throw new InvalidElementStateException($message, $results);
+                case 'invalid selector':
+                    throw new InvalidSelectorException($message, $results);
+                case 'invalid session id':
+                    throw new InvalidSessionIdException($message, $results);
+                case 'javascript error':
+                    throw new JavascriptErrorException($message, $results);
+                case 'move target out of bounds':
+                    throw new MoveTargetOutOfBoundsException($message, $results);
+                case 'no such alert':
+                    throw new NoSuchAlertException($message, $results);
+                case 'no such cookie':
+                    throw new NoSuchCookieException($message, $results);
                 case 'no such element':
                     throw new NoSuchElementException($message, $results);
                 case 'no such frame':
                     throw new NoSuchFrameException($message, $results);
-                case 'unknown command':
-                    throw new UnknownCommandException($message, $results);
+                case 'no such window':
+                    throw new NoSuchWindowException($message, $results);
+                case 'script timeout':
+                    throw new ScriptTimeoutException($message, $results);
+                case 'session not created':
+                    throw new SessionNotCreatedException($message, $results);
                 case 'stale element reference':
                     throw new StaleElementReferenceException($message, $results);
-                case 'invalid element state':
-                    throw new InvalidElementStateException($message, $results);
-                case 'unknown error':
-                    throw new UnknownServerException($message, $results);
-                case 'unsupported operation':
-                    throw new ExpectedException($message, $results);
-                case 'element not interactable':
-                    throw new ElementNotSelectableException($message, $results);
-                case 'no such window':
-                    throw new NoSuchDocumentException($message, $results);
-                case 'javascript error':
-                    throw new UnexpectedJavascriptException($message, $results);
                 case 'timeout':
-                    throw new TimeOutException($message, $results);
-                case 'no such window':
-                    throw new NoSuchWindowException($message, $results);
-                case 'invalid cookie domain':
-                    throw new InvalidCookieDomainException($message, $results);
+                    throw new TimeoutException($message, $results);
                 case 'unable to set cookie':
                     throw new UnableToSetCookieException($message, $results);
+                case 'unable to capture screen':
+                    throw new UnableToCaptureScreenException($message, $results);
                 case 'unexpected alert open':
                     throw new UnexpectedAlertOpenException($message, $results);
-                case 'no such alert':
-                    throw new NoAlertOpenException($message, $results);
-                case 'script timeout':
-                    throw new ScriptTimeoutException($message, $results);
-                case 'invalid selector':
-                    throw new InvalidSelectorException($message, $results);
-                case 'session not created':
-                    throw new SessionNotCreatedException($message, $results);
-                case 'move target out of bounds':
-                    throw new MoveTargetOutOfBoundsException($message, $results);
+                case 'unknown command':
+                    throw new UnknownCommandException($message, $results);
+                case 'unknown error':
+                    throw new UnknownErrorException($message, $results);
+                case 'unknown method':
+                    throw new UnknownMethodException($message, $results);
+                case 'unsupported operation':
+                    throw new UnsupportedOperationException($message, $results);
                 default:
                     throw new UnrecognizedExceptionException($message, $results);
             }
@@ -175,7 +201,7 @@ public static function throwException($status_code, $message, $results)
             case 20:
                 throw new NoSuchCollectionException($message, $results);
             case 21:
-                throw new TimeOutException($message, $results);
+                throw new TimeoutException($message, $results);
             case 22:
                 throw new NullPointerException($message, $results);
             case 23:
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
index c7f589dcc..dada9df25 100644
--- a/lib/Exception/XPathLookupException.php
+++ b/lib/Exception/XPathLookupException.php
@@ -15,6 +15,9 @@
 
 namespace Facebook\WebDriver\Exception;
 
+/**
+ * @deprecated Removed in W3C WebDriver
+ */
 class XPathLookupException extends WebDriverException
 {
 }
diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 00ad62593..17cb08026 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -16,7 +16,7 @@
 namespace Facebook\WebDriver\Net;
 
 use Exception;
-use Facebook\WebDriver\Exception\TimeOutException;
+use Facebook\WebDriver\Exception\TimeoutException;
 
 class URLChecker
 {
@@ -34,7 +34,7 @@ public function waitUntilAvailable($timeout_in_ms, $url)
             usleep(self::POLL_INTERVAL_MS);
         }
 
-        throw new TimeOutException(sprintf(
+        throw new TimeoutException(sprintf(
             'Timed out waiting for %s to become available after %d ms.',
             $url,
             $timeout_in_ms
@@ -52,7 +52,7 @@ public function waitUntilUnavailable($timeout_in_ms, $url)
             usleep(self::POLL_INTERVAL_MS);
         }
 
-        throw new TimeOutException(sprintf(
+        throw new TimeoutException(sprintf(
             'Timed out waiting for %s to become unavailable after %d ms.',
             $url,
             $timeout_in_ms
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 37c44f94f..82d7fb57c 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -16,7 +16,7 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\NoSuchElementException;
-use Facebook\WebDriver\Exception\TimeOutException;
+use Facebook\WebDriver\Exception\TimeoutException;
 
 /**
  * A utility class, designed to help the user to wait until a condition turns true.
@@ -52,7 +52,7 @@ public function __construct(WebDriver $driver, $timeout_in_second = null, $inter
      * @param string $message
      *
      * @throws NoSuchElementException
-     * @throws TimeOutException
+     * @throws TimeoutException
      * @throws \Exception
      * @return mixed The return value of $func_or_ec
      */
@@ -81,6 +81,6 @@ public function until($func_or_ec, $message = '')
             throw $last_exception;
         }
 
-        throw new TimeOutException($message);
+        throw new TimeoutException($message);
     }
 }
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index b99dad1fa..b5fd3dec5 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -16,6 +16,7 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\NoAlertOpenException;
+use Facebook\WebDriver\Exception\NoSuchAlertException;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
@@ -42,7 +43,12 @@ public function testShouldAcceptAlert()
 
         $this->driver->switchTo()->alert()->accept();
 
-        $this->expectException(NoAlertOpenException::class);
+        if (self::isW3cProtocolBuild()) {
+            $this->expectException(NoSuchAlertException::class);
+        } else {
+            $this->expectException(NoAlertOpenException::class);
+        }
+
         $this->driver->switchTo()->alert()->accept();
     }
 
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index cd3e10d99..ca85075b8 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -17,7 +17,7 @@
 
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\ScriptTimeoutException;
-use Facebook\WebDriver\Exception\TimeOutException;
+use Facebook\WebDriver\Exception\TimeoutException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
@@ -65,8 +65,8 @@ public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
 
         try {
             $this->driver->get($this->getTestPageUrl('slow_loading.html'));
-            $this->fail('ScriptTimeoutException or TimeOutException exception should be thrown');
-        } catch (TimeOutException $e) { // thrown by Selenium 3.0.0+
+            $this->fail('ScriptTimeoutException or TimeoutException exception should be thrown');
+        } catch (TimeoutException $e) { // thrown by Selenium 3.0.0+
         } catch (ScriptTimeoutException $e) { // thrown by Selenium 2
         }
     }
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index f9aadd207..be3ab964c 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -29,14 +29,15 @@ public function testShouldStoreResultsOnInstantiation()
     }
 
     /**
-     * @dataProvider statusCodeProvider
-     * @param int $statusCode
+     * @dataProvider jsonWireStatusCodeProvider
+     * @dataProvider w3CWebDriverErrorCodeProvider
+     * @param int $errorCode
      * @param string $expectedExceptionType
      */
-    public function testShouldThrowProperExceptionBasedOnSeleniumStatusCode($statusCode, $expectedExceptionType)
+    public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCode, $expectedExceptionType)
     {
         try {
-            WebDriverException::throwException($statusCode, 'exception message', ['results']);
+            WebDriverException::throwException($errorCode, 'exception message', ['results']);
         } catch (WebDriverException $e) {
             $this->assertInstanceOf($expectedExceptionType, $e);
 
@@ -48,7 +49,7 @@ public function testShouldThrowProperExceptionBasedOnSeleniumStatusCode($statusC
     /**
      * @return array[]
      */
-    public function statusCodeProvider()
+    public function jsonWireStatusCodeProvider()
     {
         return [
             [1337, UnrecognizedExceptionException::class],
@@ -72,7 +73,7 @@ public function statusCodeProvider()
             [18, NoScriptResultException::class],
             [19, XPathLookupException::class],
             [20, NoSuchCollectionException::class],
-            [21, TimeOutException::class],
+            [21, TimeoutException::class],
             [22, NullPointerException::class],
             [23, NoSuchWindowException::class],
             [24, InvalidCookieDomainException::class],
@@ -88,4 +89,40 @@ public function statusCodeProvider()
             [34, MoveTargetOutOfBoundsException::class],
         ];
     }
+
+    /**
+     * @return array[]
+     */
+    public function w3CWebDriverErrorCodeProvider()
+    {
+        return [
+                ['element click intercepted', ElementClickInterceptedException::class],
+                ['element not interactable', ElementNotInteractableException::class],
+                ['element not interactable', ElementNotInteractableException::class],
+                ['insecure certificate', InsecureCertificateException::class],
+                ['invalid argument', InvalidArgumentException::class],
+                ['invalid cookie domain', InvalidCookieDomainException::class],
+                ['invalid element state', InvalidElementStateException::class],
+                ['invalid selector', InvalidSelectorException::class],
+                ['invalid session id', InvalidSessionIdException::class],
+                ['javascript error', JavascriptErrorException::class],
+                ['move target out of bounds', MoveTargetOutOfBoundsException::class],
+                ['no such alert', NoSuchAlertException::class],
+                ['no such cookie', NoSuchCookieException::class],
+                ['no such element', NoSuchElementException::class],
+                ['no such frame', NoSuchFrameException::class],
+                ['no such window', NoSuchWindowException::class],
+                ['script timeout', ScriptTimeoutException::class],
+                ['session not created', SessionNotCreatedException::class],
+                ['stale element reference', StaleElementReferenceException::class],
+                ['timeout', TimeoutException::class],
+                ['unable to set cookie', UnableToSetCookieException::class],
+                ['unable to capture screen', UnableToCaptureScreenException::class],
+                ['unexpected alert open', UnexpectedAlertOpenException::class],
+                ['unknown command', UnknownCommandException::class],
+                ['unknown error', UnknownErrorException::class],
+                ['unknown method', UnknownMethodException::class],
+                ['unsupported operation', UnsupportedOperationException::class],
+        ];
+    }
 }

From 88fff59dac637265906d100fb91142d3f5475aca Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 21 Nov 2019 09:32:34 +0800
Subject: [PATCH 468/784] Pass W3C Compliance to RemoteTargetLocator

---
 lib/Remote/RemoteTargetLocator.php | 11 +++++++----
 lib/Remote/RemoteWebDriver.php     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 8bd89ef44..1f8cb9270 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -33,11 +33,16 @@ class RemoteTargetLocator implements WebDriverTargetLocator
      * @var WebDriver
      */
     protected $driver;
+    /**
+     * @var bool
+     */
+    protected $isW3cCompliant;
 
-    public function __construct($executor, $driver)
+    public function __construct($executor, $driver, $isW3cCompliant = false)
     {
         $this->executor = $executor;
         $this->driver = $driver;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -112,8 +117,6 @@ public function activeElement()
         $response = $this->driver->execute(DriverCommand::GET_ACTIVE_ELEMENT, []);
         $method = new RemoteExecuteMethod($this->driver);
 
-        $isW3cCompliant = ($this->driver instanceof RemoteWebDriver) ? $this->driver->isW3cCompliant() : false;
-
-        return new RemoteWebElement($method, JsonWireCompat::getElement($response), $isW3cCompliant);
+        return new RemoteWebElement($method, JsonWireCompat::getElement($response), $this->isW3cCompliant);
     }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 1762f44a8..3164bad5e 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -432,7 +432,7 @@ public function navigate()
      */
     public function switchTo()
     {
-        return new RemoteTargetLocator($this->getExecuteMethod(), $this);
+        return new RemoteTargetLocator($this->getExecuteMethod(), $this, $this->isW3cCompliant);
     }
 
     /**

From 57f871eaa558b1108ece0fc4a713dd57796e4d50 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 20 Nov 2019 20:54:38 +0800
Subject: [PATCH 469/784] W3C switchToWindow takes a handle

The W3C specification dictates that the parameter used to select the
window should be named `handle`.

Source: https://www.w3.org/TR/webdriver/#switch-to-window
---
 lib/Remote/RemoteTargetLocator.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 1f8cb9270..7e8dbcd1f 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -89,7 +89,12 @@ public function frame($frame)
      */
     public function window($handle)
     {
-        $params = ['name' => (string) $handle];
+        if ($this->isW3cCompliant) {
+            $params = ['handle' => (string) $handle];
+        } else {
+            $params = ['name' => (string) $handle];
+        }
+
         $this->executor->execute(DriverCommand::SWITCH_TO_WINDOW, $params);
 
         return $this->driver;

From 98686d91d96db975e1e22f6a8bdc5ccda2b54319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 25 Nov 2019 18:54:33 +0100
Subject: [PATCH 470/784] Add tests for switchTo()->window() of
 RemoteTargetLocator

---
 tests/functional/RemoteTargetLocatorTest.php | 55 ++++++++++++++++++++
 tests/functional/WebDriverAlertTest.php      |  1 +
 tests/functional/web/index.html              |  2 +
 tests/functional/web/open_new_window.html    |  2 +-
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 tests/functional/RemoteTargetLocatorTest.php

diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
new file mode 100644
index 000000000..210e90b18
--- /dev/null
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -0,0 +1,55 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+/**
+ * @covers \Facebook\WebDriver\Remote\RemoteTargetLocator
+ */
+class RemoteTargetLocatorTest extends WebDriverTestCase
+{
+    public function testShouldSwitchToWindow()
+    {
+        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
+        $originalWindowHandle = $this->driver->getWindowHandle();
+        $windowHandlesBefore = $this->driver->getWindowHandles();
+
+        $this->driver->findElement(WebDriverBy::cssSelector('a#open-new-window'))
+            ->click();
+
+        $this->driver->wait()->until(
+            WebDriverExpectedCondition::numberOfWindowsToBe(2)
+        );
+
+        // At first the window should not be switched
+        $this->assertContains('open_new_window.html', $this->driver->getCurrentURL());
+        $this->assertSame($originalWindowHandle, $this->driver->getWindowHandle());
+
+        /**
+         * @see https://w3c.github.io/webdriver/#get-window-handles
+         * > "The order in which the window handles are returned is arbitrary."
+         * Thus we must first find out which window handle is the new one
+         */
+        $windowHandlesAfter = $this->driver->getWindowHandles();
+        $newWindowHandle = array_diff($windowHandlesAfter, $windowHandlesBefore);
+        $newWindowHandle = reset($newWindowHandle);
+
+        $this->driver->switchTo()->window($newWindowHandle);
+
+        // After switchTo() is called, the active window should be changed
+        $this->assertContains('index.html', $this->driver->getCurrentURL());
+        $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
+    }
+}
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index b5fd3dec5..72d38d82a 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -21,6 +21,7 @@
 
 /**
  * @covers \Facebook\WebDriver\WebDriverAlert
+ * @covers \Facebook\WebDriver\Remote\RemoteTargetLocator
  */
 class WebDriverAlertTest extends WebDriverTestCase
 {
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index cf5b9c6c1..ff80fe025 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -11,6 +11,8 @@ <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
     |
     <a href="http://github.com/upload.html" id="a-form-upload">Form with file upload</a>
     |
+    <a href="http://github.com/form_checkbox_radio.html" id="a-form-checkbox-radio">Form with checkboxes and radios</a>
+    |
     <a href="http://github.com/open_new_window.html" id="a-new-window">New window opener test page</a>
     |
     <a href="http://github.com/delayed_element.html" id="a-delayed-element">Delayed render</a>
diff --git a/tests/functional/web/open_new_window.html b/tests/functional/web/open_new_window.html
index b56e93d69..3c790226a 100644
--- a/tests/functional/web/open_new_window.html
+++ b/tests/functional/web/open_new_window.html
@@ -5,6 +5,6 @@
     <title>php-webdriver test page</title>
 </head>
 <body>
-    <a href="#" target="_blank">open new window</a>
+    <a href="http://github.com/index.html" target="_blank" id="open-new-window">open new window</a>
 </body>
 </html>

From 51353795e94ed34d23f2657bb690827a072ad14a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 21 Nov 2019 08:32:22 +0800
Subject: [PATCH 471/784] Make GET_ACTIVE_ELEMENT a GET for W3C

As defined in the specification 12.2.6:

HTTP Method   URI Template
GET           /session/{session id}/element/active

Source: https://www.w3.org/TR/webdriver/#get-active-element
---
 lib/Remote/HttpCommandExecutor.php           |  1 +
 tests/functional/RemoteTargetLocatorTest.php | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index d137030a4..a1b05c5ff 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -146,6 +146,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
         DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
         DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'GET', 'url' => '/session/:sessionId/element/active'],
         DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window'],
         DriverCommand::GET_ELEMENT_LOCATION => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 210e90b18..becc194c8 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -15,6 +15,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\RemoteWebElement;
+
 /**
  * @covers \Facebook\WebDriver\Remote\RemoteTargetLocator
  */
@@ -52,4 +54,21 @@ public function testShouldSwitchToWindow()
         $this->assertContains('index.html', $this->driver->getCurrentURL());
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
+
+    /**
+     * @cover ::activeElement
+     */
+    public function testActiveElement()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $activeElement = $this->driver->switchTo()->activeElement();
+        $this->assertInstanceOf(RemoteWebElement::class, $activeElement);
+        $this->assertSame('body', $activeElement->getTagName());
+
+        $this->driver->findElement(WebDriverBy::name('test_name'))->click();
+        $activeElement = $this->driver->switchTo()->activeElement();
+        $this->assertSame('input', $activeElement->getTagName());
+        $this->assertSame('test_name', $activeElement->getAttribute('name'));
+    }
 }

From 1dcec4bcda282ae4ea6a4e1314a1cd3c953974d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 26 Nov 2019 17:12:40 +0100
Subject: [PATCH 472/784] Minor codestyle improvements and unifications

---
 .php_cs.dist                                     | 10 +++++++++-
 phpstan.neon                                     | 16 ++++++++--------
 tests/functional/RemoteWebDriverCreateTest.php   |  2 +-
 tests/functional/RemoteWebDriverTest.php         |  2 +-
 tests/functional/WebDriverActionsTest.php        |  2 +-
 tests/functional/WebDriverAlertTest.php          |  2 +-
 tests/functional/WebDriverByTest.php             |  7 +++++--
 tests/functional/WebDriverCheckboxesTest.php     | 14 +++++++-------
 tests/functional/WebDriverNavigationTest.php     |  2 +-
 tests/functional/WebDriverRadiosTest.php         | 14 +++++++-------
 tests/functional/WebDriverSelectTest.php         |  9 ++++++---
 tests/functional/WebDriverTimeoutsTest.php       |  4 ++--
 tests/unit/CookieTest.php                        |  4 ++--
 tests/unit/Exception/WebDriverExceptionTest.php  |  8 ++++----
 .../WebDriverButtonReleaseActionTest.php         |  4 ++--
 .../Internal/WebDriverClickActionTest.php        |  4 ++--
 .../Internal/WebDriverClickAndHoldActionTest.php |  4 ++--
 .../Internal/WebDriverContextClickActionTest.php |  4 ++--
 .../Internal/WebDriverCoordinatesTest.php        | 10 +++++-----
 .../Internal/WebDriverDoubleClickActionTest.php  |  4 ++--
 .../Internal/WebDriverKeyDownActionTest.php      |  4 ++--
 .../Internal/WebDriverKeyUpActionTest.php        |  4 ++--
 .../Internal/WebDriverMouseMoveActionTest.php    |  4 ++--
 .../WebDriverMouseToOffsetActionTest.php         |  4 ++--
 .../Internal/WebDriverSendKeysActionTest.php     |  4 ++--
 tests/unit/Remote/DesiredCapabilitiesTest.php    |  6 +++---
 tests/unit/Remote/HttpCommandExecutorTest.php    |  6 +++---
 tests/unit/Remote/RemoteWebDriverTest.php        |  2 +-
 tests/unit/Support/XPathEscaperTest.php          |  4 ++--
 tests/unit/WebDriverOptionsTest.php              |  2 +-
 30 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index 48aa29de7..b771f8b04 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -13,6 +13,8 @@ return PhpCsFixer\Config::create()
         'concat_space' => ['spacing' => 'one'],
         'function_typehint_space' => true,
         'general_phpdoc_annotation_remove' => ['author'],
+        'implode_call' => true,
+        'is_null' => true,
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
         'mb_str_functions' => true,
@@ -51,9 +53,15 @@ return PhpCsFixer\Config::create()
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => true,
-        'php_unit_expectation' => true,
+        'php_unit_expectation' => ['target' => '5.6'],
+        'php_unit_method_casing' => ['case' => 'camel_case'],
         'php_unit_mock' => true,
+        'php_unit_mock_short_will_return' => true,
+        'php_unit_namespaced' => ['target' => '5.7'],
         'php_unit_no_expectation_annotation' => true,
+        'php_unit_ordered_covers' => true,
+        'php_unit_set_up_tear_down_visibility' => true,
+        'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
diff --git a/phpstan.neon b/phpstan.neon
index 7023c466e..3ea02aee5 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,10 +1,10 @@
 parameters:
-	ignoreErrors:
-		- '#Class Symfony\\Component\\Process\\ProcessBuilder not found.#'
-		- '#Instantiated class Symfony\\Component\\Process\\ProcessBuilder not found.#'
-		- '#Call to method setPrefix\(\) on an unknown class Symfony\\Component\\Process\\ProcessBuilder#'
+    ignoreErrors:
+        - '#Class Symfony\\Component\\Process\\ProcessBuilder not found.#'
+        - '#Instantiated class Symfony\\Component\\Process\\ProcessBuilder not found.#'
+        - '#Call to method setPrefix\(\) on an unknown class Symfony\\Component\\Process\\ProcessBuilder#'
         # To be fixed:
-		- '#Call to an undefined method RecursiveIteratorIterator::getSubPathName\(\)#'
-		- '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
-		- '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
-		- '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
+        - '#Call to an undefined method RecursiveIteratorIterator::getSubPathName\(\)#'
+        - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
+        - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
+        - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index a2f6e9d0f..5abec763b 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -20,8 +20,8 @@
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 
 /**
- * @covers \Facebook\WebDriver\Remote\RemoteWebDriver
  * @covers \Facebook\WebDriver\Remote\HttpCommandExecutor
+ * @covers \Facebook\WebDriver\Remote\RemoteWebDriver
  */
 class RemoteWebDriverCreateTest extends WebDriverTestCase
 {
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 72fc30505..6f3becb0b 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -38,8 +38,8 @@ public function testShouldGetPageTitle()
     }
 
     /**
-     * @covers ::getCurrentURL
      * @covers ::get
+     * @covers ::getCurrentURL
      */
     public function testShouldGetCurrentUrl()
     {
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index cb4359183..deb700575 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -61,8 +61,8 @@ public function testShouldClickOnElement()
     /**
      * @covers ::__construct
      * @covers ::clickAndHold
-     * @covers ::release
      * @covers ::perform
+     * @covers ::release
      */
     public function testShouldClickAndHoldOnElementAndRelease()
     {
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 72d38d82a..d6f5c91a2 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -20,8 +20,8 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @covers \Facebook\WebDriver\WebDriverAlert
  * @covers \Facebook\WebDriver\Remote\RemoteTargetLocator
+ * @covers \Facebook\WebDriver\WebDriverAlert
  */
 class WebDriverAlertTest extends WebDriverTestCase
 {
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 028db7920..4ff114751 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -24,7 +24,7 @@
 class WebDriverByTest extends WebDriverTestCase
 {
     /**
-     * @dataProvider textElementsProvider
+     * @dataProvider provideTextElements
      * @param string $webDriverByLocatorMethod
      * @param string $webDriverByLocatorValue
      * @param string $expectedText
@@ -52,7 +52,10 @@ public function testShouldFindTextElementByLocator(
         }
     }
 
-    public function textElementsProvider()
+    /**
+     * @return array[]
+     */
+    public function provideTextElements()
     {
         return [
             'id' => ['id', 'id_test', 'Test by ID'],
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 91513bd94..0ddcccd0d 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -18,8 +18,8 @@
 use Facebook\WebDriver\Exception\NoSuchElementException;
 
 /**
- * @covers \Facebook\WebDriver\WebDriverCheckboxes
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @covers \Facebook\WebDriver\WebDriverCheckboxes
  * @group exclude-edge
  */
 class WebDriverCheckboxesTest extends WebDriverTestCase
@@ -137,7 +137,7 @@ public function testSelectByIndexInvalid()
     }
 
     /**
-     * @dataProvider selectByVisibleTextDataProvider
+     * @dataProvider provideSelectByVisibleTextData
      *
      * @param string $text
      * @param string $value
@@ -154,9 +154,9 @@ public function testSelectByVisibleText($text, $value)
     }
 
     /**
-     * @return array
+     * @return array[]
      */
-    public function selectByVisibleTextDataProvider()
+    public function provideSelectByVisibleTextData()
     {
         return [
             ['J 2 B', 'j2b'],
@@ -165,7 +165,7 @@ public function selectByVisibleTextDataProvider()
     }
 
     /**
-     * @dataProvider selectByVisiblePartialTextDataProvider
+     * @dataProvider provideSelectByVisiblePartialTextData
      *
      * @param string $text
      * @param string $value
@@ -182,9 +182,9 @@ public function testSelectByVisiblePartialText($text, $value)
     }
 
     /**
-     * @return array
+     * @return array[]
      */
-    public function selectByVisiblePartialTextDataProvider()
+    public function provideSelectByVisiblePartialTextData()
     {
         return [
             ['2 B', 'j2b'],
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index d3aaebcb6..c2286f3b2 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -21,8 +21,8 @@
 class WebDriverNavigationTest extends WebDriverTestCase
 {
     /**
-     * @covers ::to
      * @covers ::__construct
+     * @covers ::to
      */
     public function testShouldNavigateToUrl()
     {
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index cf7b8378c..bb0eaa41e 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -19,8 +19,8 @@
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 
 /**
- * @covers \Facebook\WebDriver\WebDriverRadios
  * @covers \Facebook\WebDriver\AbstractWebDriverCheckboxOrRadio
+ * @covers \Facebook\WebDriver\WebDriverRadios
  * @group exclude-edge
  */
 class WebDriverRadiosTest extends WebDriverTestCase
@@ -115,7 +115,7 @@ public function testSelectByIndexInvalid()
     }
 
     /**
-     * @dataProvider selectByVisibleTextDataProvider
+     * @dataProvider provideSelectByVisibleTextData
      *
      * @param string $text
      * @param string $value
@@ -128,9 +128,9 @@ public function testSelectByVisibleText($text, $value)
     }
 
     /**
-     * @return array
+     * @return array[]
      */
-    public function selectByVisibleTextDataProvider()
+    public function provideSelectByVisibleTextData()
     {
         return [
             ['J 3 B', 'j3b'],
@@ -139,7 +139,7 @@ public function selectByVisibleTextDataProvider()
     }
 
     /**
-     * @dataProvider selectByVisiblePartialTextDataProvider
+     * @dataProvider provideSelectByVisiblePartialTextData
      *
      * @param string $text
      * @param string $value
@@ -152,9 +152,9 @@ public function testSelectByVisiblePartialText($text, $value)
     }
 
     /**
-     * @return array
+     * @return array[]
      */
-    public function selectByVisiblePartialTextDataProvider()
+    public function provideSelectByVisiblePartialTextData()
     {
         return [
             ['3 B', 'j3b'],
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index b25dd03af..8d96a1944 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -21,8 +21,8 @@
 
 /**
  * @group exclude-saucelabs
- * @covers \Facebook\WebDriver\WebDriverSelect
  * @covers \Facebook\WebDriver\Exception\UnexpectedTagNameException
+ * @covers \Facebook\WebDriver\WebDriverSelect
  */
 class WebDriverSelectTest extends WebDriverTestCase
 {
@@ -58,7 +58,7 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
     }
 
     /**
-     * @dataProvider selectSelectorProvider
+     * @dataProvider provideSelectSelector
      * @param string $selector
      */
     public function testShouldGetOptionsOfSelect($selector)
@@ -72,7 +72,10 @@ public function testShouldGetOptionsOfSelect($selector)
         $this->assertCount(5, $options);
     }
 
-    public function selectSelectorProvider()
+    /**
+     * @return array[]
+     */
+    public function provideSelectSelector()
     {
         return [
             'simple <select>' => ['#select'],
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index ca85075b8..cd864bfaa 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -38,8 +38,8 @@ public function testShouldFailGettingDelayedElementWithoutWait()
     }
 
     /**
-     * @covers ::implicitlyWait
      * @covers ::__construct
+     * @covers ::implicitlyWait
      */
     public function testShouldGetDelayedElementWithImplicitWait()
     {
@@ -52,8 +52,8 @@ public function testShouldGetDelayedElementWithImplicitWait()
     }
 
     /**
-     * @covers ::pageLoadTimeout
      * @covers ::__construct
+     * @covers ::pageLoadTimeout
      */
     public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
     {
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 5fdb43038..3df705e2a 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -161,7 +161,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
     }
 
     /**
-     * @dataProvider invalidCookieProvider
+     * @dataProvider provideInvalidCookie
      * @param string $name
      * @param string $value
      * @param string $domain
@@ -185,7 +185,7 @@ public function testShouldValidateCookieOnConstruction($name, $value, $domain, $
     /**
      * @return array[]
      */
-    public function invalidCookieProvider()
+    public function provideInvalidCookie()
     {
         return [
             // $name, $value, $domain, $expectedMessage
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index be3ab964c..8c2820980 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -29,8 +29,8 @@ public function testShouldStoreResultsOnInstantiation()
     }
 
     /**
-     * @dataProvider jsonWireStatusCodeProvider
-     * @dataProvider w3CWebDriverErrorCodeProvider
+     * @dataProvider provideJsonWireStatusCode
+     * @dataProvider provideW3CWebDriverErrorCode
      * @param int $errorCode
      * @param string $expectedExceptionType
      */
@@ -49,7 +49,7 @@ public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCo
     /**
      * @return array[]
      */
-    public function jsonWireStatusCodeProvider()
+    public function provideJsonWireStatusCode()
     {
         return [
             [1337, UnrecognizedExceptionException::class],
@@ -93,7 +93,7 @@ public function jsonWireStatusCodeProvider()
     /**
      * @return array[]
      */
-    public function w3CWebDriverErrorCodeProvider()
+    public function provideW3CWebDriverErrorCode()
     {
         return [
                 ['element click intercepted', ElementClickInterceptedException::class],
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index db8574a0b..f03b7d607 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -28,7 +28,7 @@ class WebDriverButtonReleaseActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -43,7 +43,7 @@ public function testPerformSendsMouseUpCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseUp')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverButtonReleaseAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 8041d7ae7..d8f6ce081 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -28,7 +28,7 @@ class WebDriverClickActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -43,7 +43,7 @@ public function testPerformSendsClickCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverClickAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index ebe933f8c..57de1581b 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -28,7 +28,7 @@ class WebDriverClickAndHoldActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -43,7 +43,7 @@ public function testPerformSendsMouseDownCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseDown')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverClickAndHoldAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index 67ca63e4c..e3a600a97 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -28,7 +28,7 @@ class WebDriverContextClickActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -43,7 +43,7 @@ public function testPerformSendsContextClickCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('contextClick')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverContextClickAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index 209daa63f..83e22be2b 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -28,10 +28,10 @@ public function testConstruct()
 
         $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-        self::assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
-        self::assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
-        self::assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
-        self::assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
+        $this->assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
+        $this->assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
+        $this->assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
+        $this->assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
     }
 
     public function testGetAuxiliary()
@@ -43,6 +43,6 @@ public function testGetAuxiliary()
 
         $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-        self::assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
+        $this->assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 86710d330..3e6540b86 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -28,7 +28,7 @@ class WebDriverDoubleClickActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -43,7 +43,7 @@ public function testPerformSendsDoubleClickCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('doubleClick')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverDoubleClickAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index a03791fd9..0068960ec 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -31,7 +31,7 @@ class WebDriverKeyDownActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
@@ -49,7 +49,7 @@ public function testPerformFocusesOnElementAndSendPressKeyCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverKeyboard->expects($this->once())->method('pressKey');
         $this->webDriverKeyDownAction->perform();
     }
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 7ebc17ac0..44fc7ffdc 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -31,7 +31,7 @@ class WebDriverKeyUpActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
@@ -50,7 +50,7 @@ public function testPerformFocusesOnElementAndSendPressKeyCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
         $this->webDriverKeyUpAction->perform();
     }
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 584231f9d..4115399d2 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -28,7 +28,7 @@ class WebDriverMouseMoveActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -44,7 +44,7 @@ public function testPerformFocusesOnElementAndSendPressKeyCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverMouseMoveAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index a055c746d..e27339b80 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -30,7 +30,7 @@ class WebDriverMouseToOffsetActionTest extends TestCase
     /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
     private $locationProvider;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
@@ -48,7 +48,7 @@ public function testPerformFocusesOnElementAndSendPressKeyCommand()
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
         $this->webDriverMouse->expects($this->once())->method('mouseMove')->with($coords, 150, 200);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverMoveToOffsetAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index 22cb47e9d..993e7aecb 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -33,7 +33,7 @@ class WebDriverSendKeysActionTest extends TestCase
     /** @var array */
     private $keys;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
@@ -54,7 +54,7 @@ public function testPerformFocusesOnElementAndSendPressKeyCommand()
             ->disableOriginalConstructor()->getMock();
         $this->webDriverKeyboard->expects($this->once())->method('sendKeys')->with($this->keys);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
-        $this->locationProvider->expects($this->once())->method('getCoordinates')->will($this->returnValue($coords));
+        $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverSendKeysAction->perform();
     }
 }
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 4ef4a055a..04075b458 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -83,7 +83,7 @@ public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser()
     }
 
     /**
-     * @dataProvider browserCapabilitiesProvider
+     * @dataProvider provideBrowserCapabilities
      * @param string $setupMethod
      * @param string $expectedBrowser
      * @param string $expectedPlatform
@@ -101,9 +101,9 @@ public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
     }
 
     /**
-     * @return array
+     * @return array[]
      */
-    public function browserCapabilitiesProvider()
+    public function provideBrowserCapabilities()
     {
         return [
             ['android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID],
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index d6aae04b2..66773926b 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -25,13 +25,13 @@ class HttpCommandExecutorTest extends TestCase
     /** @var HttpCommandExecutor */
     private $executor;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->executor = new HttpCommandExecutor('http://localhost:4444/');
     }
 
     /**
-     * @dataProvider commandProvider
+     * @dataProvider provideCommand
      * @param int $command
      * @param array $params
      * @param bool $shouldResetExpectHeader
@@ -81,7 +81,7 @@ public function testShouldSendRequestToAssembledUrl(
     /**
      * @return array[]
      */
-    public function commandProvider()
+    public function provideCommand()
     {
         return [
             'POST command having :id placeholder in url' => [
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index c5e397e00..0ae855017 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -31,7 +31,7 @@ class RemoteWebDriverTest extends TestCase
     /** @var RemoteWebDriver */
     private $driver;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->driver = RemoteWebDriver::createBySessionID('session-id', 'http://foo.bar:4444/');
     }
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index 96853ed4f..572ce78e9 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -20,7 +20,7 @@
 class XPathEscaperTest extends TestCase
 {
     /**
-     * @dataProvider xpathProvider
+     * @dataProvider provideXpath
      * @param string $input
      * @param string $expectedOutput
      */
@@ -34,7 +34,7 @@ public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input,
     /**
      * @return array[]
      */
-    public function xpathProvider()
+    public function provideXpath()
     {
         return [
             'empty string encapsulate in single quotes' => ['', "''"],
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index dd7494c67..85eab8978 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -27,7 +27,7 @@ class WebDriverOptionsTest extends TestCase
     /** @var ExecuteMethod|\PHPUnit_Framework_MockObject_MockObject */
     private $executor;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->executor = $this->getMockBuilder(ExecuteMethod::class)
             ->disableOriginalConstructor()

From 648f6ede2b60cc6012420bfb121ecea126cf2f8d Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 21 Nov 2019 09:32:50 +0800
Subject: [PATCH 473/784] Frame switching W3C Compliance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change updates the frame functionality to comply with the W3C
specification.

Valid values of the `id` parameter are:
- null
- a Number between 0 and 2^16
- an Object representing a Web element

When the value is null, set the current browsing context to the current
top-level browsing context

When the value is a valid Number, let window be the associated window of
the current browsing context’s active document.

When the value is an Object, let element be the result of trying to get
a known element by web element reference id.

Source: https://www.w3.org/TR/webdriver/#switch-to-frame
---
 lib/Remote/RemoteTargetLocator.php           | 31 +++++++--
 tests/functional/RemoteTargetLocatorTest.php | 72 ++++++++++++++++++++
 tests/functional/web/iframe_content.html     | 10 +++
 tests/functional/web/page_with_frame.html    | 13 ++++
 4 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 tests/functional/web/iframe_content.html
 create mode 100644 tests/functional/web/page_with_frame.html

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 7e8dbcd1f..579d2b9d9 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -62,16 +62,39 @@ public function defaultContent()
     /**
      * Switch to the iframe by its id or name.
      *
-     * @param WebDriverElement|string $frame The WebDriverElement,
+     * @param WebDriverElement|null|int|string $frame The WebDriverElement,
      * the id or the name of the frame.
+     * When null, switch to the current top-level browsing context
+     * When int, switch to the WindowProxy identified by the value
+     * When an Element, switch to that Element.
+     *
+     * @throws \InvalidArgumentException
      * @return WebDriver The driver focused on the given frame.
      */
     public function frame($frame)
     {
-        if ($frame instanceof WebDriverElement) {
-            $id = ['ELEMENT' => $frame->getID()];
+        if ($this->isW3cCompliant) {
+            if ($frame instanceof WebDriverElement) {
+                $id = [JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $frame->getID()];
+            } elseif ($frame === null) {
+                $id = null;
+            } elseif (is_int($frame)) {
+                $id = $frame;
+            } else {
+                throw new \InvalidArgumentException(
+                    'In W3C compliance mode frame must be either instance of WebDriverElement, integer or null'
+                );
+            }
         } else {
-            $id = (string) $frame;
+            if ($frame instanceof WebDriverElement) {
+                $id = ['ELEMENT' => $frame->getID()];
+            } elseif ($frame === null) {
+                $id = null;
+            } elseif (is_int($frame)) {
+                $id = $frame;
+            } else {
+                $id = (string) $frame;
+            }
         }
 
         $params = ['id' => $id];
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index becc194c8..15e0f8603 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -71,4 +71,76 @@ public function testActiveElement()
         $this->assertSame('input', $activeElement->getTagName());
         $this->assertSame('test_name', $activeElement->getAttribute('name'));
     }
+
+    /**
+     * @cover ::frame
+     */
+    public function testShouldSwitchToFrameByItsId()
+    {
+        $parentPage = 'This is the host page which contains an iFrame';
+        $firstChildFrame = 'This is the content of the iFrame';
+        $secondChildFrame = 'open new window';
+
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(0);
+        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(null);
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(1);
+        $this->assertContains($secondChildFrame, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(null);
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+    }
+
+    /**
+     * @cover ::frame
+     */
+    public function testShouldSwitchToFrameByElement()
+    {
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('iframe_content'));
+        $this->driver->switchTo()->frame($element);
+
+        $this->assertContains('This is the content of the iFrame', $this->driver->getPageSource());
+    }
+
+    /**
+     * @cover ::frame
+     * @group exclude-saucelabs
+     */
+    public function testShouldNotAcceptStringAsFrameIdInW3cMode()
+    {
+        self::skipForJsonWireProtocol();
+
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'In W3C compliance mode frame must be either instance of WebDriverElement, integer or null'
+        );
+
+        $this->driver->switchTo()->frame('iframe_content');
+    }
+
+    /**
+     * @cover ::frame
+     * @group exclude-saucelabs
+     */
+    public function testShouldAcceptStringAsFrameIdInJsonWireMode()
+    {
+        self::skipForW3cProtocol();
+
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $this->driver->switchTo()->frame('iframe_content');
+
+        $this->assertContains('This is the content of the iFrame', $this->driver->getPageSource());
+    }
 }
diff --git a/tests/functional/web/iframe_content.html b/tests/functional/web/iframe_content.html
new file mode 100644
index 000000000..db4fed288
--- /dev/null
+++ b/tests/functional/web/iframe_content.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>php-webdriver iFrame content page</title>
+</head>
+<body>
+    <p>This is the content of the iFrame</p>
+</body>
+</html>
diff --git a/tests/functional/web/page_with_frame.html b/tests/functional/web/page_with_frame.html
new file mode 100644
index 000000000..666f6aa75
--- /dev/null
+++ b/tests/functional/web/page_with_frame.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>php-webdriver test page</title>
+</head>
+<body>
+    <p>This is the host page which contains an iFrame</p>
+    <iframe src="http://github.com/iframe_content.html" name="iframe_content" id="iframe_content"></iframe>
+    <iframe src="http://github.com/open_new_window.html" name="other_iframe_content" id="other_iframe_content"></iframe>
+    <iframe src="http://github.com/upload.html" name="0"></iframe>
+</body>
+</html>

From 081b70fea7806e8458e30216b76d494b583bf7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 28 Nov 2019 17:14:52 +0100
Subject: [PATCH 474/784] Fix JsonWire protocol detection in test skipping

---
 tests/functional/WebDriverTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 9b302a1f3..f1496d8e4 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -126,7 +126,7 @@ public static function skipForW3cProtocol($message = 'Not supported by W3C speci
     public static function skipForJsonWireProtocol($message = 'Not supported by JsonWire protocol')
     {
         if (getenv('GECKODRIVER') !== '1'
-            && (getenv('CHROMEDRIVER') !== '1' || getenv('DISABLE_W3C_PROTOCOL') === '1')) {
+            && (getenv('BROWSER_NAME') !== 'chrome' || getenv('DISABLE_W3C_PROTOCOL') === '1')) {
             static::markTestSkipped($message);
         }
     }

From 3e64169dbcff0467f8f85c5fceffa8d6a2bd06b6 Mon Sep 17 00:00:00 2001
From: Josh <2.josh.schmidt@gmail.com>
Date: Wed, 26 Jun 2019 08:25:52 -0600
Subject: [PATCH 475/784] Add status command

---
 lib/Remote/HttpCommandExecutor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index a1b05c5ff..76b21c082 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -126,6 +126,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
             'method' => 'POST',
             'url' => '/session/:sessionId/window/:windowHandle/size',
         ],
+        DriverCommand::STATUS => ['method' => 'GET', 'url' => '/status'],
         DriverCommand::SUBMIT_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'],
         DriverCommand::SCREENSHOT => ['method' => 'GET', 'url' => '/session/:sessionId/screenshot'],
         DriverCommand::TOUCH_SINGLE_TAP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/click'],

From 9f3fc33f65c161dc2ca0b8855b187be8d2be4e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 26 Nov 2019 11:27:05 +0100
Subject: [PATCH 476/784] Process status response to RemoteStatus value object

---
 CHANGELOG.md                             |  1 +
 lib/Remote/RemoteStatus.php              | 93 ++++++++++++++++++++++++
 lib/Remote/RemoteWebDriver.php           | 10 +++
 tests/functional/RemoteWebDriverTest.php | 16 ++++
 4 files changed, 120 insertions(+)
 create mode 100644 lib/Remote/RemoteStatus.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b83a21743..038b10b6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - Experimental W3C WebDriver protocol support. The protocol will be used automatically when remote end (like Geckodriver, newer Chromedriver etc.) supports it.
+- `getStatus()` method of RemoteWebDriver to get information about remote-end readiness to create new sessions.
 
 ### Changed
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
diff --git a/lib/Remote/RemoteStatus.php b/lib/Remote/RemoteStatus.php
new file mode 100644
index 000000000..031d3ed76
--- /dev/null
+++ b/lib/Remote/RemoteStatus.php
@@ -0,0 +1,93 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Remote;
+
+/**
+ * Represents status of remote end
+ *
+ * @see https://www.w3.org/TR/webdriver/#status
+ */
+class RemoteStatus
+{
+    /** @var bool */
+    protected $isReady;
+    /** @var string */
+    protected $message;
+    /** @var array */
+    protected $meta = [];
+
+    /**
+     * @param bool $isReady
+     * @param string $message
+     */
+    protected function __construct($isReady, $message, array $meta = [])
+    {
+        $this->isReady = (bool) $isReady;
+        $this->message = (string) $message;
+
+        $this->setMeta($meta);
+    }
+
+    /**
+     * @param array $responseBody
+     * @return RemoteStatus
+     */
+    public static function createFromResponse(array $responseBody)
+    {
+        $object = new static($responseBody['ready'], $responseBody['message'], $responseBody);
+
+        return $object;
+    }
+
+    /**
+     * The remote end's readiness state.
+     * False if an attempt to create a session at the current time would fail.
+     * However, the value true does not guarantee that a New Session command will succeed.
+     *
+     * @return bool
+     */
+    public function isReady()
+    {
+        return $this->isReady;
+    }
+
+    /**
+     * An implementation-defined string explaining the remote end's readiness state.
+     *
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * Arbitrary meta information specific to remote-end implementation.
+     *
+     * @return array
+     */
+    public function getMeta()
+    {
+        return $this->meta;
+    }
+
+    protected function setMeta(array $meta)
+    {
+        unset($meta['ready'], $meta['message']);
+
+        $this->meta = $meta;
+    }
+}
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 3164bad5e..6163c8b7b 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -380,6 +380,16 @@ public function takeScreenshot($save_as = null)
         return $screenshot;
     }
 
+    /**
+     * Status returns information about whether a remote end is in a state in which it can create new sessions.
+     */
+    public function getStatus()
+    {
+        $response = $this->execute(DriverCommand::STATUS);
+
+        return RemoteStatus::createFromResponse($response);
+    }
+
     /**
      * Construct a new WebDriverWait by the current WebDriver instance.
      * Sample usage:
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 6f3becb0b..6c023dd92 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -271,4 +271,20 @@ public function testShouldSaveScreenshotToFile()
 
         unlink($screenshotPath);
     }
+
+    /**
+     * @covers ::getStatus
+     * @covers \Facebook\WebDriver\Remote\RemoteStatus
+     * @group exclude-saucelabs
+     * Status endpoint is not supported on Sauce Labs
+     */
+    public function testShouldGetRemoteEndStatus()
+    {
+        $status = $this->driver->getStatus();
+
+        $this->assertInternalType('boolean', $status->isReady());
+        $this->assertNotEmpty($status->getMessage());
+
+        $this->assertInternalType('array', $status->getMeta());
+    }
 }

From 13fc55d13850fa54f1fd8c7a31f70dff0631acb3 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 28 Nov 2019 13:15:59 +0800
Subject: [PATCH 477/784] Allow specification of alternate host for fixtures

---
 tests/functional/WebDriverTestCase.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index f1496d8e4..7fd4a6047 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -139,7 +139,12 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
      */
     protected function getTestPageUrl($path)
     {
-        return 'http://localhost:8000/' . $path;
+        $host = 'http://localhost:8000/';
+        if ($alternateHost = getenv('FIXTURES_HOST')) {
+            $host = $alternateHost;
+        }
+
+        return $host . '/' . $path;
     }
 
     protected function setUpSauceLabs()

From 060af761ec35baf32e5cfbd8adc599c4d688306a Mon Sep 17 00:00:00 2001
From: Sjors <sjorsottjes@gmail.com>
Date: Wed, 17 Apr 2019 10:51:11 +0200
Subject: [PATCH 478/784] Allow screenshots to be saved in subdirectory

---
 lib/Remote/RemoteWebDriver.php           | 7 +++++++
 tests/functional/RemoteWebDriverTest.php | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 6163c8b7b..50ad42501 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -373,7 +373,14 @@ public function takeScreenshot($save_as = null)
         $screenshot = base64_decode(
             $this->execute(DriverCommand::SCREENSHOT)
         );
+
         if ($save_as) {
+            $directoryPath = dirname($save_as);
+
+            if (!file_exists($directoryPath)) {
+                mkdir($directoryPath, 0777, true);
+            }
+
             file_put_contents($save_as, $screenshot);
         }
 
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 6c023dd92..26afac751 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -257,7 +257,8 @@ public function testShouldSaveScreenshotToFile()
             $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
         }
 
-        $screenshotPath = sys_get_temp_dir() . '/selenium-screenshot.png';
+        // Intentionally save screenshot to subdirectory to tests it is being created
+        $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/selenium-screenshot.png';
 
         $this->driver->get($this->getTestPageUrl('index.html'));
 
@@ -270,6 +271,7 @@ public function testShouldSaveScreenshotToFile()
         $this->assertGreaterThan(0, imagesy($image));
 
         unlink($screenshotPath);
+        rmdir(dirname($screenshotPath));
     }
 
     /**

From 1ad0697c6ada89b21e4a768b04ca82a89fc6a0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Nov 2019 17:53:33 +0100
Subject: [PATCH 479/784] Improve screenshot tests

---
 lib/WebDriverOptions.php                 |  2 +-
 tests/functional/RemoteWebDriverTest.php | 12 ++++++++++++
 tests/functional/web/index.html          | 17 +++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 682918a17..7e3b42e29 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -76,7 +76,7 @@ public function deleteAllCookies()
     }
 
     /**
-     * Delete the cookie with the give name.
+     * Delete the cookie with the given name.
      *
      * @param string $name
      * @return WebDriverOptions The current instance.
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 26afac751..6544a8583 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -270,6 +270,18 @@ public function testShouldSaveScreenshotToFile()
         $this->assertGreaterThan(0, imagesx($image));
         $this->assertGreaterThan(0, imagesy($image));
 
+        // Validate expected red box is present on the screenshot
+        $this->assertSame(
+            ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0],
+            imagecolorsforindex($image, imagecolorat($image, 5, 5))
+        );
+
+        // And whitespace has expected background color
+        $this->assertSame(
+            ['red' => 250, 'green' => 250, 'blue' => 255, 'alpha' => 0],
+            imagecolorsforindex($image, imagecolorat($image, 15, 5))
+        );
+
         unlink($screenshotPath);
         rmdir(dirname($screenshotPath));
     }
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index ff80fe025..d94ba31f9 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -3,9 +3,22 @@
 <head>
     <meta charset="utf-8">
     <title>php-webdriver test page</title>
+    <style>
+        #red-box {
+            position: absolute;
+            top: 5px;
+            left: 5px;
+            width: 5px;
+            height: 5px;
+            background-color: #ff0000;
+        }
+    </style>
 </head>
-<body>
-    <h1 id='welcome'>Welcome to the facebook/php-webdriver testing page.</h1>
+<body style="background-color: #fafaff;">
+
+    <div id="red-box"></div>
+
+    <h1 id="welcome">Welcome to the facebook/php-webdriver testing page.</h1>
 
     <a href="http://github.com/form.html" id="a-form">Form test page</a>
     |

From 630863c9d865a0223a65218acaabd3dba1833520 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 28 Nov 2019 13:07:21 +0800
Subject: [PATCH 480/784] Allow specification of firefox options for non-gecko

---
 tests/functional/WebDriverTestCase.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 7fd4a6047..136e06c55 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -63,8 +63,10 @@ protected function setUp()
                 }
 
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
-            } elseif (getenv('GECKODRIVER') === '1') {
-                $this->serverUrl = 'http://localhost:4444/';
+            } elseif ($browserName === WebDriverBrowserType::FIREFOX) {
+                if (getenv('GECKODRIVER') === '1') {
+                    $this->serverUrl = 'http://localhost:4444/';
+                }
                 $this->desiredCapabilities->setCapability(
                     'moz:firefoxOptions',
                     ['args' => ['-headless']]

From 45d83575283758ccac4146a16deacc7d28cf5505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 2 Dec 2019 00:37:07 +0100
Subject: [PATCH 481/784] Improve code coverage

---
 lib/Remote/RemoteTargetLocator.php           | 12 ++---
 tests/functional/RemoteTargetLocatorTest.php | 11 -----
 tests/functional/RemoteWebDriverTest.php     | 48 ++++++++++++++++++--
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 579d2b9d9..da9bdf0b6 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -25,17 +25,11 @@
  */
 class RemoteTargetLocator implements WebDriverTargetLocator
 {
-    /**
-     * @var ExecuteMethod
-     */
+    /** @var ExecuteMethod */
     protected $executor;
-    /**
-     * @var WebDriver
-     */
+    /** @var WebDriver */
     protected $driver;
-    /**
-     * @var bool
-     */
+    /** @var bool */
     protected $isW3cCompliant;
 
     public function __construct($executor, $driver, $isW3cCompliant = false)
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 15e0f8603..0cf8b9e2b 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -55,9 +55,6 @@ public function testShouldSwitchToWindow()
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
 
-    /**
-     * @cover ::activeElement
-     */
     public function testActiveElement()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
@@ -72,9 +69,6 @@ public function testActiveElement()
         $this->assertSame('test_name', $activeElement->getAttribute('name'));
     }
 
-    /**
-     * @cover ::frame
-     */
     public function testShouldSwitchToFrameByItsId()
     {
         $parentPage = 'This is the host page which contains an iFrame';
@@ -98,9 +92,6 @@ public function testShouldSwitchToFrameByItsId()
         $this->assertContains($parentPage, $this->driver->getPageSource());
     }
 
-    /**
-     * @cover ::frame
-     */
     public function testShouldSwitchToFrameByElement()
     {
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
@@ -112,7 +103,6 @@ public function testShouldSwitchToFrameByElement()
     }
 
     /**
-     * @cover ::frame
      * @group exclude-saucelabs
      */
     public function testShouldNotAcceptStringAsFrameIdInW3cMode()
@@ -130,7 +120,6 @@ public function testShouldNotAcceptStringAsFrameIdInW3cMode()
     }
 
     /**
-     * @cover ::frame
      * @group exclude-saucelabs
      */
     public function testShouldAcceptStringAsFrameIdInJsonWireMode()
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 6544a8583..59d9d108d 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -62,9 +62,18 @@ public function testShouldGetPageSource()
 
     /**
      * @covers ::getSessionID
+     * @covers ::isW3cCompliant
      */
     public function testShouldGetSessionId()
     {
+        // This tests is intentionally included in another test, to not slow down build.
+        // @TODO Remove following in 2.0
+        if (self::isW3cProtocolBuild()) {
+            $this->assertTrue($this->driver->isW3cCompliant());
+        } else {
+            $this->assertFalse($this->driver->isW3cCompliant());
+        }
+
         $sessionId = $this->driver->getSessionID();
 
         $this->assertInternalType('string', $sessionId);
@@ -171,13 +180,17 @@ public function testShouldExecuteScriptAndDoNotBlockExecution()
         $this->assertSame('Test by ID', $element->getText());
 
         $start = microtime(true);
-        $this->driver->executeScript('
+        $scriptResult = $this->driver->executeScript('
             setTimeout(
                 function(){document.getElementById("id_test").innerHTML = "Text changed by script";},
                 250
-            )');
+            );
+            return "returned value";
+            ');
         $end = microtime(true);
 
+        $this->assertSame('returned value', $scriptResult);
+
         $this->assertLessThan(250, $end - $start, 'executeScript() should not block execution');
 
         // If we wait, the script should be executed and its value changed
@@ -199,18 +212,20 @@ public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
         $this->assertSame('Test by ID', $element->getText());
 
         $start = microtime(true);
-        $this->driver->executeAsyncScript(
+        $scriptResult = $this->driver->executeAsyncScript(
             'var callback = arguments[arguments.length - 1];
             setTimeout(
                 function(){
                     document.getElementById("id_test").innerHTML = "Text changed by script";
-                    callback();
+                    callback("returned value");
                  },
                 250
             );'
         );
         $end = microtime(true);
 
+        $this->assertSame('returned value', $scriptResult);
+
         $this->assertGreaterThan(
             0.250,
             $end - $start,
@@ -222,6 +237,31 @@ function(){
         $this->assertSame('Text changed by script', $element->getText());
     }
 
+    /**
+     * @covers ::executeScript
+     * @covers ::prepareScriptArguments
+     * @group exclude-saucelabs
+     */
+    public function testShouldExecuteScriptWithParamsAndReturnValue()
+    {
+        $this->driver->manage()->timeouts()->setScriptTimeout(1);
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $element1 = $this->driver->findElement(WebDriverBy::id('id_test'));
+        $element2 = $this->driver->findElement(WebDriverBy::className('test_class'));
+
+        $scriptResult = $this->driver->executeScript(
+            'var element1 = arguments[0];
+            var element2 = arguments[1];
+            return "1: " + element1.innerText + ", 2: " + element2.innerText;
+            ',
+            [$element1, $element2]
+        );
+
+        $this->assertSame('1: Test by ID, 2: Test by Class', $scriptResult);
+    }
+
     /**
      * @covers ::takeScreenshot
      */

From 5dbadd61bdf64d05656379ae27364055da591a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 29 Nov 2019 17:46:43 +0100
Subject: [PATCH 482/784] Accept W3C capabilitites from the browser and provide
 them as OSS ones (fixes #692)

---
 lib/Remote/DesiredCapabilities.php            | 43 ++++++++++++-------
 lib/Remote/RemoteWebDriver.php                | 10 +++--
 .../functional/RemoteWebDriverCreateTest.php  |  5 ++-
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index c78d2302b..1e49eb9f5 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -25,16 +25,36 @@
 
 class DesiredCapabilities implements WebDriverCapabilities
 {
-    /**
-     * @var array
-     */
+    /** @var array */
     private $capabilities;
 
+    /** @var array */
+    private static $ossToW3c = [
+        WebDriverCapabilityType::PLATFORM => 'platformName',
+        WebDriverCapabilityType::VERSION => 'browserVersion',
+        WebDriverCapabilityType::ACCEPT_SSL_CERTS => 'acceptInsecureCerts',
+        ChromeOptions::CAPABILITY => ChromeOptions::CAPABILITY_W3C,
+    ];
+
     public function __construct(array $capabilities = [])
     {
         $this->capabilities = $capabilities;
     }
 
+    public static function createFromW3cCapabilities(array $capabilities = [])
+    {
+        $w3cToOss = array_flip(static::$ossToW3c);
+
+        foreach ($w3cToOss as $w3cCapability => $ossCapability) {
+            // Copy W3C capabilities to OSS ones
+            if (array_key_exists($w3cCapability, $capabilities)) {
+                $capabilities[$ossCapability] = $capabilities[$w3cCapability];
+            }
+        }
+
+        return new self($capabilities);
+    }
+
     /**
      * @return string The name of the browser.
      */
@@ -183,13 +203,6 @@ public function toArray()
      */
     public function toW3cCompatibleArray()
     {
-        $ossToW3c = [
-            WebDriverCapabilityType::PLATFORM => 'platformName',
-            WebDriverCapabilityType::VERSION => 'browserVersion',
-            WebDriverCapabilityType::ACCEPT_SSL_CERTS => 'acceptInsecureCerts',
-            ChromeOptions::CAPABILITY => ChromeOptions::CAPABILITY_W3C,
-        ];
-
         $allowedW3cCapabilities = [
             'browserName',
             'browserVersion',
@@ -212,12 +225,12 @@ public function toW3cCompatibleArray()
                 $w3cCapabilities[$capabilityKey] = $capabilityValue;
             }
 
-            // Convert capabilitites with changed name
-            if (array_key_exists($capabilityKey, $ossToW3c)) {
-                if ($capabilityKey === 'platform') {
-                    $w3cCapabilities[$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
+            // Convert capabilities with changed name
+            if (array_key_exists($capabilityKey, static::$ossToW3c)) {
+                if ($capabilityKey === WebDriverCapabilityType::PLATFORM) {
+                    $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
                 } else {
-                    $w3cCapabilities[$ossToW3c[$capabilityKey]] = $capabilityValue;
+                    $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = $capabilityValue;
                 }
             }
 
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 50ad42501..8fc2e2bb3 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -149,13 +149,17 @@ public static function create(
         $response = $executor->execute($command);
         $value = $response->getValue();
 
-        if (!$w3c_compliant = isset($value['capabilities'])) {
+        if (!$isW3cCompliant = isset($value['capabilities'])) {
             $executor->disableW3cCompliance();
         }
 
-        $returnedCapabilities = new DesiredCapabilities($w3c_compliant ? $value['capabilities'] : $value);
+        if ($isW3cCompliant) {
+            $returnedCapabilities = DesiredCapabilities::createFromW3cCapabilities($value['capabilities']);
+        } else {
+            $returnedCapabilities = new DesiredCapabilities($value);
+        }
 
-        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities, $w3c_compliant);
+        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities, $isW3cCompliant);
 
         return $driver;
     }
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 5abec763b..455313354 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -50,9 +50,12 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $returnedCapabilities = $this->driver->getCapabilities();
         $this->assertInstanceOf(WebDriverCapabilities::class, $returnedCapabilities);
         $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
+        $this->assertNotEmpty($returnedCapabilities->getPlatform());
+        $this->assertNotEmpty($returnedCapabilities);
+        $this->assertNotEmpty($returnedCapabilities->getVersion());
     }
 
-    public function testShouldAcceprCapabilitiesAsAnArray()
+    public function testShouldAcceptCapabilitiesAsAnArray()
     {
         // Method has a side-effect of converting whole content of desiredCapabilities to an array
         $this->desiredCapabilities->toArray();

From 4fb525ba17a8ee247e15fb9be320817eb3bd7630 Mon Sep 17 00:00:00 2001
From: Rob <rob.rimmer@mclaren.com>
Date: Mon, 5 Mar 2018 10:02:54 +0000
Subject: [PATCH 483/784] Change variable name defining path to ChromeDriver
 executable

1. Why is this change necessary?
Current environment variable in ChromeDriver.php uses '.', whilst valid according to the specification, this will not work using a bash shell (probably the most commonly used)

2. How does it address the issue?
'.' replaced with '_'.  This is usable in bash (including cygwin)
Original code still there, only attempts new variable if original does not exist

3. What are the side effects?
None, previous name will still work, new name only used if original name does not exist
---
 lib/Chrome/ChromeDriverService.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index c9525126d..bade9e8b0 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -19,19 +19,23 @@
 
 class ChromeDriverService extends DriverService
 {
-    // The environment variable storing the path to the chrome driver executable.
+    /**
+     * The environment variable storing the path to the chrome driver executable.
+     * @deprecated Use ChromeDriverService::CHROME_DRIVER_EXECUTABLE
+     */
     const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
+    // The environment variable storing the path to the chrome driver executable
+    const CHROME_DRIVER_EXECUTABLE = 'WEBDRIVER_CHROME_DRIVER';
 
     /**
      * @return static
      */
     public static function createDefaultService()
     {
-        $exe = getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+        $exe = getenv(self::CHROME_DRIVER_EXECUTABLE) ?: getenv(self::CHROME_DRIVER_EXE_PROPERTY);
         $port = 9515; // TODO: Get another port if the default port is used.
-        $args = ["--port=$port"];
-        $service = new static($exe, $port, $args);
+        $args = ['--port=' . $port];
 
-        return $service;
+        return new static($exe, $port, $args);
     }
 }

From 6ee27df1adb0e0030007333f297cee1d017cf138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Nov 2019 18:27:16 +0100
Subject: [PATCH 484/784] Annouce change of variable name in changelog and
 tests

---
 CHANGELOG.md                                        | 1 +
 tests/functional/Chrome/ChromeDriverServiceTest.php | 6 +++---
 tests/functional/Chrome/ChromeDriverTest.php        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 038b10b6c..899406486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
 - Allow installation of Symfony 5 components.
+- Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility
 
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 781a68bae..41069ecef 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
-        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . getenv('CHROMEDRIVER_PATH'));
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
 
         $driverService = ChromeDriverService::createDefaultService();
 
@@ -66,7 +66,7 @@ public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
 
     public function testShouldThrowExceptionIfExecutableCannotBeFound()
     {
-        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=/not/existing');
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=/not/existing');
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('\'/not/existing\' is not a file.');
@@ -75,7 +75,7 @@ public function testShouldThrowExceptionIfExecutableCannotBeFound()
 
     public function testShouldThrowExceptionIfExecutableIsNotExecutable()
     {
-        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . __FILE__);
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . __FILE__);
 
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('is not executable');
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 89eb766cd..2c10194de 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -46,11 +46,11 @@ protected function tearDown()
     public function testShouldStartChromeDriver()
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
-        putenv(ChromeDriverService::CHROME_DRIVER_EXE_PROPERTY . '=' . getenv('CHROMEDRIVER_PATH'));
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
 
         // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
         $chromeOptions = new ChromeOptions();
-        $chromeOptions->addArguments(['--no-sandbox']);
+        $chromeOptions->addArguments(['--no-sandbox', '--headless']);
         $desiredCapabilities = DesiredCapabilities::chrome();
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
 

From 6a56eba0cb980cac13bc742aeb46a33a3ed0f1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 1 Dec 2019 23:43:40 +0100
Subject: [PATCH 485/784] Implement W3C compatible RemoteKeyboard (fixes #698)

---
 .travis.yml                               |   1 +
 lib/Remote/RemoteKeyboard.php             |  62 +++++++++---
 lib/Remote/RemoteWebDriver.php            |   2 +-
 tests/functional/RemoteKeyboardTest.php   | 109 ++++++++++++++++++++++
 tests/functional/WebDriverActionsTest.php |   2 +-
 tests/functional/WebDriverAlertTest.php   |   4 +-
 tests/functional/web/events.html          |  38 +++++---
 tests/functional/web/form.html            |   6 ++
 8 files changed, 192 insertions(+), 32 deletions(-)
 create mode 100644 tests/functional/RemoteKeyboardTest.php

diff --git a/.travis.yml b/.travis.yml
index 9bb73cc1e..5fc19ab3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -169,6 +169,7 @@ before_script:
 script:
   - if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
   - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
+  - if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
   - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
   - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
diff --git a/lib/Remote/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
index b10b1ca72..40528964f 100644
--- a/lib/Remote/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverKeys;
 
@@ -23,17 +24,21 @@
  */
 class RemoteKeyboard implements WebDriverKeyboard
 {
-    /**
-     * @var RemoteExecuteMethod
-     */
+    /** @var RemoteExecuteMethod */
     private $executor;
+    /** @var WebDriver */
+    private $driver;
+    /** @var bool */
+    private $isW3cCompliant;
 
     /**
-     * @param RemoteExecuteMethod $executor
+     * @param bool $isW3cCompliant
      */
-    public function __construct(RemoteExecuteMethod $executor)
+    public function __construct(RemoteExecuteMethod $executor, WebDriver $driver, $isW3cCompliant = false)
     {
         $this->executor = $executor;
+        $this->driver = $driver;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -43,9 +48,14 @@ public function __construct(RemoteExecuteMethod $executor)
      */
     public function sendKeys($keys)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
-            'value' => WebDriverKeys::encode($keys),
-        ]);
+        if ($this->isW3cCompliant) {
+            $activeElement = $this->driver->switchTo()->activeElement();
+            $activeElement->sendKeys($keys);
+        } else {
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
+                'value' => WebDriverKeys::encode($keys),
+            ]);
+        }
 
         return $this;
     }
@@ -59,9 +69,21 @@ public function sendKeys($keys)
      */
     public function pressKey($key)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
-            'value' => [(string) $key],
-        ]);
+        if ($this->isW3cCompliant) {
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'key',
+                        'id' => 'keyboard',
+                        'actions' => [['type' => 'keyDown', 'value' => $key]],
+                    ],
+                ],
+            ]);
+        } else {
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
+                'value' => [(string) $key],
+            ]);
+        }
 
         return $this;
     }
@@ -75,9 +97,21 @@ public function pressKey($key)
      */
     public function releaseKey($key)
     {
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
-            'value' => [(string) $key],
-        ]);
+        if ($this->isW3cCompliant) {
+            $this->executor->execute(DriverCommand::ACTIONS, [
+                'actions' => [
+                    [
+                        'type' => 'key',
+                        'id' => 'keyboard',
+                        'actions' => [['type' => 'keyUp', 'value' => $key]],
+                    ],
+                ],
+            ]);
+        } else {
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ACTIVE_ELEMENT, [
+                'value' => [(string) $key],
+            ]);
+        }
 
         return $this;
     }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 8fc2e2bb3..07b773a9a 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -474,7 +474,7 @@ public function getMouse()
     public function getKeyboard()
     {
         if (!$this->keyboard) {
-            $this->keyboard = new RemoteKeyboard($this->getExecuteMethod());
+            $this->keyboard = new RemoteKeyboard($this->getExecuteMethod(), $this, $this->isW3cCompliant);
         }
 
         return $this->keyboard;
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
new file mode 100644
index 000000000..ce0064de8
--- /dev/null
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -0,0 +1,109 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+/**
+ * @covers  \Facebook\WebDriver\Remote\RemoteKeyboard
+ */
+class RemoteKeyboardTest extends WebDriverTestCase
+{
+    /**
+     * @group exclude-firefox
+     * Firefox does not properly support keyboard actions:
+     * https://github.com/mozilla/geckodriver/issues/245
+     * https://github.com/mozilla/geckodriver/issues/646
+     * https://github.com/mozilla/geckodriver/issues/944
+     * @group exclude-edge
+     */
+    public function testShouldPressSendAndReleaseKeys()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not peorperly supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
+        $this->driver->getKeyboard()->sendKeys('ab');
+        $this->driver->getKeyboard()->pressKey(WebDriverKeys::SHIFT);
+
+        $this->driver->getKeyboard()->sendKeys('cd' . WebDriverKeys::NULL . 'e');
+
+        $this->driver->getKeyboard()->pressKey(WebDriverKeys::SHIFT);
+        $this->driver->getKeyboard()->pressKey('f');
+        $this->driver->getKeyboard()->releaseKey(WebDriverKeys::SHIFT);
+        $this->driver->getKeyboard()->releaseKey('f');
+
+        if (self::isW3cProtocolBuild()) {
+            $this->assertEquals(
+                [
+                    'keydown "a"',
+                    'keyup "a"',
+                    'keydown "b"',
+                    'keyup "b"',
+                    'keydown "Shift"',
+                    'keydown "C"',
+                    'keyup "C"',
+                    'keydown "D"',
+                    'keyup "D"',
+                    'keyup "Shift"',
+                    'keydown "e"',
+                    'keyup "e"',
+                    'keydown "Shift"',
+                    'keydown "F"',
+                    'keyup "Shift"',
+                    'keyup "f"',
+                ],
+                $this->retrieveLoggedEvents()
+            );
+        } else {
+            $this->assertEquals(
+                [
+                    'keydown "a"',
+                    'keyup "a"',
+                    'keydown "b"',
+                    'keyup "b"',
+                    'keydown "Shift"',
+                    'keydown "C"',
+                    'keyup "C"',
+                    'keydown "D"',
+                    'keyup "D"',
+                    'keyup "Shift"',
+                    'keydown "e"',
+                    'keyup "e"',
+                    'keydown "Shift"',
+                    'keydown "F"', // pressKey behaves differently on old protocol
+                    'keyup "F"',
+                    'keyup "Shift"',
+                    'keydown "f"',
+                    'keyup "f"',
+                ],
+                $this->retrieveLoggedEvents()
+            );
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
+
+        return explode("\n", $logElement->getText());
+    }
+}
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index deb700575..d222a86b1 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -166,7 +166,7 @@ public function testShouldDragAndDrop()
      */
     private function retrieveLoggedEvents()
     {
-        $logElement = $this->driver->findElement(WebDriverBy::id('log'));
+        $logElement = $this->driver->findElement(WebDriverBy::id('mouseEventsLog'));
 
         return explode("\n", $logElement->getText());
     }
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index d6f5c91a2..401500de2 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -55,7 +55,7 @@ public function testShouldAcceptAlert()
 
     public function testShouldAcceptAndDismissConfirmation()
     {
-        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
@@ -82,7 +82,7 @@ public function testShouldAcceptAndDismissConfirmation()
 
     public function testShouldSubmitPromptText()
     {
-        if ($this->desiredCapabilities->getBrowserName() == WebDriverBrowserType::HTMLUNIT) {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
diff --git a/tests/functional/web/events.html b/tests/functional/web/events.html
index e915a89a0..45e8f3971 100644
--- a/tests/functional/web/events.html
+++ b/tests/functional/web/events.html
@@ -28,23 +28,30 @@
     <li id="item-3" draggable="true">Third item</li>
 </ul>
 
-<pre id="log" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
+<pre id="mouseEventsLog" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
+
+<pre id="keyboardEventsLog" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
 
 <script>
-    function logEvent(event) {
-        var logElement = document.getElementById('log');
+    function logMouseEvent(event) {
+        var logElement = document.getElementById('mouseEventsLog');
         logElement.innerHTML += '<strong>' + event.type + '</strong> <span>' + event.target.id +'</span><br>';
-        logElement.scrollTop = logElement.scrollHeight;
+        console.log(event);
+    }
+
+    function logKeyboardEvent(event) {
+        var logElement = document.getElementById('keyboardEventsLog');
+        logElement.innerHTML += '<strong>' + event.type + '</strong> <span>&quot;' + event.key +'&quot;</span>' + "\n";
         console.log(event);
     }
 
     function handleDragenter(e) {
-        logEvent(e);
+        logMouseEvent(e);
         e.target.classList.add('active');
     }
 
     function handleDragleave(e) {
-        logEvent(e);
+        logMouseEvent(e);
         e.target.classList.remove('active');
     }
 
@@ -53,7 +60,7 @@
     }
 
     function handleDrop(e) {
-        logEvent(e);
+        logMouseEvent(e);
         e.preventDefault();
 
         var data = e.dataTransfer.getData('text');
@@ -68,18 +75,21 @@
         el.addEventListener(
             'dragstart',
             function (e) {
-                logEvent(e);
+                logMouseEvent(e);
                 e.dataTransfer.setData('text/plain', e.target.id);
             }
         );
 
-        el.addEventListener('click', logEvent);
-        el.addEventListener('contextmenu', logEvent);
-        el.addEventListener('dblclick', logEvent);
-        el.addEventListener('mouseover', logEvent);
-        el.addEventListener('mousedown', logEvent);
-        el.addEventListener('mouseup', logEvent);
+        el.addEventListener('click', logMouseEvent);
+        el.addEventListener('contextmenu', logMouseEvent);
+        el.addEventListener('dblclick', logMouseEvent);
+        el.addEventListener('mouseover', logMouseEvent);
+        el.addEventListener('mousedown', logMouseEvent);
+        el.addEventListener('mouseup', logMouseEvent);
     }
+
+    document.addEventListener('keydown', logKeyboardEvent);
+    document.addEventListener('keyup', logKeyboardEvent);
 </script>
 
 </body>
diff --git a/tests/functional/web/form.html b/tests/functional/web/form.html
index c1570df8a..7463750a6 100644
--- a/tests/functional/web/form.html
+++ b/tests/functional/web/form.html
@@ -12,6 +12,12 @@
         </label>
         <br>
 
+        <label>
+            Text (empty):
+            <input type="text" name="text" id="input-text-empty" value=""/>
+        </label>
+        <br>
+
         <label>
             Text disabled:
             <input type="text" name="text" id="input-text-disabled" value="Text of disabled input" disabled/>

From 639ed82adbf5edb83f9091f0e79d457a02717dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 7 Dec 2019 02:00:50 +0100
Subject: [PATCH 486/784] Add new keyboard codes constants

---
 lib/WebDriverKeys.php | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index c25748e8c..f6baf96af 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -18,6 +18,7 @@
 /**
  * Representations of pressable keys that aren't text.
  * These are stored in the Unicode PUA (Private Use Area) code points.
+ * @see https://w3c.github.io/webdriver/#keyboard-actions
  */
 class WebDriverKeys
 {
@@ -27,14 +28,11 @@ class WebDriverKeys
     const BACKSPACE = "\xEE\x80\x83";
     const TAB = "\xEE\x80\x84";
     const CLEAR = "\xEE\x80\x85";
-    const RETURN_KEY = "\xEE\x80\x86"; // php does not allow RETURN
+    const RETURN_KEY = "\xEE\x80\x86";
     const ENTER = "\xEE\x80\x87";
     const SHIFT = "\xEE\x80\x88";
-    const LEFT_SHIFT = "\xEE\x80\x88";
     const CONTROL = "\xEE\x80\x89";
-    const LEFT_CONTROL = "\xEE\x80\x89";
     const ALT = "\xEE\x80\x8A";
-    const LEFT_ALT = "\xEE\x80\x8A";
     const PAUSE = "\xEE\x80\x8B";
     const ESCAPE = "\xEE\x80\x8C";
     const SPACE = "\xEE\x80\x8D";
@@ -42,13 +40,9 @@ class WebDriverKeys
     const PAGE_DOWN = "\xEE\x80\x8F";
     const END = "\xEE\x80\x90";
     const HOME = "\xEE\x80\x91";
-    const LEFT = "\xEE\x80\x92";
     const ARROW_LEFT = "\xEE\x80\x92";
-    const UP = "\xEE\x80\x93";
     const ARROW_UP = "\xEE\x80\x93";
-    const RIGHT = "\xEE\x80\x94";
     const ARROW_RIGHT = "\xEE\x80\x94";
-    const DOWN = "\xEE\x80\x95";
     const ARROW_DOWN = "\xEE\x80\x95";
     const INSERT = "\xEE\x80\x96";
     const DELETE = "\xEE\x80\x97";
@@ -83,8 +77,30 @@ class WebDriverKeys
     const F11 = "\xEE\x80\xBB";
     const F12 = "\xEE\x80\xBC";
     const META = "\xEE\x80\xBD";
-    const COMMAND = "\xEE\x80\xBD"; // ALIAS
     const ZENKAKU_HANKAKU = "\xEE\x80\xC0";
+    const RIGHT_SHIFT = "\xEE\x81\x90";
+    const RIGHT_CONTROL = "\xEE\x81\x91";
+    const RIGHT_ALT = "\xEE\x81\x92";
+    const RIGHT_META = "\xEE\x81\x93";
+    const NUMPAD_PAGE_UP = "\xEE\x81\x94";
+    const NUMPAD_PAGE_DOWN = "\xEE\x81\x95";
+    const NUMPAD_END = "\xEE\x81\x96";
+    const NUMPAD_HOME = "\xEE\x81\x97";
+    const NUMPAD_ARROW_LEFT = "\xEE\x81\x98";
+    const NUMPAD_ARROW_UP = "\xEE\x81\x99";
+    const NUMPAD_ARROW_RIGHT = "\xEE\x81\x9A";
+    const NUMPAD_ARROW_DOWN = "\xEE\x81\x9B";
+    const NUMPAD_ARROW_INSERT = "\xEE\x81\x9C";
+    const NUMPAD_ARROW_DELETE = "\xEE\x81\x9D";
+    // Aliases
+    const LEFT_SHIFT = self::SHIFT;
+    const LEFT_CONTROL = self::CONTROL;
+    const LEFT_ALT = self::ALT;
+    const LEFT = self::ARROW_LEFT;
+    const UP = self::ARROW_UP;
+    const RIGHT = self::ARROW_RIGHT;
+    const DOWN = self::ARROW_DOWN;
+    const COMMAND = self::META;
 
     /**
      * Encode input of `sendKeys()`.

From c0fd3966f88b09d0cabf3c1a0929a741ecfabbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 7 Dec 2019 02:38:04 +0100
Subject: [PATCH 487/784] Use clear endpoint to clear element content

---
 lib/Remote/RemoteWebElement.php | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 33286504b..9ae3325dc 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -62,7 +62,7 @@ public function __construct(RemoteExecuteMethod $executor, $id, $isW3cCompliant
     }
 
     /**
-     * If this element is a TEXTAREA or text INPUT element, this will clear the value.
+     * Clear content editable or resettable element
      *
      * @return RemoteWebElement The current instance.
      */
@@ -73,25 +73,6 @@ public function clear()
             [':id' => $this->id]
         );
 
-        if ($this->isW3cCompliant) {
-            $this->executor->execute(DriverCommand::ACTIONS, [
-                'actions' => [
-                    [
-                        'type' => 'key',
-                        'id' => 'keyboard',
-                        'actions' => [
-                            ['type' => 'keyDown', 'value' => WebDriverKeys::CONTROL],
-                            ['type' => 'keyDown', 'value' => 'a'],
-                            ['type' => 'keyUp', 'value' => WebDriverKeys::CONTROL],
-                            ['type' => 'keyUp', 'value' => 'a'],
-                            ['type' => 'keyDown', 'value' => WebDriverKeys::BACKSPACE],
-                            ['type' => 'keyUp', 'value' => WebDriverKeys::BACKSPACE],
-                        ],
-                    ],
-                ],
-            ]);
-        }
-
         return $this;
     }
 

From 8b64b7a404cc1a9c7f71d355035f82195b825507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 7 Dec 2019 16:39:38 +0100
Subject: [PATCH 488/784] Add PHP 7.4 Travis build

Also replace mock-objects with PHP 5.6-7.4 compatible fork sminnee/phpunit-mock-objects
---
 .travis.yml   |  3 ++-
 composer.json | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5fc19ab3c..6e7bfaab7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
+  - '7.4snapshot'
 
 env:
   global:
@@ -47,7 +48,7 @@ matrix:
 
     # Firefox with Geckodriver (W3C mode) inside Travis environment
     - name: 'Firefox latest on Travis (W3C protocol); no Selenium server'
-      php: 7.3
+      php: '7.3'
       env:
         - BROWSER_NAME="firefox"
         - GECKODRIVER="1"
diff --git a/composer.json b/composer.json
index a6aec98ae..2545d9aa5 100644
--- a/composer.json
+++ b/composer.json
@@ -13,21 +13,22 @@
   "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
-    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0",
-    "symfony/polyfill-mbstring": "^1.12",
     "ext-curl": "*",
+    "ext-json": "*",
     "ext-zip": "*",
-    "ext-json": "*"
+    "symfony/polyfill-mbstring": "^1.12",
+    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
   },
   "require-dev": {
+    "friendsofphp/php-cs-fixer": "^2.0",
+    "jakub-onderka/php-parallel-lint": "^0.9.2",
+    "php-coveralls/php-coveralls": "^2.0",
+    "php-mock/php-mock-phpunit": "^1.1",
     "phpunit/phpunit": "^5.7",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-    "friendsofphp/php-cs-fixer": "^2.0",
+    "sminnee/phpunit-mock-objects": "^3.4",
     "squizlabs/php_codesniffer": "^2.6",
-    "php-mock/php-mock-phpunit": "^1.1",
-    "php-coveralls/php-coveralls": "^2.0",
-    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0",
-    "jakub-onderka/php-parallel-lint": "^0.9.2"
+    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
   },
   "suggest": {
     "ext-SimpleXML": "For Firefox profile creation"
@@ -57,6 +58,9 @@
       "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
   },
+  "config": {
+    "sort-packages": true
+  },
   "extra": {
     "branch-alias": {
       "dev-community": "1.8.x-dev"

From 5ee2b824a1c120fc9c24514af51e9f579d99ec5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 9 Dec 2019 13:50:42 +0100
Subject: [PATCH 489/784] Update phpstan

---
 .travis.yml                        |  2 +-
 lib/WebDriverExpectedCondition.php | 28 +++++++++++++++-------------
 phpstan.neon                       |  3 +++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e7bfaab7..9810c6a55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ matrix:
         - phpenv config-rm xdebug.ini
       before_script: ~
       script:
-        - composer require phpstan/phpstan-shim # Not part of require-dev, because it won't install on PHP 5.6
+        - composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
         - composer analyze
         - composer codestyle:check
       after_script: ~
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 4bab4707b..632b4fdfc 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -522,21 +522,23 @@ function () use ($element_or_by, $selected) {
                     return $element_or_by->isSelected() === $selected;
                 }
             );
-        } else {
-            if ($element_or_by instanceof WebDriverBy) {
-                return new static(
-                    function (WebDriver $driver) use ($element_or_by, $selected) {
-                        try {
-                            $element = $driver->findElement($element_or_by);
-
-                            return $element->isSelected() === $selected;
-                        } catch (StaleElementReferenceException $e) {
-                            return null;
-                        }
+        }
+
+        if ($element_or_by instanceof WebDriverBy) {
+            return new static(
+                function (WebDriver $driver) use ($element_or_by, $selected) {
+                    try {
+                        $element = $driver->findElement($element_or_by);
+
+                        return $element->isSelected() === $selected;
+                    } catch (StaleElementReferenceException $e) {
+                        return null;
                     }
-                );
-            }
+                }
+            );
         }
+
+        throw new \InvalidArgumentException('Instance of either WebDriverElement or WebDriverBy must be given');
     }
 
     /**
diff --git a/phpstan.neon b/phpstan.neon
index 3ea02aee5..de6574f0b 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -8,3 +8,6 @@ parameters:
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
+        - '#Unsafe usage of new static\(\)#'
+
+    inferPrivatePropertyTypeFromConstructor: true

From 0bf4f388d5b7de79c546415f7077adaeff6f796b Mon Sep 17 00:00:00 2001
From: Lctrs <jerome@prmntr.me>
Date: Wed, 4 Dec 2019 10:01:49 +0100
Subject: [PATCH 490/784] Maintain BC for renamed TimeOutException

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 2545d9aa5..ede6c4d8d 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,9 @@
     "ext-SimpleXML": "For Firefox profile creation"
   },
   "autoload": {
+    "files": [
+      "lib/Exception/TimeoutException.php"
+    ],
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"
     }

From dab650722fce570adfa0364d273f1571bd041d48 Mon Sep 17 00:00:00 2001
From: sapzape <sapzape@gmail.com>
Date: Mon, 2 Dec 2019 15:04:37 +0900
Subject: [PATCH 491/784] Add take element screenshot command

---
 lib/Remote/DriverCommand.php       |  1 +
 lib/Remote/HttpCommandExecutor.php |  4 ++++
 lib/Remote/RemoteWebElement.php    | 21 +++++++++++++++++++++
 lib/WebDriverElement.php           |  9 +++++++++
 4 files changed, 35 insertions(+)

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index fd24a691c..4e1d29629 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -149,6 +149,7 @@ class DriverCommand
     // W3C specific
     const ACTIONS = 'actions';
     const GET_ELEMENT_PROPERTY = 'getElementProperty';
+    const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
 
     private function __construct()
     {
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 76b21c082..f7daf43da 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -129,6 +129,10 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::STATUS => ['method' => 'GET', 'url' => '/status'],
         DriverCommand::SUBMIT_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/:id/submit'],
         DriverCommand::SCREENSHOT => ['method' => 'GET', 'url' => '/session/:sessionId/screenshot'],
+        DriverCommand::TAKE_ELEMENT_SCREENSHOT => [
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/screenshot',
+        ],
         DriverCommand::TOUCH_SINGLE_TAP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/click'],
         DriverCommand::TOUCH_DOWN => ['method' => 'POST', 'url' => '/session/:sessionId/touch/down'],
         DriverCommand::TOUCH_DOUBLE_TAP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/doubleclick'],
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 9ae3325dc..7d09e11e2 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -431,6 +431,27 @@ public function getID()
         return $this->id;
     }
 
+    /**
+     * Take screenshot of a specific element.
+     *
+     * @param string $save_as The path of the screenshot to be saved.
+     * @return string The screenshot in PNG format.
+     */
+    public function takeElementScreenshot($save_as = null)
+    {
+        $screenshot = base64_decode(
+            $this->executor->execute(
+                DriverCommand::TAKE_ELEMENT_SCREENSHOT,
+                [':id' => $this->id]
+            )
+        );
+        if ($save_as) {
+            file_put_contents($save_as, $screenshot);
+        }
+
+        return $screenshot;
+    }
+
     /**
      * Test if two element IDs refer to the same DOM element.
      *
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 7253cb238..f0284aa16 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -132,4 +132,13 @@ public function submit();
      * @return string The opaque ID.
      */
     public function getID();
+
+    /**
+     * Take screenshot of a specific element.
+     *
+     * @param string $save_as The path of the screenshot to be saved.
+     * @return string The screenshot in PNG format.
+     * @todo Add in next major release (BC)
+     */
+    //public function takeElementScreenshot($save_as = null);
 }

From 2a7208bcdbd87c8a0212c8cfae1e58c91c5e2cdf Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 27 Nov 2019 12:48:10 +0800
Subject: [PATCH 492/784] Add unit tests for takeElementScreenshot

---
 tests/functional/RemoteWebElementTest.php | 55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 52877dcda..8b916ab75 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -17,6 +17,7 @@
 
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebElement
@@ -336,4 +337,58 @@ public function testShouldFindMultipleChildElements()
         $this->assertCount(3, $childElements); // but we should find only subelements of one <ul>
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $childElements);
     }
+
+    /**
+     * @covers ::takeScreenshot
+     */
+    public function testShouldTakeElementScreenshot()
+    {
+        if (!extension_loaded('gd')) {
+            $this->markTestSkipped('GD extension must be enabled');
+        }
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+        $outputPng = $firstElement->takeElementScreenshot();
+
+        $image = imagecreatefromstring($outputPng);
+        $this->assertInternalType('resource', $image);
+
+        $size = $firstElement->getSize();
+        $this->assertEquals($size->getWidth(), imagesx($image));
+        $this->assertEquals($size->getHeight(), imagesy($image));
+    }
+
+    /**
+     * @covers ::takeScreenshot
+     */
+    public function testShouldSaveElementScreenshotToFile()
+    {
+        if (!extension_loaded('gd')) {
+            $this->markTestSkipped('GD extension must be enabled');
+        }
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
+        }
+
+        $screenshotPath = sys_get_temp_dir() . '/selenium-screenshot.png';
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
+        $firstElement->takeElementScreenshot($screenshotPath);
+
+        $image = imagecreatefrompng($screenshotPath);
+        $this->assertInternalType('resource', $image);
+
+        $size = $firstElement->getSize();
+        $this->assertEquals($size->getWidth(), imagesx($image));
+        $this->assertEquals($size->getHeight(), imagesy($image));
+
+        unlink($screenshotPath);
+    }
 }

From 0c36f13e8ca8b168f9cbd0e04c9ea7238ac840c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Dec 2019 11:26:05 +0100
Subject: [PATCH 493/784] Improve take element screenshot unit tests

---
 CHANGELOG.md                              |  3 +-
 lib/Remote/RemoteWebElement.php           |  6 +++
 tests/functional/RemoteWebElementTest.php | 59 ++++++++++-------------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 899406486..3c6a2d690 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - Experimental W3C WebDriver protocol support. The protocol will be used automatically when remote end (like Geckodriver, newer Chromedriver etc.) supports it.
-- `getStatus()` method of RemoteWebDriver to get information about remote-end readiness to create new sessions.
+- `getStatus()` method of `RemoteWebDriver` to get information about remote-end readiness to create new sessions.
+- `takeElementScreenshot()` method of `RemoteWebElement` to do the obvious - take screenshot of the particular element.
 
 ### Changed
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 7d09e11e2..bd9440f3d 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -445,7 +445,13 @@ public function takeElementScreenshot($save_as = null)
                 [':id' => $this->id]
             )
         );
+
         if ($save_as) {
+            $directoryPath = dirname($save_as);
+            if (!file_exists($directoryPath)) {
+                mkdir($directoryPath, 0777, true);
+            }
+
             file_put_contents($save_as, $screenshot);
         }
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 8b916ab75..a3927966e 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -339,35 +339,13 @@ public function testShouldFindMultipleChildElements()
     }
 
     /**
-     * @covers ::takeScreenshot
+     * @covers ::takeElementScreenshot
+     * @group exclude-saucelabs
      */
-    public function testShouldTakeElementScreenshot()
+    public function testShouldTakeAndSaveElementScreenshot()
     {
-        if (!extension_loaded('gd')) {
-            $this->markTestSkipped('GD extension must be enabled');
-        }
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
-        }
-
-        $this->driver->get($this->getTestPageUrl('index.html'));
-
-        $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
-        $outputPng = $firstElement->takeElementScreenshot();
+        self::skipForJsonWireProtocol('Take element screenshot is only part of W3C protocol');
 
-        $image = imagecreatefromstring($outputPng);
-        $this->assertInternalType('resource', $image);
-
-        $size = $firstElement->getSize();
-        $this->assertEquals($size->getWidth(), imagesx($image));
-        $this->assertEquals($size->getHeight(), imagesy($image));
-    }
-
-    /**
-     * @covers ::takeScreenshot
-     */
-    public function testShouldSaveElementScreenshotToFile()
-    {
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
@@ -375,20 +353,33 @@ public function testShouldSaveElementScreenshotToFile()
             $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
         }
 
-        $screenshotPath = sys_get_temp_dir() . '/selenium-screenshot.png';
+        // Intentionally save screenshot to subdirectory to tests it is being created
+        $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/element-screenshot.png';
 
         $this->driver->get($this->getTestPageUrl('index.html'));
 
-        $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
-        $firstElement->takeElementScreenshot($screenshotPath);
+        $element = $this->driver->findElement(WebDriverBy::id('red-box'));
+
+        $outputPngString = $element->takeElementScreenshot($screenshotPath);
 
-        $image = imagecreatefrompng($screenshotPath);
-        $this->assertInternalType('resource', $image);
+        // Assert file output
+        $imageFromFile = imagecreatefrompng($screenshotPath);
+        $this->assertEquals(5, imagesx($imageFromFile));
+        $this->assertEquals(5, imagesy($imageFromFile));
+
+        // Validate element is actually red
+        $this->assertSame(
+            ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0],
+            imagecolorsforindex($imageFromFile, imagecolorat($imageFromFile, 0, 0))
+        );
 
-        $size = $firstElement->getSize();
-        $this->assertEquals($size->getWidth(), imagesx($image));
-        $this->assertEquals($size->getHeight(), imagesy($image));
+        // Assert string output
+        $imageFromString = imagecreatefromstring($outputPngString);
+        $this->assertInternalType('resource', $imageFromString);
+        $this->assertEquals(5, imagesx($imageFromString));
+        $this->assertEquals(5, imagesy($imageFromString));
 
         unlink($screenshotPath);
+        rmdir(dirname($screenshotPath));
     }
 }

From d600f7e229a12679731b035b706ce77577737652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Dec 2019 16:28:11 +0100
Subject: [PATCH 494/784] Finally run Travis on PHP 7.4; also bump some
 dependencies

---
 .travis-php74.ini | 1 +
 .travis.yml       | 8 ++++++--
 composer.json     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 .travis-php74.ini

diff --git a/.travis-php74.ini b/.travis-php74.ini
new file mode 100644
index 000000000..3dc1a1238
--- /dev/null
+++ b/.travis-php74.ini
@@ -0,0 +1 @@
+extension=libzip.so
diff --git a/.travis.yml b/.travis.yml
index 9810c6a55..e2d4b2550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ php:
   - '7.1'
   - '7.2'
   - '7.3'
-  - '7.4snapshot'
+  - '7.4'
 
 env:
   global:
@@ -20,10 +20,11 @@ matrix:
   include:
     # Codestyle check build
     - name: 'Code style and static analysis'
-      php: '7.3'
+      php: '7.4'
       env: CHECK_CODESTYLE=1
       before_install:
         - phpenv config-rm xdebug.ini
+        - phpenv config-add .travis-php74.ini
       before_script: ~
       script:
         - composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
@@ -131,6 +132,9 @@ cache:
   directories:
     - $HOME/.composer/cache
 
+before_install:
+  - if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then phpenv config-add .travis-php74.ini; fi
+
 install:
   - travis_retry composer self-update
   - travis_retry composer update --no-interaction $DEPENDENCIES
diff --git a/composer.json b/composer.json
index ede6c4d8d..d422149ee 100644
--- a/composer.json
+++ b/composer.json
@@ -21,13 +21,13 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
-    "jakub-onderka/php-parallel-lint": "^0.9.2",
+    "jakub-onderka/php-parallel-lint": "^1.0",
     "php-coveralls/php-coveralls": "^2.0",
     "php-mock/php-mock-phpunit": "^1.1",
     "phpunit/phpunit": "^5.7",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "sminnee/phpunit-mock-objects": "^3.4",
-    "squizlabs/php_codesniffer": "^2.6",
+    "squizlabs/php_codesniffer": "^3.5",
     "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
   },
   "suggest": {

From 371bc9ff2dca368dd2745a9abd348c5316a6305d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 18 Dec 2019 16:44:21 +0100
Subject: [PATCH 495/784] Run tests on ubuntu xenial

---
 .travis-php74.ini |  1 -
 .travis.yml       | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 .travis-php74.ini

diff --git a/.travis-php74.ini b/.travis-php74.ini
deleted file mode 100644
index 3dc1a1238..000000000
--- a/.travis-php74.ini
+++ /dev/null
@@ -1 +0,0 @@
-extension=libzip.so
diff --git a/.travis.yml b/.travis.yml
index e2d4b2550..3494ab206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
-sudo: false
-dist: trusty
+dist: xenial
 
 php:
   - '5.6'
@@ -16,6 +15,9 @@ env:
     - BROWSER_NAME="htmlunit"
     - SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
 
+services:
+  - xvfb
+
 matrix:
   include:
     # Codestyle check build
@@ -24,7 +26,6 @@ matrix:
       env: CHECK_CODESTYLE=1
       before_install:
         - phpenv config-rm xdebug.ini
-        - phpenv config-add .travis-php74.ini
       before_script: ~
       script:
         - composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
@@ -132,9 +133,6 @@ cache:
   directories:
     - $HOME/.composer/cache
 
-before_install:
-  - if [ "$TRAVIS_PHP_VERSION" == "7.4" ]; then phpenv config-add .travis-php74.ini; fi
-
 install:
   - travis_retry composer self-update
   - travis_retry composer update --no-interaction $DEPENDENCIES
@@ -149,7 +147,6 @@ before_script:
     fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
   - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver; fi
-  - sh -e /etc/init.d/xvfb start # TODO: start only when needed (ie. not in headless mode)
   - if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
       mkdir -p jar;
       if [ "$SELENIUM_SERVER" = "legacy" ]; then

From 62b0221638de83fc2dae9ca3eb362fff79666e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 21 Dec 2019 13:35:01 +0100
Subject: [PATCH 496/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c6a2d690..836e8c444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
 - Allow installation of Symfony 5 components.
 - Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility
+- If subdirectories in a path to screenshot destination does not exists (using `takeScreenshot()` or `takeElementScreenshot()` methods), they are automatically created.
 
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.

From 9a9ab004654fc143fda71c04a53706144208343e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 21 Dec 2019 15:12:49 +0100
Subject: [PATCH 497/784] Improve codestyle and type-safety comparisons

---
 CHANGELOG.md                             | 1 +
 lib/AbstractWebDriverCheckboxOrRadio.php | 2 +-
 lib/Chrome/ChromeOptions.php             | 4 ++--
 lib/Remote/HttpCommandExecutor.php       | 6 +++---
 lib/Remote/RemoteWebDriver.php           | 2 +-
 lib/Remote/RemoteWebElement.php          | 7 ++++---
 lib/Remote/WebDriverCommand.php          | 3 ++-
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836e8c444..2362cda35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Allow installation of Symfony 5 components.
 - Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility
 - If subdirectories in a path to screenshot destination does not exists (using `takeScreenshot()` or `takeElementScreenshot()` methods), they are automatically created.
+- When zip archive cannot be crated during file upload, throw exception instead of silently returning false.
 
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index 1268ce7c0..9c5c61cc2 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -211,7 +211,7 @@ protected function getRelatedElements($value = null)
             $form = $this->element->findElement(WebDriverBy::xpath('ancestor::form'));
 
             $formId = $form->getAttribute('id');
-            if (!$formId) {
+            if ($formId === '' || $formId === null) {
                 return $form->findElements(WebDriverBy::xpath(
                     sprintf('.//input[@name = %s%s]', XPathEscaper::escapeQuotes($this->name), $valueSelector)
                 ));
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 949d6708b..a9076bb83 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -142,11 +142,11 @@ public function toArray()
         // set the 'binary' to avoid returning an empty array.
         $options['binary'] = $this->binary;
 
-        if ($this->arguments) {
+        if (!empty($this->arguments)) {
             $options['args'] = $this->arguments;
         }
 
-        if ($this->extensions) {
+        if (!empty($this->extensions)) {
             $options['extensions'] = $this->extensions;
         }
 
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index f7daf43da..344e24f65 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -295,7 +295,7 @@ public function execute(WebDriverCommand $command)
             }
         }
 
-        if ($params && is_array($params) && $http_method !== 'POST') {
+        if (is_array($params) && !empty($params) && $http_method !== 'POST') {
             throw new BadMethodCallException(sprintf(
                 'The http method called for %s is %s but it has to be POST' .
                 ' if you want to pass the JSON params %s',
@@ -325,7 +325,7 @@ public function execute(WebDriverCommand $command)
         $encoded_params = null;
 
         if ($http_method === 'POST') {
-            if ($params && is_array($params)) {
+            if (is_array($params) && !empty($params)) {
                 $encoded_params = json_encode($params);
             } elseif ($this->isW3cCompliant) {
                 // POST body must be valid JSON in W3C, even if empty: https://www.w3.org/TR/webdriver/#processing-model
@@ -343,7 +343,7 @@ public function execute(WebDriverCommand $command)
                 $http_method,
                 $url
             );
-            if ($params && is_array($params)) {
+            if (is_array($params) && !empty($params)) {
                 $msg .= sprintf(' with params: %s', json_encode($params));
             }
 
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 07b773a9a..bac55c9b1 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -378,7 +378,7 @@ public function takeScreenshot($save_as = null)
             $this->execute(DriverCommand::SCREENSHOT)
         );
 
-        if ($save_as) {
+        if ($save_as !== null) {
             $directoryPath = dirname($save_as);
 
             if (!file_exists($directoryPath)) {
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index bd9440f3d..4e6556a30 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -446,7 +446,7 @@ public function takeElementScreenshot($save_as = null)
             )
         );
 
-        if ($save_as) {
+        if ($save_as !== null) {
             $directoryPath = dirname($save_as);
             if (!file_exists($directoryPath)) {
                 mkdir($directoryPath, 0777, true);
@@ -505,9 +505,10 @@ protected function upload($local_file)
         // Create a temporary file in the system temp directory.
         $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
         $zip = new ZipArchive();
-        if ($zip->open($temp_zip, ZipArchive::CREATE) !== true) {
-            return false;
+        if (($errorCode = $zip->open($temp_zip, ZipArchive::CREATE)) !== true) {
+            throw new WebDriverException(sprintf('Error creating zip archive: %s', $errorCode));
         }
+
         $info = pathinfo($local_file);
         $file_name = $info['basename'];
         $zip->addFile($local_file, $file_name);
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index b801b0645..804c1a933 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -27,7 +27,8 @@ class WebDriverCommand
     /**
      * @param string $session_id
      * @param string $name Constant from DriverCommand
-     * @param array $parameters Array of
+     * @param array $parameters
+     * @todo In 2.0 force parameters to be an array, then remove is_array() checks in HttpCommandExecutor
      */
     public function __construct($session_id, $name, $parameters)
     {

From 1dfdeae5b9ed33f6c4bddc523c16256d963b6e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 21 Dec 2019 15:13:40 +0100
Subject: [PATCH 498/784] Add common interface for WebDriverNavigation classes
 to improve LSP

---
 CHANGELOG.md                                  |  1 +
 .../Events/EventFiringWebDriverNavigation.php | 29 +++----------
 lib/WebDriver.php                             |  2 +-
 lib/WebDriverNavigation.php                   | 33 +-------------
 lib/WebDriverNavigationInterface.php          | 43 +++++++++++++++++++
 5 files changed, 52 insertions(+), 56 deletions(-)
 create mode 100644 lib/WebDriverNavigationInterface.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2362cda35..d418af776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility
 - If subdirectories in a path to screenshot destination does not exists (using `takeScreenshot()` or `takeElementScreenshot()` methods), they are automatically created.
 - When zip archive cannot be crated during file upload, throw exception instead of silently returning false.
+- `WebDriverNavigation` and `EventFiringWebDriverNavigation` now both implement new `WebDriverNavigationInterface`.
 
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 7d8920eb1..0d26a39f1 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -17,12 +17,12 @@
 
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\WebDriverDispatcher;
-use Facebook\WebDriver\WebDriverNavigation;
+use Facebook\WebDriver\WebDriverNavigationInterface;
 
-class EventFiringWebDriverNavigation
+class EventFiringWebDriverNavigation implements WebDriverNavigationInterface
 {
     /**
-     * @var WebDriverNavigation
+     * @var WebDriverNavigationInterface
      */
     protected $navigator;
     /**
@@ -31,10 +31,10 @@ class EventFiringWebDriverNavigation
     protected $dispatcher;
 
     /**
-     * @param WebDriverNavigation $navigator
+     * @param WebDriverNavigationInterface $navigator
      * @param WebDriverDispatcher $dispatcher
      */
-    public function __construct(WebDriverNavigation $navigator, WebDriverDispatcher $dispatcher)
+    public function __construct(WebDriverNavigationInterface $navigator, WebDriverDispatcher $dispatcher)
     {
         $this->navigator = $navigator;
         $this->dispatcher = $dispatcher;
@@ -49,17 +49,13 @@ public function getDispatcher()
     }
 
     /**
-     * @return WebDriverNavigation
+     * @return WebDriverNavigationInterface
      */
     public function getNavigator()
     {
         return $this->navigator;
     }
 
-    /**
-     * @throws WebDriverException
-     * @return $this
-     */
     public function back()
     {
         $this->dispatch(
@@ -79,10 +75,6 @@ public function back()
         return $this;
     }
 
-    /**
-     * @throws WebDriverException
-     * @return $this
-     */
     public function forward()
     {
         $this->dispatch(
@@ -102,10 +94,6 @@ public function forward()
         return $this;
     }
 
-    /**
-     * @throws WebDriverException
-     * @return $this
-     */
     public function refresh()
     {
         try {
@@ -118,11 +106,6 @@ public function refresh()
         }
     }
 
-    /**
-     * @param mixed $url
-     * @throws WebDriverException
-     * @return $this
-     */
     public function to($url)
     {
         $this->dispatch(
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index f6e8200ae..6115a5006 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -115,7 +115,7 @@ public function manage();
      * An abstraction allowing the driver to access the browser's history and to
      * navigate to a given URL.
      *
-     * @return WebDriverNavigation
+     * @return WebDriverNavigationInterface
      * @see WebDriverNavigation
      */
     public function navigate();
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 6de59b035..4836a2700 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -18,16 +18,7 @@
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
 
-/**
- * An abstraction allowing the driver to access the browser's history and to
- * navigate to a given URL.
- *
- * Note that they are all blocking functions until the page is loaded by
- * by default. It could be overridden by 'webdriver.load.strategy' in the
- * FirefoxProfile preferences.
- * https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#firefoxprofile-settings
- */
-class WebDriverNavigation
+class WebDriverNavigation implements WebDriverNavigationInterface
 {
     protected $executor;
 
@@ -36,11 +27,6 @@ public function __construct(ExecuteMethod $executor)
         $this->executor = $executor;
     }
 
-    /**
-     * Move back a single entry in the browser's history, if possible.
-     *
-     * @return WebDriverNavigation The instance.
-     */
     public function back()
     {
         $this->executor->execute(DriverCommand::GO_BACK);
@@ -48,11 +34,6 @@ public function back()
         return $this;
     }
 
-    /**
-     * Move forward a single entry in the browser's history, if possible.
-     *
-     * @return WebDriverNavigation The instance.
-     */
     public function forward()
     {
         $this->executor->execute(DriverCommand::GO_FORWARD);
@@ -60,11 +41,6 @@ public function forward()
         return $this;
     }
 
-    /**
-     * Refresh the current page.
-     *
-     * @return WebDriverNavigation The instance.
-     */
     public function refresh()
     {
         $this->executor->execute(DriverCommand::REFRESH);
@@ -72,13 +48,6 @@ public function refresh()
         return $this;
     }
 
-    /**
-     * Navigate to the given URL.
-     *
-     * @see WebDriver::get()
-     * @param string $url
-     * @return WebDriverNavigation The instance.
-     */
     public function to($url)
     {
         $params = ['url' => (string) $url];
diff --git a/lib/WebDriverNavigationInterface.php b/lib/WebDriverNavigationInterface.php
new file mode 100644
index 000000000..6fcd06e6a
--- /dev/null
+++ b/lib/WebDriverNavigationInterface.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+/**
+ * An abstraction allowing the driver to access the browser's history and to
+ * navigate to a given URL.
+ */
+interface WebDriverNavigationInterface
+{
+    /**
+     * Move back a single entry in the browser's history, if possible.
+     * This is equivalent to pressing the back button in the browser or invoking window.history.back.
+     *
+     * @return self
+     */
+    public function back();
+
+    /**
+     * Move forward a single entry in the browser's history, if possible.
+     * This is equivalent to pressing the forward button in the browser or invoking window.history.back.
+     *
+     * @return self
+     */
+    public function forward();
+
+    /**
+     * Refresh the current page
+     * This is equivalent to pressing the refresh button in the browser.
+     *
+     * @return self
+     */
+    public function refresh();
+
+    /**
+     * Navigate to the given URL
+     *
+     * @param string $url
+     * @return self
+     * @see WebDriver::get()
+     */
+    public function to($url);
+}

From dd1313f9c5948f674c255e1ac6697984162b068b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 21 Dec 2019 14:16:32 +0100
Subject: [PATCH 499/784] Use W3C command to get named cookie

---
 lib/Remote/DriverCommand.php                  |   1 +
 lib/Remote/HttpCommandExecutor.php            |   1 +
 lib/WebDriverOptions.php                      |  15 ++-
 .../WebDriverOptionsCookiesTest.php           | 108 ++++++++++++++++++
 4 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 tests/functional/WebDriverOptionsCookiesTest.php

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 4e1d29629..113e305c9 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -149,6 +149,7 @@ class DriverCommand
     // W3C specific
     const ACTIONS = 'actions';
     const GET_ELEMENT_PROPERTY = 'getElementProperty';
+    const GET_NAMED_COOKIE = 'getNamedCookie';
     const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
 
     private function __construct()
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 344e24f65..7405ea2d2 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -56,6 +56,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/active'],
         DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert_text'],
         DriverCommand::GET_ALL_COOKIES => ['method' => 'GET', 'url' => '/session/:sessionId/cookie'],
+        DriverCommand::GET_NAMED_COOKIE => ['method' => 'GET', 'url' => '/session/:sessionId/cookie/:name'],
         DriverCommand::GET_ALL_SESSIONS => ['method' => 'GET', 'url' => '/sessions'],
         DriverCommand::GET_AVAILABLE_LOG_TYPES => ['method' => 'GET', 'url' => '/session/:sessionId/log/types'],
         DriverCommand::GET_CURRENT_URL => ['method' => 'GET', 'url' => '/session/:sessionId/url'],
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 7e3b42e29..19f6ff514 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -15,6 +15,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\NoSuchCookieException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
 use InvalidArgumentException;
@@ -48,7 +49,7 @@ public function __construct(ExecuteMethod $executor, $isW3cCompliant = false)
      */
     public function addCookie($cookie)
     {
-        if (is_array($cookie)) {
+        if (is_array($cookie)) { // @todo @deprecated remove in 2.0
             $cookie = Cookie::createFromArray($cookie);
         }
         if (!$cookie instanceof Cookie) {
@@ -95,10 +96,20 @@ public function deleteCookieNamed($name)
      * Get the cookie with a given name.
      *
      * @param string $name
-     * @return Cookie|null The cookie, or null if no cookie with the given name is presented.
+     * @throws NoSuchCookieException In W3C compliant mode if no cookie with the given name is present
+     * @return Cookie|null The cookie, or null in JsonWire mode if no cookie with the given name is present
      */
     public function getCookieNamed($name)
     {
+        if ($this->isW3cCompliant) {
+            $cookieArray = $this->executor->execute(
+                DriverCommand::GET_NAMED_COOKIE,
+                [':name' => $name]
+            );
+
+            return Cookie::createFromArray($cookieArray);
+        }
+
         $cookies = $this->getCookies();
         foreach ($cookies as $cookie) {
             if ($cookie['name'] === $name) {
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
new file mode 100644
index 000000000..62b4c7e9d
--- /dev/null
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -0,0 +1,108 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchCookieException;
+
+/**
+ * @covers \Facebook\WebDriver\WebDriverOptions
+ */
+class WebDriverOptionsCookiesTest extends WebDriverTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+    }
+
+    public function testShouldSetGetAndDeleteCookies()
+    {
+        $cookie1 = new Cookie('cookie1', 'cookie1Value');
+        $cookie2 = new Cookie('cookie2', 'cookie2Value');
+        $cookie3 = new Cookie('cookie3', 'cookie3Value');
+
+        // Verify initial state - no cookies are present
+        $this->assertSame([], $this->driver->manage()->getCookies());
+
+        // Add cookie1
+        $this->driver->manage()->addCookie($cookie1);
+
+        // get all cookies
+        $cookiesWithOneCookie = $this->driver->manage()->getCookies();
+        $this->assertCount(1, $cookiesWithOneCookie);
+        $this->assertContainsOnlyInstancesOf(Cookie::class, $cookiesWithOneCookie);
+        $this->assertSame('cookie1', $cookiesWithOneCookie[0]->getName());
+        $this->assertSame('cookie1Value', $cookiesWithOneCookie[0]->getValue());
+        $this->assertSame('/', $cookiesWithOneCookie[0]->getPath());
+        $this->assertSame('localhost', $cookiesWithOneCookie[0]->getDomain());
+
+        // Add cookie2
+        $this->driver->manage()->addCookie($cookie2);
+
+        // get all cookies
+        $cookiesWithTwoCookies = $this->driver->manage()->getCookies();
+
+        $this->assertCount(2, $cookiesWithTwoCookies);
+        $this->assertContainsOnlyInstancesOf(Cookie::class, $cookiesWithTwoCookies);
+
+        // normalize received cookies (their order is arbitrary)
+        $normalizedCookies = [
+            $cookiesWithTwoCookies[0]->getName() => $cookiesWithTwoCookies[0]->getValue(),
+            $cookiesWithTwoCookies[1]->getName() => $cookiesWithTwoCookies[1]->getValue(),
+        ];
+        ksort($normalizedCookies);
+        $this->assertSame(['cookie1' => 'cookie1Value', 'cookie2' => 'cookie2Value'], $normalizedCookies);
+
+        // getCookieNamed()
+        $onlyCookieOne = $this->driver->manage()->getCookieNamed('cookie1');
+        $this->assertInstanceOf(Cookie::class, $onlyCookieOne);
+        $this->assertSame('cookie1', $onlyCookieOne->getName());
+        $this->assertSame('cookie1Value', $onlyCookieOne->getValue());
+
+        // deleteCookieNamed()
+        $this->driver->manage()->deleteCookieNamed('cookie1');
+        $cookiesWithOnlySecondCookie = $this->driver->manage()->getCookies();
+        $this->assertCount(1, $cookiesWithOnlySecondCookie);
+        $this->assertSame('cookie2', $cookiesWithOnlySecondCookie[0]->getName());
+
+        // getting non-existent cookie should throw an exception in W3C mode but return null in JsonWire mode
+        if (self::isW3cProtocolBuild()) {
+            try {
+                $noSuchCookieExceptionThrown = false;
+                $this->driver->manage()->getCookieNamed('cookie1');
+            } catch (NoSuchCookieException $e) {
+                $noSuchCookieExceptionThrown = true;
+            } finally {
+                $this->assertTrue($noSuchCookieExceptionThrown, 'NoSuchCookieException was not thrown');
+            }
+        } else {
+            $this->assertNull($this->driver->manage()->getCookieNamed('cookie1'));
+        }
+
+        // deleting non-existent cookie shod not throw an error
+        $this->driver->manage()->deleteCookieNamed('cookie1');
+
+        // Add cookie3
+        $this->driver->manage()->addCookie($cookie1);
+        $this->assertCount(2, $this->driver->manage()->getCookies());
+
+        // Delete all cookies
+        $this->driver->manage()->deleteAllCookies();
+
+        $this->assertSame([], $this->driver->manage()->getCookies());
+    }
+}

From 40d375a76a96f5953202db7ddd491227791abb91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 22 Dec 2019 14:39:43 +0100
Subject: [PATCH 500/784] Do not fail getCookies in Microsoft Edge if there are
 no cookies

---
 CHANGELOG.md             | 1 +
 lib/WebDriverOptions.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d418af776..2e2681661 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
+- Improper behavior of Microsoft Edge when retrieving all cookies via `getCookies()` (it was causing fatal error  when there were no cookies).
 
 ## 1.7.1 - 2019-06-13
 ### Fixed
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 19f6ff514..bbbacfbeb 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -107,6 +107,10 @@ public function getCookieNamed($name)
                 [':name' => $name]
             );
 
+            if (!is_array($cookieArray)) { // Microsoft Edge returns null even in W3C mode => emulate proper behavior
+                throw new NoSuchCookieException('no such cookie');
+            }
+
             return Cookie::createFromArray($cookieArray);
         }
 
@@ -128,8 +132,11 @@ public function getCookieNamed($name)
     public function getCookies()
     {
         $cookieArrays = $this->executor->execute(DriverCommand::GET_ALL_COOKIES);
-        $cookies = [];
+        if (!is_array($cookieArrays)) { // Microsoft Edge returns null if there are no cookies...
+            return [];
+        }
 
+        $cookies = [];
         foreach ($cookieArrays as $cookieArray) {
             $cookies[] = Cookie::createFromArray($cookieArray);
         }

From 4d5af5530fd6d414a7e52081b1dff5d45fbdcdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 23 Dec 2019 11:54:00 +0100
Subject: [PATCH 501/784] Update changelog typos

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d418af776..eccdc4977 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Allow installation of Symfony 5 components.
 - Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility
 - If subdirectories in a path to screenshot destination does not exists (using `takeScreenshot()` or `takeElementScreenshot()` methods), they are automatically created.
-- When zip archive cannot be crated during file upload, throw exception instead of silently returning false.
+- When zip archive cannot be created during file upload, throw an exception instead of silently returning false.
 - `WebDriverNavigation` and `EventFiringWebDriverNavigation` now both implement new `WebDriverNavigationInterface`.
 
 ### Fixed

From 26e96effef0bbb560836ccd4f48cb6b270b410ac Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 11 Dec 2019 21:16:46 +0800
Subject: [PATCH 502/784] Add switch to parent frame command

Part of #683
---
 lib/Remote/HttpCommandExecutor.php           |  1 +
 lib/Remote/RemoteTargetLocator.php           | 12 ++++++++++++
 lib/WebDriverTargetLocator.php               |  8 ++++++++
 tests/functional/RemoteTargetLocatorTest.php | 16 ++++++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 7405ea2d2..6334dedce 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -51,6 +51,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::FIND_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element'],
         DriverCommand::FIND_ELEMENTS => ['method' => 'POST', 'url' => '/session/:sessionId/elements'],
         DriverCommand::SWITCH_TO_FRAME => ['method' => 'POST', 'url' => '/session/:sessionId/frame'],
+        DriverCommand::SWITCH_TO_PARENT_FRAME => ['method' => 'POST', 'url' => '/session/:sessionId/frame/parent'],
         DriverCommand::SWITCH_TO_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window'],
         DriverCommand::GET => ['method' => 'POST', 'url' => '/session/:sessionId/url'],
         DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'POST', 'url' => '/session/:sessionId/element/active'],
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index da9bdf0b6..b3124153a 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -97,6 +97,18 @@ public function frame($frame)
         return $this->driver;
     }
 
+    /**
+     * Switch to the parent iframe.
+     *
+     * @return WebDriver The driver focused on the given frame.
+     */
+    public function parent()
+    {
+        $this->executor->execute(DriverCommand::SWITCH_TO_PARENT_FRAME, []);
+
+        return $this->driver;
+    }
+
     /**
      * Switch the focus to another window by its handle.
      *
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index e6e5dabc5..c0b8877b5 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -37,6 +37,14 @@ public function defaultContent();
      */
     public function frame($frame);
 
+    ///**
+    // * Switch to the parent iframe.
+    // *
+    // * @todo Add in next major release (BC)
+    // * @return WebDriver The driver focused on the given frame.
+    // */
+    //public function parent();
+
     /**
      * Switch the focus to another window by its handle.
      *
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 0cf8b9e2b..4e6fb5803 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -92,6 +92,22 @@ public function testShouldSwitchToFrameByItsId()
         $this->assertContains($parentPage, $this->driver->getPageSource());
     }
 
+    public function testShouldSwitchToParentFrame()
+    {
+        $parentPage = 'This is the host page which contains an iFrame';
+        $firstChildFrame = 'This is the content of the iFrame';
+
+        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(0);
+        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->parent();
+        $this->assertContains($parentPage, $this->driver->getPageSource());
+    }
+
     public function testShouldSwitchToFrameByElement()
     {
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));

From 7d7648c4fe4b23ada90529da39998033c02ff903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Dec 2019 00:56:29 +0100
Subject: [PATCH 503/784] Rerun failed tests

Chromedriver on Travis got crazy lately for no obvious reason. This should help us keeping stability of the builds.
---
 tests/functional/WebDriverTestCase.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 136e06c55..bc3b96603 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -17,6 +17,7 @@
 
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Exception\NoSuchWindowException;
+use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
@@ -133,6 +134,30 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
         }
     }
 
+    /**
+     * Rerun failed tests.
+     * @TODO Replace with PHPUnit 7.3+ builtin functionality once upgraded to PHP 7.1+
+     */
+    public function runBare()
+    {
+        $e = null;
+        $numberOfRetires = 3;
+
+        for ($i = 0; $i < $numberOfRetires; ++$i) {
+            try {
+                parent::runBare();
+
+                return;
+            } catch (WebDriverException $e) {
+                // repeat
+            }
+        }
+
+        if ($e !== null) {
+            throw $e;
+        }
+    }
+
     /**
      * Get the URL of given test HTML on running webserver.
      *

From 3be6a60d34fed680d37975f95dd2a5401b8c073e Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Thu, 26 Dec 2019 00:10:54 +0200
Subject: [PATCH 504/784] Fix "path is not canonical" error when uploading file
 in chrome

---
 CHANGELOG.md                     | 1 +
 lib/Remote/LocalFileDetector.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0ae2c8f6..15d1d2524 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - `WebDriverExpectedCondition::presenceOfElementLocated()` works correctly when used within `WebDriverExpectedCondition::not()`.
 - Improper behavior of Microsoft Edge when retrieving all cookies via `getCookies()` (it was causing fatal error  when there were no cookies).
+- Avoid "path is not canonical" error when uploading file to Chromedriver.
 
 ## 1.7.1 - 2019-06-13
 ### Fixed
diff --git a/lib/Remote/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
index 07f996cf0..c133d2497 100644
--- a/lib/Remote/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -25,7 +25,7 @@ class LocalFileDetector implements FileDetector
     public function getLocalFile($file)
     {
         if (is_file($file)) {
-            return $file;
+            return realpath($file);
         }
 
         return null;

From a0ae3f555eeefc0987995fb2a8fe4a9ef4bd1190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Dec 2019 23:21:37 +0100
Subject: [PATCH 505/784] Typehint against FileDetector interface, not
 implementation

---
 lib/Remote/RemoteWebElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 4e6556a30..6b2befb2a 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -40,7 +40,7 @@ class RemoteWebElement implements WebDriverElement, WebDriverLocatable
      */
     protected $id;
     /**
-     * @var UselessFileDetector
+     * @var FileDetector
      */
     protected $fileDetector;
     /**

From ed8c868fd02bfb4f7081706a613c3bdc546c9727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 6 Jan 2020 15:53:05 +0100
Subject: [PATCH 506/784] Exclude skipped test on saucelabs

---
 tests/functional/RemoteWebElementTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index a3927966e..bd6e4f6f0 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -270,6 +270,7 @@ public function testShouldSubmitFormByClickOnSubmitInput()
 
     /**
      * @covers ::equals
+     * @group exclude-saucelabs
      */
     public function testShouldCompareEqualsElement()
     {

From 329de08025cc29dc273aeca0e641699f3ad06c36 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 11 Dec 2019 21:24:49 +0800
Subject: [PATCH 507/784] Add minimize window command

Part of #683
---
 lib/Remote/DriverCommand.php             |  1 +
 lib/Remote/HttpCommandExecutor.php       |  1 +
 lib/WebDriverOptions.php                 |  2 +-
 lib/WebDriverWindow.php                  | 24 +++++++++++++++++++++++-
 tests/functional/WebDriverWindowTest.php | 13 +++++++++++++
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 113e305c9..88091023e 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -151,6 +151,7 @@ class DriverCommand
     const GET_ELEMENT_PROPERTY = 'getElementProperty';
     const GET_NAMED_COOKIE = 'getNamedCookie';
     const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
+    const MINIMIZE_WINDOW = 'minimizeWindow';
 
     private function __construct()
     {
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 6334dedce..fb3d7b23d 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -167,6 +167,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::GET_WINDOW_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
         DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::MAXIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/maximize'],
+        DriverCommand::MINIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/minimize'],
         DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index bbbacfbeb..51f89a4e7 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -162,7 +162,7 @@ public function timeouts()
      */
     public function window()
     {
-        return new WebDriverWindow($this->executor);
+        return new WebDriverWindow($this->executor, $this->isW3cCompliant);
     }
 
     /**
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 6b9090a99..c613732fa 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -16,6 +16,7 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
 
@@ -28,10 +29,15 @@ class WebDriverWindow
      * @var ExecuteMethod
      */
     protected $executor;
+    /**
+     * @var bool
+     */
+    protected $isW3cCompliant;
 
-    public function __construct(ExecuteMethod $executor)
+    public function __construct(ExecuteMethod $executor, $isW3cCompliant = false)
     {
         $this->executor = $executor;
+        $this->isW3cCompliant = $isW3cCompliant;
     }
 
     /**
@@ -72,6 +78,22 @@ public function getSize()
         );
     }
 
+    /**
+     * Minimizes the current window if it is not already minimized.
+     *
+     * @return WebDriverWindow The instance.
+     */
+    public function minimize()
+    {
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('Minimize window is only supported in W3C mode');
+        }
+
+        $this->executor->execute(DriverCommand::MINIMIZE_WINDOW, []);
+
+        return $this;
+    }
+
     /**
      * Maximizes the current window if it is not already maximized
      *
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 8de61d3e8..5d0d695c6 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -48,6 +48,19 @@ public function testShouldMaximizeWindow()
         $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
     }
 
+    public function testShouldMinimizeWindow()
+    {
+        self::skipForJsonWireProtocol('"minimize" window is not supported in JsonWire protocol');
+
+        $this->assertSame('visible', $this->driver->executeScript('return document.visibilityState;'));
+
+        $this->driver->manage()
+            ->window()
+            ->minimize();
+
+        $this->assertSame('hidden', $this->driver->executeScript('return document.visibilityState;'));
+    }
+
     /**
      * @group exclude-saucelabs
      */

From f777ca1139d3e089e5b4583de8a531a6b1a336c9 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Sun, 22 Dec 2019 21:18:00 +0800
Subject: [PATCH 508/784] Exlude minimizeWindow test from chrome

An issue with headless Chrome prevents us from testing this with Chrome
at the moment.

See https://bugs.chromium.org/p/chromedriver/issues/detail?id=3275 for
further information.
---
 .travis.yml                              | 1 +
 tests/functional/WebDriverWindowTest.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3494ab206..aa9bce590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,6 +172,7 @@ script:
   - if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
   - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
   - if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
+  - if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
   - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
   - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 5d0d695c6..fb11abe2a 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -48,6 +48,11 @@ public function testShouldMaximizeWindow()
         $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
     }
 
+    /**
+     * @group exclude-saucelabs
+     * @group exclude-chrome
+     * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1038050
+     */
     public function testShouldMinimizeWindow()
     {
         self::skipForJsonWireProtocol('"minimize" window is not supported in JsonWire protocol');

From 1a4f7a1fc682e5d338e55580480862daa83acec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 9 Jan 2020 14:58:19 +0100
Subject: [PATCH 509/784] Remove 'any' when present in W3C platformName
 capabilitites

---
 lib/Remote/DesiredCapabilities.php            | 5 +++++
 lib/WebDriverPlatform.php                     | 1 +
 tests/unit/Remote/DesiredCapabilitiesTest.php | 8 +++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 1e49eb9f5..ac634de86 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -229,6 +229,11 @@ public function toW3cCompatibleArray()
             if (array_key_exists($capabilityKey, static::$ossToW3c)) {
                 if ($capabilityKey === WebDriverCapabilityType::PLATFORM) {
                     $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
+
+                    // Remove platformName if it is set to "any"
+                    if ($w3cCapabilities[static::$ossToW3c[$capabilityKey]] === 'any') {
+                        unset($w3cCapabilities[static::$ossToW3c[$capabilityKey]]);
+                    }
                 } else {
                     $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = $capabilityValue;
                 }
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 5609eb0b8..4cf4c2b1a 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -23,6 +23,7 @@
 class WebDriverPlatform
 {
     const ANDROID = 'ANDROID';
+    /** @deprecated */
     const ANY = 'ANY';
     const LINUX = 'LINUX';
     const MAC = 'MAC';
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 04075b458..7949ec447 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -187,7 +187,7 @@ public function provideW3cCapabilities()
                 ]),
                 [],
             ],
-            'already W3C capabilitites' => [
+            'already W3C capabilities' => [
                 new DesiredCapabilities([
                     'pageLoadStrategy' => 'eager',
                     'strictFileInteractability' => false,
@@ -197,6 +197,12 @@ public function provideW3cCapabilities()
                     'strictFileInteractability' => false,
                 ],
             ],
+            '"ANY" platform should be completely removed' => [
+                new DesiredCapabilities([
+                    WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
+                ]),
+                [],
+            ],
             'custom vendor extension' => [
                 new DesiredCapabilities([
                     'vendor:prefix' => 'vendor extension should be kept',

From e32ccb149d99d28e79f742267c5378b398e4d542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 14 Jan 2020 19:02:38 +0100
Subject: [PATCH 510/784] Change license to MIT

---
 LICENSE.md                                    | 223 ++----------------
 composer.json                                 |   2 +-
 example.php                                   |  13 -
 lib/AbstractWebDriverCheckboxOrRadio.php      |  13 -
 lib/Chrome/ChromeDriver.php                   |  13 -
 lib/Chrome/ChromeDriverService.php            |  13 -
 lib/Chrome/ChromeOptions.php                  |  13 -
 lib/Cookie.php                                |  13 -
 .../ElementClickInterceptedException.php      |  13 -
 .../ElementNotInteractableException.php       |  13 -
 .../ElementNotSelectableException.php         |  13 -
 lib/Exception/ElementNotVisibleException.php  |  13 -
 lib/Exception/ExpectedException.php           |  13 -
 .../IMEEngineActivationFailedException.php    |  13 -
 lib/Exception/IMENotAvailableException.php    |  13 -
 lib/Exception/IndexOutOfBoundsException.php   |  13 -
 .../InsecureCertificateException.php          |  13 -
 lib/Exception/InvalidArgumentException.php    |  13 -
 .../InvalidCookieDomainException.php          |  13 -
 lib/Exception/InvalidCoordinatesException.php |  13 -
 .../InvalidElementStateException.php          |  13 -
 lib/Exception/InvalidSelectorException.php    |  13 -
 lib/Exception/InvalidSessionIdException.php   |  13 -
 lib/Exception/JavascriptErrorException.php    |  13 -
 .../MoveTargetOutOfBoundsException.php        |  13 -
 lib/Exception/NoAlertOpenException.php        |  13 -
 lib/Exception/NoCollectionException.php       |  13 -
 lib/Exception/NoScriptResultException.php     |  13 -
 lib/Exception/NoStringException.php           |  13 -
 lib/Exception/NoStringLengthException.php     |  13 -
 lib/Exception/NoStringWrapperException.php    |  13 -
 lib/Exception/NoSuchAlertException.php        |  13 -
 lib/Exception/NoSuchCollectionException.php   |  13 -
 lib/Exception/NoSuchCookieException.php       |  13 -
 lib/Exception/NoSuchDocumentException.php     |  13 -
 lib/Exception/NoSuchDriverException.php       |  13 -
 lib/Exception/NoSuchElementException.php      |  13 -
 lib/Exception/NoSuchFrameException.php        |  13 -
 lib/Exception/NoSuchWindowException.php       |  13 -
 lib/Exception/NullPointerException.php        |  13 -
 lib/Exception/ScriptTimeoutException.php      |  13 -
 lib/Exception/SessionNotCreatedException.php  |  13 -
 .../StaleElementReferenceException.php        |  13 -
 lib/Exception/TimeoutException.php            |  13 -
 .../UnableToCaptureScreenException.php        |  13 -
 lib/Exception/UnableToSetCookieException.php  |  13 -
 .../UnexpectedAlertOpenException.php          |  13 -
 .../UnexpectedJavascriptException.php         |  13 -
 lib/Exception/UnexpectedTagNameException.php  |  13 -
 lib/Exception/UnknownCommandException.php     |  13 -
 lib/Exception/UnknownErrorException.php       |  13 -
 lib/Exception/UnknownMethodException.php      |  13 -
 lib/Exception/UnknownServerException.php      |  13 -
 .../UnrecognizedExceptionException.php        |  13 -
 .../UnsupportedOperationException.php         |  13 -
 lib/Exception/WebDriverCurlException.php      |  13 -
 lib/Exception/WebDriverException.php          |  13 -
 lib/Exception/XPathLookupException.php        |  13 -
 lib/Firefox/FirefoxDriver.php                 |  13 -
 lib/Firefox/FirefoxPreferences.php            |  13 -
 lib/Firefox/FirefoxProfile.php                |  13 -
 .../Internal/WebDriverButtonReleaseAction.php |  13 -
 .../Internal/WebDriverClickAction.php         |  13 -
 .../Internal/WebDriverClickAndHoldAction.php  |  13 -
 .../Internal/WebDriverContextClickAction.php  |  13 -
 .../Internal/WebDriverCoordinates.php         |  13 -
 .../Internal/WebDriverDoubleClickAction.php   |  13 -
 .../Internal/WebDriverKeyDownAction.php       |  13 -
 .../Internal/WebDriverKeyUpAction.php         |  13 -
 .../Internal/WebDriverKeysRelatedAction.php   |  13 -
 .../Internal/WebDriverMouseAction.php         |  13 -
 .../Internal/WebDriverMouseMoveAction.php     |  13 -
 .../Internal/WebDriverMoveToOffsetAction.php  |  13 -
 .../Internal/WebDriverSendKeysAction.php      |  13 -
 .../Internal/WebDriverSingleKeyAction.php     |  13 -
 .../Touch/WebDriverDoubleTapAction.php        |  13 -
 .../Touch/WebDriverDownAction.php             |  13 -
 .../Touch/WebDriverFlickAction.php            |  13 -
 .../Touch/WebDriverFlickFromElementAction.php |  13 -
 .../Touch/WebDriverLongPressAction.php        |  13 -
 .../Touch/WebDriverMoveAction.php             |  13 -
 .../Touch/WebDriverScrollAction.php           |  13 -
 .../WebDriverScrollFromElementAction.php      |  13 -
 lib/Interactions/Touch/WebDriverTapAction.php |  13 -
 .../Touch/WebDriverTouchAction.php            |  13 -
 .../Touch/WebDriverTouchScreen.php            |  13 -
 lib/Interactions/WebDriverActions.php         |  13 -
 lib/Interactions/WebDriverCompositeAction.php |  13 -
 lib/Interactions/WebDriverTouchActions.php    |  13 -
 lib/Internal/WebDriverLocatable.php           |  13 -
 lib/JavaScriptExecutor.php                    |  13 -
 lib/Net/URLChecker.php                        |  13 -
 lib/Remote/DesiredCapabilities.php            |  13 -
 lib/Remote/DriverCommand.php                  |  13 -
 lib/Remote/ExecuteMethod.php                  |  13 -
 lib/Remote/FileDetector.php                   |  13 -
 lib/Remote/HttpCommandExecutor.php            |  13 -
 lib/Remote/JsonWireCompat.php                 |  13 -
 lib/Remote/LocalFileDetector.php              |  13 -
 lib/Remote/RemoteExecuteMethod.php            |  13 -
 lib/Remote/RemoteKeyboard.php                 |  13 -
 lib/Remote/RemoteMouse.php                    |  13 -
 lib/Remote/RemoteStatus.php                   |  13 -
 lib/Remote/RemoteTargetLocator.php            |  13 -
 lib/Remote/RemoteTouchScreen.php              |  13 -
 lib/Remote/RemoteWebDriver.php                |  13 -
 lib/Remote/RemoteWebElement.php               |  13 -
 lib/Remote/Service/DriverCommandExecutor.php  |  13 -
 lib/Remote/Service/DriverService.php          |  13 -
 lib/Remote/UselessFileDetector.php            |  13 -
 lib/Remote/WebDriverBrowserType.php           |  13 -
 lib/Remote/WebDriverCapabilityType.php        |  13 -
 lib/Remote/WebDriverCommand.php               |  13 -
 lib/Remote/WebDriverResponse.php              |  13 -
 lib/Support/Events/EventFiringWebDriver.php   |  13 -
 .../Events/EventFiringWebDriverNavigation.php |  13 -
 lib/Support/Events/EventFiringWebElement.php  |  13 -
 lib/Support/XPathEscaper.php                  |  13 -
 lib/WebDriver.php                             |  13 -
 lib/WebDriverAction.php                       |  13 -
 lib/WebDriverAlert.php                        |  13 -
 lib/WebDriverBy.php                           |  13 -
 lib/WebDriverCapabilities.php                 |  13 -
 lib/WebDriverCheckboxes.php                   |  13 -
 lib/WebDriverCommandExecutor.php              |  13 -
 lib/WebDriverDimension.php                    |  13 -
 lib/WebDriverDispatcher.php                   |  13 -
 lib/WebDriverElement.php                      |  13 -
 lib/WebDriverEventListener.php                |  13 -
 lib/WebDriverExpectedCondition.php            |  13 -
 lib/WebDriverHasInputDevices.php              |  13 -
 lib/WebDriverKeyboard.php                     |  13 -
 lib/WebDriverKeys.php                         |  13 -
 lib/WebDriverMouse.php                        |  13 -
 lib/WebDriverNavigation.php                   |  13 -
 lib/WebDriverOptions.php                      |  13 -
 lib/WebDriverPlatform.php                     |  13 -
 lib/WebDriverPoint.php                        |  13 -
 lib/WebDriverRadios.php                       |  13 -
 lib/WebDriverSearchContext.php                |  13 -
 lib/WebDriverSelect.php                       |  13 -
 lib/WebDriverSelectInterface.php              |  13 -
 lib/WebDriverTargetLocator.php                |  13 -
 lib/WebDriverTimeouts.php                     |  13 -
 lib/WebDriverUpAction.php                     |  13 -
 lib/WebDriverWait.php                         |  13 -
 lib/WebDriverWindow.php                       |  13 -
 tests/bootstrap.php                           |  13 -
 .../Chrome/ChromeDriverServiceTest.php        |  13 -
 tests/functional/Chrome/ChromeDriverTest.php  |  13 -
 tests/functional/FileUploadTest.php           |  13 -
 tests/functional/RemoteKeyboardTest.php       |  13 -
 tests/functional/RemoteTargetLocatorTest.php  |  13 -
 .../functional/RemoteWebDriverCreateTest.php  |  13 -
 .../RemoteWebDriverFindElementTest.php        |  13 -
 tests/functional/RemoteWebDriverTest.php      |  13 -
 tests/functional/RemoteWebElementTest.php     |  13 -
 .../ReportSauceLabsStatusListener.php         |  13 -
 tests/functional/WebDriverActionsTest.php     |  13 -
 tests/functional/WebDriverAlertTest.php       |  13 -
 tests/functional/WebDriverByTest.php          |  13 -
 tests/functional/WebDriverCheckboxesTest.php  |  13 -
 tests/functional/WebDriverNavigationTest.php  |  13 -
 .../WebDriverOptionsCookiesTest.php           |  13 -
 tests/functional/WebDriverRadiosTest.php      |  13 -
 tests/functional/WebDriverSelectTest.php      |  13 -
 tests/functional/WebDriverTestCase.php        |  13 -
 tests/functional/WebDriverTimeoutsTest.php    |  13 -
 tests/functional/web/slow_pixel.png.php       |  13 -
 tests/functional/web/submit.php               |  13 -
 tests/functional/web/upload.php               |  13 -
 tests/unit/CookieTest.php                     |  13 -
 .../unit/Exception/WebDriverExceptionTest.php |  13 -
 .../WebDriverButtonReleaseActionTest.php      |  13 -
 .../Internal/WebDriverClickActionTest.php     |  13 -
 .../WebDriverClickAndHoldActionTest.php       |  13 -
 .../WebDriverContextClickActionTest.php       |  13 -
 .../Internal/WebDriverCoordinatesTest.php     |  13 -
 .../WebDriverDoubleClickActionTest.php        |  13 -
 .../Internal/WebDriverKeyDownActionTest.php   |  13 -
 .../Internal/WebDriverKeyUpActionTest.php     |  13 -
 .../Internal/WebDriverMouseMoveActionTest.php |  13 -
 .../WebDriverMouseToOffsetActionTest.php      |  13 -
 .../Internal/WebDriverSendKeysActionTest.php  |  13 -
 tests/unit/Remote/DesiredCapabilitiesTest.php |  13 -
 tests/unit/Remote/HttpCommandExecutorTest.php |  13 -
 tests/unit/Remote/RemoteWebDriverTest.php     |  13 -
 tests/unit/Remote/RemoteWebElementTest.php    |  13 -
 tests/unit/Remote/WebDriverCommandTest.php    |  13 -
 tests/unit/Support/XPathEscaperTest.php       |  13 -
 tests/unit/WebDriverExpectedConditionTest.php |  13 -
 tests/unit/WebDriverKeysTest.php              |  13 -
 tests/unit/WebDriverOptionsTest.php           |  13 -
 193 files changed, 23 insertions(+), 2685 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 0b3f67bd7..611fa7390 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,201 +1,22 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2004-present Facebook
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   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.
+MIT License
+
+Copyright (c) 2004-2020 Facebook
+Copyright (c) 2020-present [open-source contributors](https://github.com/php-webdriver/php-webdriver/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/composer.json b/composer.json
index d422149ee..d31c8d2a6 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
   "keywords": ["webdriver", "selenium", "php", "facebook"],
   "homepage": "https://github.com/facebook/php-webdriver",
   "type": "library",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "support": {
     "issues": "https://github.com/facebook/php-webdriver/issues",
     "forum": "https://www.facebook.com/groups/phpwebdriver/",
diff --git a/example.php b/example.php
index 4dbb93900..ab7464a3a 100644
--- a/example.php
+++ b/example.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
 
 // An example of using php-webdriver.
 // Do not forget to run composer install before and also have Selenium server started and listening on port 4444.
diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index 9c5c61cc2..9cd04c967 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 107854b4a..1c9828c8e 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Chrome;
 
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index bade9e8b0..0a48c626a 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Chrome;
 
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index a9076bb83..af99d3cfe 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Chrome;
 
diff --git a/lib/Cookie.php b/lib/Cookie.php
index 170b46486..0e1436089 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/Exception/ElementClickInterceptedException.php b/lib/Exception/ElementClickInterceptedException.php
index e4b3a529e..349e963ff 100644
--- a/lib/Exception/ElementClickInterceptedException.php
+++ b/lib/Exception/ElementClickInterceptedException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/ElementNotInteractableException.php b/lib/Exception/ElementNotInteractableException.php
index 640a6a2a2..48169cb77 100644
--- a/lib/Exception/ElementNotInteractableException.php
+++ b/lib/Exception/ElementNotInteractableException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/ElementNotSelectableException.php b/lib/Exception/ElementNotSelectableException.php
index 35e4de13b..643f72ea0 100644
--- a/lib/Exception/ElementNotSelectableException.php
+++ b/lib/Exception/ElementNotSelectableException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
index 1af6f5892..6d41d0c02 100644
--- a/lib/Exception/ElementNotVisibleException.php
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
index 17fa2f2e9..60afca373 100644
--- a/lib/Exception/ExpectedException.php
+++ b/lib/Exception/ExpectedException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
index 89e91b9a0..99236737d 100644
--- a/lib/Exception/IMEEngineActivationFailedException.php
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
index 46720f9a4..bc2bad261 100644
--- a/lib/Exception/IMENotAvailableException.php
+++ b/lib/Exception/IMENotAvailableException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
index 5f7a7bf65..897714cf4 100644
--- a/lib/Exception/IndexOutOfBoundsException.php
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InsecureCertificateException.php b/lib/Exception/InsecureCertificateException.php
index 393e75156..434fb0917 100644
--- a/lib/Exception/InsecureCertificateException.php
+++ b/lib/Exception/InsecureCertificateException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidArgumentException.php b/lib/Exception/InvalidArgumentException.php
index 498adfd5f..9ae459011 100644
--- a/lib/Exception/InvalidArgumentException.php
+++ b/lib/Exception/InvalidArgumentException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidCookieDomainException.php b/lib/Exception/InvalidCookieDomainException.php
index 5186539cd..5fca85562 100644
--- a/lib/Exception/InvalidCookieDomainException.php
+++ b/lib/Exception/InvalidCookieDomainException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
index 058491702..94852a03b 100644
--- a/lib/Exception/InvalidCoordinatesException.php
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidElementStateException.php b/lib/Exception/InvalidElementStateException.php
index 07552f136..02b6af17c 100644
--- a/lib/Exception/InvalidElementStateException.php
+++ b/lib/Exception/InvalidElementStateException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidSelectorException.php b/lib/Exception/InvalidSelectorException.php
index 24ee46db5..077a8d7c7 100644
--- a/lib/Exception/InvalidSelectorException.php
+++ b/lib/Exception/InvalidSelectorException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/InvalidSessionIdException.php b/lib/Exception/InvalidSessionIdException.php
index 406d29dee..d97fa3118 100644
--- a/lib/Exception/InvalidSessionIdException.php
+++ b/lib/Exception/InvalidSessionIdException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/JavascriptErrorException.php b/lib/Exception/JavascriptErrorException.php
index 930d5c6dc..e8537e1ba 100644
--- a/lib/Exception/JavascriptErrorException.php
+++ b/lib/Exception/JavascriptErrorException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/MoveTargetOutOfBoundsException.php b/lib/Exception/MoveTargetOutOfBoundsException.php
index 103058cff..03631a63a 100644
--- a/lib/Exception/MoveTargetOutOfBoundsException.php
+++ b/lib/Exception/MoveTargetOutOfBoundsException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoAlertOpenException.php b/lib/Exception/NoAlertOpenException.php
index 59e4fedc4..8c076e971 100644
--- a/lib/Exception/NoAlertOpenException.php
+++ b/lib/Exception/NoAlertOpenException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
index e438551c1..9d435db68 100644
--- a/lib/Exception/NoCollectionException.php
+++ b/lib/Exception/NoCollectionException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
index d16442dbb..32aa617ea 100644
--- a/lib/Exception/NoScriptResultException.php
+++ b/lib/Exception/NoScriptResultException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
index 88de4619c..951bd2602 100644
--- a/lib/Exception/NoStringException.php
+++ b/lib/Exception/NoStringException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
index 3d72b9d30..fd7b6ca93 100644
--- a/lib/Exception/NoStringLengthException.php
+++ b/lib/Exception/NoStringLengthException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
index 08d97a1e5..2df7a44e9 100644
--- a/lib/Exception/NoStringWrapperException.php
+++ b/lib/Exception/NoStringWrapperException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchAlertException.php b/lib/Exception/NoSuchAlertException.php
index 2d504bb96..12553c7d9 100644
--- a/lib/Exception/NoSuchAlertException.php
+++ b/lib/Exception/NoSuchAlertException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
index ce357979d..f09bab32c 100644
--- a/lib/Exception/NoSuchCollectionException.php
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchCookieException.php b/lib/Exception/NoSuchCookieException.php
index 78b4434e2..72e68ae82 100644
--- a/lib/Exception/NoSuchCookieException.php
+++ b/lib/Exception/NoSuchCookieException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchDocumentException.php b/lib/Exception/NoSuchDocumentException.php
index 509ec8585..142c3fe66 100644
--- a/lib/Exception/NoSuchDocumentException.php
+++ b/lib/Exception/NoSuchDocumentException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
index 66518987f..f34fc988a 100644
--- a/lib/Exception/NoSuchDriverException.php
+++ b/lib/Exception/NoSuchDriverException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchElementException.php b/lib/Exception/NoSuchElementException.php
index 8e0f1d0cc..7896d81c7 100644
--- a/lib/Exception/NoSuchElementException.php
+++ b/lib/Exception/NoSuchElementException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchFrameException.php b/lib/Exception/NoSuchFrameException.php
index e7bd0b080..10e6aa64e 100644
--- a/lib/Exception/NoSuchFrameException.php
+++ b/lib/Exception/NoSuchFrameException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NoSuchWindowException.php b/lib/Exception/NoSuchWindowException.php
index 6fdf9cb01..18964443e 100644
--- a/lib/Exception/NoSuchWindowException.php
+++ b/lib/Exception/NoSuchWindowException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
index 512d9c5ff..999d0ac99 100644
--- a/lib/Exception/NullPointerException.php
+++ b/lib/Exception/NullPointerException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/ScriptTimeoutException.php b/lib/Exception/ScriptTimeoutException.php
index 77057e53a..b5a2d3231 100644
--- a/lib/Exception/ScriptTimeoutException.php
+++ b/lib/Exception/ScriptTimeoutException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/SessionNotCreatedException.php b/lib/Exception/SessionNotCreatedException.php
index 0b727c45d..d9183f81b 100644
--- a/lib/Exception/SessionNotCreatedException.php
+++ b/lib/Exception/SessionNotCreatedException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/StaleElementReferenceException.php b/lib/Exception/StaleElementReferenceException.php
index fda75af37..450ce2e0c 100644
--- a/lib/Exception/StaleElementReferenceException.php
+++ b/lib/Exception/StaleElementReferenceException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/TimeoutException.php b/lib/Exception/TimeoutException.php
index 0b965d1d2..fd97ba0bd 100644
--- a/lib/Exception/TimeoutException.php
+++ b/lib/Exception/TimeoutException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnableToCaptureScreenException.php b/lib/Exception/UnableToCaptureScreenException.php
index b21b8bed3..70d19836b 100644
--- a/lib/Exception/UnableToCaptureScreenException.php
+++ b/lib/Exception/UnableToCaptureScreenException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnableToSetCookieException.php b/lib/Exception/UnableToSetCookieException.php
index 5ea07f39e..4ba03f04a 100644
--- a/lib/Exception/UnableToSetCookieException.php
+++ b/lib/Exception/UnableToSetCookieException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnexpectedAlertOpenException.php b/lib/Exception/UnexpectedAlertOpenException.php
index ce2cf9da9..d3e80d33b 100644
--- a/lib/Exception/UnexpectedAlertOpenException.php
+++ b/lib/Exception/UnexpectedAlertOpenException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnexpectedJavascriptException.php b/lib/Exception/UnexpectedJavascriptException.php
index 706dade08..9267997d7 100644
--- a/lib/Exception/UnexpectedJavascriptException.php
+++ b/lib/Exception/UnexpectedJavascriptException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnexpectedTagNameException.php b/lib/Exception/UnexpectedTagNameException.php
index 0703c7d4e..53712057e 100644
--- a/lib/Exception/UnexpectedTagNameException.php
+++ b/lib/Exception/UnexpectedTagNameException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnknownCommandException.php b/lib/Exception/UnknownCommandException.php
index 5a928697b..58ad74f0b 100644
--- a/lib/Exception/UnknownCommandException.php
+++ b/lib/Exception/UnknownCommandException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnknownErrorException.php b/lib/Exception/UnknownErrorException.php
index a186e13b1..cdd96b3f9 100644
--- a/lib/Exception/UnknownErrorException.php
+++ b/lib/Exception/UnknownErrorException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnknownMethodException.php b/lib/Exception/UnknownMethodException.php
index bd50a83f2..0f7bae527 100644
--- a/lib/Exception/UnknownMethodException.php
+++ b/lib/Exception/UnknownMethodException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnknownServerException.php b/lib/Exception/UnknownServerException.php
index b8bba5d9f..d4945808a 100644
--- a/lib/Exception/UnknownServerException.php
+++ b/lib/Exception/UnknownServerException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnrecognizedExceptionException.php b/lib/Exception/UnrecognizedExceptionException.php
index fa1038605..9e59a3383 100644
--- a/lib/Exception/UnrecognizedExceptionException.php
+++ b/lib/Exception/UnrecognizedExceptionException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/UnsupportedOperationException.php b/lib/Exception/UnsupportedOperationException.php
index ce4517151..5465e17b3 100644
--- a/lib/Exception/UnsupportedOperationException.php
+++ b/lib/Exception/UnsupportedOperationException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/WebDriverCurlException.php b/lib/Exception/WebDriverCurlException.php
index f559826c0..c5f95476d 100644
--- a/lib/Exception/WebDriverCurlException.php
+++ b/lib/Exception/WebDriverCurlException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index 0f708a587..11a8fff45 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
index dada9df25..1c669ae82 100644
--- a/lib/Exception/XPathLookupException.php
+++ b/lib/Exception/XPathLookupException.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index f2883e642..a713834b2 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Firefox;
 
diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
index be1199c24..96248aa98 100644
--- a/lib/Firefox/FirefoxPreferences.php
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Firefox;
 
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index b9d36b30e..04e31dbc0 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Firefox;
 
diff --git a/lib/Interactions/Internal/WebDriverButtonReleaseAction.php b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
index 5df3cb6db..91cad24af 100644
--- a/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
+++ b/lib/Interactions/Internal/WebDriverButtonReleaseAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverClickAction.php b/lib/Interactions/Internal/WebDriverClickAction.php
index cf5bb9e68..e21b88336 100644
--- a/lib/Interactions/Internal/WebDriverClickAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverClickAndHoldAction.php b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
index 8f1907d84..5f5042c0b 100644
--- a/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
+++ b/lib/Interactions/Internal/WebDriverClickAndHoldAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverContextClickAction.php b/lib/Interactions/Internal/WebDriverContextClickAction.php
index 175c60e3e..493978bba 100644
--- a/lib/Interactions/Internal/WebDriverContextClickAction.php
+++ b/lib/Interactions/Internal/WebDriverContextClickAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
index 911b7aece..387bdbea6 100644
--- a/lib/Interactions/Internal/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverDoubleClickAction.php b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
index 46c197bbb..386c49639 100644
--- a/lib/Interactions/Internal/WebDriverDoubleClickAction.php
+++ b/lib/Interactions/Internal/WebDriverDoubleClickAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverKeyDownAction.php b/lib/Interactions/Internal/WebDriverKeyDownAction.php
index bb3820ed3..24ffe4eed 100644
--- a/lib/Interactions/Internal/WebDriverKeyDownAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyDownAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverKeyUpAction.php b/lib/Interactions/Internal/WebDriverKeyUpAction.php
index b675025e6..7df738c64 100644
--- a/lib/Interactions/Internal/WebDriverKeyUpAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyUpAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index 899bb822e..69f4aa179 100644
--- a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
index 2bec07386..5cb0cfd10 100644
--- a/lib/Interactions/Internal/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverMouseMoveAction.php b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
index 87c6d7cbb..1969f01ba 100644
--- a/lib/Interactions/Internal/WebDriverMouseMoveAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseMoveAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index 29be343d2..98fd824d7 100644
--- a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
index ef3ea0b71..4e65cc27c 100644
--- a/lib/Interactions/Internal/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 6311ee805..ccdf68cea 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/lib/Interactions/Touch/WebDriverDoubleTapAction.php b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
index 47664fe23..25a1761b3 100644
--- a/lib/Interactions/Touch/WebDriverDoubleTapAction.php
+++ b/lib/Interactions/Touch/WebDriverDoubleTapAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
index 5f392313c..2e0f1e5d1 100644
--- a/lib/Interactions/Touch/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
index a32164d83..5430852ac 100644
--- a/lib/Interactions/Touch/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index 78445c256..799febe10 100644
--- a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverLongPressAction.php b/lib/Interactions/Touch/WebDriverLongPressAction.php
index bf6e8bf49..7c1a165c6 100644
--- a/lib/Interactions/Touch/WebDriverLongPressAction.php
+++ b/lib/Interactions/Touch/WebDriverLongPressAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverMoveAction.php b/lib/Interactions/Touch/WebDriverMoveAction.php
index bb2a4bab1..8cdf5eb99 100644
--- a/lib/Interactions/Touch/WebDriverMoveAction.php
+++ b/lib/Interactions/Touch/WebDriverMoveAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverScrollAction.php b/lib/Interactions/Touch/WebDriverScrollAction.php
index 0bb70a8e5..0fd40c5b4 100644
--- a/lib/Interactions/Touch/WebDriverScrollAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
index 073244480..ba68bc62c 100644
--- a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverTapAction.php b/lib/Interactions/Touch/WebDriverTapAction.php
index 31ccf5678..63527e810 100644
--- a/lib/Interactions/Touch/WebDriverTapAction.php
+++ b/lib/Interactions/Touch/WebDriverTapAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
index dd09e6499..3919170a9 100644
--- a/lib/Interactions/Touch/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/Touch/WebDriverTouchScreen.php b/lib/Interactions/Touch/WebDriverTouchScreen.php
index 4bb6f1100..21696fc90 100644
--- a/lib/Interactions/Touch/WebDriverTouchScreen.php
+++ b/lib/Interactions/Touch/WebDriverTouchScreen.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Touch;
 
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 66ac7c1ab..aefd07faf 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions;
 
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index d4ca94c5d..168bf5ff5 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions;
 
diff --git a/lib/Interactions/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
index d8cf05f4b..da0e47815 100644
--- a/lib/Interactions/WebDriverTouchActions.php
+++ b/lib/Interactions/WebDriverTouchActions.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions;
 
diff --git a/lib/Internal/WebDriverLocatable.php b/lib/Internal/WebDriverLocatable.php
index e40c36b57..225a10d66 100644
--- a/lib/Internal/WebDriverLocatable.php
+++ b/lib/Internal/WebDriverLocatable.php
@@ -1,17 +1,4 @@
 <?php
-// copyright 2004-present facebook. all rights reserved.
-//
-// licensed under the apache license, version 2.0 (the "license");
-// you may not use this file except in compliance with the license.
-// you may obtain a copy of the license at
-//
-//   http://www.apache.org/licenses/license-2.0
-//
-// unless required by applicable law or agreed to in writing, software
-// distributed under the license is distributed on an "as is" basis,
-// 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\WebDriver\Internal;
 
diff --git a/lib/JavaScriptExecutor.php b/lib/JavaScriptExecutor.php
index d4a587acf..dfedc0fcc 100644
--- a/lib/JavaScriptExecutor.php
+++ b/lib/JavaScriptExecutor.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 17cb08026..a4ff2df00 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Net;
 
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index ac634de86..7eef1de29 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 88091023e..867e0cd32 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
index b12c25ed8..3f1636e5b 100644
--- a/lib/Remote/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/FileDetector.php b/lib/Remote/FileDetector.php
index 483df049c..a17965e75 100644
--- a/lib/Remote/FileDetector.php
+++ b/lib/Remote/FileDetector.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index fb3d7b23d..08ca9c1c2 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index 3488b8604..65a6956ba 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/LocalFileDetector.php b/lib/Remote/LocalFileDetector.php
index c133d2497..ea7e85e01 100644
--- a/lib/Remote/LocalFileDetector.php
+++ b/lib/Remote/LocalFileDetector.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
index 4ab9e3890..6cc0c26a7 100644
--- a/lib/Remote/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteKeyboard.php b/lib/Remote/RemoteKeyboard.php
index 40528964f..095b0c573 100644
--- a/lib/Remote/RemoteKeyboard.php
+++ b/lib/Remote/RemoteKeyboard.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 6b7375834..e95a12fe3 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteStatus.php b/lib/Remote/RemoteStatus.php
index 031d3ed76..3d123bd45 100644
--- a/lib/Remote/RemoteStatus.php
+++ b/lib/Remote/RemoteStatus.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index b3124153a..a5bd9e03c 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
index 8c3981474..889c12e6c 100644
--- a/lib/Remote/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index bac55c9b1..5cac97247 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 6b2befb2a..cb0caee46 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 28cc5e438..4e364e073 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote\Service;
 
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index eabf24e7a..f64c3b8c8 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote\Service;
 
diff --git a/lib/Remote/UselessFileDetector.php b/lib/Remote/UselessFileDetector.php
index 5ddd78e7d..6bce0e004 100644
--- a/lib/Remote/UselessFileDetector.php
+++ b/lib/Remote/UselessFileDetector.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 53b6ab977..bc7c041a5 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
index c452e771c..45833339a 100644
--- a/lib/Remote/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index 804c1a933..9b893697a 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Remote/WebDriverResponse.php b/lib/Remote/WebDriverResponse.php
index 92ac6f66d..39b19bf09 100644
--- a/lib/Remote/WebDriverResponse.php
+++ b/lib/Remote/WebDriverResponse.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 5a75dbe1f..81a27816b 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Support\Events;
 
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 0d26a39f1..59eab3fd7 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Support\Events;
 
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 8df5cbb78..0e9271665 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Support\Events;
 
diff --git a/lib/Support/XPathEscaper.php b/lib/Support/XPathEscaper.php
index c90cefa87..eb85081ca 100644
--- a/lib/Support/XPathEscaper.php
+++ b/lib/Support/XPathEscaper.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Support;
 
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index 6115a5006..a15d1a06b 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverAction.php b/lib/WebDriverAction.php
index aead0a708..3b3a78418 100644
--- a/lib/WebDriverAction.php
+++ b/lib/WebDriverAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverAlert.php b/lib/WebDriverAlert.php
index b35132de6..5953ae5c2 100644
--- a/lib/WebDriverAlert.php
+++ b/lib/WebDriverAlert.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverBy.php b/lib/WebDriverBy.php
index 822a5c5fc..4bead6743 100644
--- a/lib/WebDriverBy.php
+++ b/lib/WebDriverBy.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverCapabilities.php b/lib/WebDriverCapabilities.php
index 9ac851d90..75cb99de2 100644
--- a/lib/WebDriverCapabilities.php
+++ b/lib/WebDriverCapabilities.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverCheckboxes.php b/lib/WebDriverCheckboxes.php
index 1ac00093d..5467589c8 100644
--- a/lib/WebDriverCheckboxes.php
+++ b/lib/WebDriverCheckboxes.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 0a50ccdde..4031c235d 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverDimension.php b/lib/WebDriverDimension.php
index 81a223989..dbc84abb1 100644
--- a/lib/WebDriverDimension.php
+++ b/lib/WebDriverDimension.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 65e0f688d..851214719 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index f0284aa16..538e0a8e5 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 074adebf6..673d85bee 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 632b4fdfc..23fc92fba 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverHasInputDevices.php b/lib/WebDriverHasInputDevices.php
index 7cb1992eb..efe41ae42 100644
--- a/lib/WebDriverHasInputDevices.php
+++ b/lib/WebDriverHasInputDevices.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverKeyboard.php b/lib/WebDriverKeyboard.php
index f44582a12..5074eeeac 100644
--- a/lib/WebDriverKeyboard.php
+++ b/lib/WebDriverKeyboard.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index f6baf96af..77f75b4ea 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License; Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     httpconst //www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing; software
-// distributed under the License is distributed on an "AS IS" BASIS;
-// 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\WebDriver;
 
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 9fe052119..5178a314b 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverNavigation.php b/lib/WebDriverNavigation.php
index 4836a2700..b961a15e9 100644
--- a/lib/WebDriverNavigation.php
+++ b/lib/WebDriverNavigation.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 51f89a4e7..84f2270eb 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 4cf4c2b1a..0b45800d5 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverPoint.php b/lib/WebDriverPoint.php
index 9600af9d8..c36d6384f 100644
--- a/lib/WebDriverPoint.php
+++ b/lib/WebDriverPoint.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverRadios.php b/lib/WebDriverRadios.php
index d6a4d2ac7..e1687983e 100644
--- a/lib/WebDriverRadios.php
+++ b/lib/WebDriverRadios.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 4d784c682..8a723d8e7 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 1dfbe268b..53d894b96 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverSelectInterface.php b/lib/WebDriverSelectInterface.php
index 830416a51..030a783e9 100644
--- a/lib/WebDriverSelectInterface.php
+++ b/lib/WebDriverSelectInterface.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index c0b8877b5..413e25b4b 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index 5735cb48d..add6a0900 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverUpAction.php b/lib/WebDriverUpAction.php
index e8a480c9e..62d275dea 100644
--- a/lib/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 82d7fb57c..34dd057ae 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index c613732fa..b92caa0fc 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 801396034..6c8c4f51b 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,16 +1,3 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
 
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 41069ecef..a21727781 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Chrome;
 
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 2c10194de..26c9de81d 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Chrome;
 
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 1029a2363..f4728be41 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index ce0064de8..3da1341c0 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 4e6fb5803..e47612173 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 455313354..bf2d13620 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index c5671b497..4ac265381 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 59d9d108d..afbf3baf6 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index bd6e4f6f0..46e3509bb 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index 8d25b76ff..d09d46f22 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index d222a86b1..054147d52 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 401500de2..83730f6af 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 4ff114751..6ff0c8a55 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 0ddcccd0d..106ddf42a 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index c2286f3b2..6de24d1c0 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index 62b4c7e9d..b00d51130 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index bb0eaa41e..95e517f8c 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 8d96a1944..c908693b7 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index bc3b96603..9718cd671 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index cd864bfaa..bd849c6c4 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/functional/web/slow_pixel.png.php b/tests/functional/web/slow_pixel.png.php
index 6e822f899..d95805e21 100644
--- a/tests/functional/web/slow_pixel.png.php
+++ b/tests/functional/web/slow_pixel.png.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
 
 sleep(5);
 
diff --git a/tests/functional/web/submit.php b/tests/functional/web/submit.php
index 7c75e0b2e..c53321f1f 100644
--- a/tests/functional/web/submit.php
+++ b/tests/functional/web/submit.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/functional/web/upload.php b/tests/functional/web/upload.php
index 0bac36c3a..71143d46c 100644
--- a/tests/functional/web/upload.php
+++ b/tests/functional/web/upload.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 3df705e2a..621fb65c0 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index 8c2820980..5013265f1 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Exception;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index f03b7d607..6771b331d 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index d8f6ce081..99eb28d0d 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index 57de1581b..fb71ff8b7 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index e3a600a97..74f205064 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index 83e22be2b..af107e61a 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 3e6540b86..2ba6629de 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 0068960ec..969a1fb75 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 44fc7ffdc..2727be004 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 4115399d2..71ab09d4c 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index e27339b80..e2b78b77f 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index 993e7aecb..cc0d3f763 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 7949ec447..131bec2ca 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 66773926b..af7670b06 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 0ae855017..330da2d54 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
index e1b0a2b47..7ca0eddb6 100644
--- a/tests/unit/Remote/RemoteWebElementTest.php
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 2e1a0ad9f..0bf6efb20 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Remote;
 
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index 572ce78e9..e5a373f98 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver\Support;
 
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 6dde484ef..94bafb150 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index 71fef3b9e..b60bdb2b0 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 85eab8978..14dc8b503 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -1,17 +1,4 @@
 <?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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\WebDriver;
 

From f548928c79d50049cecee4221da9d3c9f5f0e10a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 14 Jan 2020 18:39:34 +0100
Subject: [PATCH 511/784] Rename repository to php-webdriver/php-webdriver

---
 README.md                                | 6 +++---
 composer.json                            | 9 ++-------
 tests/functional/RemoteWebDriverTest.php | 2 +-
 tests/functional/web/index.html          | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 71742583b..c7242088b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ versions of Chrome and Chromedriver with just a slight limitations.
 The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
 [Selenium project](https://github.com/SeleniumHQ/selenium/).
 
-Looking for API documentation of php-webdriver? See [https://facebook.github.io/php-webdriver/](https://facebook.github.io/php-webdriver/latest/)
+Looking for API documentation of php-webdriver? See [https://php-webdriver.github.io/php-webdriver/](https://php-webdriver.github.io/php-webdriver/latest/)
 
 Any complaints, questions, or ideas? Post them in the user group https://www.facebook.com/groups/phpwebdriver/.
 
@@ -94,7 +94,7 @@ For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
 ## More information
 
-Some how-tos are provided right here in [our GitHub wiki](https://github.com/facebook/php-webdriver/wiki).
+Some how-tos are provided right here in [our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
 
 You may also want to check out the Selenium [docs](http://docs.seleniumhq.org/docs/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
 
@@ -113,7 +113,7 @@ We have a great community willing to help you!
 
 - **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contribute to communal discussion and support
 - **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow
-- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/facebook/php-webdriver/issues/new) as a new issue
+- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/php-webdriver/php-webdriver/issues/new) as a new issue
 
 ## Contributing
 
diff --git a/composer.json b/composer.json
index d31c8d2a6..9e4a00e68 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,10 @@
 {
   "name": "facebook/webdriver",
   "description": "A PHP client for Selenium WebDriver",
-  "keywords": ["webdriver", "selenium", "php", "facebook"],
-  "homepage": "https://github.com/facebook/php-webdriver",
+  "keywords": ["webdriver", "selenium", "php"],
+  "homepage": "https://github.com/php-webdriver/php-webdriver",
   "type": "library",
   "license": "MIT",
-  "support": {
-    "issues": "https://github.com/facebook/php-webdriver/issues",
-    "forum": "https://www.facebook.com/groups/phpwebdriver/",
-    "source": "https://github.com/facebook/php-webdriver"
-  },
   "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index afbf3baf6..28b4e52ab 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -44,7 +44,7 @@ public function testShouldGetPageSource()
 
         $source = $this->driver->getPageSource();
         $this->assertContains('<h1 id="welcome">', $source);
-        $this->assertContains('Welcome to the facebook/php-webdriver testing page.', $source);
+        $this->assertContains('Welcome to the php-webdriver testing page.', $source);
     }
 
     /**
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index d94ba31f9..02c42e9d6 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -18,7 +18,7 @@
 
     <div id="red-box"></div>
 
-    <h1 id="welcome">Welcome to the facebook/php-webdriver testing page.</h1>
+    <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
 
     <a href="http://github.com/form.html" id="a-form">Form test page</a>
     |

From 71aff82f2a6c9bc5ea4805f25af82915a87297e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 15 Jan 2020 00:38:07 +0100
Subject: [PATCH 512/784] Remove Facebook CLA requirement

---
 CONTRIBUTING.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 741a140a9..b7fa587cc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,8 +16,6 @@ The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
 4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
 5. Submit your [pull request](https://github.com/facebook/php-webdriver/pulls) against community branch
  
-Note before any pull request can be accepted, a [Contributors Licensing Agreement](https://developers.facebook.com/opensource/cla) must be signed.
-
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
 

From 7e75d88d17dd76095f88b8b748c7276696d03c08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Dec 2019 03:29:56 +0100
Subject: [PATCH 513/784] Migrate codestyle check to GitHub actions

---
 CONTRIBUTING.md => .github/CONTRIBUTING.md    |  0
 .../ISSUE_TEMPLATE.md                         |  0
 .github/workflows/php.yaml                    | 30 +++++++++++++++++++
 .travis.yml                                   | 14 ---------
 4 files changed, 30 insertions(+), 14 deletions(-)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%)
 rename ISSUE_TEMPLATE.md => .github/ISSUE_TEMPLATE.md (100%)
 create mode 100644 .github/workflows/php.yaml

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md
diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
new file mode 100644
index 000000000..04fd5b9da
--- /dev/null
+++ b/.github/workflows/php.yaml
@@ -0,0 +1,30 @@
+name: PHP
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron:  '0 3 * * *'
+
+jobs:
+  analyze:
+    name: "Code style and static analysis"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: '7.4'
+          extensions: mbstring, intl, zip
+
+      - name: Install dependencies
+        run: |
+          composer update --no-interaction
+          composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
+
+      - name: Run checks
+        run: |
+          composer analyze
+          composer codestyle:check
diff --git a/.travis.yml b/.travis.yml
index aa9bce590..517535f4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,20 +20,6 @@ services:
 
 matrix:
   include:
-    # Codestyle check build
-    - name: 'Code style and static analysis'
-      php: '7.4'
-      env: CHECK_CODESTYLE=1
-      before_install:
-        - phpenv config-rm xdebug.ini
-      before_script: ~
-      script:
-        - composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
-        - composer analyze
-        - composer codestyle:check
-      after_script: ~
-      after_success: ~
-
     # Build with lowest possible dependencies on lowest possible PHP
     - name: 'Lowest dependencies build'
       php: '5.6'

From 1cb715acd554fdc13a7c812fdb72d1d603d893bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 16 Jan 2020 14:08:19 +0100
Subject: [PATCH 514/784] Update URL and JWT of Travis builds

---
 .travis.yml | 8 ++++----
 README.md   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 517535f4b..a773b2c6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,7 +80,7 @@ matrix:
       addons:
         sauce_connect: true
         jwt:
-          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
 
     - name: 'Sauce Labs, Chrome 74, OSS protocol'
       php: '7.3'
@@ -91,7 +91,7 @@ matrix:
       addons:
         sauce_connect: true
         jwt:
-          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
 
     - name: 'Sauce Labs, Chrome latest, W3C protocol'
       php: '7.3'
@@ -102,7 +102,7 @@ matrix:
       addons:
         sauce_connect: true
         jwt:
-          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
 
     - name: 'Sauce Labs, Edge latest, W3C protocol'
       php: '7.3'
@@ -113,7 +113,7 @@ matrix:
       addons:
         sauce_connect: true
         jwt:
-          secure: HPq5xFhosa1eSGnaRdJzeyEuaE0mhRlG1gf3G7+dKS0VniF30husSyrxZhbGCCKBGxmIySoAQzd43BCwL69EkUEVKDN87Cpid1Ce9KrSfU3cnN8XIb+4QINyy7x1a47RUAfaaOEx53TrW0ShalvjD+ZwDE8LrgagSox6KQ+nQLE=
+          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
 
 cache:
   directories:
diff --git a/README.md b/README.md
index c7242088b..3d24af5df 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
-[![Travis Build](https://img.shields.io/travis/facebook/php-webdriver/community.svg?style=flat-square)](https://travis-ci.org/facebook/php-webdriver)
+[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/community.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
 [![Total Downloads](https://img.shields.io/packagist/dt/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
 [![License](https://img.shields.io/packagist/l/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)

From d97761cf0ff988cee255d62854c9eb9442721ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 16 Jan 2020 13:43:59 +0100
Subject: [PATCH 515/784] Rename Packagist package to php-webdriver/webdriver

---
 README.md     | 7 +++----
 composer.json | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 3d24af5df..affefa390 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
-[![Latest Stable Version](https://img.shields.io/packagist/v/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
+[![Latest Stable Version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 [![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/community.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
-[![Total Downloads](https://img.shields.io/packagist/dt/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
-[![License](https://img.shields.io/packagist/l/facebook/webdriver.svg?style=flat-square)](https://packagist.org/packages/facebook/webdriver)
+[![Total Downloads](https://img.shields.io/packagist/dt/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
@@ -33,7 +32,7 @@ If you don't already use Composer, you can download the `composer.phar` binary:
 
 Then install the library:
 
-    php composer.phar require facebook/webdriver
+    php composer.phar require php-webdriver/webdriver
 
 ## Getting started
 
diff --git a/composer.json b/composer.json
index 9e4a00e68..58ab593b4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
-  "name": "facebook/webdriver",
-  "description": "A PHP client for Selenium WebDriver",
-  "keywords": ["webdriver", "selenium", "php"],
+  "name": "php-webdriver/webdriver",
+  "description": "A PHP client for Selenium WebDriver. Previously facebook/php-webdriver.",
+  "keywords": ["webdriver", "selenium", "php", "geckodriver", "chromedriver"],
   "homepage": "https://github.com/php-webdriver/php-webdriver",
   "type": "library",
   "license": "MIT",

From 79e3b832c5e36437caf822c349ff1b931427ef43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 16 Jan 2020 15:54:31 +0100
Subject: [PATCH 516/784] Include information about renaming in changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d1d2524..f9317baab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - `takeElementScreenshot()` method of `RemoteWebElement` to do the obvious - take screenshot of the particular element.
 
 ### Changed
+- The repository was migrated to [`php-webdriver/php-webdriver`](https://github.com/php-webdriver/php-webdriver/).
+- The Packagist package was renamed to [`php-webdriver/webdriver`](https://packagist.org/packages/php-webdriver/webdriver) and the original [`facebook/webdriver`](https://packagist.org/packages/facebook/webdriver) was marked as abandoned.
 - Revert no longer needed workaround for Chromedriver bug [2943](https://bugs.chromium.org/p/chromedriver/issues/detail?id=2943).
 - Allow installation of Symfony 5 components.
 - Rename environment variable used to pass path to ChromeDriver executable from `webdriver.chrome.driver` to `WEBDRIVER_CHROME_DRIVER`. However the old one also still works to keep backward compatibility

From 79e9fcacea3777528dbe6addff4fa3d603695689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 17 Jan 2020 13:03:00 +0100
Subject: [PATCH 517/784] Show downloads/day badge

---
 README.md     | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index affefa390..e05ff8526 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Latest Stable Version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 [![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/community.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
-[![Total Downloads](https://img.shields.io/packagist/dt/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
+[![Total Downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
diff --git a/composer.json b/composer.json
index 58ab593b4..f370c2fb0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "php-webdriver/webdriver",
-  "description": "A PHP client for Selenium WebDriver. Previously facebook/php-webdriver.",
+  "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
   "keywords": ["webdriver", "selenium", "php", "geckodriver", "chromedriver"],
   "homepage": "https://github.com/php-webdriver/php-webdriver",
   "type": "library",

From 4767e547c6d26ea2b245cc4fc9801b0bf744a21b Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 11 Dec 2019 21:35:51 +0800
Subject: [PATCH 518/784] Window maximize does not take args in w3c

---
 lib/WebDriverWindow.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index b92caa0fc..3a703b35f 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -88,10 +88,14 @@ public function minimize()
      */
     public function maximize()
     {
-        $this->executor->execute(
-            DriverCommand::MAXIMIZE_WINDOW,
-            [':windowHandle' => 'current']
-        );
+        if ($this->isW3cCompliant) {
+            $this->executor->execute(DriverCommand::MAXIMIZE_WINDOW, []);
+        } else {
+            $this->executor->execute(
+                DriverCommand::MAXIMIZE_WINDOW,
+                [':windowHandle' => 'current']
+            );
+        }
 
         return $this;
     }

From 393f30cc6a2ce4b538d1c22357a0a9c53b648438 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 11 Dec 2019 21:40:33 +0800
Subject: [PATCH 519/784] Add fullscreen window command

Part of #683
---
 lib/Remote/DriverCommand.php             |  1 +
 lib/Remote/HttpCommandExecutor.php       |  1 +
 lib/WebDriverWindow.php                  | 16 ++++++++++++++++
 tests/functional/WebDriverWindowTest.php | 24 ++++++++++++++++++++++++
 4 files changed, 42 insertions(+)

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 867e0cd32..34daf3e42 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -125,6 +125,7 @@ class DriverCommand
     const GET_WINDOW_SIZE = 'getWindowSize';
     const GET_WINDOW_POSITION = 'getWindowPosition';
     const MAXIMIZE_WINDOW = 'maximizeWindow';
+    const FULLSCREEN_WINDOW = 'fullscreenWindow';
     // Logging API
     const GET_AVAILABLE_LOG_TYPES = 'getAvailableLogTypes';
     const GET_LOG = 'getLog';
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 08ca9c1c2..dcaa1374c 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -140,6 +140,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
         DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
         DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::FULLSCREEN_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/fullscreen'],
         DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'GET', 'url' => '/session/:sessionId/element/active'],
         DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window'],
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 3a703b35f..e212f92ed 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -100,6 +100,22 @@ public function maximize()
         return $this;
     }
 
+    /**
+     * Makes the current window full screen.
+     *
+     * @return WebDriverWindow The instance.
+     */
+    public function fullscreen()
+    {
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('The Fullscreen window command is only supported in W3C mode');
+        }
+
+        $this->executor->execute(DriverCommand::FULLSCREEN_WINDOW, []);
+
+        return $this;
+    }
+
     /**
      * Set the size of the current window. This will change the outer window
      * dimension, not just the view port.
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index fb11abe2a..6b2671b81 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -48,6 +48,30 @@ public function testShouldMaximizeWindow()
         $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
     }
 
+    /**
+     * @group exclude-edge
+     */
+    public function testShouldFullscreenWindow()
+    {
+        self::skipForJsonWireProtocol('"fullscreen" window is not supported in JsonWire protocol');
+
+        $this->driver->manage()
+            ->window()
+            ->setSize(new WebDriverDimension(400, 300));
+
+        $this->driver->manage()
+            ->window()
+            ->fullscreen();
+
+        $sizeAfter = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        // Note: Headless browsers see no effect.
+        $this->assertGreaterThanOrEqual(400, $sizeAfter->getWidth());
+        $this->assertGreaterThanOrEqual(300, $sizeAfter->getHeight());
+    }
+
     /**
      * @group exclude-saucelabs
      * @group exclude-chrome

From a806290e992f320a92b693d3ba069e7b23541409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 24 Jan 2020 15:52:33 +0100
Subject: [PATCH 520/784] Change community branch to master #739

---
 .github/CONTRIBUTING.md | 4 ++--
 README.md               | 2 +-
 composer.json           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b7fa587cc..2fdbb677f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 We love to have your help to make php-webdriver better!
  
-Feel free to open an [issue](https://github.com/facebook/php-webdriver/issues) if you run into any problem, or
+Feel free to open an [issue](https://github.com/php-webdriver/php-webdriver/issues) if you run into any problem, or
 send a pull request (see bellow) with your contribution.
 
 ## Code of Conduct
@@ -14,7 +14,7 @@ The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
 2. Implement your code changes into separate branch
 3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have Travis CI build which will automatically run tests on your pull request.
 4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
-5. Submit your [pull request](https://github.com/facebook/php-webdriver/pulls) against community branch
+5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `master` branch
  
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
diff --git a/README.md b/README.md
index e05ff8526..199d210e5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
-[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/community.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
+[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/master.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
 [![Total Downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 
diff --git a/composer.json b/composer.json
index f370c2fb0..aa8ab5a1d 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-community": "1.8.x-dev"
+      "dev-master": "1.8.x-dev"
     }
   }
 }

From 95becf6a53f921b1ec2ff2f85a3b90405968b907 Mon Sep 17 00:00:00 2001
From: Maxim Leontyev <leontyevmax@gmail.com>
Date: Fri, 26 Oct 2018 14:52:28 +0300
Subject: [PATCH 521/784] Support of custom http WebDriver commands

---
 lib/Remote/DriverCommand.php                  |  2 +
 lib/Remote/HttpCommandExecutor.php            | 50 +++++++++++++-----
 lib/Remote/RemoteWebDriver.php                | 25 +++++++++
 lib/Remote/WebDriverCommand.php               | 52 +++++++++++++++++++
 tests/unit/Remote/HttpCommandExecutorTest.php | 33 +++++++++++-
 tests/unit/Remote/WebDriverCommandTest.php    | 24 +++++++++
 6 files changed, 171 insertions(+), 15 deletions(-)

diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 34daf3e42..3f1e8392d 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -133,6 +133,8 @@ class DriverCommand
     // Mobile API
     const GET_NETWORK_CONNECTION = 'getNetworkConnection';
     const SET_NETWORK_CONNECTION = 'setNetworkConnection';
+    // Custom command
+    const CUSTOM_COMMAND = 'customCommand';
 
     // W3C specific
     const ACTIONS = 'actions';
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index dcaa1374c..9510ab491 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -130,6 +130,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::TOUCH_MOVE => ['method' => 'POST', 'url' => '/session/:sessionId/touch/move'],
         DriverCommand::TOUCH_SCROLL => ['method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'],
         DriverCommand::TOUCH_UP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/up'],
+        DriverCommand::CUSTOM_COMMAND => false,
     ];
     /**
      * @var array Will be merged with $commands
@@ -262,21 +263,10 @@ public function setRequestTimeout($timeout_in_ms)
      */
     public function execute(WebDriverCommand $command)
     {
-        $commandName = $command->getName();
-        if (!isset(self::$commands[$commandName])) {
-            if ($this->isW3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
-                throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
-            }
-        }
+        $http_options = $this->getCommandHttpOptions($command);
+        $http_method = $http_options['method'];
+        $url = $http_options['url'];
 
-        if ($this->isW3cCompliant) {
-            $raw = self::$w3cCompliantCommands[$command->getName()];
-        } else {
-            $raw = self::$commands[$command->getName()];
-        }
-
-        $http_method = $raw['method'];
-        $url = $raw['url'];
         $url = str_replace(':sessionId', $command->getSessionID(), $url);
         $params = $command->getParameters();
         foreach ($params as $name => $value) {
@@ -400,4 +390,36 @@ public function getAddressOfRemoteServer()
     {
         return $this->url;
     }
+
+    /**
+     * @return array
+     */
+    protected function getCommandHttpOptions(WebDriverCommand $command)
+    {
+        $commandName = $command->getName();
+        if (!isset(self::$commands[$commandName])) {
+            if ($this->isW3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
+                throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
+            }
+        }
+
+        if ($this->isW3cCompliant) {
+            $raw = self::$w3cCompliantCommands[$command->getName()];
+        } else {
+            $raw = self::$commands[$command->getName()];
+        }
+
+        if ($raw === false) {
+            $url = $command->getCustomUrl();
+            $method = $command->getCustomMethod();
+        } else {
+            $url = $raw['url'];
+            $method = $raw['method'];
+        }
+
+        return [
+            'url' => $url,
+            'method' => $method,
+        ];
+    }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 5cac97247..358e31405 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -589,6 +589,31 @@ public function execute($command_name, $params = [])
         return null;
     }
 
+    /**
+     * @param string $url
+     * @param string $method
+     * @param array $params
+     * @return mixed|null
+     */
+    public function executeCustomCommand($url, $method = 'GET', $params = [])
+    {
+        $command = new WebDriverCommand(
+            $this->sessionID,
+            DriverCommand::CUSTOM_COMMAND,
+            $params
+        );
+
+        $command->setCustomRequestParameters($url, $method);
+
+        if ($this->executor) {
+            $response = $this->executor->execute($command);
+
+            return $response->getValue();
+        }
+
+        return null;
+    }
+
     /**
      * @internal
      * @return bool
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index 9b893697a..e1a693c7f 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -2,14 +2,22 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\WebDriverException;
+
 class WebDriverCommand
 {
+    const METHOD_GET = 'GET';
+    const METHOD_POST = 'POST';
     /** @var string */
     private $sessionID;
     /** @var string */
     private $name;
     /** @var array */
     private $parameters;
+    /** @var string */
+    private $customUrl;
+    /** @var string */
+    private $customMethod;
 
     /**
      * @param string $session_id
@@ -47,4 +55,48 @@ public function getParameters()
     {
         return $this->parameters;
     }
+
+    /**
+     * @param string $custom_url
+     * @param string $custom_method
+     * @throws WebDriverException
+     */
+    public function setCustomRequestParameters($custom_url, $custom_method)
+    {
+        if (!in_array($custom_method, [static::METHOD_GET, static::METHOD_POST])) {
+            throw new WebDriverException('Invalid custom method');
+        }
+        $this->customMethod = $custom_method;
+
+        if (mb_substr($custom_url, 0, 1) !== '/') {
+            throw new WebDriverException('Custom url should start with /');
+        }
+        $this->customUrl = $custom_url;
+    }
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCustomUrl()
+    {
+        if ($this->customUrl === null) {
+            throw new WebDriverException('Custom url is not set');
+        }
+
+        return $this->customUrl;
+    }
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCustomMethod()
+    {
+        if ($this->customUrl === null) {
+            throw new WebDriverException('Custom url is not set');
+        }
+
+        return $this->customMethod;
+    }
 }
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index af7670b06..43c5859c9 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -24,16 +24,25 @@ protected function setUp()
      * @param bool $shouldResetExpectHeader
      * @param string $expectedUrl
      * @param string $expectedPostData
+     * @param null|array $customCommandParameters
      */
     public function testShouldSendRequestToAssembledUrl(
         $command,
         array $params,
         $shouldResetExpectHeader,
         $expectedUrl,
-        $expectedPostData
+        $expectedPostData,
+        $customCommandParameters = null
     ) {
         $command = new WebDriverCommand('foo-123', $command, $params);
 
+        if ($customCommandParameters !== null) {
+            $command->setCustomRequestParameters(
+                $customCommandParameters['url'],
+                $customCommandParameters['method']
+            );
+        }
+
         $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
         $curlSetoptMock->expects($this->at(0))
             ->with($this->anything(), CURLOPT_URL, $expectedUrl);
@@ -106,6 +115,28 @@ public function provideCommand()
                 'http://localhost:4444/sessions',
                 null,
             ],
+            'Custom GET command' => [
+                DriverCommand::CUSTOM_COMMAND,
+                [':someParameter' => 'someValue'],
+                false,
+                'http://localhost:4444/session/foo-123/custom-command/someValue',
+                null,
+                [
+                    'url' => '/session/:sessionId/custom-command/:someParameter',
+                    'method' => 'GET',
+                ],
+            ],
+            'Custom POST command' => [
+                DriverCommand::CUSTOM_COMMAND,
+                ['someParameter' => 'someValue'],
+                true,
+                'http://localhost:4444/session/foo-123/custom-post-command/',
+                '{"someParameter":"someValue"}',
+                [
+                    'url' => '/session/:sessionId/custom-post-command/',
+                    'method' => 'POST',
+                ],
+            ],
         ];
     }
 }
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 0bf6efb20..39177dca1 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\WebDriverException;
 use PHPUnit\Framework\TestCase;
 
 class WebDriverCommandTest extends TestCase
@@ -14,4 +15,27 @@ public function testShouldSetOptionsUsingConstructor()
         $this->assertSame('bar-baz-name', $command->getName());
         $this->assertSame(['foo' => 'bar'], $command->getParameters());
     }
+
+    public function testCustomCommandInit()
+    {
+        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
+        $command->setCustomRequestParameters('/some-url', 'POST');
+
+        $this->assertSame('/some-url', $command->getCustomUrl());
+        $this->assertSame('POST', $command->getCustomMethod());
+    }
+
+    public function testCustomCommandInvalidUrlExceptionInit()
+    {
+        $this->expectException(WebDriverException::class);
+        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
+        $command->setCustomRequestParameters('url-without-leading-slash', 'POST');
+    }
+
+    public function testCustomCommandInvalidMethodExceptionInit()
+    {
+        $this->expectException(WebDriverException::class);
+        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
+        $command->setCustomRequestParameters('/some-url', 'invalid-method');
+    }
 }

From 5e0d2071214796a76b2aadf0b9efe06e57bc1f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 22 Jan 2020 14:05:36 +0100
Subject: [PATCH 522/784] Refactor custom commands

---
 lib/Remote/CustomWebDriverCommand.php         | 82 +++++++++++++++++++
 lib/Remote/HttpCommandExecutor.php            |  4 +-
 lib/Remote/RemoteWebDriver.php                | 11 ++-
 lib/Remote/WebDriverCommand.php               | 58 +------------
 .../Remote/CustomWebDriverCommandTest.php     | 38 +++++++++
 tests/unit/Remote/HttpCommandExecutorTest.php | 76 +++++++----------
 tests/unit/Remote/WebDriverCommandTest.php    | 24 ------
 7 files changed, 161 insertions(+), 132 deletions(-)
 create mode 100644 lib/Remote/CustomWebDriverCommand.php
 create mode 100644 tests/unit/Remote/CustomWebDriverCommandTest.php

diff --git a/lib/Remote/CustomWebDriverCommand.php b/lib/Remote/CustomWebDriverCommand.php
new file mode 100644
index 000000000..157902199
--- /dev/null
+++ b/lib/Remote/CustomWebDriverCommand.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+
+class CustomWebDriverCommand extends WebDriverCommand
+{
+    const METHOD_GET = 'GET';
+    const METHOD_POST = 'POST';
+
+    /** @var string */
+    private $customUrl;
+    /** @var string */
+    private $customMethod;
+
+    /**
+     * @param string $session_id
+     * @param string $url
+     * @param string $method
+     * @param array $parameters
+     */
+    public function __construct($session_id, $url, $method, array $parameters)
+    {
+        $this->setCustomRequestParameters($url, $method);
+
+        parent::__construct($session_id, DriverCommand::CUSTOM_COMMAND, $parameters);
+    }
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCustomUrl()
+    {
+        if ($this->customUrl === null) {
+            throw new WebDriverException('URL of custom command is not set');
+        }
+
+        return $this->customUrl;
+    }
+
+    /**
+     * @throws WebDriverException
+     * @return string
+     */
+    public function getCustomMethod()
+    {
+        if ($this->customMethod === null) {
+            throw new WebDriverException('Method of custom command is not set');
+        }
+
+        return $this->customMethod;
+    }
+
+    /**
+     * @param string $custom_url
+     * @param string $custom_method
+     * @throws WebDriverException
+     */
+    protected function setCustomRequestParameters($custom_url, $custom_method)
+    {
+        $allowedMethods = [static::METHOD_GET, static::METHOD_POST];
+        if (!in_array($custom_method, $allowedMethods, true)) {
+            throw new WebDriverException(
+                sprintf(
+                    'Invalid custom method "%s", must be one of [%s]',
+                    $custom_method,
+                    implode(', ', $allowedMethods)
+                )
+            );
+        }
+        $this->customMethod = $custom_method;
+
+        if (mb_strpos($custom_url, '/') !== 0) {
+            throw new WebDriverException(
+                sprintf('URL of custom command has to start with / but is "%s"', $custom_url)
+            );
+        }
+        $this->customUrl = $custom_url;
+    }
+}
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 9510ab491..6bc942adf 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -130,7 +130,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::TOUCH_MOVE => ['method' => 'POST', 'url' => '/session/:sessionId/touch/move'],
         DriverCommand::TOUCH_SCROLL => ['method' => 'POST', 'url' => '/session/:sessionId/touch/scroll'],
         DriverCommand::TOUCH_UP => ['method' => 'POST', 'url' => '/session/:sessionId/touch/up'],
-        DriverCommand::CUSTOM_COMMAND => false,
+        DriverCommand::CUSTOM_COMMAND => [],
     ];
     /**
      * @var array Will be merged with $commands
@@ -409,7 +409,7 @@ protected function getCommandHttpOptions(WebDriverCommand $command)
             $raw = self::$commands[$command->getName()];
         }
 
-        if ($raw === false) {
+        if ($command instanceof CustomWebDriverCommand) {
             $url = $command->getCustomUrl();
             $method = $command->getCustomMethod();
         } else {
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 358e31405..f157fdf06 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -590,21 +590,20 @@ public function execute($command_name, $params = [])
     }
 
     /**
-     * @param string $url
+     * @param string $endpointUrl
      * @param string $method
      * @param array $params
      * @return mixed|null
      */
-    public function executeCustomCommand($url, $method = 'GET', $params = [])
+    public function executeCustomCommand($endpointUrl, $method = 'GET', $params = [])
     {
-        $command = new WebDriverCommand(
+        $command = new CustomWebDriverCommand(
             $this->sessionID,
-            DriverCommand::CUSTOM_COMMAND,
+            $endpointUrl,
+            $method,
             $params
         );
 
-        $command->setCustomRequestParameters($url, $method);
-
         if ($this->executor) {
             $response = $this->executor->execute($command);
 
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index e1a693c7f..e21fbdaae 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -2,22 +2,14 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\WebDriverException;
-
 class WebDriverCommand
 {
-    const METHOD_GET = 'GET';
-    const METHOD_POST = 'POST';
     /** @var string */
-    private $sessionID;
+    protected $sessionID;
     /** @var string */
-    private $name;
+    protected $name;
     /** @var array */
-    private $parameters;
-    /** @var string */
-    private $customUrl;
-    /** @var string */
-    private $customMethod;
+    protected $parameters;
 
     /**
      * @param string $session_id
@@ -55,48 +47,4 @@ public function getParameters()
     {
         return $this->parameters;
     }
-
-    /**
-     * @param string $custom_url
-     * @param string $custom_method
-     * @throws WebDriverException
-     */
-    public function setCustomRequestParameters($custom_url, $custom_method)
-    {
-        if (!in_array($custom_method, [static::METHOD_GET, static::METHOD_POST])) {
-            throw new WebDriverException('Invalid custom method');
-        }
-        $this->customMethod = $custom_method;
-
-        if (mb_substr($custom_url, 0, 1) !== '/') {
-            throw new WebDriverException('Custom url should start with /');
-        }
-        $this->customUrl = $custom_url;
-    }
-
-    /**
-     * @throws WebDriverException
-     * @return string
-     */
-    public function getCustomUrl()
-    {
-        if ($this->customUrl === null) {
-            throw new WebDriverException('Custom url is not set');
-        }
-
-        return $this->customUrl;
-    }
-
-    /**
-     * @throws WebDriverException
-     * @return string
-     */
-    public function getCustomMethod()
-    {
-        if ($this->customUrl === null) {
-            throw new WebDriverException('Custom url is not set');
-        }
-
-        return $this->customMethod;
-    }
 }
diff --git a/tests/unit/Remote/CustomWebDriverCommandTest.php b/tests/unit/Remote/CustomWebDriverCommandTest.php
new file mode 100644
index 000000000..b56bc4aea
--- /dev/null
+++ b/tests/unit/Remote/CustomWebDriverCommandTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+use PHPUnit\Framework\TestCase;
+
+class CustomWebDriverCommandTest extends TestCase
+{
+    public function testShouldSetOptionsUsingConstructor()
+    {
+        $command = new CustomWebDriverCommand(
+            'session-id-123',
+            '/some-url',
+            'POST',
+            ['foo' => 'bar']
+        );
+
+        $this->assertSame('/some-url', $command->getCustomUrl());
+        $this->assertSame('POST', $command->getCustomMethod());
+    }
+
+    public function testCustomCommandInvalidUrlExceptionInit()
+    {
+        $this->expectException(WebDriverException::class);
+        $this->expectExceptionMessage('URL of custom command has to start with / but is "url-without-leading-slash"');
+
+        new CustomWebDriverCommand('session-id-123', 'url-without-leading-slash', 'POST', []);
+    }
+
+    public function testCustomCommandInvalidMethodExceptionInit()
+    {
+        $this->expectException(WebDriverException::class);
+        $this->expectExceptionMessage('Invalid custom method "invalid-method", must be one of [GET, POST]');
+
+        new CustomWebDriverCommand('session-id-123', '/some-url', 'invalid-method', []);
+    }
+}
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 43c5859c9..d76780463 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -19,30 +19,17 @@ protected function setUp()
 
     /**
      * @dataProvider provideCommand
-     * @param int $command
-     * @param array $params
+     * @param WebDriverCommand $command
      * @param bool $shouldResetExpectHeader
      * @param string $expectedUrl
-     * @param string $expectedPostData
-     * @param null|array $customCommandParameters
+     * @param string|null $expectedPostData
      */
     public function testShouldSendRequestToAssembledUrl(
-        $command,
-        array $params,
+        WebDriverCommand $command,
         $shouldResetExpectHeader,
         $expectedUrl,
-        $expectedPostData,
-        $customCommandParameters = null
+        $expectedPostData
     ) {
-        $command = new WebDriverCommand('foo-123', $command, $params);
-
-        if ($customCommandParameters !== null) {
-            $command->setCustomRequestParameters(
-                $customCommandParameters['url'],
-                $customCommandParameters['method']
-            );
-        }
-
         $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
         $curlSetoptMock->expects($this->at(0))
             ->with($this->anything(), CURLOPT_URL, $expectedUrl);
@@ -81,61 +68,60 @@ public function provideCommand()
     {
         return [
             'POST command having :id placeholder in url' => [
-                DriverCommand::SEND_KEYS_TO_ELEMENT,
-                ['value' => 'submitted-value', ':id' => '1337'],
+                new WebDriverCommand(
+                    'fooSession',
+                    DriverCommand::SEND_KEYS_TO_ELEMENT,
+                    ['value' => 'submitted-value', ':id' => '1337']
+                ),
                 true,
-                'http://localhost:4444/session/foo-123/element/1337/value',
+                'http://localhost:4444/session/fooSession/element/1337/value',
                 '{"value":"submitted-value"}',
             ],
             'POST command without :id placeholder in url' => [
-                DriverCommand::TOUCH_UP,
-                ['x' => 3, 'y' => 6],
+                new WebDriverCommand('fooSession', DriverCommand::TOUCH_UP, ['x' => 3, 'y' => 6]),
                 true,
-                'http://localhost:4444/session/foo-123/touch/up',
+                'http://localhost:4444/session/fooSession/touch/up',
                 '{"x":3,"y":6}',
             ],
             'Extra useless placeholder parameter should be removed' => [
-                DriverCommand::TOUCH_UP,
-                ['x' => 3, 'y' => 6, ':useless' => 'foo'],
+                new WebDriverCommand('fooSession', DriverCommand::TOUCH_UP, ['x' => 3, 'y' => 6, ':useless' => 'foo']),
                 true,
-                'http://localhost:4444/session/foo-123/touch/up',
+                'http://localhost:4444/session/fooSession/touch/up',
                 '{"x":3,"y":6}',
             ],
             'DELETE command' => [
-                DriverCommand::DELETE_COOKIE,
-                [':name' => 'cookie-name'],
+                new WebDriverCommand('fooSession', DriverCommand::DELETE_COOKIE, [':name' => 'cookie-name']),
                 false,
-                'http://localhost:4444/session/foo-123/cookie/cookie-name',
+                'http://localhost:4444/session/fooSession/cookie/cookie-name',
                 null,
             ],
             'GET command without session in URL' => [
-                DriverCommand::GET_ALL_SESSIONS,
-                [],
+                new WebDriverCommand('fooSession', DriverCommand::GET_ALL_SESSIONS, []),
                 false,
                 'http://localhost:4444/sessions',
                 null,
             ],
             'Custom GET command' => [
-                DriverCommand::CUSTOM_COMMAND,
-                [':someParameter' => 'someValue'],
+                new CustomWebDriverCommand(
+                    'fooSession',
+                    '/session/:sessionId/custom-command/:someParameter',
+                    'GET',
+                    [':someParameter' => 'someValue']
+                ),
                 false,
-                'http://localhost:4444/session/foo-123/custom-command/someValue',
+                'http://localhost:4444/session/fooSession/custom-command/someValue',
                 null,
-                [
-                    'url' => '/session/:sessionId/custom-command/:someParameter',
-                    'method' => 'GET',
-                ],
             ],
             'Custom POST command' => [
-                DriverCommand::CUSTOM_COMMAND,
-                ['someParameter' => 'someValue'],
+                new CustomWebDriverCommand(
+                    'fooSession',
+                    '/session/:sessionId/custom-post-command/',
+                    'POST',
+                    ['someParameter' => 'someValue']
+                ),
                 true,
-                'http://localhost:4444/session/foo-123/custom-post-command/',
+                'http://localhost:4444/session/fooSession/custom-post-command/',
                 '{"someParameter":"someValue"}',
-                [
-                    'url' => '/session/:sessionId/custom-post-command/',
-                    'method' => 'POST',
-                ],
             ],
         ];
     }
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 39177dca1..0bf6efb20 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -2,7 +2,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\WebDriverException;
 use PHPUnit\Framework\TestCase;
 
 class WebDriverCommandTest extends TestCase
@@ -15,27 +14,4 @@ public function testShouldSetOptionsUsingConstructor()
         $this->assertSame('bar-baz-name', $command->getName());
         $this->assertSame(['foo' => 'bar'], $command->getParameters());
     }
-
-    public function testCustomCommandInit()
-    {
-        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
-        $command->setCustomRequestParameters('/some-url', 'POST');
-
-        $this->assertSame('/some-url', $command->getCustomUrl());
-        $this->assertSame('POST', $command->getCustomMethod());
-    }
-
-    public function testCustomCommandInvalidUrlExceptionInit()
-    {
-        $this->expectException(WebDriverException::class);
-        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
-        $command->setCustomRequestParameters('url-without-leading-slash', 'POST');
-    }
-
-    public function testCustomCommandInvalidMethodExceptionInit()
-    {
-        $this->expectException(WebDriverException::class);
-        $command = new WebDriverCommand('session-id-123', 'customCommand', ['foo' => 'bar']);
-        $command->setCustomRequestParameters('/some-url', 'invalid-method');
-    }
 }

From f5a1b0d998b4188d2bb2d0e362768b21d8c346d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 3 Feb 2020 12:30:41 +0100
Subject: [PATCH 523/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9317baab..645ffd936 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Experimental W3C WebDriver protocol support. The protocol will be used automatically when remote end (like Geckodriver, newer Chromedriver etc.) supports it.
 - `getStatus()` method of `RemoteWebDriver` to get information about remote-end readiness to create new sessions.
 - `takeElementScreenshot()` method of `RemoteWebElement` to do the obvious - take screenshot of the particular element.
+- Support for sending custom commands via `executeCustomCommand()`. See [wiki](https://github.com/php-webdriver/php-webdriver/wiki/Custom-commands) for more information.
 
 ### Changed
 - The repository was migrated to [`php-webdriver/php-webdriver`](https://github.com/php-webdriver/php-webdriver/).

From bb8d3707b06b3313fac511b53dce2fbaa14382af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 16 Dec 2019 16:29:14 +0100
Subject: [PATCH 524/784] Update example.php to use Wikipedia website

---
 composer.json |  2 +-
 example.php   | 71 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/composer.json b/composer.json
index aa8ab5a1d..77df01f21 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ],
     "analyze": [
-      "vendor/bin/parallel-lint -j 10 ./lib ./tests",
+      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
       "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
   },
diff --git a/example.php b/example.php
index ab7464a3a..be2c5eaa3 100644
--- a/example.php
+++ b/example.php
@@ -1,7 +1,7 @@
 <?php
 
 // An example of using php-webdriver.
-// Do not forget to run composer install before and also have Selenium server started and listening on port 4444.
+// Do not forget to run composer install before. You must also have Selenium server started and listening on port 4444.
 
 namespace Facebook\WebDriver;
 
@@ -10,51 +10,66 @@
 
 require_once('vendor/autoload.php');
 
-// start Chrome with 5 seconds timeout
-$host = 'http://localhost:4444/wd/hub'; // this is the default
+// This is where Selenium server 2/3 listens by default. For Selenium 4, Chromedriver or Geckodriver, use http://localhost:4444/
+$host = 'http://localhost:4444/wd/hub';
+
 $capabilities = DesiredCapabilities::chrome();
-$driver = RemoteWebDriver::create($host, $capabilities, 5000);
 
-// navigate to 'http://www.seleniumhq.org/'
-$driver->get('https://www.seleniumhq.org/');
+$driver = RemoteWebDriver::create($host, $capabilities);
 
-// adding cookie
-$driver->manage()->deleteAllCookies();
+// navigate to Selenium page on Wikipedia
+$driver->get('https://en.wikipedia.org/wiki/Selenium_(software)');
 
-$cookie = new Cookie('cookie_name', 'cookie_value');
-$driver->manage()->addCookie($cookie);
+// write 'PHP' in the search box
+$driver->findElement(WebDriverBy::id('searchInput')) // find search input element
+    ->sendKeys('PHP') // fill the search box
+    ->submit(); // submit the whole form
 
-$cookies = $driver->manage()->getCookies();
-print_r($cookies);
+// wait until 'PHP' is shown in the page heading element
+$driver->wait()->until(
+    WebDriverExpectedCondition::elementTextContains(WebDriverBy::id('firstHeading'), 'PHP')
+);
+
+// print title of the current page to output
+echo "The title is '" . $driver->getTitle() . "'\n";
+
+// print URL of current page to output
+echo "The current URL is '" . $driver->getCurrentURL() . "'\n";
 
-// click the link 'About'
-$link = $driver->findElement(
-    WebDriverBy::id('menu_about')
+// find element of 'History' item in menu
+$historyButton = $driver->findElement(
+    WebDriverBy::cssSelector('#ca-history a')
 );
-$link->click();
 
-// wait until the page is loaded
+// read text of the element and print it to output
+echo "About to click to button with text: '" . $historyButton->getText() . "'\n";
+
+// click the element to navigate to revision history page
+$historyButton->click();
+
+// wait until the target page is loaded
 $driver->wait()->until(
-    WebDriverExpectedCondition::titleContains('About')
+    WebDriverExpectedCondition::titleContains('Revision history')
 );
 
 // print the title of the current page
 echo "The title is '" . $driver->getTitle() . "'\n";
 
 // print the URI of the current page
+
 echo "The current URI is '" . $driver->getCurrentURL() . "'\n";
 
-// write 'php' in the search box
-$driver->findElement(WebDriverBy::id('q'))
-    ->sendKeys('php') // fill the search box
-    ->submit(); // submit the whole form
+// delete all cookies
+$driver->manage()->deleteAllCookies();
+
+// add new cookie
+$cookie = new Cookie('cookie_set_by_selenium', 'cookie_value');
+$driver->manage()->addCookie($cookie);
+
+// dump current cookies to output
+$cookies = $driver->manage()->getCookies();
+print_r($cookies);
 
-// wait at most 10 seconds until at least one result is shown
-$driver->wait(10)->until(
-    WebDriverExpectedCondition::presenceOfAllElementsLocatedBy(
-        WebDriverBy::className('gsc-result')
-    )
-);
 
 // close the browser
 $driver->quit();

From 8994d572eb7142ab2e2aefcbaa007e2e82e0f515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 16 Dec 2019 16:29:46 +0100
Subject: [PATCH 525/784] Baby yoda does not have a place here

---
 lib/Remote/RemoteWebElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index cb0caee46..fff018e41 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -392,7 +392,7 @@ public function submit()
                 // cannot call the submit method directly in case an input of this form is named "submit"
                 'script' => sprintf(
                     'return Object.getPrototypeOf(%1$s).submit.call(%1$s);',
-                    'form' === $this->getTagName() ? 'arguments[0]' : 'arguments[0].form'
+                    $this->getTagName() === 'form' ? 'arguments[0]' : 'arguments[0].form'
                 ),
                 'args' => [[JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $this->id]],
             ]);

From a2e7a9cdd4ff7ddf061ba483bded1d73ee9b59d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 3 Feb 2020 17:37:50 +0100
Subject: [PATCH 526/784] Mention Symfony Panther and Laravel Dusk in README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 199d210e5..c9f4550cc 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,8 @@ You may also want to check out the Selenium [docs](http://docs.seleniumhq.org/do
 To take advantage of automatized testing you may want to integrate php-webdriver to your testing framework.
 There are some projects already providing this:
 
+- [Symfony Panther](https://github.com/symfony/panther) uses php-webdriver and integrates with PHPUnit using `PantherTestCase`
+- [Laravel Dusk](https://laravel.com/docs/dusk) is another project using php-webdriver, could be used for testing via `DuskTestCase`
 - [Steward](https://github.com/lmc-eu/steward) integrates php-webdriver directly to [PHPUnit](https://phpunit.de/), and provides parallelization
 - [Codeception](http://codeception.com) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](http://codeception.com/docs/modules/WebDriver)
 - You can also check out this [blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration

From c17361f92ccbc389ecafcfe55179696c7a761ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 5 Feb 2020 23:12:38 +0100
Subject: [PATCH 527/784] Exclude fullscreen test from chrome

Because of Chrome 80 regression: https://bugs.chromium.org/p/chromium/issues/detail?id=1049336
---
 tests/functional/WebDriverWindowTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 6b2671b81..ba0b45187 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -50,6 +50,8 @@ public function testShouldMaximizeWindow()
 
     /**
      * @group exclude-edge
+     * @group exclude-chrome
+     * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1049336
      */
     public function testShouldFullscreenWindow()
     {

From 29f054fefd7cc4d776b3370cb43c95094689b0c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Feb 2020 16:38:35 +0100
Subject: [PATCH 528/784] Extend and improve readme

---
 README.md   | 121 +++++++++++++++++++++++++++++++++++++++++-----------
 example.php |   1 -
 2 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index c9f4550cc..25d7d29de 100644
--- a/README.md
+++ b/README.md
@@ -36,66 +36,137 @@ Then install the library:
 
 ## Getting started
 
-### Start Server
+### 1. Start server (aka. remote end)
 
-The required server is the `selenium-server-standalone-#.jar` file provided here: http://selenium-release.storage.googleapis.com/index.html
+To control a browser, you need to start a *remote end* (server), which will listen to the commands sent
+from this library and will execute them in the respective browser.
 
-Download and run the server by **replacing #** with the current server version. Keep in mind **you must have Java 8+ installed to run this command**.
+This could be Selenium standalone server, but for local development, you can send them directly to so-called "browser driver" like Chromedriver or Geckodriver.
 
-    java -jar selenium-server-standalone-#.jar
+#### a) Chromedriver
 
-### Create a Browser Session
+Install the latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
+Make sure to have a compatible version of Chromedriver and Chrome!
 
-When creating a browser session, be sure to pass the url of your running server.
+Run `chromedriver` binary, you can pass `port` argument, so that it listens on port 4444:
 
-```php
-// This would be the url of the host running the server-standalone.jar
-$host = 'http://localhost:4444/wd/hub'; // this is the default url and port where Selenium server starts
+```sh
+chromedriver --port=4444
 ```
 
-##### Launch Chrome
+#### b) Geckodriver
 
-Install latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
+Install the latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases).
+Make sure to have a compatible version of Geckodriver and Firefox!
 
-The `chromedriver` binary must be placed in system `PATH` directory, otherwise you must provide the path when starting Selenium server
-(eg. `java -Dwebdriver.chrome.driver="/path/to/chromedriver" -jar selenium-server-standalone-#.jar`).
+Run `geckodriver` binary (it start to listen on port 4444 by default):
 
-```php
-$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+```sh
+geckodriver
+```
+
+#### c) Selenium standalone server
+
+[Selenium server](https://selenium.dev/downloads/) is useful especially when you need to execute multiple tests at once
+or your tests are run in different browsers - like on your CI server.
+
+Selenium server receives commands and starts new sessions using browser drivers acting like hub distributing the commands
+among multiple nodes.
+
+To run the standalone server, download [`selenium-server-standalone-#.jar` file](http://selenium-release.storage.googleapis.com/index.html)
+(replace # with the current server version). Keep in mind **you must have Java 8+ installed**.
+
+Run the server:
+
+```sh
+java -jar selenium-server-standalone-#.jar
+```
+
+You may need to provide path to `chromedriver`/`geckodriver` binary (if they are not placed in system `PATH` directory):
+
+```sh
+# Chromedriver:
+java -Dwebdriver.chrome.driver="/opt/chromium-browser/chromedriver" -jar vendor/bin/selenium-server-standalone-#.jar
+# Geckodriver:
+java -Dwebdriver.gecko.driver="/home/john/bin/geckodriver" -jar vendor/bin/selenium-server-standalone-#.jar
+
+# (These options could be combined)
 ```
 
-##### Launch Firefox
+If you want to distribute browser sessions among multiple servers ("grid mode" - one Selenium hub and multiple Selenium nodes) please
+[refer to the documentation](https://selenium.dev/documentation/en/grid/).
+
+#### d) Docker
 
-Install latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases).
+Selenium server could also be started inside Docker container - see [docker-selenium project](https://github.com/SeleniumHQ/docker-selenium).
 
-The `geckodriver` binary must be placed in system `PATH` directory, otherwise you must provide the path when starting Selenium server
-(eg. `java -Dwebdriver.gecko.driver="/path/to/geckodriver" -jar selenium-server-standalone-#.jar`).
+### 2. Create a Browser Session
 
+When creating a browser session, be sure to pass the url of your running server.
+
+For example:
+
+```php
+// Chromedriver (if started using --port=4444 as above)
+$host = 'http://localhost:4444/';
+// Geckodriver
+$host = 'http://localhost:4444/';
+// selenium-server-standalone-#.jar (version 2.x or 3.x)
+$host = 'http://localhost:4444/wd/hub';
+// selenium-server-standalone-#.jar (version 4.x)
+$host = 'http://localhost:4444/';
+```
+
+Now you can start browser of your choice:
 
 ```php
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+// Chrome
+$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+// Firefox
 $driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
+// Microsoft Edge
+$driver = RemoteWebDriver::create($host, DesiredCapabilities::microsoftEdge());
 ```
 
-### Customize Desired Capabilities
+### 3. Customize Desired Capabilities
+
+Desired capabilities define properties of the browser you are about to start.
+
+They can be customized:
 
 ```php
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+
 $desiredCapabilities = DesiredCapabilities::firefox();
+
+// Disable accepting SSL certificates
 $desiredCapabilities->setCapability('acceptSslCerts', false);
+
+// Run headless firefox
+$desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless']]);
+
 $driver = RemoteWebDriver::create($host, $desiredCapabilities);
 ```
 
-* See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities for more details.
+They can also be used to [configure proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
+To configure Chrome, you may use ChromeOptions - see [details in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/ChromeOptions).
 
-**NOTE:** Above snippets are not intended to be a working example by simply copy-pasting. See [example.php](example.php) for working example.
+* See [legacy JsonWire protocol](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities) documentation or [W3C WebDriver specification](https://w3c.github.io/webdriver/#capabilities) for more details.
+
+**NOTE:** Above snippets are not intended to be a working example by simply copy-pasting. See [example.php](example.php) for a working example.
 
 ## Changelog
 For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
 ## More information
 
-Some how-tos are provided right here in [our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
+Some basic usage example is provided in [example.php](example.php) file.
+
+How-tos are provided right here in [our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
 
-You may also want to check out the Selenium [docs](http://docs.seleniumhq.org/docs/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
+You may also want to check out the Selenium [docs](https://selenium.dev/documentation/en/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
 
 ## Testing framework integration
 
@@ -118,4 +189,4 @@ We have a great community willing to help you!
 
 ## Contributing
 
-We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](CONTRIBUTING.md) for more information about contributing and developing php-webdriver.
+We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information about contributing and developing php-webdriver.
diff --git a/example.php b/example.php
index be2c5eaa3..b7daac7bc 100644
--- a/example.php
+++ b/example.php
@@ -70,6 +70,5 @@
 $cookies = $driver->manage()->getCookies();
 print_r($cookies);
 
-
 // close the browser
 $driver->quit();

From 1b13ddf96cc007560f8522309a2b0e17d53cccb5 Mon Sep 17 00:00:00 2001
From: Kaz <krazzix@gmail.com>
Date: Wed, 5 Feb 2020 10:11:16 +0100
Subject: [PATCH 529/784] Attempt to upload the file to the remote browser even
 in W3C mode

---
 lib/Remote/RemoteWebElement.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index fff018e41..1e6a217f2 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -341,8 +341,17 @@ public function sendKeys($value)
             }
         } else {
             if ($this->isW3cCompliant) {
+                try {
+                    // Attempt to upload the file to the remote browser.
+                    // This is so far non-W3C compliant method, so it may fail - if so, we just ignore the exception.
+                    // @see https://github.com/w3c/webdriver/issues/1355
+                    $fileName = $this->upload($local_file);
+                } catch (WebDriverException $e) {
+                    $fileName = $local_file;
+                }
+
                 $params = [
-                    'text' => $local_file,
+                    'text' => $fileName,
                     ':id' => $this->id,
                 ];
             } else {

From 748901162c03a4df7610e44da01907262d4fce50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 6 Feb 2020 12:23:24 +0100
Subject: [PATCH 530/784] Add few missing unit tests

---
 lib/Remote/RemoteTargetLocator.php            |  4 ++--
 tests/functional/RemoteTargetLocatorTest.php  |  6 +++++
 tests/unit/Remote/DesiredCapabilitiesTest.php | 15 ++++++++++++
 tests/unit/Remote/LocalFileDetectorTest.php   | 24 +++++++++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/Remote/LocalFileDetectorTest.php

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index a5bd9e03c..fb5b552bc 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -27,8 +27,8 @@ public function __construct($executor, $driver, $isW3cCompliant = false)
     }
 
     /**
-     * Switch to the main document if the page contains iframes. Otherwise, switch
-     * to the first frame on the page.
+     * Set the current browsing context to the current top-level browsing context.
+     * This is the same as calling `RemoteTargetLocator::frame(null);`
      *
      * @return WebDriver The driver focused on the top window or the first frame.
      */
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index e47612173..8ee5c96bc 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -77,6 +77,12 @@ public function testShouldSwitchToFrameByItsId()
 
         $this->driver->switchTo()->frame(null);
         $this->assertContains($parentPage, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->frame(0);
+        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+
+        $this->driver->switchTo()->defaultContent();
+        $this->assertContains($parentPage, $this->driver->getPageSource());
     }
 
     public function testShouldSwitchToParentFrame()
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 131bec2ca..f74eb754d 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -50,6 +50,21 @@ public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
         $this->assertSame(333, $capabilities->getVersion());
     }
 
+    public function testShouldAccessCapabilitiesIsser()
+    {
+        $capabilities = new DesiredCapabilities();
+
+        $capabilities->setCapability('custom', 1337);
+        $capabilities->setCapability('customBooleanTrue', true);
+        $capabilities->setCapability('customBooleanFalse', false);
+        $capabilities->setCapability('customNull', null);
+
+        $this->assertTrue($capabilities->is('custom'));
+        $this->assertTrue($capabilities->is('customBooleanTrue'));
+        $this->assertFalse($capabilities->is('customBooleanFalse'));
+        $this->assertFalse($capabilities->is('customNull'));
+    }
+
     public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
     {
         $this->expectException(\Exception::class);
diff --git a/tests/unit/Remote/LocalFileDetectorTest.php b/tests/unit/Remote/LocalFileDetectorTest.php
new file mode 100644
index 000000000..b58413d8b
--- /dev/null
+++ b/tests/unit/Remote/LocalFileDetectorTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Facebook\WebDriver\Remote;
+
+use PHPUnit\Framework\TestCase;
+
+class LocalFileDetectorTest extends TestCase
+{
+    public function testShouldDetectLocalFile()
+    {
+        $detector = new LocalFileDetector();
+
+        $file = $detector->getLocalFile(__DIR__ . '/./' . basename(__FILE__));
+
+        $this->assertSame(__FILE__, $file);
+    }
+
+    public function testShouldReturnNullIfFileNotDetected()
+    {
+        $detector = new LocalFileDetector();
+
+        $this->assertNull($detector->getLocalFile('/this/is/not/a/file'));
+    }
+}

From cfc96ebb114d16ab04ee4019b7b8358199f9ccd2 Mon Sep 17 00:00:00 2001
From: Aleksandar Rusakov <aleksandar.rusakov@rewardgateway.com>
Date: Wed, 5 Feb 2020 17:21:33 +0200
Subject: [PATCH 531/784] Let ZipArchive handle the creation of the zip files

---
 lib/Remote/RemoteWebElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 1e6a217f2..8e238698c 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -499,7 +499,7 @@ protected function upload($local_file)
         }
 
         // Create a temporary file in the system temp directory.
-        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverZip');
+        $temp_zip = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('WebDriverZip', false);
         $zip = new ZipArchive();
         if (($errorCode = $zip->open($temp_zip, ZipArchive::CREATE)) !== true) {
             throw new WebDriverException(sprintf('Error creating zip archive: %s', $errorCode));

From e0de4572570704d8378710b0b67422ee3c333394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 7 Feb 2020 12:18:09 +0100
Subject: [PATCH 532/784] Refactor zip file upload method

---
 lib/Remote/RemoteWebElement.php | 38 ++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 8e238698c..fd4de3511 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -498,26 +498,38 @@ protected function upload($local_file)
             throw new WebDriverException('You may only upload files: ' . $local_file);
         }
 
+        $temp_zip_path = $this->createTemporaryZipArchive($local_file);
+
+        $remote_path = $this->executor->execute(
+            DriverCommand::UPLOAD_FILE,
+            ['file' => base64_encode(file_get_contents($temp_zip_path))]
+        );
+
+        unlink($temp_zip_path);
+
+        return $remote_path;
+    }
+
+    /**
+     * @param string $fileToZip
+     * @return string
+     */
+    protected function createTemporaryZipArchive($fileToZip)
+    {
         // Create a temporary file in the system temp directory.
-        $temp_zip = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('WebDriverZip', false);
+        // Intentionally do not use `tempnam()`, as it creates empty file which zip extension may not handle.
+        $tempZipPath = sys_get_temp_dir() . '/' . uniqid('WebDriverZip', false);
+
         $zip = new ZipArchive();
-        if (($errorCode = $zip->open($temp_zip, ZipArchive::CREATE)) !== true) {
+        if (($errorCode = $zip->open($tempZipPath, ZipArchive::CREATE)) !== true) {
             throw new WebDriverException(sprintf('Error creating zip archive: %s', $errorCode));
         }
 
-        $info = pathinfo($local_file);
+        $info = pathinfo($fileToZip);
         $file_name = $info['basename'];
-        $zip->addFile($local_file, $file_name);
+        $zip->addFile($fileToZip, $file_name);
         $zip->close();
-        $params = [
-            'file' => base64_encode(file_get_contents($temp_zip)),
-        ];
-        $remote_path = $this->executor->execute(
-            DriverCommand::UPLOAD_FILE,
-            $params
-        );
-        unlink($temp_zip);
 
-        return $remote_path;
+        return $tempZipPath;
     }
 }

From 4708f6905d3daa92083b025128c770abe9d5907b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Feb 2020 16:03:46 +0100
Subject: [PATCH 533/784] Add information about renaming into README (#756)

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 25d7d29de..6585cd227 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,21 @@ Then install the library:
 
     php composer.phar require php-webdriver/webdriver
 
+## Upgrade from version <1.8.0
+
+Starting from version 1.8.0, the project has been renamed from `facebook/php-webdriver` to `php-webdriver/webdriver`.
+
+In order to receive the new version and future updates, **you need to rename it in your composer.json**:
+
+```diff
+"require": {
+-    "facebook/webdriver": "(version you use)",
++    "php-webdriver/webdriver": "(version you use)",
+}
+```
+
+and run `composer update`.
+
 ## Getting started
 
 ### 1. Start server (aka. remote end)

From 3e33ee3b8a688d719c55acdd7c6788e3006e1d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Feb 2020 16:04:25 +0100
Subject: [PATCH 534/784] =?UTF-8?q?Release=20version=201.8.0=20?=
 =?UTF-8?q?=F0=9F=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 645ffd936..7fc31a816 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 1.8.0 - 2020-02-10
 ### Added
 - Experimental W3C WebDriver protocol support. The protocol will be used automatically when remote end (like Geckodriver, newer Chromedriver etc.) supports it.
 - `getStatus()` method of `RemoteWebDriver` to get information about remote-end readiness to create new sessions.

From 7729633d3b7068a62e76adc4b784eb78f8dec9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 13 Feb 2020 12:54:32 +0100
Subject: [PATCH 535/784] Fix sendKeys not accepting array as input (#759)

---
 CHANGELOG.md                              |  2 ++
 lib/Remote/RemoteWebElement.php           |  2 +-
 lib/WebDriverKeys.php                     | 20 +++++++++---
 tests/functional/RemoteWebElementTest.php |  5 +++
 tests/unit/WebDriverKeysTest.php          | 39 ++++++++++++++++-------
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fc31a816..48ad2ca51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
 
 ## 1.8.0 - 2020-02-10
 ### Added
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index fd4de3511..a02613104 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -330,7 +330,7 @@ public function sendKeys($value)
         if ($local_file === null) {
             if ($this->isW3cCompliant) {
                 $params = [
-                    'text' => (string) $value,
+                    'text' => WebDriverKeys::encode($value, true),
                     ':id' => $this->id,
                 ];
             } else {
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 77f75b4ea..5bba2eff0 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -90,11 +90,13 @@ class WebDriverKeys
     const COMMAND = self::META;
 
     /**
-     * Encode input of `sendKeys()`.
+     * Encode input of `sendKeys()` to appropriate format according to protocol.
+     *
      * @param string|array|int|float $keys
-     * @return array
+     * @param bool $isW3cCompliant
+     * @return array|string
      */
-    public static function encode($keys)
+    public static function encode($keys, $isW3cCompliant = false)
     {
         if (is_numeric($keys)) {
             $keys = (string) $keys;
@@ -105,7 +107,11 @@ public static function encode($keys)
         }
 
         if (!is_array($keys)) {
-            return [];
+            if (!$isW3cCompliant) {
+                return [];
+            }
+
+            return '';
         }
 
         $encoded = [];
@@ -117,6 +123,10 @@ public static function encode($keys)
             $encoded[] = (string) $key;
         }
 
-        return $encoded;
+        if (!$isW3cCompliant) {
+            return $encoded;
+        }
+
+        return implode('', $encoded);
     }
 }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 46e3509bb..319a8eabb 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -157,6 +157,11 @@ public function testShouldSendKeysToFormElement()
         $this->assertSame('foo bar', $textarea->getAttribute('value'));
         $textarea->sendKeys(' baz');
         $this->assertSame('foo bar baz', $textarea->getAttribute('value'));
+
+        // Send keys as array
+        $textarea->clear();
+        $textarea->sendKeys(['bat', 1, '3', ' ', 3, '7']);
+        $this->assertSame('bat13 37', $textarea->getAttribute('value'));
     }
 
     /**
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index b60bdb2b0..757b7ff99 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -12,11 +12,13 @@ class WebDriverKeysTest extends TestCase
     /**
      * @dataProvider provideKeys
      * @param mixed $keys
-     * @param array $expectedOutput
+     * @param array $expectedOssOutput
+     * @param string $expectedW3cOutput
      */
-    public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
+    public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOutput, $expectedW3cOutput)
     {
-        $this->assertSame($expectedOutput, WebDriverKeys::encode($keys));
+        $this->assertSame($expectedOssOutput, WebDriverKeys::encode($keys));
+        $this->assertSame($expectedW3cOutput, WebDriverKeys::encode($keys, true));
     }
 
     /**
@@ -25,19 +27,32 @@ public function testShouldEncodeKeysToArrayOfStrings($keys, $expectedOutput)
     public function provideKeys()
     {
         return [
-            'empty string' => ['', ['']],
-            'simple string' => ['foo', ['foo']],
-            'string as an array' => [['foo'], ['foo']],
-            'string with modifier as an array' => [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::SHIFT, 'foo']],
-            'string with concatenated modifier' => [[WebDriverKeys::SHIFT . 'foo'], [WebDriverKeys::SHIFT . 'foo']],
-            'simple numeric value' => [3, ['3']],
-            'multiple numeric values' => [[1, 3.33], ['1', '3.33']],
-            'multiple mixed values ' => [['foo', WebDriverKeys::END, '1.234'], ['foo', WebDriverKeys::END, '1.234']],
+            'empty string' => ['', [''], ''],
+            'simple string' => ['foo', ['foo'], 'foo'],
+            'string as an array' => [['foo'], ['foo'], 'foo'],
+            'string with modifier as an array' => [
+                [WebDriverKeys::SHIFT, 'foo'],
+                [WebDriverKeys::SHIFT, 'foo'],
+                WebDriverKeys::SHIFT . 'foo',
+            ],
+            'string with concatenated modifier' => [
+                [WebDriverKeys::SHIFT . 'foo'],
+                [WebDriverKeys::SHIFT . 'foo'],
+                WebDriverKeys::SHIFT . 'foo',
+            ],
+            'simple numeric value' => [3, ['3'], '3'],
+            'multiple numeric values' => [[1, 3.33], ['1', '3.33'], '13.33'],
+            'multiple mixed values ' => [
+                ['foo', WebDriverKeys::END, '1.234'],
+                ['foo', WebDriverKeys::END, '1.234'],
+                'foo' . WebDriverKeys::END . '1.234',
+            ],
             'array of strings with modifiers should separate them with NULL character' => [
                 [[WebDriverKeys::SHIFT, 'foo'], [WebDriverKeys::META, 'bar']],
                 [WebDriverKeys::SHIFT . 'foo' . WebDriverKeys::NULL, WebDriverKeys::META . 'bar' . WebDriverKeys::NULL],
+                WebDriverKeys::SHIFT . 'foo' . WebDriverKeys::NULL . WebDriverKeys::META . 'bar' . WebDriverKeys::NULL,
             ],
-            'null' => [null, []],
+            'null' => [null, [], ''],
         ];
     }
 }

From 6ee357444f5050feac2e11aaf83cd6130931a09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 13 Feb 2020 16:30:33 +0100
Subject: [PATCH 536/784] Edge on Sauce Labs started to misidentify itself back
 and is failing the build

---
 tests/functional/RemoteWebDriverCreateTest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index bf2d13620..2beaf8357 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @covers \Facebook\WebDriver\Remote\HttpCommandExecutor
@@ -36,7 +37,12 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
 
         $returnedCapabilities = $this->driver->getCapabilities();
         $this->assertInstanceOf(WebDriverCapabilities::class, $returnedCapabilities);
-        $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
+
+        // MicrosoftEdge on Sauce Labs started to identify itself back as "msedge"
+        if ($this->desiredCapabilities->getBrowserName() !== WebDriverBrowserType::MICROSOFT_EDGE) {
+            $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
+        }
+
         $this->assertNotEmpty($returnedCapabilities->getPlatform());
         $this->assertNotEmpty($returnedCapabilities);
         $this->assertNotEmpty($returnedCapabilities->getVersion());

From e8c0f60e0ed9d639d7e40c5bbefe7786c26694bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 Feb 2020 01:27:50 +0100
Subject: [PATCH 537/784] Use constants when referencing mouse buttons

---
 lib/Remote/RemoteMouse.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index e95a12fe3..2d9c34a99 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -10,6 +10,13 @@
  */
 class RemoteMouse implements WebDriverMouse
 {
+    /** @internal */
+    const BUTTON_LEFT = 0;
+    /** @internal */
+    const BUTTON_MIDDLE = 1;
+    /** @internal */
+    const BUTTON_RIGHT = 2;
+
     /**
      * @var RemoteExecuteMethod
      */
@@ -54,7 +61,7 @@ public function click(WebDriverCoordinates $where = null)
 
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
-            'button' => 0,
+            'button' => self::BUTTON_LEFT,
         ]);
 
         return $this;
@@ -78,13 +85,11 @@ public function contextClick(WebDriverCoordinates $where = null)
                         'actions' => array_merge($moveAction, [
                             [
                                 'type' => 'pointerDown',
-                                'duration' => 0,
-                                'button' => 2,
+                                'button' => self::BUTTON_RIGHT,
                             ],
                             [
                                 'type' => 'pointerUp',
-                                'duration' => 0,
-                                'button' => 2,
+                                'button' => self::BUTTON_RIGHT,
                             ],
                         ]),
                     ],
@@ -96,7 +101,7 @@ public function contextClick(WebDriverCoordinates $where = null)
 
         $this->moveIfNeeded($where);
         $this->executor->execute(DriverCommand::CLICK, [
-            'button' => 2,
+            'button' => self::BUTTON_RIGHT,
         ]);
 
         return $this;
@@ -150,8 +155,7 @@ public function mouseDown(WebDriverCoordinates $where = null)
                             $this->createMoveAction($where),
                             [
                                 'type' => 'pointerDown',
-                                'duration' => 0,
-                                'button' => 0,
+                                'button' => self::BUTTON_LEFT,
                             ],
                         ],
                     ],
@@ -229,8 +233,7 @@ public function mouseUp(WebDriverCoordinates $where = null)
                         'actions' => array_merge($moveAction, [
                             [
                                 'type' => 'pointerUp',
-                                'duration' => 0,
-                                'button' => 0,
+                                'button' => self::BUTTON_LEFT,
                             ],
                         ]),
                     ],
@@ -290,13 +293,11 @@ private function createClickActions()
         return [
             [
                 'type' => 'pointerDown',
-                'duration' => 0,
-                'button' => 0,
+                'button' => self::BUTTON_LEFT,
             ],
             [
                 'type' => 'pointerUp',
-                'duration' => 0,
-                'button' => 0,
+                'button' => self::BUTTON_LEFT,
             ],
         ];
     }

From f6fe710c7160d3058016f3caf66a9a7fef61f36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 13 Feb 2020 14:36:22 +0100
Subject: [PATCH 538/784] Add functional tests for dragAndDrop actions

---
 tests/functional/WebDriverActionsTest.php | 134 ++++++++++++++++------
 tests/functional/web/events.html          |   2 +
 tests/functional/web/index.html           |   2 +
 tests/functional/web/sortable.html        |  76 ++++++++++++
 4 files changed, 177 insertions(+), 37 deletions(-)
 create mode 100644 tests/functional/web/sortable.html

diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 054147d52..40c560f96 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -5,28 +5,32 @@
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
- * @coversDefaultClass \Facebook\WebDriver\Interactions\WebDriverActions
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverButtonReleaseAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverClickAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverClickAndHoldAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverContextClickAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverDoubleClickAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverKeyDownAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverKeysRelatedAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverKeyUpAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverMouseAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverMouseMoveAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverMoveToOffsetAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverSendKeysAction
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverSingleKeyAction
+ * @covers \Facebook\WebDriver\Interactions\WebDriverActions
  */
 class WebDriverActionsTest extends WebDriverTestCase
 {
-    protected function setUp()
-    {
-        parent::setUp();
-
-        $this->driver->get($this->getTestPageUrl('events.html'));
-    }
-
-    /**
-     * @covers ::__construct
-     * @covers ::click
-     * @covers ::perform
-     */
     public function testShouldClickOnElement()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
 
         $this->driver->action()
@@ -45,18 +49,14 @@ public function testShouldClickOnElement()
         $this->assertSame($logs, $loggedEvents);
     }
 
-    /**
-     * @covers ::__construct
-     * @covers ::clickAndHold
-     * @covers ::perform
-     * @covers ::release
-     */
     public function testShouldClickAndHoldOnElementAndRelease()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
 
         $this->driver->action()
@@ -76,9 +76,6 @@ public function testShouldClickAndHoldOnElementAndRelease()
 
     /**
      * @group exclude-saucelabs
-     * @covers ::__construct
-     * @covers ::contextClick
-     * @covers ::perform
      */
     public function testShouldContextClickOnElement()
     {
@@ -90,6 +87,8 @@ public function testShouldContextClickOnElement()
             $this->markTestSkipped('Getting stuck in EdgeDriver');
         }
 
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
         $element = $this->driver->findElement(WebDriverBy::id('item-2'));
 
         $this->driver->action()
@@ -103,17 +102,14 @@ public function testShouldContextClickOnElement()
         $this->assertContains('contextmenu item-2', $loggedEvents);
     }
 
-    /**
-     * @covers ::__construct
-     * @covers ::doubleClick
-     * @covers ::perform
-     */
     public function testShouldDoubleClickOnElement()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
         $element = $this->driver->findElement(WebDriverBy::id('item-3'));
 
         $this->driver->action()
@@ -124,9 +120,6 @@ public function testShouldDoubleClickOnElement()
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::dragAndDrop
-     * @covers ::perform
      * @group exclude-saucelabs
      */
     public function testShouldDragAndDrop()
@@ -135,17 +128,70 @@ public function testShouldDragAndDrop()
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
-        $element = $this->driver->findElement(WebDriverBy::id('item-3'));
-        $target = $this->driver->findElement(WebDriverBy::id('item-1'));
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::FIREFOX) {
+            self::skipForJsonWireProtocol('Broken in legacy Firefox');
+        }
+
+        $this->driver->get($this->getTestPageUrl('sortable.html'));
+
+        $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
+        $item24 = $this->driver->findElement(WebDriverBy::id('item-2-4'));
+
+        $this->driver->action()
+            ->dragAndDrop($item13, $item24)
+            ->perform();
+
+        $this->assertSame(
+            [['1-1', '1-2', '1-4', '1-5'], ['2-1', '2-2', '2-3', '2-4', '1-3', '2-5']],
+            $this->retrieveListContent()
+        );
+
+        $item21 = $this->driver->findElement(WebDriverBy::id('item-2-1'));
 
         $this->driver->action()
-            ->dragAndDrop($element, $target)
+            ->dragAndDrop($item24, $item21)
             ->perform();
 
-        $this->assertContains('mouseover item-3', $this->retrieveLoggedEvents());
-        $this->assertContains('mousedown item-3', $this->retrieveLoggedEvents());
-        $this->assertContains('mouseover item-1', $this->retrieveLoggedEvents());
-        $this->assertContains('mouseup item-1', $this->retrieveLoggedEvents());
+        $this->assertSame(
+            [['1-1', '1-2', '1-4', '1-5'], ['2-4', '2-1', '2-2', '2-3', '1-3', '2-5']],
+            $this->retrieveListContent()
+        );
+    }
+
+    /**
+     * @group exclude-saucelabs
+     */
+    public function testShouldDragAndDropBy()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPageUrl('sortable.html'));
+
+        $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
+
+        $this->driver->action()
+            ->dragAndDropBy($item13, 100, 55)
+            ->perform();
+
+        $this->assertSame(
+            [['1-1', '1-2', '1-4', '1-5'], ['2-1', '2-2', '2-3', '2-4', '1-3', '2-5']],
+            $this->retrieveListContent()
+        );
+
+        $item25 = $this->driver->findElement(WebDriverBy::id('item-2-5'));
+        $item22 = $this->driver->findElement(WebDriverBy::id('item-2-2'));
+
+        $this->driver->action()
+            ->dragAndDropBy($item25, 0, -130)
+            ->dragAndDropBy($item22, -100, -35)
+            ->perform();
+
+        $this->assertSame(
+            [['1-1', '2-2', '1-2', '1-4', '1-5'], ['2-1', '2-5', '2-3', '2-4', '1-3']],
+            $this->retrieveListContent()
+        );
     }
 
     /**
@@ -157,4 +203,18 @@ private function retrieveLoggedEvents()
 
         return explode("\n", $logElement->getText());
     }
+
+    /**
+     * @return array
+     */
+    private function retrieveListContent()
+    {
+        $list1 = $this->driver->findElement(WebDriverBy::cssSelector('#sortable1'));
+        $list2 = $this->driver->findElement(WebDriverBy::cssSelector('#sortable2'));
+
+        return [
+            explode("\n", $list1->getText()),
+            explode("\n", $list2->getText()),
+        ];
+    }
 }
diff --git a/tests/functional/web/events.html b/tests/functional/web/events.html
index 45e8f3971..5511d321a 100644
--- a/tests/functional/web/events.html
+++ b/tests/functional/web/events.html
@@ -28,8 +28,10 @@
     <li id="item-3" draggable="true">Third item</li>
 </ul>
 
+<h2>Mouse events:</h2>
 <pre id="mouseEventsLog" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
 
+<h2>Keyboard events:</h2>
 <pre id="keyboardEventsLog" style="border: 1px solid black; height: 20em; overflow: auto;"></pre>
 
 <script>
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 02c42e9d6..0f9c4e279 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -35,6 +35,8 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     <a href="http://github.com/alert.html" id="a-alerts">Javascript alerts</a>
     |
     <a href="http://github.com/events.html" id="a-drag">Events</a>
+    |
+    <a href="http://github.com/sortable.html" id="a-sortable">Sortable</a>
 
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>
diff --git a/tests/functional/web/sortable.html b/tests/functional/web/sortable.html
new file mode 100644
index 000000000..9a5196edf
--- /dev/null
+++ b/tests/functional/web/sortable.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Sortable via jQuery</title>
+
+    <link rel="stylesheet" href="http://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+    <style>
+        .row {
+            display: flex;
+            width: 200px;
+        }
+
+        .column {
+            flex: 50%;
+            margin-right: 10px;
+        }
+
+        .list-group {
+            list-style-type: none;
+            margin: 0;
+            padding: 0;
+            width: 100%;
+        }
+
+        .list-group li {
+            margin: 0 0 2px 0;
+            padding: 0.5em;
+            height: 20px;
+        }
+
+        .tinted {
+            background-color: #ffbbbb;
+        }
+
+    </style>
+
+    <script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+    <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+    <script>
+        $(function () {
+            $("#sortable1, #sortable2").sortable({
+                placeholder: "ui-state-highlight",
+                connectWith: ".list-group"
+            });
+        });
+    </script>
+</head>
+<body>
+
+<h1>Sortable using jQuery</h1>
+
+
+<div class="row">
+    <div class="column">
+        <ul id="sortable1" class="list-group">
+            <li class="ui-state-default" id="item-1-1">1-1</li>
+            <li class="ui-state-default" id="item-1-2">1-2</li>
+            <li class="ui-state-default" id="item-1-3">1-3</li>
+            <li class="ui-state-default" id="item-1-4">1-4</li>
+            <li class="ui-state-default" id="item-1-5">1-5</li>
+        </ul>
+    </div>
+    <div class="column">
+        <ul id="sortable2" class="list-group">
+            <li class="ui-state-default tinted" id="item-2-1">2-1</li>
+            <li class="ui-state-default tinted" id="item-2-2">2-2</li>
+            <li class="ui-state-default tinted" id="item-2-3">2-3</li>
+            <li class="ui-state-default tinted" id="item-2-4">2-4</li>
+            <li class="ui-state-default tinted" id="item-2-5">2-5</li>
+        </ul>
+    </div>
+</div>
+
+</body>
+</html>

From 7f8382892cb34118700c8544e4a03366efbcc50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 Feb 2020 01:41:52 +0100
Subject: [PATCH 539/784] Fix mouse move action in W3C mode to use relative
 offset (fixes #757)

https://w3c.github.io/webdriver/#dfn-dispatch-a-pointermove-action
---
 CHANGELOG.md               | 1 +
 lib/Remote/RemoteMouse.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ad2ca51..c62e52d87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Fixed
 - Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
+- Use relative offset when moving mouse pointer in W3C WebDriver mode.
 
 ## 1.8.0 - 2020-02-10
 ### Added
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 2d9c34a99..3495ea745 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -273,13 +273,15 @@ private function createMoveAction(
     ) {
         $move_action = [
             'type' => 'pointerMove',
-            'duration' => 0,
+            'duration' => 100, // to simulate human delay
             'x' => $x_offset === null ? 0 : $x_offset,
             'y' => $y_offset === null ? 0 : $y_offset,
         ];
 
         if ($where !== null) {
             $move_action['origin'] = [JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $where->getAuxiliary()];
+        } else {
+            $move_action['origin'] = 'pointer';
         }
 
         return $move_action;

From 739d2fc13787f810f7bcf9d54428a44b91eee9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 13 Feb 2020 15:25:08 +0100
Subject: [PATCH 540/784] Add functional tests for keys actions

---
 lib/Interactions/WebDriverActions.php     |   2 +-
 tests/functional/RemoteKeyboardTest.php   |  16 +---
 tests/functional/RetrieveEventsTrait.php  |  31 +++++++
 tests/functional/WebDriverActionsTest.php | 106 +++++++++++++++++-----
 4 files changed, 121 insertions(+), 34 deletions(-)
 create mode 100644 tests/functional/RetrieveEventsTrait.php

diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index aefd07faf..b5172e2e7 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -245,7 +245,7 @@ public function keyUp(WebDriverElement $element = null, $key = null)
 
     /**
      * Send keys by keyboard.
-     * If $element is provided, focus on that element first.
+     * If $element is provided, focus on that element first (using single mouse click).
      *
      * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
      * @param WebDriverElement $element
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index 3da1341c0..45c9be151 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -9,6 +9,8 @@
  */
 class RemoteKeyboardTest extends WebDriverTestCase
 {
+    use RetrieveEventsTrait;
+
     /**
      * @group exclude-firefox
      * Firefox does not properly support keyboard actions:
@@ -55,7 +57,7 @@ public function testShouldPressSendAndReleaseKeys()
                     'keyup "Shift"',
                     'keyup "f"',
                 ],
-                $this->retrieveLoggedEvents()
+                $this->retrieveLoggedKeyboardEvents()
             );
         } else {
             $this->assertEquals(
@@ -79,18 +81,8 @@ public function testShouldPressSendAndReleaseKeys()
                     'keydown "f"',
                     'keyup "f"',
                 ],
-                $this->retrieveLoggedEvents()
+                $this->retrieveLoggedKeyboardEvents()
             );
         }
     }
-
-    /**
-     * @return array
-     */
-    private function retrieveLoggedEvents()
-    {
-        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
-
-        return explode("\n", $logElement->getText());
-    }
 }
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
new file mode 100644
index 000000000..3a4a3d512
--- /dev/null
+++ b/tests/functional/RetrieveEventsTrait.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+trait RetrieveEventsTrait
+{
+    /** @var RemoteWebDriver $driver */
+    public $driver;
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedKeyboardEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
+
+        return explode("\n", $logElement->getText());
+    }
+
+    /**
+     * @return array
+     */
+    private function retrieveLoggedMouseEvents()
+    {
+        $logElement = $this->driver->findElement(WebDriverBy::id('mouseEventsLog'));
+
+        return explode("\n", $logElement->getText());
+    }
+}
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 40c560f96..476b359fd 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -23,6 +23,8 @@
  */
 class WebDriverActionsTest extends WebDriverTestCase
 {
+    use RetrieveEventsTrait;
+
     public function testShouldClickOnElement()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
@@ -38,7 +40,7 @@ public function testShouldClickOnElement()
             ->perform();
 
         $logs = ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'];
-        $loggedEvents = $this->retrieveLoggedEvents();
+        $loggedEvents = $this->retrieveLoggedMouseEvents();
 
         if (getenv('GECKODRIVER') === '1') {
             $loggedEvents = array_slice($loggedEvents, 0, count($logs));
@@ -65,11 +67,11 @@ public function testShouldClickAndHoldOnElementAndRelease()
             ->perform();
 
         if (self::isW3cProtocolBuild()) {
-            $this->assertArraySubset(['mouseover item-1', 'mousedown item-1'], $this->retrieveLoggedEvents());
+            $this->assertArraySubset(['mouseover item-1', 'mousedown item-1'], $this->retrieveLoggedMouseEvents());
         } else {
             $this->assertSame(
                 ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
-                $this->retrieveLoggedEvents()
+                $this->retrieveLoggedMouseEvents()
             );
         }
     }
@@ -95,7 +97,7 @@ public function testShouldContextClickOnElement()
             ->contextClick($element)
             ->perform();
 
-        $loggedEvents = $this->retrieveLoggedEvents();
+        $loggedEvents = $this->retrieveLoggedMouseEvents();
 
         $this->assertContains('mousedown item-2', $loggedEvents);
         $this->assertContains('mouseup item-2', $loggedEvents);
@@ -116,12 +118,87 @@ public function testShouldDoubleClickOnElement()
             ->doubleClick($element)
             ->perform();
 
-        $this->assertContains('dblclick item-3', $this->retrieveLoggedEvents());
+        $this->assertContains('dblclick item-3', $this->retrieveLoggedMouseEvents());
+    }
+
+    public function testShouldSendKeysUpAndDown()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::FIREFOX) {
+            self::skipForJsonWireProtocol('Broken in legacy Firefox');
+        }
+
+        $this->driver->get($this->getTestPageUrl('events.html'));
+
+        $this->driver->action()
+            ->keyDown(null, WebDriverKeys::CONTROL)
+            ->keyUp(null, WebDriverKeys::CONTROL)
+            ->sendKeys(null, 'ab')
+            ->perform();
+
+        $events = $this->retrieveLoggedKeyboardEvents();
+
+        $this->assertEquals(
+            [
+                'keydown "Control"',
+                'keyup "Control"',
+                'keydown "a"',
+                'keyup "a"',
+                'keydown "b"',
+                'keyup "b"',
+            ],
+            $events
+        );
+    }
+
+    public function testShouldMoveToElement()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPageUrl('sortable.html'));
+
+        $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
+        $item24 = $this->driver->findElement(WebDriverBy::id('item-2-4'));
+
+        $this->driver->action()
+            ->clickAndHold($item13)
+            ->moveToElement($item24)
+            ->release()
+            ->perform();
+
+        $this->assertSame(
+            [['1-1', '1-2', '1-4', '1-5'], ['2-1', '2-2', '2-3', '2-4', '1-3', '2-5']],
+            $this->retrieveListContent()
+        );
+    }
+
+    public function testShouldMoveByOffset()
+    {
+        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
+            $this->markTestSkipped('Not supported by HtmlUnit browser');
+        }
+
+        $this->driver->get($this->getTestPageUrl('sortable.html'));
+
+        $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
+
+        $this->driver->action()
+            ->clickAndHold($item13)
+            ->moveByOffset(100, 55)
+            ->release()
+            ->perform();
+
+        $this->assertSame(
+            [['1-1', '1-2', '1-4', '1-5'], ['2-1', '2-2', '2-3', '2-4', '1-3', '2-5']],
+            $this->retrieveListContent()
+        );
     }
 
-    /**
-     * @group exclude-saucelabs
-     */
     public function testShouldDragAndDrop()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
@@ -158,9 +235,6 @@ public function testShouldDragAndDrop()
         );
     }
 
-    /**
-     * @group exclude-saucelabs
-     */
     public function testShouldDragAndDropBy()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
@@ -194,16 +268,6 @@ public function testShouldDragAndDropBy()
         );
     }
 
-    /**
-     * @return array
-     */
-    private function retrieveLoggedEvents()
-    {
-        $logElement = $this->driver->findElement(WebDriverBy::id('mouseEventsLog'));
-
-        return explode("\n", $logElement->getText());
-    }
-
     /**
      * @return array
      */

From 639cb48fbc575f73d73c3b02eb3c2512052caebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 16 Feb 2020 20:10:27 +0100
Subject: [PATCH 541/784] Exclude skipped tests on SauceLabs

---
 tests/functional/WebDriverActionsTest.php | 6 ++++++
 tests/functional/WebDriverWindowTest.php  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 476b359fd..c3909da9b 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -121,6 +121,9 @@ public function testShouldDoubleClickOnElement()
         $this->assertContains('dblclick item-3', $this->retrieveLoggedMouseEvents());
     }
 
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldSendKeysUpAndDown()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
@@ -199,6 +202,9 @@ public function testShouldMoveByOffset()
         );
     }
 
+    /**
+     * @group exclude-saucelabs
+     */
     public function testShouldDragAndDrop()
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index ba0b45187..62756f847 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -49,6 +49,7 @@ public function testShouldMaximizeWindow()
     }
 
     /**
+     * @group exclude-saucelabs
      * @group exclude-edge
      * @group exclude-chrome
      * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1049336

From 4c4bae3eaa1a474db8bc2d36b673d1e1681cb9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Feb 2020 22:31:22 +0100
Subject: [PATCH 542/784] Reference phpunit.xsd from vendor to make it always
 up-to-date

---
 phpunit.xml.dist | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 430a8fb5c..2e81aef6d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,15 +3,9 @@
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
         backupGlobals="false"
-        backupStaticAttributes="false"
         colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
         bootstrap="tests/bootstrap.php"
         >
 

From 073a170b8b5f337c2b4eebf00057d346887e5697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 14 Feb 2020 22:31:33 +0100
Subject: [PATCH 543/784] Normalize composer.json

---
 .github/workflows/php.yaml |  8 +++++-
 composer.json              | 53 +++++++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 04fd5b9da..c96bec74e 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -22,7 +22,13 @@ jobs:
       - name: Install dependencies
         run: |
           composer update --no-interaction
-          composer require phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
+          composer require --dev phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
+          composer require --dev ergebnis/composer-normalize
+
+      - name: Check composer.json
+        run: |
+          composer validate --strict
+          composer normalize --dry-run
 
       - name: Run checks
         run: |
diff --git a/composer.json b/composer.json
index 77df01f21..619ebc205 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,16 @@
 {
   "name": "php-webdriver/webdriver",
+  "type": "library",
   "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
-  "keywords": ["webdriver", "selenium", "php", "geckodriver", "chromedriver"],
+  "keywords": [
+    "webdriver",
+    "selenium",
+    "php",
+    "geckodriver",
+    "chromedriver"
+  ],
   "homepage": "https://github.com/php-webdriver/php-webdriver",
-  "type": "library",
   "license": "MIT",
-  "minimum-stability": "beta",
   "require": {
     "php": "^5.6 || ~7.0",
     "ext-curl": "*",
@@ -28,21 +33,39 @@
   "suggest": {
     "ext-SimpleXML": "For Firefox profile creation"
   },
+  "config": {
+    "sort-packages": true
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.8.x-dev"
+    }
+  },
   "autoload": {
-    "files": [
-      "lib/Exception/TimeoutException.php"
-    ],
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"
-    }
+    },
+    "files": [
+      "lib/Exception/TimeoutException.php"
+    ]
   },
   "autoload-dev": {
     "psr-4": {
-      "Facebook\\WebDriver\\": ["tests/unit", "tests/functional"]
+      "Facebook\\WebDriver\\": [
+        "tests/unit",
+        "tests/functional"
+      ]
     },
-    "classmap": ["tests/functional/"]
+    "classmap": [
+      "tests/functional/"
+    ]
   },
+  "minimum-stability": "beta",
   "scripts": {
+    "analyze": [
+      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
+      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
+    ],
     "codestyle:check": [
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
@@ -50,18 +73,6 @@
     "codestyle:fix": [
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff -vvv || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
-    ],
-    "analyze": [
-      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
-      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ]
-  },
-  "config": {
-    "sort-packages": true
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "1.8.x-dev"
-    }
   }
 }

From 262ea0d209c292e0330be1041424887bbbffef04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 17 Feb 2020 09:14:38 +0100
Subject: [PATCH 544/784] Release version 1.8.1

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c62e52d87..9c5d381ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.8.1 - 2020-02-17
 ### Fixed
 - Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
 - Use relative offset when moving mouse pointer in W3C WebDriver mode.

From cfb919b93e665b8e07a60ddec89a5a942819a84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 19 Feb 2020 12:03:11 +0100
Subject: [PATCH 545/784] Reimplement element equals method for W3C mode

---
 CHANGELOG.md                              | 2 ++
 lib/Remote/RemoteWebElement.php           | 3 +--
 tests/functional/RemoteWebElementTest.php | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c5d381ad..9b0cbc84e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Reimplement element `equals()` method to be working in W3C mode.
 
 ## 1.8.1 - 2020-02-17
 ### Fixed
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index a02613104..023a7390c 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -2,7 +2,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
@@ -463,7 +462,7 @@ public function takeElementScreenshot($save_as = null)
     public function equals(WebDriverElement $other)
     {
         if ($this->isW3cCompliant) {
-            throw new UnsupportedOperationException('"elementEquals" is not supported by the W3C specification');
+            return $this->getID() === $other->getID();
         }
 
         return $this->executor->execute(DriverCommand::ELEMENT_EQUALS, [
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 319a8eabb..cacf16390 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -262,12 +262,9 @@ public function testShouldSubmitFormByClickOnSubmitInput()
 
     /**
      * @covers ::equals
-     * @group exclude-saucelabs
      */
     public function testShouldCompareEqualsElement()
     {
-        self::skipForW3cProtocol('"equals" is not supported by the W3C specification');
-
         $this->driver->get($this->getTestPageUrl('index.html'));
 
         $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));

From fdf430d33376acf626b6335ecf576f7c3d7a5e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 24 Feb 2020 17:54:33 +0100
Subject: [PATCH 546/784] When creating from session ID properly read W3C
 compliance param

---
 CHANGELOG.md                                   |  3 +++
 lib/Remote/RemoteWebDriver.php                 | 10 ++++++++--
 phpstan.neon                                   |  4 ++++
 tests/functional/RemoteWebDriverCreateTest.php |  6 +++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b0cbc84e..95cf82f88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Reimplement element `equals()` method to be working in W3C mode.
 
+### Fixed
+- Properly read fifth parameter whether W3C compliant instance should be created when using `createBySessionID()`.
+
 ## 1.8.1 - 2020-02-17
 ### Fixed
 - Accept array as possible input to `sendKeys()` method. (Unintentional BC break in 1.8.0.)
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f157fdf06..0f81a2f90 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -161,6 +161,7 @@ public static function create(
      * @param string $session_id The existing session id
      * @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
+     * @param bool $isW3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
      * @return static
      */
     public static function createBySessionID(
@@ -170,7 +171,8 @@ public static function createBySessionID(
         $request_timeout_in_ms = null
     ) {
         // BC layer to not break the method signature
-        $w3c_compliant = func_num_args() > 3 ? func_get_arg(3) : false;
+        $isW3cCompliant = func_num_args() > 4 ? func_get_arg(4) : false;
+
         $executor = new HttpCommandExecutor($selenium_server_url, null, null);
         if ($connection_timeout_in_ms !== null) {
             $executor->setConnectionTimeout($connection_timeout_in_ms);
@@ -179,7 +181,11 @@ public static function createBySessionID(
             $executor->setRequestTimeout($request_timeout_in_ms);
         }
 
-        return new static($executor, $session_id, null, $w3c_compliant);
+        if (!$isW3cCompliant) {
+            $executor->disableW3cCompliance();
+        }
+
+        return new static($executor, $session_id, null, $isW3cCompliant);
     }
 
     /**
diff --git a/phpstan.neon b/phpstan.neon
index de6574f0b..cf3300bfe 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -10,4 +10,8 @@ parameters:
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
         - '#Unsafe usage of new static\(\)#'
 
+        # Parameter is intentionally not part of signature to not break BC
+        - message: '#PHPDoc tag \@param references unknown parameter: \$isW3cCompliant#'
+          path: 'lib/Remote/RemoteWebDriver.php'
+
     inferPrivatePropertyTypeFromConstructor: true
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 2beaf8357..4eb7ee507 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -92,11 +92,15 @@ public function testShouldCreateInstanceFromExistingSessionId()
 
         // Store session ID
         $sessionId = $originalDriver->getSessionID();
+        $isW3cCompliant = $originalDriver->isW3cCompliant();
 
         // Create new RemoteWebDriver instance based on the session ID
-        $this->driver = RemoteWebDriver::createBySessionID($sessionId, $this->serverUrl);
+        $this->driver = RemoteWebDriver::createBySessionID($sessionId, $this->serverUrl, null, null, $isW3cCompliant);
 
         // Check we reused the previous instance (window) and it has the same URL
         $this->assertContains('/index.html', $this->driver->getCurrentURL());
+
+        // Do some interaction with the new driver
+        $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
     }
 }

From c1539255983f567d7711641ce603e9a3e4d13563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 24 Feb 2020 17:56:58 +0100
Subject: [PATCH 547/784] Create W3C compatible instance by default (fixes
 #771)

---
 CHANGELOG.md                   | 1 +
 lib/Remote/RemoteWebDriver.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95cf82f88..128ee4b78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Changed
 - Reimplement element `equals()` method to be working in W3C mode.
+- New instance of `RemoteWebDriver` created via `createBySessionID()` by default expects W3C mode. This could be disabled using fifth parameter of `createBySessionID()`.
 
 ### Fixed
 - Properly read fifth parameter whether W3C compliant instance should be created when using `createBySessionID()`.
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 0f81a2f90..b5f53246f 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -161,7 +161,7 @@ public static function create(
      * @param string $session_id The existing session id
      * @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
-     * @param bool $isW3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
+     * @param bool $isW3cCompliant True to use W3C WebDriver (default), false to use the legacy JsonWire protocol
      * @return static
      */
     public static function createBySessionID(
@@ -171,7 +171,7 @@ public static function createBySessionID(
         $request_timeout_in_ms = null
     ) {
         // BC layer to not break the method signature
-        $isW3cCompliant = func_num_args() > 4 ? func_get_arg(4) : false;
+        $isW3cCompliant = func_num_args() > 4 ? func_get_arg(4) : true;
 
         $executor = new HttpCommandExecutor($selenium_server_url, null, null);
         if ($connection_timeout_in_ms !== null) {

From b614a01496ad7efe21bc24dc63c6419ebbf76eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Sat, 22 Feb 2020 12:16:36 +0100
Subject: [PATCH 548/784] Fix creating firefox profile zip when using libzip
 1.6+

---
 lib/Firefox/FirefoxProfile.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 04e31dbc0..cce9baaf4 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -148,8 +148,10 @@ public function encode()
         }
         file_put_contents($temp_dir . '/user.js', $content);
 
+        // Intentionally do not use `tempnam()`, as it creates empty file which zip extension may not handle.
+        $temp_zip = sys_get_temp_dir() . '/' . uniqid('WebDriverFirefoxProfileZip', false);
+
         $zip = new ZipArchive();
-        $temp_zip = tempnam(sys_get_temp_dir(), 'WebDriverFirefoxProfileZip');
         $zip->open($temp_zip, ZipArchive::CREATE);
 
         $dir = new RecursiveDirectoryIterator($temp_dir);

From 792e82cfb90375efb9191e487ab260fa193cf39c Mon Sep 17 00:00:00 2001
From: Chin Leung <chin@swoo.ca>
Date: Mon, 17 Feb 2020 10:17:23 -0500
Subject: [PATCH 549/784] Disable the JSON viewer in Firefox

---
 lib/Firefox/FirefoxPreferences.php | 2 ++
 lib/Remote/DesiredCapabilities.php | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
index 96248aa98..159a9c806 100644
--- a/lib/Firefox/FirefoxPreferences.php
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -16,6 +16,8 @@ class FirefoxPreferences
     const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
     /** @var string Browser homepage */
     const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
+    /** @var string Should the Devtools JSON view be enabled? */
+    const DEVTOOLS_JSONVIEW = 'devtools.jsonview.enabled';
 
     private function __construct()
     {
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 7eef1de29..e022ccecd 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -288,9 +288,12 @@ public static function firefox()
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ]);
 
-        // disable the "Reader View" help tooltip, which can hide elements in the window.document
         $profile = new FirefoxProfile();
+        // disable the "Reader View" help tooltip, which can hide elements in the window.document
         $profile->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
+        // disable JSON viewer and let JSON be rendered as raw data
+        $profile->setPreference(FirefoxPreferences::DEVTOOLS_JSONVIEW, false);
+
         $caps->setCapability(FirefoxDriver::PROFILE, $profile);
 
         return $caps;

From 28fdc8db48b186817d4b9fbf86d7e6853e6b0609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 4 Mar 2020 13:17:19 +0100
Subject: [PATCH 550/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128ee4b78..71d904027 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,9 +5,11 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Reimplement element `equals()` method to be working in W3C mode.
 - New instance of `RemoteWebDriver` created via `createBySessionID()` by default expects W3C mode. This could be disabled using fifth parameter of `createBySessionID()`.
+- Disable JSON viewer in Firefox to let JSON response be rendered as-is.
 
 ### Fixed
 - Properly read fifth parameter whether W3C compliant instance should be created when using `createBySessionID()`.
+- Creating of Firefox profile with libzip 1.6+ (eg. on Mac OS Catalina).
 
 ## 1.8.1 - 2020-02-17
 ### Fixed

From 3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 4 Mar 2020 15:40:12 +0100
Subject: [PATCH 551/784] Release version 1.8.2

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71d904027..b2ff306a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.8.2 - 2020-03-04
 ### Changed
 - Reimplement element `equals()` method to be working in W3C mode.
 - New instance of `RemoteWebDriver` created via `createBySessionID()` by default expects W3C mode. This could be disabled using fifth parameter of `createBySessionID()`.

From 306402134d01590dad2070b779288e30b7fce5ea Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 19 Mar 2020 21:47:38 +0100
Subject: [PATCH 552/784] Clean up some files from dist version

---
 .gitattributes | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index c3b6383af..3123b82f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,7 @@
 /.travis.yml export-ignore
 /example.php export-ignore
 /phpunit.xml.dist export-ignore
+/.github export-ignore
+/.php_cs.dist export-ignore
+/phpstan.neon export-ignore
+/.coveralls.yml export-ignore

From 512899069b78274b4f09d96f209b788603faaf5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 24 Apr 2020 16:34:08 +0200
Subject: [PATCH 553/784] Update dependencies and fix phpstan build

---
 composer.json | 2 +-
 phpstan.neon  | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 619ebc205..1d6e43ec0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,9 +21,9 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
-    "jakub-onderka/php-parallel-lint": "^1.0",
     "php-coveralls/php-coveralls": "^2.0",
     "php-mock/php-mock-phpunit": "^1.1",
+    "php-parallel-lint/php-parallel-lint": "^1.2",
     "phpunit/phpunit": "^5.7",
     "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
     "sminnee/phpunit-mock-objects": "^3.4",
diff --git a/phpstan.neon b/phpstan.neon
index cf3300bfe..939659c07 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,8 +1,5 @@
 parameters:
     ignoreErrors:
-        - '#Class Symfony\\Component\\Process\\ProcessBuilder not found.#'
-        - '#Instantiated class Symfony\\Component\\Process\\ProcessBuilder not found.#'
-        - '#Call to method setPrefix\(\) on an unknown class Symfony\\Component\\Process\\ProcessBuilder#'
         # To be fixed:
         - '#Call to an undefined method RecursiveIteratorIterator::getSubPathName\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'

From 86179ee11f5d8a2ad07ac837b06122aad9449cf7 Mon Sep 17 00:00:00 2001
From: Jean Ragouin <jrean@users.noreply.github.com>
Date: Sun, 12 Apr 2020 21:45:07 +0800
Subject: [PATCH 554/784] Update method description

---
 lib/Remote/RemoteWebElement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 023a7390c..f8ee1d1fd 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -124,7 +124,7 @@ public function findElements(WebDriverBy $by)
     }
 
     /**
-     * Get the value of a the given attribute of the element.
+     * Get the value of the given attribute of the element.
      *
      * @param string $attribute_name The name of the attribute.
      * @return string|null The value of the attribute.

From a3b6811dcf3d638ddcd33cf82cc81fd2d334d7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 24 Apr 2020 18:31:12 +0200
Subject: [PATCH 555/784] Mark package replacing facebook/webdriver (fixes
 #780)

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 1d6e43ec0..32014e38c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,9 @@
     "symfony/polyfill-mbstring": "^1.12",
     "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
   },
+  "replace": {
+    "facebook/webdriver": "*"
+  },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
     "php-coveralls/php-coveralls": "^2.0",

From f5caf908489c4b2ba0b8b378e1d2b7487e33b116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 7 May 2020 00:35:03 +0200
Subject: [PATCH 556/784] Fix phpstan build

---
 phpstan.neon | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpstan.neon b/phpstan.neon
index 939659c07..b0777e2c2 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,6 @@
 parameters:
     ignoreErrors:
         # To be fixed:
-        - '#Call to an undefined method RecursiveIteratorIterator::getSubPathName\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'

From a5974811f645adf625c27af8abd7e8a73e89a362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 May 2020 12:33:26 +0200
Subject: [PATCH 557/784] Fix alertIsPresent expected condition in W3C mode
 (fixes #790)

---
 lib/WebDriverExpectedCondition.php      |  4 ++--
 tests/functional/WebDriverAlertTest.php |  4 ++--
 tests/functional/web/alert.html         | 11 ++++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 23fc92fba..02d2e71e0 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver;
 
-use Facebook\WebDriver\Exception\NoAlertOpenException;
+use Facebook\WebDriver\Exception\NoSuchAlertException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\NoSuchFrameException;
 use Facebook\WebDriver\Exception\StaleElementReferenceException;
@@ -545,7 +545,7 @@ function (WebDriver $driver) {
                     $alert->getText();
 
                     return $alert;
-                } catch (NoAlertOpenException $e) {
+                } catch (NoSuchAlertException $e) {
                     return null;
                 }
             }
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 83730f6af..f8373d635 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -21,8 +21,8 @@ protected function setUp()
 
     public function testShouldAcceptAlert()
     {
-        // Open alert
-        $this->driver->findElement(WebDriverBy::id('open-alert'))->click();
+        // Open alert (it is delayed for 1 second, to make sure following wait for alertIsPresent works properly)
+        $this->driver->findElement(WebDriverBy::id('open-alert-delayed'))->click();
 
         // Wait until present
         $this->driver->wait()->until(WebDriverExpectedCondition::alertIsPresent());
diff --git a/tests/functional/web/alert.html b/tests/functional/web/alert.html
index 079d75130..4bf78680a 100644
--- a/tests/functional/web/alert.html
+++ b/tests/functional/web/alert.html
@@ -7,13 +7,18 @@
 <body>
 
 <p>
-    <a href="#" onclick="javascript:alert('This is alert'); return false;" id="open-alert">Open alert</a>
+    <a href="#" onclick="alert('This is alert'); return false;" id="open-alert">Open alert</a>
     <br>
 
-    <a href="#" onclick="javascript:openConfirm(); return false;" id="open-confirm">Open confirm</a>
+    <a href="#" onclick="setTimeout(function(){ alert('This is alert');}, 1000); return false;" id="open-alert-delayed">
+        Open alert after 1 second
+    </a>
     <br>
 
-    <a href="#" onclick="javascript:openPrompt(); return false;" id="open-prompt">Open prompt</a>
+    <a href="#" onclick="openConfirm(); return false;" id="open-confirm">Open confirm</a>
+    <br>
+
+    <a href="#" onclick="openPrompt(); return false;" id="open-prompt">Open prompt</a>
     <br>
 </p>
 

From 0bb2c95d673d0a6ee10e92381ac9a0bfd304c6c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 9 May 2020 12:10:48 +0200
Subject: [PATCH 558/784] Fix RemoteWebDriver cannot be instantiated without
 second parameter (fixes #789)

---
 lib/Chrome/ChromeDriver.php                    |  2 +-
 lib/Remote/RemoteWebDriver.php                 |  9 ++++-----
 tests/functional/RemoteWebDriverCreateTest.php | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 1c9828c8e..a9ead161b 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -35,7 +35,7 @@ public function startSession(DesiredCapabilities $desired_capabilities)
             null,
             DriverCommand::NEW_SESSION,
             [
-                'desiredCapabilities' => $desired_capabilities->toArray(),
+                'desiredCapabilities' => (object) $desired_capabilities->toArray(),
             ]
         );
         $response = $this->executor->execute($command);
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index b5f53246f..f1a47fe44 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -93,7 +93,6 @@ public static function create(
         $http_proxy_port = null,
         DesiredCapabilities $required_capabilities = null
     ) {
-        // BC layer to not break the method signature
         $selenium_server_url = preg_replace('#/+$#', '', $selenium_server_url);
 
         $desired_capabilities = self::castToDesiredCapabilitiesObject($desired_capabilities);
@@ -109,12 +108,12 @@ public static function create(
         // W3C
         $parameters = [
             'capabilities' => [
-                'firstMatch' => [$desired_capabilities->toW3cCompatibleArray()],
+                'firstMatch' => [(object) $desired_capabilities->toW3cCompatibleArray()],
             ],
         ];
 
         if ($required_capabilities !== null && !empty($required_capabilities->toArray())) {
-            $parameters['capabilities']['alwaysMatch'] = $required_capabilities->toW3cCompatibleArray();
+            $parameters['capabilities']['alwaysMatch'] = (object) $required_capabilities->toW3cCompatibleArray();
         }
 
         // Legacy protocol
@@ -122,10 +121,10 @@ public static function create(
             // TODO: Selenium (as of v3.0.1) does accept requiredCapabilities only as a property of desiredCapabilities.
             // This has changed with the W3C WebDriver spec, but is the only way how to pass these
             // values with the legacy protocol.
-            $desired_capabilities->setCapability('requiredCapabilities', $required_capabilities->toArray());
+            $desired_capabilities->setCapability('requiredCapabilities', (object) $required_capabilities->toArray());
         }
 
-        $parameters['desiredCapabilities'] = $desired_capabilities->toArray();
+        $parameters['desiredCapabilities'] = (object) $desired_capabilities->toArray();
 
         $command = new WebDriverCommand(
             null,
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 4eb7ee507..db379964d 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -78,6 +78,22 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
     }
 
+    /**
+     * Capabilities (browser name) must be defined when executing via Selenium proxy (standalone server, Saucelabs etc.)
+     * @group exclude-saucelabs
+     */
+    public function testShouldCreateWebDriverWithoutCapabilities()
+    {
+        if (getenv('GECKODRIVER') !== '1' && getenv('CHROMEDRIVER') !== '1') {
+            $this->markTestSkipped('This test makes sense only when run directly via specific browser driver');
+        }
+
+        $this->driver = RemoteWebDriver::create($this->serverUrl);
+
+        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+        $this->assertNotEmpty($this->driver->getSessionID());
+    }
+
     public function testShouldCreateInstanceFromExistingSessionId()
     {
         // Create driver instance and load page "index.html"

From 53b023cd48af86c30e8cf182146a402b4f09c260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 12 May 2020 23:59:42 +0200
Subject: [PATCH 559/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2ff306a8..33c219c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- Make `alertIsPresent()` condition working in W3C mode.
+- `RemoteWebDriver::create()` cannot be used without providing the second parameter (which is in fact optional).
 
 ## 1.8.2 - 2020-03-04
 ### Changed

From 501987c3b8c012a08384c0c65dcffd319d0cebae Mon Sep 17 00:00:00 2001
From: Arnout Boks <arnoutboks@gmail.com>
Date: Tue, 2 Jun 2020 21:33:06 +0200
Subject: [PATCH 560/784] Fix ChromeDriver::start() causes 'mixed' W3c mode

The `new static` within ChromeDriver::start() creates a RemoteWebDriver that
is not W3C compatible by default (due to the default for RemoteWebDriver's 3rd
constructor arg). The command executor it uses assumes W3C compatibility by
default though. This causes strange bugs, where commands are created assuming
non-compliance, but translated by the command executor as if they were W3C
compliant.

By using the logic already present in RemoteWebDriver::create(), ChromeDriver
now detects whether the sesson it started is in W3C compatible mode and updates
the flags both on itself and on its executor.
---
 lib/Chrome/ChromeDriver.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index a9ead161b..1b77169fb 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -39,6 +39,12 @@ public function startSession(DesiredCapabilities $desired_capabilities)
             ]
         );
         $response = $this->executor->execute($command);
+        $value = $response->getValue();
+
+        if (!$this->isW3cCompliant = isset($value['capabilities'])) {
+            $this->executor->disableW3cCompliance();
+        }
+
         $this->sessionID = $response->getSessionID();
     }
 

From e4347e2164d56c9ad20911f37d41919a0eaadf8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 18 Jun 2020 19:43:24 +0200
Subject: [PATCH 561/784] Rename default branch to main

---
 .github/CONTRIBUTING.md | 2 +-
 README.md               | 2 +-
 composer.json           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2fdbb677f..ed13ceed8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -14,7 +14,7 @@ The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
 2. Implement your code changes into separate branch
 3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have Travis CI build which will automatically run tests on your pull request.
 4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
-5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `master` branch
+5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `main` branch
  
 When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
 FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
diff --git a/README.md b/README.md
index 6585cd227..c69dea366 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
-[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/master.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
+[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/main.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
 [![Total Downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
 
diff --git a/composer.json b/composer.json
index 32014e38c..7c0f1fdc3 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.8.x-dev"
+      "dev-main": "1.8.x-dev"
     }
   },
   "autoload": {

From 6916b0bf61ab19b9d06f50f3c79b209e17f4c9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Aug 2020 13:53:57 +0200
Subject: [PATCH 562/784] Minor improvements and typos fixes

---
 lib/Remote/RemoteWebElement.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index f8ee1d1fd..0ca59aba7 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -81,8 +81,7 @@ public function click()
      * Find the first WebDriverElement within this element using the given mechanism.
      *
      * @param WebDriverBy $by
-     * @return RemoteWebElement NoSuchElementException is thrown in
-     *    HttpCommandExecutor if no element is found.
+     * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
     public function findElement(WebDriverBy $by)
@@ -213,10 +212,10 @@ public function getCoordinates()
         $element = $this;
 
         $on_screen = null; // planned but not yet implemented
-        $in_view_port = function () use ($element) {
+        $in_view_port = static function () use ($element) {
             return $element->getLocationOnScreenOnceScrolledIntoView();
         };
-        $on_page = function () use ($element) {
+        $on_page = static function () use ($element) {
             return $element->getLocation();
         };
         $auxiliary = $this->getID();
@@ -304,7 +303,7 @@ public function isEnabled()
     }
 
     /**
-     * Determine whether or not this element is selected or not.
+     * Determine whether this element is selected or not.
      *
      * @return bool
      */
@@ -367,8 +366,7 @@ public function sendKeys($value)
     }
 
     /**
-     * Set the fileDetector in order to let the RemoteWebElement to know that
-     * you are going to upload a file.
+     * Set the fileDetector in order to let the RemoteWebElement to know that you are going to upload a file.
      *
      * Basically, if you want WebDriver trying to send a file, set the fileDetector
      * to be LocalFileDetector. Otherwise, keep it UselessFileDetector.
@@ -427,7 +425,7 @@ public function getID()
     }
 
     /**
-     * Take screenshot of a specific element.
+     * Take a screenshot of a specific element.
      *
      * @param string $save_as The path of the screenshot to be saved.
      * @return string The screenshot in PNG format.
@@ -454,7 +452,7 @@ public function takeElementScreenshot($save_as = null)
     }
 
     /**
-     * Test if two element IDs refer to the same DOM element.
+     * Test if two elements IDs refer to the same DOM element.
      *
      * @param WebDriverElement $other
      * @return bool

From e2ae45a78370e2000711ba60de16d7f13317a53a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 26 Jun 2020 11:02:41 +0800
Subject: [PATCH 563/784] Work around NULL key issue in sendKeys

A long-standing geckodriver bug
(https://bugzilla.mozilla.org/show_bug.cgi?id=1494661) means that it is
not possible to send a key combination such as SHIFT + 'h' + NULL + 'ello'.
In this case the NULL key does not clear the SHIFT modifier as per the
specification, and it additionally prints a character for the NULL key.

It is possible to work around this bug by splitting on the encoded key
and sending the input in multiple commands instead.
Geckodriver already sends an implicity NULL at the end of the sendKeys
command which does work, does release the modifier and does not print
any character.
---
 lib/Remote/RemoteWebElement.php           | 24 +++++++++++++++--------
 tests/functional/RemoteWebElementTest.php |  8 ++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 0ca59aba7..b4b640374 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -325,14 +325,20 @@ public function sendKeys($value)
     {
         $local_file = $this->fileDetector->getLocalFile($value);
 
+        $params = [];
         if ($local_file === null) {
             if ($this->isW3cCompliant) {
-                $params = [
-                    'text' => WebDriverKeys::encode($value, true),
-                    ':id' => $this->id,
-                ];
+                // Work around the Geckodriver NULL issue by splitting on NULL and calling sendKeys multiple times.
+                // See https://bugzilla.mozilla.org/show_bug.cgi?id=1494661.
+                $encodedValues = explode(WebDriverKeys::NULL, WebDriverKeys::encode($value, true));
+                foreach ($encodedValues as $encodedValue) {
+                    $params[] = [
+                        'text' => $encodedValue,
+                        ':id' => $this->id,
+                    ];
+                }
             } else {
-                $params = [
+                $params[] = [
                     'value' => WebDriverKeys::encode($value),
                     ':id' => $this->id,
                 ];
@@ -348,19 +354,21 @@ public function sendKeys($value)
                     $fileName = $local_file;
                 }
 
-                $params = [
+                $params[] = [
                     'text' => $fileName,
                     ':id' => $this->id,
                 ];
             } else {
-                $params = [
+                $params[] = [
                     'value' => WebDriverKeys::encode($this->upload($local_file)),
                     ':id' => $this->id,
                 ];
             }
         }
 
-        $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $params);
+        foreach ($params as $param) {
+            $this->executor->execute(DriverCommand::SEND_KEYS_TO_ELEMENT, $param);
+        }
 
         return $this;
     }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index cacf16390..021e6ed1a 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -152,12 +152,20 @@ public function testShouldSendKeysToFormElement()
         $input->sendKeys(' baz');
         $this->assertSame('foo bar baz', $input->getAttribute('value'));
 
+        $input->clear();
+        $input->sendKeys([WebDriverKeys::SHIFT, 'H', WebDriverKeys::NULL, 'ello']);
+        $this->assertSame('Hello', $input->getAttribute('value'));
+
         $textarea->clear();
         $textarea->sendKeys('foo bar');
         $this->assertSame('foo bar', $textarea->getAttribute('value'));
         $textarea->sendKeys(' baz');
         $this->assertSame('foo bar baz', $textarea->getAttribute('value'));
 
+        $textarea->clear();
+        $textarea->sendKeys([WebDriverKeys::SHIFT, 'H', WebDriverKeys::NULL, 'ello']);
+        $this->assertSame('Hello', $textarea->getAttribute('value'));
+
         // Send keys as array
         $textarea->clear();
         $textarea->sendKeys(['bat', 1, '3', ' ', 3, '7']);

From 99ec34e9ee006a80042dd860f17010f13ddabed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 9 Sep 2020 17:44:26 +0200
Subject: [PATCH 564/784] Update travis build to latest geckodriver

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a773b2c6f..134f39466 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -132,7 +132,7 @@ before_script:
       unzip chromedriver_linux64.zip -d chromedriver;
     fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
-  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz; tar xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver; fi
+  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz; tar xzf geckodriver-v0.27.0-linux64.tar.gz -C geckodriver; fi
   - if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
       mkdir -p jar;
       if [ "$SELENIUM_SERVER" = "legacy" ]; then

From d01e823a2605118f41638e7d8ebcce870ff70e1d Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Mon, 22 Jun 2020 23:55:53 +0300
Subject: [PATCH 565/784] Make sure that chromeOptions is an object when empty

---
 lib/Chrome/ChromeOptions.php                  | 14 ++++++----
 lib/Remote/DesiredCapabilities.php            |  8 ++++--
 tests/unit/Remote/DesiredCapabilitiesTest.php | 28 +++++++++++++------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index af99d3cfe..1b3c4cbdc 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -117,17 +117,19 @@ public function toCapabilities()
     }
 
     /**
-     * @return array
+     * @return \ArrayObject|array
      */
     public function toArray()
     {
-        $options = $this->experimentalOptions;
-
         // The selenium server expects a 'dictionary' instead of a 'list' when
         // reading the chrome option. However, an empty array in PHP will be
-        // converted to a 'list' instead of a 'dictionary'. To fix it, we always
-        // set the 'binary' to avoid returning an empty array.
-        $options['binary'] = $this->binary;
+        // converted to a 'list' instead of a 'dictionary'. To fix it, we work
+        // with `ArrayObject`
+        $options = new \ArrayObject($this->experimentalOptions);
+
+        if (!empty($this->binary)) {
+            $options['binary'] = $this->binary;
+        }
 
         if (!empty($this->arguments)) {
             $options['args'] = $this->arguments;
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index e022ccecd..5fcf651d9 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -235,9 +235,11 @@ public function toW3cCompatibleArray()
         // Convert ChromeOptions
         if (array_key_exists(ChromeOptions::CAPABILITY, $ossCapabilities)) {
             if (array_key_exists(ChromeOptions::CAPABILITY_W3C, $ossCapabilities)) {
-                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = array_merge_recursive(
-                    $ossCapabilities[ChromeOptions::CAPABILITY],
-                    $ossCapabilities[ChromeOptions::CAPABILITY_W3C]
+                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = new \ArrayObject(
+                    array_merge_recursive(
+                        (array) $ossCapabilities[ChromeOptions::CAPABILITY],
+                        (array) $ossCapabilities[ChromeOptions::CAPABILITY_W3C]
+                    )
                 );
             } else {
                 $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = $ossCapabilities[ChromeOptions::CAPABILITY];
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index f74eb754d..f24d8eb40 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -213,15 +213,24 @@ public function provideW3cCapabilities()
                     'vendor:prefix' => 'vendor extension should be kept',
                 ],
             ],
+            'chromeOptions should be an object if empty' => [
+                new DesiredCapabilities([
+                    ChromeOptions::CAPABILITY => new ChromeOptions(),
+                ]),
+                [
+                    'goog:chromeOptions' => new \ArrayObject(),
+                ],
+            ],
             'chromeOptions should be converted' => [
                 new DesiredCapabilities([
                     ChromeOptions::CAPABILITY => $chromeOptions,
                 ]),
                 [
-                    'goog:chromeOptions' => [
-                        'args' => ['--headless'],
-                        'binary' => '',
-                    ],
+                    'goog:chromeOptions' => new \ArrayObject(
+                        [
+                            'args' => ['--headless'],
+                        ]
+                    ),
                 ],
             ],
             'chromeOptions should be merged if already defined' => [
@@ -233,11 +242,12 @@ public function provideW3cCapabilities()
                     ],
                 ]),
                 [
-                    'goog:chromeOptions' => [
-                        'args' => ['--headless', 'window-size=1024,768'],
-                        'binary' => '',
-                        'debuggerAddress' => '127.0.0.1:38947',
-                    ],
+                    'goog:chromeOptions' => new \ArrayObject(
+                        [
+                            'args' => ['--headless', 'window-size=1024,768'],
+                            'debuggerAddress' => '127.0.0.1:38947',
+                        ]
+                    ),
                 ],
             ],
             'firefox_profile should be converted' => [

From 33284ca385542df62a15ee53cc82eef33ca0c407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 10 Sep 2020 13:45:09 +0200
Subject: [PATCH 566/784] Run SauceLabs tests via GitHub Actions

---
 .github/workflows/sauce-labs.yaml      | 66 ++++++++++++++++++++++++++
 .travis.yml                            | 46 +-----------------
 composer.json                          |  1 +
 tests/functional/WebDriverTestCase.php | 26 +++++++---
 4 files changed, 88 insertions(+), 51 deletions(-)
 create mode 100644 .github/workflows/sauce-labs.yaml

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
new file mode 100644
index 000000000..9398909ae
--- /dev/null
+++ b/.github/workflows/sauce-labs.yaml
@@ -0,0 +1,66 @@
+name: Sauce Labs
+
+on:
+  push:
+  schedule:
+    - cron:  '0 3 * * *'
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    env:
+      SAUCELABS: 1
+      SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
+      SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { name: "Firefox 47, OSS protocol", BROWSER_NAME: "firefox", VERSION: "47.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-1" }
+          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-2" } # 74 is the last version which don't use W3C WebDriver by default
+          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
+          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-4" }
+
+    name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          extensions: mbstring, intl, zip
+
+      - name: Install dependencies
+        run: composer update --no-interaction
+
+      - name: Start local PHP server
+        run: |
+          php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+
+      - name: Start Sauce Connect
+        uses: saucelabs/sauce-connect-action@master
+        with:
+          username: ${{ secrets.SAUCE_USERNAME }}
+          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
+          tunnelIdentifier: ${{ matrix.tunnel-id }}
+
+      - name: Run tests
+        env:
+          BROWSER_NAME: ${{ matrix.BROWSER_NAME }}
+          VERSION: ${{ matrix.VERSION }}
+          PLATFORM: ${{ matrix.PLATFORM }}
+          DISABLE_W3C_PROTOCOL: ${{ matrix.DISABLE_W3C_PROTOCOL }}
+          SAUCE_TUNNEL_IDENTIFIER: ${{ matrix.tunnel-id }}
+        run: |
+          if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
+          if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
+          if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
+          if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
+          if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
+          ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
+
+      - name: Print logs
+        if: ${{ always() }}
+        run: |
+          if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
diff --git a/.travis.yml b/.travis.yml
index 134f39466..a627edc09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,51 +70,6 @@ matrix:
       addons:
         chrome: stable
 
-    # Saucelabs builds
-    - name: 'Sauce Labs, Firefox 47, OSS protocol'
-      php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="firefox" VERSION="47.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1"
-      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"
-      addons:
-        sauce_connect: true
-        jwt:
-          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
-
-    - name: 'Sauce Labs, Chrome 74, OSS protocol'
-      php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" VERSION="74.0" PLATFORM="Windows 10" DISABLE_W3C_PROTOCOL="1" # 74 is the last version which don't use W3C WebDriver by default
-      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"
-      addons:
-        sauce_connect: true
-        jwt:
-          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
-
-    - name: 'Sauce Labs, Chrome latest, W3C protocol'
-      php: '7.3'
-      env: SAUCELABS=1 BROWSER_NAME="chrome" 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"
-      addons:
-        sauce_connect: true
-        jwt:
-          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
-
-    - name: 'Sauce Labs, Edge latest, W3C protocol'
-      php: '7.3'
-      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"
-      addons:
-        sauce_connect: true
-        jwt:
-          secure: 5s8iQfH1dHgEm0DeP9VZ/MCzCeiE/HnMWqPFzRmg6VD2qJ53oYdseo8j+QCbE25MIwoSnIbKzlnbCN6fVzZc/0S7Mo45xJiq8xVLPSdMjDoOeqYE4of+t5Srq4iSzGLPCLiMTtB4xDEl6blUVGhYxN5rA/tVN+cVtLNQvo3ovRon3Mw3MqR4pgCE6PofcLXtyJc3KuOBlUJLWdPGRdlZrpKWE5ogyj4a1h4bVwidckZqkOF+gm58Gf0zVfFazDQFIw2Xuq7SZmiNgdOD5yUEePkrMhy2tbOlPNAIgHCpzHldv5Y+GYyxIYHZ0mGlGxHrfjrcAoSA6r2iXB9q2ijLVwqOARpcvGcBzZBil9aMAHRIXHAOV9Ihv4velrzmiLKADtD60Bfj2zzntGYZA3EGucitMMkkP7vfAa769i5QWK1Lniq3+VUuGNVjRzl4GuQPpc0wMWeJvQGc5Uf9Kk/sOCkPp0SPWcZ6nNAUebRy3V5OoADA9IntyXxfTlZdOHSbJTsG+eOGve0uLGRAOS+oeCstO7Gk4e/Ylozju+ixkINEY7HHDGt6AyHGtjPdy08Y0XrIqs0JMxsHKrtTVNxDjIFKbMees+vtxU3DEr/tNo1sTo34ieGKZP2Cp5mG/IrcjD1saebUaCngQO3QfeuKcU8pBTR7l7PtFNHm3HrmdkY=
-
 cache:
   directories:
     - $HOME/.composer/cache
@@ -156,6 +111,7 @@ before_script:
 
 script:
   - if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
+  - if [ -n "$SAUCELABS" ]; then export SAUCE_TUNNEL_IDENTIFIER="$TRAVIS_JOB_NUMBER"; fi
   - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
   - if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
diff --git a/composer.json b/composer.json
index 7c0f1fdc3..b94e7ac94 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
+    "ondram/ci-detector": "^2.1 || ^3.5",
     "php-coveralls/php-coveralls": "^2.0",
     "php-mock/php-mock-phpunit": "^1.1",
     "php-parallel-lint/php-parallel-lint": "^1.2",
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 9718cd671..76c79bb7d 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -8,6 +8,7 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use OndraM\CiDetector\CiDetector;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -174,9 +175,18 @@ protected function setUpSauceLabs()
         $name = get_class($this) . '::' . $this->getName();
         $tags = [get_class($this)];
 
-        if (getenv('TRAVIS_JOB_NUMBER')) {
-            $tunnelIdentifier = getenv('TRAVIS_JOB_NUMBER');
-            $build = getenv('TRAVIS_JOB_NUMBER');
+        $ciDetector = new CiDetector();
+        if ($ciDetector->isCiDetected()) {
+            $ci = $ciDetector->detect();
+            if (!empty($ci->getBuildNumber())) {
+                // SAUCE_TUNNEL_IDENTIFIER appended as a workaround for GH actions not having environment value
+                // to distinguish runs of the matrix
+                $build = $ci->getBuildNumber() . '.' . getenv('SAUCE_TUNNEL_IDENTIFIER');
+            }
+        }
+
+        if (getenv('SAUCE_TUNNEL_IDENTIFIER')) {
+            $tunnelIdentifier = getenv('SAUCE_TUNNEL_IDENTIFIER');
         }
 
         if (!getenv('DISABLE_W3C_PROTOCOL')) {
@@ -184,17 +194,21 @@ protected function setUpSauceLabs()
                 'name' => $name,
                 'tags' => $tags,
             ];
-            if (isset($tunnelIdentifier, $build)) {
-                $sauceOptions['tunnelIdentifier'] = $tunnelIdentifier;
+            if (isset($build)) {
                 $sauceOptions['build'] = $build;
             }
+            if (isset($tunnelIdentifier)) {
+                $sauceOptions['tunnelIdentifier'] = $tunnelIdentifier;
+            }
             $this->desiredCapabilities->setCapability('sauce:options', (object) $sauceOptions);
         } else {
             $this->desiredCapabilities->setCapability('name', $name);
             $this->desiredCapabilities->setCapability('tags', $tags);
 
-            if (isset($tunnelIdentifier, $build)) {
+            if (isset($tunnelIdentifier)) {
                 $this->desiredCapabilities->setCapability('tunnel-identifier', $tunnelIdentifier);
+            }
+            if (isset($build)) {
                 $this->desiredCapabilities->setCapability('build', $build);
             }
         }

From 0ac00d8deca08b2c5a94dd9f25533588da94c8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Oct 2020 20:22:34 +0200
Subject: [PATCH 567/784] Disable composer memory limit in travis builds

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a627edc09..31c92bd5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env:
     - DISPLAY=:99.0
     - BROWSER_NAME="htmlunit"
     - SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
+    - COMPOSER_MEMORY_LIMIT=-1
 
 services:
   - xvfb

From d5790a8daea2172dc3923b1565aed8df12922177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Oct 2020 21:09:25 +0200
Subject: [PATCH 568/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c219c31..b4ceccbda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Make `alertIsPresent()` condition working in W3C mode.
 - `RemoteWebDriver::create()` cannot be used without providing the second parameter (which is in fact optional).
+- `ChromeDriver::start()` starts in inconsistent state mixing W3C/OSS mode.
+- Modifier keys are not released when sending NULL key in GeckoDriver (workaround for GeckoDriver bug [1494661](https://bugzilla.mozilla.org/show_bug.cgi?id=1494661)).
+- Do not set unnecessary `binary` value of `goog:chromeOptions` while keep the object in proper data type required by ChromeDriver.
 
 ## 1.8.2 - 2020-03-04
 ### Changed

From fb0fc4cb01c70a7790a5fcc91d461b88c83174a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Oct 2020 21:10:04 +0200
Subject: [PATCH 569/784] Release version 1.8.3

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4ceccbda..c4f091d8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.8.3 - 2020-10-06
 ### Fixed
 - Make `alertIsPresent()` condition working in W3C mode.
 - `RemoteWebDriver::create()` cannot be used without providing the second parameter (which is in fact optional).

From 841b5b7e099aed453b67b617014f79b822688f90 Mon Sep 17 00:00:00 2001
From: Michael Steininger <11192306+codegain@users.noreply.github.com>
Date: Fri, 18 Sep 2020 22:38:24 +0200
Subject: [PATCH 570/784] Add same-site support for cookies (fixes #705)

---
 lib/Cookie.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 0e1436089..1005bd0dc 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -58,6 +58,9 @@ public static function createFromArray(array $cookieArray)
         if (isset($cookieArray['httpOnly'])) {
             $cookie->setHttpOnly($cookieArray['httpOnly']);
         }
+        if (isset($cookieArray['sameSite'])) {
+            $cookie->setSameSite($cookieArray['sameSite']);
+        }
 
         return $cookie;
     }
@@ -172,6 +175,24 @@ public function isHttpOnly()
         return $this->offsetGet('httpOnly');
     }
 
+    /**
+     * The cookie's same-site value.
+     *
+     * @param string $sameSite
+     */
+    public function setSameSite($sameSite)
+    {
+        $this->offsetSet('sameSite', $sameSite);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getSameSite()
+    {
+        return $this->offsetGet('sameSite');
+    }
+
     /**
      * @return array
      */

From 7efbcb88a34b1df5aeaa1c40bf20d96388633d09 Mon Sep 17 00:00:00 2001
From: Michael Steininger <11192306+codegain@users.noreply.github.com>
Date: Tue, 6 Oct 2020 22:07:06 +0200
Subject: [PATCH 571/784] added unit tests for same-site cookie attribute

---
 tests/unit/CookieTest.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 621fb65c0..cced57524 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -17,6 +17,7 @@ public function testShouldSetAllProperties()
         $cookie->setExpiry(1485388387);
         $cookie->setSecure(true);
         $cookie->setHttpOnly(true);
+        $cookie->setSameSite('Lax');
 
         $this->assertSame('cookieName', $cookie->getName());
         $this->assertSame('someValue', $cookie->getValue());
@@ -25,6 +26,7 @@ public function testShouldSetAllProperties()
         $this->assertSame(1485388387, $cookie->getExpiry());
         $this->assertTrue($cookie->isSecure());
         $this->assertTrue($cookie->isHttpOnly());
+        $this->assertSame('Lax', $cookie->getSameSite());
 
         return $cookie;
     }
@@ -44,6 +46,7 @@ public function testShouldBeConvertibleToArray(Cookie $cookie)
                 'expiry' => 1485388387,
                 'secure' => true,
                 'httpOnly' => true,
+                'sameSite' => 'Lax',
             ],
             $cookie->toArray()
         );
@@ -84,6 +87,7 @@ public function testShouldProvideArrayAccessToProperties(Cookie $cookie)
         $this->assertSame(1485388387, $cookie['expiry']);
         $this->assertTrue($cookie['secure']);
         $this->assertTrue($cookie['httpOnly']);
+        $this->assertSame('Lax', $cookie['sameSite']);
 
         $cookie->offsetSet('domain', 'bar.com');
         $this->assertSame('bar.com', $cookie['domain']);
@@ -122,6 +126,10 @@ public function testShouldBeCreatableFromAnArrayWithBasicValues()
         $this->assertArrayNotHasKey('httpOnly', $cookie);
         $this->assertNull($cookie['httpOnly']);
         $this->assertNull($cookie->isHttpOnly());
+
+        $this->assertArrayNotHasKey('sameSite', $cookie);
+        $this->assertNull($cookie['sameSite']);
+        $this->assertNull($cookie->getSameSite());
     }
 
     public function testShouldBeCreatableFromAnArrayWithAllValues()
@@ -134,6 +142,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
             'expiry' => 1485388333,
             'secure' => false,
             'httpOnly' => false,
+            'sameSite' => 'Lax',
         ];
 
         $cookie = Cookie::createFromArray($sourceArray);
@@ -145,6 +154,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
         $this->assertSame(1485388333, $cookie['expiry']);
         $this->assertFalse($cookie['secure']);
         $this->assertFalse($cookie['httpOnly']);
+        $this->assertSame('Lax', $cookie['sameSite']);
     }
 
     /**

From 4fbb161f0a480b48cce0116af581c61c3fd8c347 Mon Sep 17 00:00:00 2001
From: Michael Steininger <11192306+codegain@users.noreply.github.com>
Date: Tue, 6 Oct 2020 22:38:12 +0200
Subject: [PATCH 572/784] Updated testShouldNotContainNullValues

---
 tests/unit/CookieTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index cced57524..d58419a9a 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -67,6 +67,7 @@ public function testShouldNotContainNullValues()
 
         $cookie->setHttpOnly(null);
         $cookie->setPath(null);
+        $cookie->setSameSite(null);
         $cookieArray = $cookie->toArray();
 
         foreach ($cookieArray as $key => $value) {

From c106a41a1a75e3e3e163f6a3f58aeec80e434b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Oct 2020 23:12:46 +0200
Subject: [PATCH 573/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4f091d8a..5009ff1dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- Support of SameSite cookie property.
 
 ## 1.8.3 - 2020-10-06
 ### Fixed

From 9e8aeac43ec9e3e2f530c7662ecb67cbb4150495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 16 Nov 2020 15:26:32 +0100
Subject: [PATCH 574/784] Move phpstan path and level config to file

---
 phpstan.neon | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index b0777e2c2..846484976 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,4 +1,9 @@
 parameters:
+    level: 2
+    paths:
+        - lib/
+        - tests/
+
     ignoreErrors:
         # To be fixed:
         - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'

From 5898a74ce2bb87b2b755d322069200c7460fe907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 16 Nov 2020 15:30:31 +0100
Subject: [PATCH 575/784] Workaround for broken PHPStan parallel processing

---
 composer.json              | 3 ++-
 phpstan-webdriverkeys.neon | 6 ++++++
 phpstan.neon               | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 phpstan-webdriverkeys.neon

diff --git a/composer.json b/composer.json
index b94e7ac94..0a3e81ae3 100644
--- a/composer.json
+++ b/composer.json
@@ -68,7 +68,8 @@
   "scripts": {
     "analyze": [
       "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
-      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
+      "vendor/bin/phpstan.phar analyze -c phpstan.neon --ansi",
+      "vendor/bin/phpstan.phar analyze -c phpstan-webdriverkeys.neon --ansi"
     ],
     "codestyle:check": [
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
diff --git a/phpstan-webdriverkeys.neon b/phpstan-webdriverkeys.neon
new file mode 100644
index 000000000..799558876
--- /dev/null
+++ b/phpstan-webdriverkeys.neon
@@ -0,0 +1,6 @@
+# WebDriverKeys.php breaks PHPStan parallel processing, so we must analyze the file separately.
+# See https://github.com/phpstan/phpstan/issues/3956 and https://github.com/clue/reactphp-ndjson/issues/21
+parameters:
+    level: 2
+    paths:
+        - lib/WebDriverKeys.php
diff --git a/phpstan.neon b/phpstan.neon
index 846484976..4b12710a5 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -16,3 +16,6 @@ parameters:
           path: 'lib/Remote/RemoteWebDriver.php'
 
     inferPrivatePropertyTypeFromConstructor: true
+
+    excludes_analyse:
+        - lib/WebDriverKeys.php

From 4d2eb507e6308b8794ddf0b2e75be245bbff967c Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 16 Nov 2020 16:22:05 +0100
Subject: [PATCH 576/784] Scripts and configuration changes for PHP 8

Co-Authored-By: Dries Vints <dries@vints.io>
---
 .gitattributes                   |  1 +
 .github/workflows/php.yaml       |  2 +-
 .gitignore                       |  1 +
 .php_cs.dist                     |  2 +-
 .travis.yml                      | 22 ++++++++++++++++++----
 composer.json                    | 10 ++++------
 scripts/apply-phpunit-patches.sh | 20 ++++++++++++++++++++
 7 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100755 scripts/apply-phpunit-patches.sh

diff --git a/.gitattributes b/.gitattributes
index 3123b82f2..8a5e272b2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 * text=auto
 
+/scripts export-ignore
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index c96bec74e..3065ff732 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '7.4'
           extensions: mbstring, intl, zip
diff --git a/.gitignore b/.gitignore
index deb25f3ae..d5605367c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ composer.phar
 composer.lock
 vendor
 .php_cs.cache
+.phpunit.result.cache
 phpunit.xml
 logs/
 
diff --git a/.php_cs.dist b/.php_cs.dist
index b771f8b04..a438f2095 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -52,7 +52,7 @@ return PhpCsFixer\Config::create()
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_construct' => true,
-        'php_unit_dedicate_assert' => true,
+        'php_unit_dedicate_assert' => false,
         'php_unit_expectation' => ['target' => '5.6'],
         'php_unit_method_casing' => ['case' => 'camel_case'],
         'php_unit_mock' => true,
diff --git a/.travis.yml b/.travis.yml
index 31c92bd5d..b8f993e44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ language: php
 dist: xenial
 
 php:
-  - '5.6'
-  - '7.0'
   - '7.1'
   - '7.2'
   - '7.3'
@@ -21,10 +19,25 @@ services:
 
 matrix:
   include:
+    - name: 'PHP nightly build'
+      php: 'nightly'
+      env: DEPENDENCIES="--ignore-platform-req=php"
+
+    - name: 'PHP 7.0'
+      php: '7.0'
+      env: RUN_PHPUNIT_PATCHES="true"
+
+    - name: 'PHP 5.6'
+      php: '5.6'
+      env: RUN_PHPUNIT_PATCHES="true"
+
     # Build with lowest possible dependencies on lowest possible PHP
     - name: 'Lowest dependencies build'
       php: '5.6'
-      env: DEPENDENCIES="--prefer-lowest"
+      env:
+        - DEPENDENCIES="--prefer-lowest"
+        - RUN_PHPUNIT_PATCHES="true"
+
 
     # Firefox inside Travis environment
     - name: 'Firefox 45 on Travis (OSS protocol); via legacy Selenium server'
@@ -80,6 +93,7 @@ install:
   - travis_retry composer update --no-interaction $DEPENDENCIES
 
 before_script:
+  - if [ "$RUN_PHPUNIT_PATCHES" = "true" ]; then ./scripts/apply-phpunit-patches.sh; fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then
       mkdir chromedriver;
       CHROME_VERSION=$(google-chrome --product-version);
@@ -126,4 +140,4 @@ after_script:
   - if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
 
 after_success:
-  - travis_retry php vendor/bin/php-coveralls -v
+  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then travis_retry php vendor/bin/php-coveralls -v; fi
diff --git a/composer.json b/composer.json
index 0a3e81ae3..88f215101 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
   "homepage": "https://github.com/php-webdriver/php-webdriver",
   "license": "MIT",
   "require": {
-    "php": "^5.6 || ~7.0",
+    "php": "^5.6 || ~7.0 || ^8.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-zip": "*",
@@ -25,12 +25,10 @@
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
     "ondram/ci-detector": "^2.1 || ^3.5",
-    "php-coveralls/php-coveralls": "^2.0",
-    "php-mock/php-mock-phpunit": "^1.1",
+    "php-coveralls/php-coveralls": "^2.4",
+    "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
     "php-parallel-lint/php-parallel-lint": "^1.2",
-    "phpunit/phpunit": "^5.7",
-    "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-    "sminnee/phpunit-mock-objects": "^3.4",
+    "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
   },
diff --git a/scripts/apply-phpunit-patches.sh b/scripts/apply-phpunit-patches.sh
new file mode 100755
index 000000000..ee1dd00f3
--- /dev/null
+++ b/scripts/apply-phpunit-patches.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# All commands below must no fail
+set -e
+
+# Be in the root dir
+cd "$(dirname $0)/../"
+
+find tests/ -type f -print0 | xargs -0 sed -i 's/function setUpBeforeClass(): void/function setUpBeforeClass()/g';
+find tests/ -type f -print0 | xargs -0 sed -i 's/function setUp(): void/function setUp()/g';
+find tests/ -type f -print0 | xargs -0 sed -i 's/function tearDown(): void/function tearDown()/g';
+
+sed -i 's/endTest(\\PHPUnit\\Framework\\Test \$test, float \$time): void/endTest(\\PHPUnit_Framework_Test \$test, \$time)/g' tests/functional/ReportSauceLabsStatusListener.php;
+sed -i 's/: void/ /g' tests/functional/ReportSauceLabsStatusListener.php;
+# Drop the listener from the config file
+sed -i '/<listeners>/,+2d' phpunit.xml.dist;
+sed -i 's/function runBare(): void/function runBare()/g' tests/functional/WebDriverTestCase.php;
+
+# Return back to original dir
+cd - > /dev/null
\ No newline at end of file

From 6583dd2fddac651d75ead9189cacc9fec0ef504f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 16 Nov 2020 12:17:56 +0100
Subject: [PATCH 577/784] PHP 8 and phpunit compatibility changes on source
 files  tests/*

---
 .../Chrome/ChromeDriverServiceTest.php        |  2 +-
 tests/functional/Chrome/ChromeDriverTest.php  |  4 +-
 tests/functional/RemoteTargetLocatorTest.php  | 28 +++++-----
 .../functional/RemoteWebDriverCreateTest.php  |  6 +--
 .../RemoteWebDriverFindElementTest.php        |  4 +-
 tests/functional/RemoteWebDriverTest.php      | 18 +++----
 tests/functional/RemoteWebElementTest.php     |  6 +--
 .../ReportSauceLabsStatusListener.php         | 52 ++++++++++++++++---
 tests/functional/WebDriverActionsTest.php     |  3 +-
 tests/functional/WebDriverAlertTest.php       |  2 +-
 tests/functional/WebDriverCheckboxesTest.php  |  2 +-
 .../WebDriverOptionsCookiesTest.php           |  2 +-
 tests/functional/WebDriverRadiosTest.php      |  2 +-
 tests/functional/WebDriverSelectTest.php      |  2 +-
 tests/functional/WebDriverTestCase.php        | 22 ++++++--
 .../WebDriverButtonReleaseActionTest.php      |  6 +--
 .../Internal/WebDriverClickActionTest.php     |  6 +--
 .../WebDriverClickAndHoldActionTest.php       |  6 +--
 .../WebDriverContextClickActionTest.php       |  6 +--
 .../Internal/WebDriverCoordinatesTest.php     | 22 +++-----
 .../WebDriverDoubleClickActionTest.php        |  6 +--
 .../Internal/WebDriverKeyDownActionTest.php   |  8 +--
 .../Internal/WebDriverKeyUpActionTest.php     |  8 +--
 .../Internal/WebDriverMouseMoveActionTest.php |  6 +--
 .../WebDriverMouseToOffsetActionTest.php      |  6 +--
 .../Internal/WebDriverSendKeysActionTest.php  |  8 +--
 tests/unit/Remote/HttpCommandExecutorTest.php |  2 +-
 tests/unit/Remote/RemoteWebDriverTest.php     |  2 +-
 tests/unit/WebDriverExpectedConditionTest.php |  4 +-
 tests/unit/WebDriverOptionsTest.php           |  4 +-
 30 files changed, 151 insertions(+), 104 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index a21727781..1f5baa4f9 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -11,7 +11,7 @@
  */
 class ChromeDriverServiceTest extends TestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
             $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 26c9de81d..fd7581008 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -16,14 +16,14 @@ class ChromeDriverTest extends TestCase
     /** @var ChromeDriver */
     protected $driver;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
             $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor() !== null) {
             $this->driver->quit();
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 8ee5c96bc..9128502b2 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -23,7 +23,7 @@ public function testShouldSwitchToWindow()
         );
 
         // At first the window should not be switched
-        $this->assertContains('open_new_window.html', $this->driver->getCurrentURL());
+        $this->compatAssertStringContainsString('open_new_window.html', $this->driver->getCurrentURL());
         $this->assertSame($originalWindowHandle, $this->driver->getWindowHandle());
 
         /**
@@ -38,7 +38,7 @@ public function testShouldSwitchToWindow()
         $this->driver->switchTo()->window($newWindowHandle);
 
         // After switchTo() is called, the active window should be changed
-        $this->assertContains('index.html', $this->driver->getCurrentURL());
+        $this->compatAssertStringContainsString('index.html', $this->driver->getCurrentURL());
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
 
@@ -64,25 +64,25 @@ public function testShouldSwitchToFrameByItsId()
 
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
 
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(null);
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(1);
-        $this->assertContains($secondChildFrame, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($secondChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(null);
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->defaultContent();
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
     public function testShouldSwitchToParentFrame()
@@ -92,13 +92,13 @@ public function testShouldSwitchToParentFrame()
 
         $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
 
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->assertContains($firstChildFrame, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->parent();
-        $this->assertContains($parentPage, $this->driver->getPageSource());
+        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
     public function testShouldSwitchToFrameByElement()
@@ -108,7 +108,7 @@ public function testShouldSwitchToFrameByElement()
         $element = $this->driver->findElement(WebDriverBy::id('iframe_content'));
         $this->driver->switchTo()->frame($element);
 
-        $this->assertContains('This is the content of the iFrame', $this->driver->getPageSource());
+        $this->compatAssertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
     }
 
     /**
@@ -139,6 +139,6 @@ public function testShouldAcceptStringAsFrameIdInJsonWireMode()
 
         $this->driver->switchTo()->frame('iframe_content');
 
-        $this->assertContains('This is the content of the iFrame', $this->driver->getPageSource());
+        $this->compatAssertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
     }
 }
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index db379964d..29302e16a 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -32,7 +32,7 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
         $this->assertNotEmpty($this->driver->getCommandExecutor()->getAddressOfRemoteServer());
 
-        $this->assertInternalType('string', $this->driver->getSessionID());
+        $this->assertTrue(is_string($this->driver->getSessionID()));
         $this->assertNotEmpty($this->driver->getSessionID());
 
         $returnedCapabilities = $this->driver->getCapabilities();
@@ -104,7 +104,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
             $this->requestTimeout
         );
         $originalDriver->get($this->getTestPageUrl('index.html'));
-        $this->assertContains('/index.html', $originalDriver->getCurrentURL());
+        $this->compatAssertStringContainsString('/index.html', $originalDriver->getCurrentURL());
 
         // Store session ID
         $sessionId = $originalDriver->getSessionID();
@@ -114,7 +114,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
         $this->driver = RemoteWebDriver::createBySessionID($sessionId, $this->serverUrl, null, null, $isW3cCompliant);
 
         // Check we reused the previous instance (window) and it has the same URL
-        $this->assertContains('/index.html', $this->driver->getCurrentURL());
+        $this->compatAssertStringContainsString('/index.html', $this->driver->getCurrentURL());
 
         // Do some interaction with the new driver
         $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 4ac265381..5a7d18e70 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -34,7 +34,7 @@ public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('not_existing'));
 
-        $this->assertInternalType('array', $elements);
+        $this->assertTrue(is_array($elements));
         $this->assertCount(0, $elements);
     }
 
@@ -44,7 +44,7 @@ public function testShouldFindMultipleElements()
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
 
-        $this->assertInternalType('array', $elements);
+        $this->assertTrue(is_array($elements));
         $this->assertCount(5, $elements);
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
     }
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 28b4e52ab..ae289de5d 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -43,8 +43,8 @@ public function testShouldGetPageSource()
         $this->driver->get($this->getTestPageUrl('index.html'));
 
         $source = $this->driver->getPageSource();
-        $this->assertContains('<h1 id="welcome">', $source);
-        $this->assertContains('Welcome to the php-webdriver testing page.', $source);
+        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
+        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
     }
 
     /**
@@ -63,7 +63,7 @@ public function testShouldGetSessionId()
 
         $sessionId = $this->driver->getSessionID();
 
-        $this->assertInternalType('string', $sessionId);
+        $this->assertTrue(is_string($sessionId));
         $this->assertNotEmpty($sessionId);
     }
 
@@ -79,7 +79,7 @@ public function testShouldGetAllSessions()
 
         $sessions = RemoteWebDriver::getAllSessions($this->serverUrl, 30000);
 
-        $this->assertInternalType('array', $sessions);
+        $this->assertTrue(is_array($sessions));
         $this->assertCount(1, $sessions);
 
         $this->assertArrayHasKey('capabilities', $sessions[0]);
@@ -124,7 +124,7 @@ public function testShouldGetWindowHandles()
         $windowHandle = $this->driver->getWindowHandle();
         $windowHandles = $this->driver->getWindowHandles();
 
-        $this->assertInternalType('string', $windowHandle);
+        $this->assertTrue(is_string($windowHandle));
         $this->assertNotEmpty($windowHandle);
         $this->assertSame([$windowHandle], $windowHandles);
 
@@ -266,7 +266,7 @@ public function testShouldTakeScreenshot()
         $outputPng = $this->driver->takeScreenshot();
 
         $image = imagecreatefromstring($outputPng);
-        $this->assertInternalType('resource', $image);
+        $this->assertTrue(is_resource($image));
 
         $this->assertGreaterThan(0, imagesx($image));
         $this->assertGreaterThan(0, imagesy($image));
@@ -292,7 +292,7 @@ public function testShouldSaveScreenshotToFile()
         $this->driver->takeScreenshot($screenshotPath);
 
         $image = imagecreatefrompng($screenshotPath);
-        $this->assertInternalType('resource', $image);
+        $this->assertTrue(is_resource($image));
 
         $this->assertGreaterThan(0, imagesx($image));
         $this->assertGreaterThan(0, imagesy($image));
@@ -323,9 +323,9 @@ public function testShouldGetRemoteEndStatus()
     {
         $status = $this->driver->getStatus();
 
-        $this->assertInternalType('boolean', $status->isReady());
+        $this->assertTrue(is_bool($status->isReady()));
         $this->assertNotEmpty($status->getMessage());
 
-        $this->assertInternalType('array', $status->getMeta());
+        $this->assertTrue(is_array($status->getMeta()));
     }
 }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 021e6ed1a..21d890ccc 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -318,7 +318,7 @@ public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
 
         $childElements = $element->findElements(WebDriverBy::cssSelector('not_existing'));
 
-        $this->assertInternalType('array', $childElements);
+        $this->assertTrue(is_array($childElements));
         $this->assertCount(0, $childElements);
     }
 
@@ -330,7 +330,7 @@ public function testShouldFindMultipleChildElements()
         $allElements = $this->driver->findElements(WebDriverBy::cssSelector('li'));
         $childElements = $element->findElements(WebDriverBy::cssSelector('li'));
 
-        $this->assertInternalType('array', $childElements);
+        $this->assertTrue(is_array($childElements));
         $this->assertCount(5, $allElements); // there should be 5 <li> elements on page
         $this->assertCount(3, $childElements); // but we should find only subelements of one <ul>
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $childElements);
@@ -373,7 +373,7 @@ public function testShouldTakeAndSaveElementScreenshot()
 
         // Assert string output
         $imageFromString = imagecreatefromstring($outputPngString);
-        $this->assertInternalType('resource', $imageFromString);
+        $this->assertTrue(is_resource($imageFromString));
         $this->assertEquals(5, imagesx($imageFromString));
         $this->assertEquals(5, imagesy($imageFromString));
 
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index d09d46f22..7c3bed873 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -3,11 +3,12 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use PHPUnit\Framework\BaseTestListener;
+use PHPUnit\Framework\TestListener;
+use Throwable;
 
-class ReportSauceLabsStatusListener extends BaseTestListener
+class ReportSauceLabsStatusListener implements TestListener
 {
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(\PHPUnit\Framework\Test $test, float $time): void
     {
         if (!$test instanceof WebDriverTestCase || !$test->driver instanceof RemoteWebDriver) {
             return;
@@ -31,21 +32,60 @@ public function endTest(\PHPUnit_Framework_Test $test, $time)
         );
 
         $data = [
-            'passed' => ($testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_PASSED),
+            'passed' => ($testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_PASSED),
             'custom-data' => ['message' => $test->getStatusMessage()],
         ];
 
         $this->submitToSauceLabs($endpointUrl, $data);
     }
 
+    public function addError(\PHPUnit\Framework\Test $test, Throwable $t, float $time): void
+    {
+    }
+
+    public function addWarning(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\Warning $w, float $time): void
+    {
+    }
+
+    public function addFailure(
+        \PHPUnit\Framework\Test $test,
+        \PHPUnit\Framework\AssertionFailedError $e,
+        float $time
+    ): void {
+    }
+
+    public function addIncompleteTest(\PHPUnit\Framework\Test $test, Throwable $t, float $time): void
+    {
+    }
+
+    public function addRiskyTest(\PHPUnit\Framework\Test $test, Throwable $t, float $time): void
+    {
+    }
+
+    public function addSkippedTest(\PHPUnit\Framework\Test $test, Throwable $t, float $time): void
+    {
+    }
+
+    public function startTestSuite(\PHPUnit\Framework\TestSuite $suite): void
+    {
+    }
+
+    public function endTestSuite(\PHPUnit\Framework\TestSuite $suite): void
+    {
+    }
+
+    public function startTest(\PHPUnit\Framework\Test $test): void
+    {
+    }
+
     /**
      * @param int $testStatus
      * @return bool
      */
     private function testWasSkippedOrIncomplete($testStatus)
     {
-        if ($testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
-            || $testStatus === \PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE) {
+        if ($testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED
+            || $testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_INCOMPLETE) {
             return true;
         }
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index c3909da9b..b9c617142 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -67,7 +67,8 @@ public function testShouldClickAndHoldOnElementAndRelease()
             ->perform();
 
         if (self::isW3cProtocolBuild()) {
-            $this->assertArraySubset(['mouseover item-1', 'mousedown item-1'], $this->retrieveLoggedMouseEvents());
+            $this->assertContains('mouseover item-1', $this->retrieveLoggedMouseEvents());
+            $this->assertContains('mousedown item-1', $this->retrieveLoggedMouseEvents());
         } else {
             $this->assertSame(
                 ['mouseover item-1', 'mousedown item-1', 'mouseup item-1', 'click item-1'],
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index f8373d635..1eb665b75 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -12,7 +12,7 @@
  */
 class WebDriverAlertTest extends WebDriverTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 106ddf42a..e42ab144b 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -11,7 +11,7 @@
  */
 class WebDriverCheckboxesTest extends WebDriverTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index b00d51130..cba3d6833 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -9,7 +9,7 @@
  */
 class WebDriverOptionsCookiesTest extends WebDriverTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 95e517f8c..b6f900d8a 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -12,7 +12,7 @@
  */
 class WebDriverRadiosTest extends WebDriverTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index c908693b7..aa3cce1f2 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -13,7 +13,7 @@
  */
 class WebDriverSelectTest extends WebDriverTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 76c79bb7d..0ade1c509 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -29,7 +29,7 @@ class WebDriverTestCase extends TestCase
     /** @var int */
     protected $requestTimeout = 60000;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->desiredCapabilities = new DesiredCapabilities();
 
@@ -78,7 +78,7 @@ protected function setUp()
         }
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor()) {
             try {
@@ -126,7 +126,7 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
      * Rerun failed tests.
      * @TODO Replace with PHPUnit 7.3+ builtin functionality once upgraded to PHP 7.1+
      */
-    public function runBare()
+    public function runBare(): void
     {
         $e = null;
         $numberOfRetires = 3;
@@ -213,4 +213,20 @@ protected function setUpSauceLabs()
             }
         }
     }
+
+    /**
+     * Uses assertStringContainsString when it is available or uses assertContains for old phpunit versions
+     * @param string $needle
+     * @param string $haystack
+     * @param string $message
+     */
+    protected function compatAssertStringContainsString($needle, $haystack, $message = '')
+    {
+        if (method_exists($this, 'assertStringContainsString')) {
+            parent::assertStringContainsString($needle, $haystack, $message);
+
+            return;
+        }
+        parent::assertContains($needle, $haystack, $message);
+    }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index 6771b331d..22aed07ef 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -10,12 +10,12 @@ class WebDriverButtonReleaseActionTest extends TestCase
 {
     /** @var WebDriverButtonReleaseAction */
     private $webDriverButtonReleaseAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 99eb28d0d..7ec720f5d 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -10,12 +10,12 @@ class WebDriverClickActionTest extends TestCase
 {
     /** @var WebDriverClickAction */
     private $webDriverClickAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index fb71ff8b7..749215583 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -10,12 +10,12 @@ class WebDriverClickAndHoldActionTest extends TestCase
 {
     /** @var WebDriverClickAndHoldAction */
     private $webDriverClickAndHoldAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index 74f205064..5bc3282e7 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -10,12 +10,12 @@ class WebDriverContextClickActionTest extends TestCase
 {
     /** @var WebDriverContextClickAction */
     private $webDriverContextClickAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index af107e61a..b14ad2654 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
+use Facebook\WebDriver\WebDriverPoint;
 use PHPUnit\Framework\TestCase;
 
 class WebDriverCoordinatesTest extends TestCase
@@ -9,27 +10,16 @@ class WebDriverCoordinatesTest extends TestCase
     public function testConstruct()
     {
         $in_view_port = function () {
+            return new WebDriverPoint(0, 0);
         };
         $on_page = function () {
+            return new WebDriverPoint(10, 10);
         };
 
         $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
 
-        $this->assertAttributeEquals(null, 'onScreen', $webDriverCoordinates);
-        $this->assertAttributeEquals($in_view_port, 'inViewPort', $webDriverCoordinates);
-        $this->assertAttributeEquals($on_page, 'onPage', $webDriverCoordinates);
-        $this->assertAttributeEquals('auxiliary', 'auxiliary', $webDriverCoordinates);
-    }
-
-    public function testGetAuxiliary()
-    {
-        $in_view_port = function () {
-        };
-        $on_page = function () {
-        };
-
-        $webDriverCoordinates = new WebDriverCoordinates(null, $in_view_port, $on_page, 'auxiliary');
-
-        $this->assertEquals('auxiliary', $webDriverCoordinates->getAuxiliary());
+        $this->assertEquals(new WebDriverPoint(0, 0), $webDriverCoordinates->inViewPort());
+        $this->assertEquals(new WebDriverPoint(10, 10), $webDriverCoordinates->onPage());
+        $this->assertSame('auxiliary', $webDriverCoordinates->getAuxiliary());
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 2ba6629de..72122e30e 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -10,12 +10,12 @@ class WebDriverDoubleClickActionTest extends TestCase
 {
     /** @var WebDriverDoubleClickAction */
     private $webDriverDoubleClickAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 969a1fb75..25e30415b 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -11,14 +11,14 @@ class WebDriverKeyDownActionTest extends TestCase
 {
     /** @var WebDriverKeyDownAction */
     private $webDriverKeyDownAction;
-    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverKeyboard|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverKeyboard;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 2727be004..0dfa50af6 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -11,14 +11,14 @@ class WebDriverKeyUpActionTest extends TestCase
 {
     /** @var WebDriverKeyUpAction */
     private $webDriverKeyUpAction;
-    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverKeyboard|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverKeyboard;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 71ab09d4c..47c8aa191 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -10,12 +10,12 @@ class WebDriverMouseMoveActionTest extends TestCase
 {
     /** @var WebDriverMouseMoveAction */
     private $webDriverMouseMoveAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index e2b78b77f..af2c9be09 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -12,12 +12,12 @@ class WebDriverMouseToOffsetActionTest extends TestCase
      * @type WebDriverMoveToOffsetAction
      */
     private $webDriverMoveToOffsetAction;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
         $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index cc0d3f763..d38816479 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -11,16 +11,16 @@ class WebDriverSendKeysActionTest extends TestCase
 {
     /** @var WebDriverSendKeysAction */
     private $webDriverSendKeysAction;
-    /** @var WebDriverKeyboard|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverKeyboard|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverKeyboard;
-    /** @var WebDriverMouse|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverMouse|\PHPUnit\Framework\MockObject\MockObject */
     private $webDriverMouse;
-    /** @var WebDriverLocatable|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WebDriverLocatable|\PHPUnit\Framework\MockObject\MockObject */
     private $locationProvider;
     /** @var array */
     private $keys;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
         $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index d76780463..30e117536 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -12,7 +12,7 @@ class HttpCommandExecutorTest extends TestCase
     /** @var HttpCommandExecutor */
     private $executor;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->executor = new HttpCommandExecutor('http://localhost:4444/');
     }
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 330da2d54..7f0475dec 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -18,7 +18,7 @@ class RemoteWebDriverTest extends TestCase
     /** @var RemoteWebDriver */
     private $driver;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->driver = RemoteWebDriver::createBySessionID('session-id', 'http://foo.bar:4444/');
     }
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 94bafb150..2d0e743f7 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -14,12 +14,12 @@
  */
 class WebDriverExpectedConditionTest extends TestCase
 {
-    /** @var RemoteWebDriver|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var RemoteWebDriver|\PHPUnit\Framework\MockObject\MockObject */
     private $driverMock;
     /** @var WebDriverWait */
     private $wait;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->driverMock = $this->createMock(RemoteWebDriver::class);
         $this->wait = new WebDriverWait($this->driverMock, 1, 1);
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 14dc8b503..7b4b8f45e 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -11,10 +11,10 @@
  */
 class WebDriverOptionsTest extends TestCase
 {
-    /** @var ExecuteMethod|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var ExecuteMethod|\PHPUnit\Framework\MockObject\MockObject */
     private $executor;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->executor = $this->getMockBuilder(ExecuteMethod::class)
             ->disableOriginalConstructor()

From bfa41cc08c6fc0fe0a30953ae143a1b0789c7012 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 18 Jun 2020 21:15:39 +0800
Subject: [PATCH 578/784] Add new window command

---
 CHANGELOG.md                             |  1 +
 lib/Remote/DriverCommand.php             |  1 +
 lib/Remote/HttpCommandExecutor.php       |  1 +
 lib/Remote/RemoteWebDriver.php           | 20 ++++++++++++++
 tests/functional/RemoteWebDriverTest.php | 34 ++++++++++++++++++++++++
 5 files changed, 57 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5009ff1dd..f62490eb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Added
 - Support of SameSite cookie property.
+- Command `RemoteWebDriver::newWindow()` for W3C mode to open new top-level browsing context (aka window).
 
 ## 1.8.3 - 2020-10-06
 ### Fixed
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 3f1e8392d..97b9090ef 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -140,6 +140,7 @@ class DriverCommand
     const ACTIONS = 'actions';
     const GET_ELEMENT_PROPERTY = 'getElementProperty';
     const GET_NAMED_COOKIE = 'getNamedCookie';
+    const NEW_WINDOW = 'newWindow';
     const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
     const MINIMIZE_WINDOW = 'minimizeWindow';
 
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 6bc942adf..f853a735e 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -157,6 +157,7 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::MAXIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/maximize'],
         DriverCommand::MINIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/minimize'],
+        DriverCommand::NEW_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/new'],
         DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f1a47fe44..20a8a2f53 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
@@ -199,6 +200,25 @@ public function close()
         return $this;
     }
 
+    /**
+     * Create a new top-level browsing context.
+     *
+     * @return RemoteWebDriver The current instance.
+     */
+    public function newWindow()
+    {
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('New window is only supported in W3C mode');
+        }
+
+        $response = $this->execute(DriverCommand::NEW_WINDOW, []);
+        $handle = $response['handle'];
+
+        $this->switchTo()->window($handle);
+
+        return $this;
+    }
+
     /**
      * Find the first WebDriverElement using the given mechanism.
      *
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index ae289de5d..191e6d2d4 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -47,6 +47,40 @@ public function testShouldGetPageSource()
         $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
     }
 
+    /**
+     * @group exclude-saucelabs
+     * @covers ::window
+     */
+    public function testShouldCreateNewWindow()
+    {
+        self::skipForJsonWireProtocol('Create new window is not supported in JsonWire protocol');
+
+        // Ensure that the initial context matches.
+        $initialHandle = $this->driver->getWindowHandle();
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+        $source = $this->driver->getPageSource();
+        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
+        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
+        $windowHandles = $this->driver->getWindowHandles();
+        $this->assertCount(1, $windowHandles);
+
+        // Create a new window
+        $this->driver->newWindow();
+
+        $windowHandles = $this->driver->getWindowHandles();
+        $this->assertCount(2, $windowHandles);
+
+        $newWindowHandle = $this->driver->getWindowHandle();
+        $this->driver->get($this->getTestPageUrl('upload.html'));
+        $this->assertEquals($this->getTestPageUrl('upload.html'), $this->driver->getCurrentUrl());
+        $this->assertNotEquals($initialHandle, $newWindowHandle);
+
+        // Switch back to original context.
+        $this->driver->switchTo()->window($initialHandle);
+        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+    }
+
     /**
      * @covers ::getSessionID
      * @covers ::isW3cCompliant

From 8163ba2f534fdc9f470b20045449525362c495a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 16 Nov 2020 17:20:06 +0100
Subject: [PATCH 579/784] Warn users to not use end(getWindowHandles())

---
 lib/Remote/RemoteWebDriver.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 20a8a2f53..c8416bec0 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -319,6 +319,9 @@ public function getWindowHandle()
     /**
      * Get all window handles available to the current session.
      *
+     * Note: Do not use `end($driver->getWindowHandles())` to find the last open window, for proper solution see:
+     * https://github.com/php-webdriver/php-webdriver/wiki/Alert,-tabs,-frames,-iframes#switch-to-the-new-window
+     *
      * @return array An array of string containing all available window handles.
      */
     public function getWindowHandles()

From ad5b8c58292f1c5186b11e7294fc3f07d09c11e6 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Mon, 16 Nov 2020 23:41:54 +0100
Subject: [PATCH 580/784] Revert "Workaround for broken PHPStan parallel
 processing"

This reverts commit 5898a74ce2bb87b2b755d322069200c7460fe907.
---
 composer.json              | 3 +--
 phpstan-webdriverkeys.neon | 6 ------
 phpstan.neon               | 3 ---
 3 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 phpstan-webdriverkeys.neon

diff --git a/composer.json b/composer.json
index 88f215101..6732f5947 100644
--- a/composer.json
+++ b/composer.json
@@ -66,8 +66,7 @@
   "scripts": {
     "analyze": [
       "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
-      "vendor/bin/phpstan.phar analyze -c phpstan.neon --ansi",
-      "vendor/bin/phpstan.phar analyze -c phpstan-webdriverkeys.neon --ansi"
+      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
     ],
     "codestyle:check": [
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
diff --git a/phpstan-webdriverkeys.neon b/phpstan-webdriverkeys.neon
deleted file mode 100644
index 799558876..000000000
--- a/phpstan-webdriverkeys.neon
+++ /dev/null
@@ -1,6 +0,0 @@
-# WebDriverKeys.php breaks PHPStan parallel processing, so we must analyze the file separately.
-# See https://github.com/phpstan/phpstan/issues/3956 and https://github.com/clue/reactphp-ndjson/issues/21
-parameters:
-    level: 2
-    paths:
-        - lib/WebDriverKeys.php
diff --git a/phpstan.neon b/phpstan.neon
index 4b12710a5..846484976 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -16,6 +16,3 @@ parameters:
           path: 'lib/Remote/RemoteWebDriver.php'
 
     inferPrivatePropertyTypeFromConstructor: true
-
-    excludes_analyse:
-        - lib/WebDriverKeys.php

From 77a9cb52c305631be20bf5ba8385482328be1ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 17 Nov 2020 01:50:34 +0100
Subject: [PATCH 581/784] Remove redundant PHPStan config

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6732f5947..f0dcbf5a2 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
   "scripts": {
     "analyze": [
       "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
-      "vendor/bin/phpstan.phar analyze ./lib ./tests --level 2 -c phpstan.neon --ansi"
+      "vendor/bin/phpstan analyze -c phpstan.neon --ansi"
     ],
     "codestyle:check": [
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",

From 5d0e10b88f0b811ec426361bd37e7d1014d8486f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 19 Nov 2020 16:20:03 +0100
Subject: [PATCH 582/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f62490eb9..8110be980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Support of SameSite cookie property.
 - Command `RemoteWebDriver::newWindow()` for W3C mode to open new top-level browsing context (aka window).
+- PHP 8.0 support.
 
 ## 1.8.3 - 2020-10-06
 ### Fixed

From e3633154554605274cc9d59837f55a7427d72003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 19 Nov 2020 16:21:05 +0100
Subject: [PATCH 583/784] Release 1.9.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8110be980..b1d8c625a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.9.0 - 2020-11-19
 ### Added
 - Support of SameSite cookie property.
 - Command `RemoteWebDriver::newWindow()` for W3C mode to open new top-level browsing context (aka window).

From 41f2f8708d0d6d6cc9fba8e492dd82b96d22ce52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Nov 2020 18:35:48 +0100
Subject: [PATCH 584/784] Improve executeCustomCommand phpDoc

---
 lib/Remote/RemoteWebDriver.php |  4 ++++
 lib/WebDriver.php              | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index c8416bec0..8cb787d03 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -618,6 +618,10 @@ public function execute($command_name, $params = [])
     }
 
     /**
+     * Execute custom commands on remote end.
+     * For example vendor-specific commands or other commands not implemented by php-webdriver.
+     *
+     * @see https://github.com/php-webdriver/php-webdriver/wiki/Custom-commands
      * @param string $endpointUrl
      * @param string $method
      * @param array $params
diff --git a/lib/WebDriver.php b/lib/WebDriver.php
index a15d1a06b..52120a7d7 100755
--- a/lib/WebDriver.php
+++ b/lib/WebDriver.php
@@ -127,4 +127,17 @@ public function switchTo();
      * @return mixed
      */
     public function execute($name, $params);
+
+    // TODO: Add in next major release (BC)
+    ///**
+    // * Execute custom commands on remote end.
+    // * For example vendor-specific commands or other commands not implemented by php-webdriver.
+    // *
+    // * @see https://github.com/php-webdriver/php-webdriver/wiki/Custom-commands
+    // * @param string $endpointUrl
+    // * @param string $method
+    // * @param array $params
+    // * @return mixed|null
+    // */
+    //public function executeCustomCommand($endpointUrl, $method = 'GET', $params = []);
 }

From 660cc9f2de2fec46f297c047056aa832430c4e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Nov 2020 18:58:23 +0100
Subject: [PATCH 585/784] Add support for executing Chrome DevTools Protocol
 (CDP) commands

---
 lib/Chrome/ChromeDevToolsDriver.php           | 46 +++++++++++++++++++
 .../Chrome/ChromeDevToolsDriverTest.php       | 45 ++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 lib/Chrome/ChromeDevToolsDriver.php
 create mode 100644 tests/functional/Chrome/ChromeDevToolsDriverTest.php

diff --git a/lib/Chrome/ChromeDevToolsDriver.php b/lib/Chrome/ChromeDevToolsDriver.php
new file mode 100644
index 000000000..ffbb91a18
--- /dev/null
+++ b/lib/Chrome/ChromeDevToolsDriver.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+/**
+ * Provide access to Chrome DevTools Protocol (CDP) commands via HTTP endpoint of Chromedriver.
+ *
+ * @see https://chromedevtools.github.io/devtools-protocol/
+ */
+class ChromeDevToolsDriver
+{
+    const SEND_COMMAND = [
+        'method' => 'POST',
+        'url' => '/session/:sessionId/goog/cdp/execute',
+    ];
+
+    /**
+     * @var RemoteWebDriver
+     */
+    private $driver;
+
+    public function __construct(RemoteWebDriver $driver)
+    {
+        $this->driver = $driver;
+    }
+
+    /**
+     * Executes a Chrome DevTools command
+     *
+     * @param string $command The DevTools command to execute
+     * @param array $parameters Optional parameters to the command
+     * @return array The result of the command
+     */
+    public function execute($command, array $parameters = [])
+    {
+        $params = ['cmd' => $command, 'params' => (object) $parameters];
+
+        return $this->driver->executeCustomCommand(
+            self::SEND_COMMAND['url'],
+            self::SEND_COMMAND['method'],
+            $params
+        );
+    }
+}
diff --git a/tests/functional/Chrome/ChromeDevToolsDriverTest.php b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
new file mode 100644
index 000000000..b395edea7
--- /dev/null
+++ b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Facebook\WebDriver\Chrome;
+
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+use Facebook\WebDriver\WebDriverTestCase;
+
+/**
+ * @group exclude-saucelabs
+ * @group exclude-firefox
+ * @group exclude-edge
+ */
+class ChromeDevToolsDriverTest extends WebDriverTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if ($this->desiredCapabilities->getBrowserName() !== WebDriverBrowserType::CHROME) {
+            $this->markTestSkipped('ChromeDevTools are available only in Chrome');
+        }
+    }
+
+    public function testShouldExecuteDevToolsCommandWithoutParameters()
+    {
+        $devTools = new ChromeDevToolsDriver($this->driver);
+
+        $result = $devTools->execute('Performance.enable');
+
+        $this->assertSame([], $result);
+    }
+
+    public function testShouldExecuteDevToolsCommandWithParameters()
+    {
+        $devTools = new ChromeDevToolsDriver($this->driver);
+
+        $result = $devTools->execute('Runtime.evaluate', [
+            'returnByValue' => true,
+            'expression' => '42 + 1',
+        ]);
+
+        $this->assertSame('number', $result['result']['type']);
+        $this->assertSame(43, $result['result']['value']);
+    }
+}

From d8ad5d17ce2e3a54bef48a54242996494c3170b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Nov 2020 19:16:41 +0100
Subject: [PATCH 586/784] Access ChromeDevToolsDriver from ChromeDriver
 instance

---
 lib/Chrome/ChromeDriver.php                  | 15 ++++++++
 tests/functional/Chrome/ChromeDriverTest.php | 39 +++++++++++++++-----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 1b77169fb..83a1745d0 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -11,6 +11,9 @@
 
 class ChromeDriver extends RemoteWebDriver
 {
+    /** @var ChromeDevToolsDriver */
+    private $devTools;
+
     /**
      * @return static
      */
@@ -91,4 +94,16 @@ public static function createBySessionID(
     ) {
         throw new WebDriverException('Please use ChromeDriver::start() instead.');
     }
+
+    /**
+     * @return ChromeDevToolsDriver
+     */
+    public function getDevTools()
+    {
+        if ($this->devTools === null) {
+            $this->devTools = new ChromeDevToolsDriver($this);
+        }
+
+        return $this->devTools;
+    }
 }
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index fd7581008..a37de2f5b 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -31,6 +31,36 @@ protected function tearDown(): void
     }
 
     public function testShouldStartChromeDriver()
+    {
+        $this->startChromeDriver();
+
+        $this->assertInstanceOf(ChromeDriver::class, $this->driver);
+        $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
+
+        $this->driver->get('http://localhost:8000/');
+
+        $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
+    }
+
+    public function testShouldInstantiateDevTools()
+    {
+        $this->startChromeDriver();
+
+        $devTools = $this->driver->getDevTools();
+
+        $this->assertInstanceOf(ChromeDevToolsDriver::class, $devTools);
+
+        $this->driver->get('http://localhost:8000/');
+
+        $cdpResult = $devTools->execute(
+            'Runtime.evaluate',
+            ['expression' => 'window.location.toString()']
+        );
+
+        $this->assertSame(['result' => ['type' => 'string', 'value' => 'http://localhost:8000/']], $cdpResult);
+    }
+
+    private function startChromeDriver()
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
@@ -42,14 +72,5 @@ public function testShouldStartChromeDriver()
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
 
         $this->driver = ChromeDriver::start($desiredCapabilities);
-
-        $this->assertInstanceOf(ChromeDriver::class, $this->driver);
-        $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
-
-        $this->driver->get('http://localhost:8000/');
-
-        $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
-
-        $this->driver->quit();
     }
 }

From f8189b4fc0c6f203dbd6f93fc38e4c7f130f7612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Nov 2020 20:38:14 +0100
Subject: [PATCH 587/784] Move newWindow() to RemoteTargetLocator, add option
 to specify window type

---
 lib/Remote/RemoteTargetLocator.php           | 28 ++++++++++++++++
 lib/Remote/RemoteWebDriver.php               | 16 +++------
 lib/WebDriverTargetLocator.php               |  8 +++++
 tests/functional/RemoteTargetLocatorTest.php | 34 ++++++++++++++++++++
 tests/functional/RemoteWebDriverTest.php     | 34 --------------------
 5 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index fb5b552bc..c4d9243e1 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverAlert;
 use Facebook\WebDriver\WebDriverElement;
@@ -116,6 +117,33 @@ public function window($handle)
         return $this->driver;
     }
 
+    /**
+     * Creates a new browser window and switches the focus for future commands of this driver to the new window.
+     *
+     * @see https://w3c.github.io/webdriver/#new-window
+     * @param string $windowType The type of a new browser window that should be created. One of [tab, window].
+     * The created window is not guaranteed to be of the requested type; if the driver does not support the requested
+     * type, a new browser window will be created of whatever type the driver does support.
+     * @throws UnsupportedOperationException
+     * @return RemoteWebDriver This driver focused on the given window
+     */
+    public function newWindow($windowType = self::WINDOW_TYPE_TAB)
+    {
+        if ($windowType !== self::WINDOW_TYPE_TAB && $windowType !== self::WINDOW_TYPE_WINDOW) {
+            throw new \InvalidArgumentException('Window type must by either "tab" or "window"');
+        }
+
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('New window is only supported in W3C mode');
+        }
+
+        $response = $this->executor->execute(DriverCommand::NEW_WINDOW, ['type' => $windowType]);
+
+        $this->window($response['handle']);
+
+        return $this->driver;
+    }
+
     /**
      * Switch to the currently active modal dialog for this particular driver
      * instance.
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index c8416bec0..bbd26a63b 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -2,7 +2,6 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\WebDriver;
@@ -203,20 +202,13 @@ public function close()
     /**
      * Create a new top-level browsing context.
      *
-     * @return RemoteWebDriver The current instance.
+     * @codeCoverageIgnore
+     * @deprecated Use $driver->switchTo()->newWindow()
+     * @return WebDriver The current instance.
      */
     public function newWindow()
     {
-        if (!$this->isW3cCompliant) {
-            throw new UnsupportedOperationException('New window is only supported in W3C mode');
-        }
-
-        $response = $this->execute(DriverCommand::NEW_WINDOW, []);
-        $handle = $response['handle'];
-
-        $this->switchTo()->window($handle);
-
-        return $this;
+        return $this->switchTo()->newWindow();
     }
 
     /**
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 413e25b4b..17c872eb9 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -7,6 +7,11 @@
  */
 interface WebDriverTargetLocator
 {
+    /** @var string */
+    const WINDOW_TYPE_WINDOW = 'window';
+    /** @var string */
+    const WINDOW_TYPE_TAB = 'tab';
+
     /**
      * Switch to the main document if the page contains iframes. Otherwise, switch
      * to the first frame on the page.
@@ -41,6 +46,9 @@ public function frame($frame);
      */
     public function window($handle);
 
+    // TODO: Add in next major release (BC)
+    //public function newWindow($windowType = self::WINDOW_TYPE_TAB);
+
     /**
      * Switch to the currently active modal dialog for this particular driver
      * instance.
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 9128502b2..cbb448ff0 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -111,6 +111,40 @@ public function testShouldSwitchToFrameByElement()
         $this->compatAssertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
     }
 
+    /**
+     * @group exclude-saucelabs
+     * @covers ::window
+     */
+    public function testShouldCreateNewWindow()
+    {
+        self::skipForJsonWireProtocol('Create new window is not supported in JsonWire protocol');
+
+        // Ensure that the initial context matches.
+        $initialHandle = $this->driver->getWindowHandle();
+        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+        $source = $this->driver->getPageSource();
+        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
+        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
+        $windowHandles = $this->driver->getWindowHandles();
+        $this->assertCount(1, $windowHandles);
+
+        // Create a new window
+        $this->driver->switchTo()->newWindow();
+
+        $windowHandles = $this->driver->getWindowHandles();
+        $this->assertCount(2, $windowHandles);
+
+        $newWindowHandle = $this->driver->getWindowHandle();
+        $this->driver->get($this->getTestPageUrl('upload.html'));
+        $this->assertEquals($this->getTestPageUrl('upload.html'), $this->driver->getCurrentUrl());
+        $this->assertNotEquals($initialHandle, $newWindowHandle);
+
+        // Switch back to original context.
+        $this->driver->switchTo()->window($initialHandle);
+        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+    }
+
     /**
      * @group exclude-saucelabs
      */
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 191e6d2d4..ae289de5d 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -47,40 +47,6 @@ public function testShouldGetPageSource()
         $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
     }
 
-    /**
-     * @group exclude-saucelabs
-     * @covers ::window
-     */
-    public function testShouldCreateNewWindow()
-    {
-        self::skipForJsonWireProtocol('Create new window is not supported in JsonWire protocol');
-
-        // Ensure that the initial context matches.
-        $initialHandle = $this->driver->getWindowHandle();
-        $this->driver->get($this->getTestPageUrl('index.html'));
-        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
-        $source = $this->driver->getPageSource();
-        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
-        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
-        $windowHandles = $this->driver->getWindowHandles();
-        $this->assertCount(1, $windowHandles);
-
-        // Create a new window
-        $this->driver->newWindow();
-
-        $windowHandles = $this->driver->getWindowHandles();
-        $this->assertCount(2, $windowHandles);
-
-        $newWindowHandle = $this->driver->getWindowHandle();
-        $this->driver->get($this->getTestPageUrl('upload.html'));
-        $this->assertEquals($this->getTestPageUrl('upload.html'), $this->driver->getCurrentUrl());
-        $this->assertNotEquals($initialHandle, $newWindowHandle);
-
-        // Switch back to original context.
-        $this->driver->switchTo()->window($initialHandle);
-        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
-    }
-
     /**
      * @covers ::getSessionID
      * @covers ::isW3cCompliant

From 56b67616137f031b9d369f9f2f78f54bad9ea62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Nov 2020 20:48:42 +0100
Subject: [PATCH 588/784] Move RemoteTargetLocator phpDoc to parent interface

---
 lib/Remote/RemoteTargetLocator.php | 42 +++++++-----------------------
 lib/WebDriverTargetLocator.php     | 22 +++++++++-------
 2 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index c4d9243e1..5b9881371 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -3,7 +3,6 @@
 namespace Facebook\WebDriver\Remote;
 
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
-use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverAlert;
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverTargetLocator;
@@ -13,14 +12,14 @@
  */
 class RemoteTargetLocator implements WebDriverTargetLocator
 {
-    /** @var ExecuteMethod */
+    /** @var RemoteExecuteMethod */
     protected $executor;
-    /** @var WebDriver */
+    /** @var RemoteWebDriver */
     protected $driver;
     /** @var bool */
     protected $isW3cCompliant;
 
-    public function __construct($executor, $driver, $isW3cCompliant = false)
+    public function __construct(RemoteExecuteMethod $executor, RemoteWebDriver $driver, $isW3cCompliant = false)
     {
         $this->executor = $executor;
         $this->driver = $driver;
@@ -28,10 +27,7 @@ public function __construct($executor, $driver, $isW3cCompliant = false)
     }
 
     /**
-     * Set the current browsing context to the current top-level browsing context.
-     * This is the same as calling `RemoteTargetLocator::frame(null);`
-     *
-     * @return WebDriver The driver focused on the top window or the first frame.
+     * @return RemoteWebDriver
      */
     public function defaultContent()
     {
@@ -42,16 +38,10 @@ public function defaultContent()
     }
 
     /**
-     * Switch to the iframe by its id or name.
-     *
-     * @param WebDriverElement|null|int|string $frame The WebDriverElement,
-     * the id or the name of the frame.
-     * When null, switch to the current top-level browsing context
-     * When int, switch to the WindowProxy identified by the value
-     * When an Element, switch to that Element.
-     *
-     * @throws \InvalidArgumentException
-     * @return WebDriver The driver focused on the given frame.
+     * @param WebDriverElement|null|int|string $frame The WebDriverElement, the id or the name of the frame.
+     * When null, switch to the current top-level browsing context When int, switch to the WindowProxy identified
+     * by the value. When an Element, switch to that Element.
+     * @return RemoteWebDriver
      */
     public function frame($frame)
     {
@@ -88,7 +78,7 @@ public function frame($frame)
     /**
      * Switch to the parent iframe.
      *
-     * @return WebDriver The driver focused on the given frame.
+     * @return RemoteWebDriver This driver focused on the parent frame
      */
     public function parent()
     {
@@ -98,11 +88,8 @@ public function parent()
     }
 
     /**
-     * Switch the focus to another window by its handle.
-     *
      * @param string $handle The handle of the window to be focused on.
-     * @return WebDriver The driver focused on the given window.
-     * @see WebDriver::getWindowHandles
+     * @return RemoteWebDriver
      */
     public function window($handle)
     {
@@ -144,21 +131,12 @@ public function newWindow($windowType = self::WINDOW_TYPE_TAB)
         return $this->driver;
     }
 
-    /**
-     * Switch to the currently active modal dialog for this particular driver
-     * instance.
-     *
-     * @return WebDriverAlert
-     */
     public function alert()
     {
         return new WebDriverAlert($this->executor);
     }
 
     /**
-     * Switches to the element that currently has focus within the document
-     * currently "switched to", or the body element if this cannot be detected.
-     *
      * @return RemoteWebElement
      */
     public function activeElement()
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 17c872eb9..08096bcab 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -13,8 +13,8 @@ interface WebDriverTargetLocator
     const WINDOW_TYPE_TAB = 'tab';
 
     /**
-     * Switch to the main document if the page contains iframes. Otherwise, switch
-     * to the first frame on the page.
+     * Set the current browsing context to the current top-level browsing context.
+     * This is the same as calling `RemoteTargetLocator::frame(null);`
      *
      * @return WebDriver The driver focused on the top window or the first frame.
      */
@@ -23,17 +23,20 @@ public function defaultContent();
     /**
      * Switch to the iframe by its id or name.
      *
-     * @param WebDriverElement|string $frame The WebDriverElement,
-     *                                       the id or the name of the frame.
+     * @param WebDriverElement|null|int|string $frame The WebDriverElement, the id or the name of the frame.
+     * When null, switch to the current top-level browsing context When int, switch to the WindowProxy identified
+     * by the value. When an Element, switch to that Element.
+     *
+     * @throws \InvalidArgumentException
      * @return WebDriver The driver focused on the given frame.
      */
     public function frame($frame);
 
+    // TODO: Add in next major release (BC)
     ///**
     // * Switch to the parent iframe.
     // *
-    // * @todo Add in next major release (BC)
-    // * @return WebDriver The driver focused on the given frame.
+    // * @return WebDriver This driver focused on the parent frame
     // */
     //public function parent();
 
@@ -50,16 +53,15 @@ public function window($handle);
     //public function newWindow($windowType = self::WINDOW_TYPE_TAB);
 
     /**
-     * Switch to the currently active modal dialog for this particular driver
-     * instance.
+     * Switch to the currently active modal dialog for this particular driver instance.
      *
      * @return WebDriverAlert
      */
     public function alert();
 
     /**
-     * Switches to the element that currently has focus within the document
-     * currently "switched to", or the body element if this cannot be detected.
+     * Switches to the element that currently has focus within the document currently "switched to",
+     * or the body element if this cannot be detected.
      *
      * @return WebDriverElement
      */

From 6c058605387bff712fcc00a6fdf2a53b5ecfce9f Mon Sep 17 00:00:00 2001
From: Tom Adam <tom@lampbristol.com>
Date: Sun, 22 Nov 2020 22:50:37 +0000
Subject: [PATCH 589/784] Add DriverServerDied exception to make previous
 exception available (fixes #595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add DriverServerDied exception to make previous exception available (fixes #595)

Co-authored-by: Ondřej Machulda <ondrej.machulda@gmail.com>
---
 CHANGELOG.md                                    |  2 ++
 lib/Exception/DriverServerDiedException.php     | 15 +++++++++++++++
 lib/Remote/Service/DriverCommandExecutor.php    |  6 +++---
 .../Exception/DriverServerDiedExceptionTest.php | 17 +++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 lib/Exception/DriverServerDiedException.php
 create mode 100644 tests/unit/Exception/DriverServerDiedExceptionTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1d8c625a..68f779ed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Throw `DriverServerDiedException` on driver server process terminating unexpectedly in `DriverCommandExecutor`, with triggering error attached to improve debugging of 'The driver server has died' errors. 
 
 ## 1.9.0 - 2020-11-19
 ### Added
diff --git a/lib/Exception/DriverServerDiedException.php b/lib/Exception/DriverServerDiedException.php
new file mode 100644
index 000000000..c3eff3b9e
--- /dev/null
+++ b/lib/Exception/DriverServerDiedException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+/**
+ * The driver server process is unexpectedly no longer available.
+ */
+class DriverServerDiedException extends WebDriverException
+{
+    public function __construct(\Exception $previous = null)
+    {
+        parent::__construct('The driver server has died.');
+        \Exception::__construct($this->getMessage(), $this->getCode(), $previous);
+    }
+}
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 4e364e073..36dc2f751 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote\Service;
 
+use Facebook\WebDriver\Exception\DriverServerDiedException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
@@ -9,8 +10,7 @@
 use Facebook\WebDriver\Remote\WebDriverResponse;
 
 /**
- * A HttpCommandExecutor that talks to a local driver service instead of
- * a remote server.
+ * A HttpCommandExecutor that talks to a local driver service instead of a remote server.
  */
 class DriverCommandExecutor extends HttpCommandExecutor
 {
@@ -47,7 +47,7 @@ public function execute(WebDriverCommand $command)
             return $value;
         } catch (\Exception $e) {
             if (!$this->service->isRunning()) {
-                throw new WebDriverException('The driver server has died.');
+                throw new DriverServerDiedException($e);
             }
             throw $e;
         }
diff --git a/tests/unit/Exception/DriverServerDiedExceptionTest.php b/tests/unit/Exception/DriverServerDiedExceptionTest.php
new file mode 100644
index 000000000..3c98e6e00
--- /dev/null
+++ b/tests/unit/Exception/DriverServerDiedExceptionTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+use PHPUnit\Framework\TestCase;
+
+class DriverServerDiedExceptionTest extends TestCase
+{
+    public function testShouldCreateWithPreviousException()
+    {
+        $dummyPreviousException = new WebDriverCurlException('CURL error');
+
+        $exception = new DriverServerDiedException($dummyPreviousException);
+
+        $this->assertSame($dummyPreviousException, $exception->getPrevious());
+    }
+}

From b6cd4f5e5b841a14ed931ff0e874618ee06dcfec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 23 Nov 2020 12:34:13 +0100
Subject: [PATCH 590/784] Update badges and readme

---
 README.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c69dea366..a719ebac4 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
-[![Latest Stable Version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
-[![Travis Build](https://img.shields.io/travis/php-webdriver/php-webdriver/main.svg?style=flat-square)](https://travis-ci.com/php-webdriver/php-webdriver)
-[![Sauce Test Status](https://saucelabs.com/buildstatus/php-webdriver)](https://saucelabs.com/u/php-webdriver)
-[![Total Downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square)](https://packagist.org/packages/php-webdriver/webdriver)
+[![Latest stable version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square&label=Packagist)](https://packagist.org/packages/php-webdriver/webdriver)
+[![Travis build status](https://img.shields.io/travis/php-webdriver/php-webdriver/main.svg?style=flat-square&label=Travis)](https://travis-ci.com/php-webdriver/php-webdriver)
+[![GitHub Actions build status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/PHP?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
+[![SauceLabs test status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Sauce%20Labs?style=flat-square&label=SauceLabs)](https://saucelabs.com/u/php-webdriver)
+[![Total downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square&label=Downloads)](https://packagist.org/packages/php-webdriver/webdriver)
 
 ## Description
 Php-webdriver library is PHP language binding for Selenium WebDriver, which allows you to control web browsers from PHP.
@@ -20,8 +21,6 @@ The concepts of this library are very similar to the "official" Java, .NET, Pyth
 
 Looking for API documentation of php-webdriver? See [https://php-webdriver.github.io/php-webdriver/](https://php-webdriver.github.io/php-webdriver/latest/)
 
-Any complaints, questions, or ideas? Post them in the user group https://www.facebook.com/groups/phpwebdriver/.
-
 ## Installation
 
 Installation is possible using [Composer](https://getcomposer.org/).
@@ -198,8 +197,8 @@ There are some projects already providing this:
 
 We have a great community willing to help you!
 
+- **Via StackOverflow** - You can [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver+php-webdriver) or find many already answered question on StackOverflow
 - **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contribute to communal discussion and support
-- **Via StackOverflow** - You can also [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver) or find many already answered question on StackOverflow
 - **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/php-webdriver/php-webdriver/issues/new) as a new issue
 
 ## Contributing

From 6d331040620e644fe2f0d5de53b091bf45925da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 23 Nov 2020 12:41:01 +0100
Subject: [PATCH 591/784] Skip test intentionally producing fails to avoid
 SauceLabs test being marked as broken

---
 tests/functional/WebDriverTimeoutsTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index bd849c6c4..61f49c18a 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -39,6 +39,7 @@ public function testShouldGetDelayedElementWithImplicitWait()
     }
 
     /**
+     * @group exclude-saucelabs
      * @covers ::__construct
      * @covers ::pageLoadTimeout
      */

From e4f99900be4bb460ed8ac991ac5b51b767a4b451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 23 Nov 2020 20:50:52 +0100
Subject: [PATCH 592/784] Do not require WEBDRIVER_CHROME_DRIVER if
 ChromeDriver is available in PATH

---
 lib/Chrome/ChromeDriverService.php            | 15 ++++-
 lib/Remote/Service/DriverService.php          | 32 ++++++++--
 .../Chrome/ChromeDriverServiceTest.php        | 61 ++++++++++++-------
 3 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index 0a48c626a..8c4dd6ea4 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -11,18 +11,27 @@ class ChromeDriverService extends DriverService
      * @deprecated Use ChromeDriverService::CHROME_DRIVER_EXECUTABLE
      */
     const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
-    // The environment variable storing the path to the chrome driver executable
+    /** @var string The environment variable storing the path to the chrome driver executable */
     const CHROME_DRIVER_EXECUTABLE = 'WEBDRIVER_CHROME_DRIVER';
+    /**
+     * @var string Default executable used when no other is provided
+     * @internal
+     */
+    const DEFAULT_EXECUTABLE = 'chromedriver';
 
     /**
      * @return static
      */
     public static function createDefaultService()
     {
-        $exe = getenv(self::CHROME_DRIVER_EXECUTABLE) ?: getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+        $pathToExecutable = getenv(self::CHROME_DRIVER_EXECUTABLE) ?: getenv(self::CHROME_DRIVER_EXE_PROPERTY);
+        if ($pathToExecutable === false) {
+            $pathToExecutable = static::DEFAULT_EXECUTABLE;
+        }
+
         $port = 9515; // TODO: Get another port if the default port is used.
         $args = ['--port=' . $port];
 
-        return new static($exe, $port, $args);
+        return new static($pathToExecutable, $port, $args);
     }
 }
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index f64c3b8c8..ef386d98f 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -71,6 +71,8 @@ public function start()
         $this->process = $this->createProcess();
         $this->process->start();
 
+        $this->checkWasStarted($this->process);
+
         $checker = new URLChecker();
         $checker->waitUntilAvailable(20 * 1000, $this->url . '/status');
 
@@ -116,17 +118,37 @@ public function isRunning()
      */
     protected static function checkExecutable($executable)
     {
-        if (!is_file($executable)) {
-            throw new Exception("'$executable' is not a file.");
-        }
-
         if (!is_executable($executable)) {
-            throw new Exception("'$executable' is not executable.");
+            throw new Exception(
+                sprintf(
+                    '"%s" is not executable. Make sure the path is correct or use environment variable to specify'
+                     . 'location of the executable.',
+                    $executable
+                )
+            );
         }
 
         return $executable;
     }
 
+    /**
+     * @param Process $process
+     */
+    protected function checkWasStarted($process)
+    {
+        usleep(10000); // wait 10ms, otherwise the asynchronous process failure may not yet be propagated
+
+        if (!$process->isRunning()) {
+            throw new Exception(
+                sprintf(
+                    'Error starting driver executable "%s": %s',
+                    $process->getCommandLine(),
+                    $process->getErrorOutput()
+                )
+            );
+        }
+    }
+
     /**
      * @return Process
      */
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 1f5baa4f9..4c41b86a0 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -11,6 +11,9 @@
  */
 class ChromeDriverServiceTest extends TestCase
 {
+    /** @var ChromeDriverService */
+    private $driverService;
+
     protected function setUp(): void
     {
         if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
@@ -18,54 +21,68 @@ protected function setUp(): void
         }
     }
 
+    protected function tearDown(): void
+    {
+        if ($this->driverService !== null && $this->driverService->isRunning()) {
+            $this->driverService->stop();
+        }
+    }
+
     public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
 
-        $driverService = ChromeDriverService::createDefaultService();
+        $this->driverService = ChromeDriverService::createDefaultService();
 
-        $this->assertSame('http://localhost:9515/', $driverService->getURL());
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
 
-        $this->assertInstanceOf(ChromeDriverService::class, $driverService->start());
-        $this->assertTrue($driverService->isRunning());
+        $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->start());
+        $this->assertTrue($this->driverService->isRunning());
 
-        $this->assertInstanceOf(ChromeDriverService::class, $driverService->start());
+        $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->start());
 
-        $this->assertInstanceOf(ChromeDriverService::class, $driverService->stop());
-        $this->assertFalse($driverService->isRunning());
+        $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->stop());
+        $this->assertFalse($this->driverService->isRunning());
 
-        $this->assertInstanceOf(ChromeDriverService::class, $driverService->stop());
+        $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->stop());
     }
 
     public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
     {
-        $driverService = new ChromeDriverService(getenv('CHROMEDRIVER_PATH'), 9515, ['--port=9515']);
+        $this->driverService = new ChromeDriverService(getenv('CHROMEDRIVER_PATH'), 9515, ['--port=9515']);
 
-        $this->assertSame('http://localhost:9515/', $driverService->getURL());
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
 
-        $driverService->start();
-        $this->assertTrue($driverService->isRunning());
+        $this->driverService->start();
+        $this->assertTrue($this->driverService->isRunning());
 
-        $driverService->stop();
-        $this->assertFalse($driverService->isRunning());
+        $this->driverService->stop();
+        $this->assertFalse($this->driverService->isRunning());
     }
 
-    public function testShouldThrowExceptionIfExecutableCannotBeFound()
+    public function testShouldThrowExceptionIfExecutableIsNotExecutable()
     {
-        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=/not/existing');
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . __FILE__);
 
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('\'/not/existing\' is not a file.');
+        $this->expectExceptionMessage('is not executable');
         ChromeDriverService::createDefaultService();
     }
 
-    public function testShouldThrowExceptionIfExecutableIsNotExecutable()
+    public function testShouldUseDefaultExecutableIfNoneProvided()
     {
-        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . __FILE__);
+        // Put path where ChromeDriver was downloaded to system PATH
+        putenv('PATH=' . getenv('PATH') . ':' . dirname(getenv('CHROMEDRIVER_PATH')));
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('is not executable');
-        ChromeDriverService::createDefaultService();
+        // Unset CHROME_DRIVER_EXECUTABLE so that ChromeDriverService will attempt to run the binary from system PATH
+        putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=');
+
+        $this->driverService = ChromeDriverService::createDefaultService();
+
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
+
+        $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->start());
+        $this->assertTrue($this->driverService->isRunning());
     }
 }

From 452647be3a4fcc9c9cc92980cf07924482b11142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Nov 2020 17:30:10 +0100
Subject: [PATCH 593/784] Update changelog

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68f779ed7..1bb680aee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,12 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- Support for sending Chrome DevTools Protocol commands (see details in [wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chrome-devtools-protocol-cdp)).
+
 ### Changed
-- Throw `DriverServerDiedException` on driver server process terminating unexpectedly in `DriverCommandExecutor`, with triggering error attached to improve debugging of 'The driver server has died' errors. 
+- Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.
+- Do not require `WEBDRIVER_CHROME_DRIVER` environment variable to be set if `chromedriver` binary is already available via system PATH.
 
 ## 1.9.0 - 2020-11-19
 ### Added

From 46f70133f0eefef9b75676d6e3661d50d94fbbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 28 Nov 2020 03:07:58 +0100
Subject: [PATCH 594/784] Update build to latest Geckodriver 0.28.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b8f993e44..fd8c225ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,7 +102,7 @@ before_script:
       unzip chromedriver_linux64.zip -d chromedriver;
     fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
-  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz; tar xzf geckodriver-v0.27.0-linux64.tar.gz -C geckodriver; fi
+  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.28.0/geckodriver-v0.28.0-linux64.tar.gz; tar xzf geckodriver-v0.28.0-linux64.tar.gz -C geckodriver; fi
   - if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
       mkdir -p jar;
       if [ "$SELENIUM_SERVER" = "legacy" ]; then

From 31431f02300dc28597c5b50d0742cb49ce6301dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 4 Dec 2020 01:54:15 +0100
Subject: [PATCH 595/784] Fix code coverage reporting on Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index fd8c225ac..fa5d0d2f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
     - BROWSER_NAME="htmlunit"
     - SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
     - COMPOSER_MEMORY_LIMIT=-1
+    - XDEBUG_MODE=coverage
 
 services:
   - xvfb

From 20ffe6bdaade82b8170ccc864d96fe71d09a24f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 5 Dec 2020 23:17:43 +0100
Subject: [PATCH 596/784] Put more information to every single deprecation

---
 lib/Chrome/ChromeOptions.php                         | 2 +-
 lib/Exception/ElementNotVisibleException.php         | 2 +-
 lib/Exception/ExpectedException.php                  | 2 +-
 lib/Exception/IMEEngineActivationFailedException.php | 2 +-
 lib/Exception/IMENotAvailableException.php           | 2 +-
 lib/Exception/IndexOutOfBoundsException.php          | 2 +-
 lib/Exception/InvalidCoordinatesException.php        | 2 +-
 lib/Exception/NoCollectionException.php              | 2 +-
 lib/Exception/NoScriptResultException.php            | 2 +-
 lib/Exception/NoStringException.php                  | 2 +-
 lib/Exception/NoStringLengthException.php            | 2 +-
 lib/Exception/NoStringWrapperException.php           | 2 +-
 lib/Exception/NoSuchCollectionException.php          | 2 +-
 lib/Exception/NoSuchDriverException.php              | 2 +-
 lib/Exception/NullPointerException.php               | 2 +-
 lib/Exception/XPathLookupException.php               | 2 +-
 lib/Remote/DesiredCapabilities.php                   | 2 +-
 lib/WebDriverPlatform.php                            | 2 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php        | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 1b3c4cbdc..d14105a74 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -13,7 +13,7 @@ class ChromeOptions
 {
     /**
      * The key of chrome options desired capabilities (in legacy OSS JsonWire protocol)
-     * @deprecated
+     * @todo Replace value with 'goog:chromeOptions' after JsonWire protocol support is removed
      */
     const CAPABILITY = 'chromeOptions';
     /**
diff --git a/lib/Exception/ElementNotVisibleException.php b/lib/Exception/ElementNotVisibleException.php
index 6d41d0c02..2979e185f 100644
--- a/lib/Exception/ElementNotVisibleException.php
+++ b/lib/Exception/ElementNotVisibleException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class ElementNotVisibleException extends WebDriverException
 {
diff --git a/lib/Exception/ExpectedException.php b/lib/Exception/ExpectedException.php
index 60afca373..35e24305b 100644
--- a/lib/Exception/ExpectedException.php
+++ b/lib/Exception/ExpectedException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class ExpectedException extends WebDriverException
 {
diff --git a/lib/Exception/IMEEngineActivationFailedException.php b/lib/Exception/IMEEngineActivationFailedException.php
index 99236737d..516919e21 100644
--- a/lib/Exception/IMEEngineActivationFailedException.php
+++ b/lib/Exception/IMEEngineActivationFailedException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class IMEEngineActivationFailedException extends WebDriverException
 {
diff --git a/lib/Exception/IMENotAvailableException.php b/lib/Exception/IMENotAvailableException.php
index bc2bad261..128e134e9 100644
--- a/lib/Exception/IMENotAvailableException.php
+++ b/lib/Exception/IMENotAvailableException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class IMENotAvailableException extends WebDriverException
 {
diff --git a/lib/Exception/IndexOutOfBoundsException.php b/lib/Exception/IndexOutOfBoundsException.php
index 897714cf4..fbfd2cc13 100644
--- a/lib/Exception/IndexOutOfBoundsException.php
+++ b/lib/Exception/IndexOutOfBoundsException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class IndexOutOfBoundsException extends WebDriverException
 {
diff --git a/lib/Exception/InvalidCoordinatesException.php b/lib/Exception/InvalidCoordinatesException.php
index 94852a03b..16d0694dc 100644
--- a/lib/Exception/InvalidCoordinatesException.php
+++ b/lib/Exception/InvalidCoordinatesException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class InvalidCoordinatesException extends WebDriverException
 {
diff --git a/lib/Exception/NoCollectionException.php b/lib/Exception/NoCollectionException.php
index 9d435db68..9012e9527 100644
--- a/lib/Exception/NoCollectionException.php
+++ b/lib/Exception/NoCollectionException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoCollectionException extends WebDriverException
 {
diff --git a/lib/Exception/NoScriptResultException.php b/lib/Exception/NoScriptResultException.php
index 32aa617ea..5e0b46e67 100644
--- a/lib/Exception/NoScriptResultException.php
+++ b/lib/Exception/NoScriptResultException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoScriptResultException extends WebDriverException
 {
diff --git a/lib/Exception/NoStringException.php b/lib/Exception/NoStringException.php
index 951bd2602..f25aa6b52 100644
--- a/lib/Exception/NoStringException.php
+++ b/lib/Exception/NoStringException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoStringException extends WebDriverException
 {
diff --git a/lib/Exception/NoStringLengthException.php b/lib/Exception/NoStringLengthException.php
index fd7b6ca93..eab381705 100644
--- a/lib/Exception/NoStringLengthException.php
+++ b/lib/Exception/NoStringLengthException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoStringLengthException extends WebDriverException
 {
diff --git a/lib/Exception/NoStringWrapperException.php b/lib/Exception/NoStringWrapperException.php
index 2df7a44e9..96a667769 100644
--- a/lib/Exception/NoStringWrapperException.php
+++ b/lib/Exception/NoStringWrapperException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoStringWrapperException extends WebDriverException
 {
diff --git a/lib/Exception/NoSuchCollectionException.php b/lib/Exception/NoSuchCollectionException.php
index f09bab32c..66cec06e6 100644
--- a/lib/Exception/NoSuchCollectionException.php
+++ b/lib/Exception/NoSuchCollectionException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoSuchCollectionException extends WebDriverException
 {
diff --git a/lib/Exception/NoSuchDriverException.php b/lib/Exception/NoSuchDriverException.php
index f34fc988a..e39fcd90b 100644
--- a/lib/Exception/NoSuchDriverException.php
+++ b/lib/Exception/NoSuchDriverException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NoSuchDriverException extends WebDriverException
 {
diff --git a/lib/Exception/NullPointerException.php b/lib/Exception/NullPointerException.php
index 999d0ac99..8d1e0a6fe 100644
--- a/lib/Exception/NullPointerException.php
+++ b/lib/Exception/NullPointerException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class NullPointerException extends WebDriverException
 {
diff --git a/lib/Exception/XPathLookupException.php b/lib/Exception/XPathLookupException.php
index 1c669ae82..86513db58 100644
--- a/lib/Exception/XPathLookupException.php
+++ b/lib/Exception/XPathLookupException.php
@@ -3,7 +3,7 @@
 namespace Facebook\WebDriver\Exception;
 
 /**
- * @deprecated Removed in W3C WebDriver
+ * @deprecated Removed in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/686
  */
 class XPathLookupException extends WebDriverException
 {
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 5fcf651d9..54980039c 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -163,7 +163,7 @@ public function setJavascriptEnabled($enabled)
     }
 
     /**
-     * @todo Remove side-effects - not change ie. ChromeOptions::CAPABILITY from instance of ChromeOptions to an array
+     * @todo Remove side-effects - not change eg. ChromeOptions::CAPABILITY from instance of ChromeOptions to an array
      * @return array
      */
     public function toArray()
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index 0b45800d5..d7194e05e 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -10,7 +10,7 @@
 class WebDriverPlatform
 {
     const ANDROID = 'ANDROID';
-    /** @deprecated */
+    /** @deprecated ANY has no meaning in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/731 */
     const ANY = 'ANY';
     const LINUX = 'LINUX';
     const MAC = 'MAC';
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index f24d8eb40..056ac1039 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -176,7 +176,7 @@ public function provideW3cCapabilities()
                     'acceptInsecureCerts' => true,
                 ],
             ],
-            'removed capabilitites' => [
+            'removed capabilities' => [
                 new DesiredCapabilities([
                     WebDriverCapabilityType::WEB_STORAGE_ENABLED => true,
                     WebDriverCapabilityType::TAKES_SCREENSHOT => false,

From 359c82f960411970cb8fb980a21b09fff342761d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 5 Dec 2020 23:45:24 +0100
Subject: [PATCH 597/784] Mark PhantomJS deprecated, as it is no longer
 developed and maintained

---
 CHANGELOG.md                        | 1 +
 lib/Remote/DesiredCapabilities.php  | 2 ++
 lib/Remote/WebDriverBrowserType.php | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bb680aee..08abc738f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.
 - Do not require `WEBDRIVER_CHROME_DRIVER` environment variable to be set if `chromedriver` binary is already available via system PATH.
+- Mark PhantomJS deprecated, as it is no longer developed and maintained.
 
 ## 1.9.0 - 2020-11-19
 ### Added
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 54980039c..8bbb9423f 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -392,6 +392,8 @@ public static function safari()
     }
 
     /**
+     * @deprecated PhantomJS is no longer developed and its support will be removed in next major version.
+     * Use headless Chrome or Firefox instead.
      * @return static
      */
     public static function phantomjs()
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index bc7c041a5..77badd6cc 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -28,6 +28,10 @@ class WebDriverBrowserType
     const IE = 'internet explorer';
     const IPHONE = 'iphone';
     const IPAD = 'iPad';
+    /**
+     * @deprecated PhantomJS is no longer developed and its support will be removed in next major version.
+     * Use headless Chrome or Firefox instead.
+     */
     const PHANTOMJS = 'phantomjs';
 
     private function __construct()

From 2c86bbdcd8896134b473e562bf143064580bdff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Nov 2020 18:00:24 +0100
Subject: [PATCH 598/784] Improve readme, add more wiki links

---
 README.md | 81 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index a719ebac4..6447e9426 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,8 @@ This could be Selenium standalone server, but for local development, you can sen
 
 #### a) Chromedriver
 
+📙 Below you find only simple example, make sure to read our wiki for [more information on Chrome/Chromedriver](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
+
 Install the latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
 Make sure to have a compatible version of Chromedriver and Chrome!
 
@@ -81,34 +83,16 @@ geckodriver
 
 #### c) Selenium standalone server
 
-[Selenium server](https://selenium.dev/downloads/) is useful especially when you need to execute multiple tests at once
-or your tests are run in different browsers - like on your CI server.
-
-Selenium server receives commands and starts new sessions using browser drivers acting like hub distributing the commands
-among multiple nodes.
-
-To run the standalone server, download [`selenium-server-standalone-#.jar` file](http://selenium-release.storage.googleapis.com/index.html)
-(replace # with the current server version). Keep in mind **you must have Java 8+ installed**.
-
-Run the server:
+Selenium server is useful especially when you need to execute multiple tests at once, if your tests are run
+in different browsers (like on your CI server) or eg. when you need to distribute tests amongst multiple machines
+in grid mode (one Selenium server hub and multiple Selenium nodes).
 
-```sh
-java -jar selenium-server-standalone-#.jar
-```
+Selenium server then act like a proxy and takes care of distributing commands to the respective nodes.
 
-You may need to provide path to `chromedriver`/`geckodriver` binary (if they are not placed in system `PATH` directory):
+The latest version can be found on [Selenium download page](https://www.selenium.dev/downloads/).
 
-```sh
-# Chromedriver:
-java -Dwebdriver.chrome.driver="/opt/chromium-browser/chromedriver" -jar vendor/bin/selenium-server-standalone-#.jar
-# Geckodriver:
-java -Dwebdriver.gecko.driver="/home/john/bin/geckodriver" -jar vendor/bin/selenium-server-standalone-#.jar
-
-# (These options could be combined)
-```
-
-If you want to distribute browser sessions among multiple servers ("grid mode" - one Selenium hub and multiple Selenium nodes) please
-[refer to the documentation](https://selenium.dev/documentation/en/grid/).
+📙 You can find [further Selenium server information](https://github.com/php-webdriver/php-webdriver/wiki/Selenium-server)
+in our wiki.
 
 #### d) Docker
 
@@ -122,13 +106,13 @@ For example:
 
 ```php
 // Chromedriver (if started using --port=4444 as above)
-$host = 'http://localhost:4444/';
+$serverUrl = 'http://localhost:4444/';
 // Geckodriver
-$host = 'http://localhost:4444/';
+$serverUrl = 'http://localhost:4444/';
 // selenium-server-standalone-#.jar (version 2.x or 3.x)
-$host = 'http://localhost:4444/wd/hub';
+$serverUrl = 'http://localhost:4444/wd/hub';
 // selenium-server-standalone-#.jar (version 4.x)
-$host = 'http://localhost:4444/';
+$serverUrl = 'http://localhost:4444/';
 ```
 
 Now you can start browser of your choice:
@@ -137,11 +121,11 @@ Now you can start browser of your choice:
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 
 // Chrome
-$driver = RemoteWebDriver::create($host, DesiredCapabilities::chrome());
+$driver = RemoteWebDriver::create($serverUrl, DesiredCapabilities::chrome());
 // Firefox
-$driver = RemoteWebDriver::create($host, DesiredCapabilities::firefox());
+$driver = RemoteWebDriver::create($serverUrl, DesiredCapabilities::firefox());
 // Microsoft Edge
-$driver = RemoteWebDriver::create($host, DesiredCapabilities::microsoftEdge());
+$driver = RemoteWebDriver::create($serverUrl, DesiredCapabilities::microsoftEdge());
 ```
 
 ### 3. Customize Desired Capabilities
@@ -161,14 +145,39 @@ $desiredCapabilities->setCapability('acceptSslCerts', false);
 // Run headless firefox
 $desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless']]);
 
-$driver = RemoteWebDriver::create($host, $desiredCapabilities);
+$driver = RemoteWebDriver::create($serverUrl, $desiredCapabilities);
 ```
 
-They can also be used to [configure proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
-To configure Chrome, you may use ChromeOptions - see [details in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/ChromeOptions).
+Capabilities can also be used to [📙 configure proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
+To configure Chrome capabilities, you may use [📙 ChromeOptions](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chromeoptions).
 
 * See [legacy JsonWire protocol](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities) documentation or [W3C WebDriver specification](https://w3c.github.io/webdriver/#capabilities) for more details.
 
+### 4. Control your browser
+
+```php
+// Go to URL
+$driver->get('https://en.wikipedia.org/wiki/Selenium_(software)');
+
+// Find search element by its id, write 'PHP' inside and submit
+$driver->findElement(WebDriverBy::id('searchInput')) // find search input element
+    ->sendKeys('PHP') // fill the search box
+    ->submit(); // submit the whole form
+
+// Find element of 'History' item in menu by its css selector
+$historyButton = $driver->findElement(
+    WebDriverBy::cssSelector('#ca-history a')
+);
+// Read text of the element and print it to output
+echo 'About to click to a button with text: ' . $historyButton->getText();
+
+// Click the element to navigate to revision history page
+$historyButton->click();
+```
+
+See [example.php](example.php) for full example scenario.
+Visit our GitHub wiki for [📙 php-webdriver command reference](https://github.com/php-webdriver/php-webdriver/wiki/Example-command-reference) and further examples.
+
 **NOTE:** Above snippets are not intended to be a working example by simply copy-pasting. See [example.php](example.php) for a working example.
 
 ## Changelog
@@ -178,7 +187,7 @@ For latest changes see [CHANGELOG.md](CHANGELOG.md) file.
 
 Some basic usage example is provided in [example.php](example.php) file.
 
-How-tos are provided right here in [our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
+How-tos are provided right here in [📙 our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
 
 You may also want to check out the Selenium [docs](https://selenium.dev/documentation/en/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
 

From 2b92a9913a30952f872ed5d3d43760c5828ae372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 25 Nov 2020 18:01:17 +0100
Subject: [PATCH 599/784] Add markdown link check action, fix links

---
 .github/CONTRIBUTING.md    |  9 +++------
 .github/workflows/php.yaml |  9 +++++++++
 CODE_OF_CONDUCT.md         |  3 ---
 README.md                  | 18 +++++++++---------
 4 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 CODE_OF_CONDUCT.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ed13ceed8..8dc3409f5 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,19 +5,16 @@ We love to have your help to make php-webdriver better!
 Feel free to open an [issue](https://github.com/php-webdriver/php-webdriver/issues) if you run into any problem, or
 send a pull request (see bellow) with your contribution.
 
-## Code of Conduct
-The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
-
 ## Workflow when contributing a patch
 
 1. Fork the project on GitHub
 2. Implement your code changes into separate branch
 3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have Travis CI build which will automatically run tests on your pull request.
-4. When implementing notable change, fix or a new feature, add record to Unreleased section of [CHANGELOG.md](CHANGELOG.md)
+4. When implementing a notable change, fix or a new feature, add record to the Unreleased section of [CHANGELOG.md](../CHANGELOG.md)
 5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `main` branch
  
-When you are going to contribute, please keep in mind that this webdriver client aims to be as close as possible to other languages Java/Ruby/Python/C#.
-FYI, here is the overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
+When you are going to contribute, please keep in mind that this webdriver client aims to be similar to clients in languages Java/Ruby/Python/C#.
+Here is the [official documentation](https://www.selenium.dev/documentation/en/) and overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
 
 ### Run unit tests
 
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 3065ff732..5c32f6abc 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -34,3 +34,12 @@ jobs:
         run: |
           composer analyze
           composer codestyle:check
+
+  markdown-link-check:
+    name: "Markdown link check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gaurav-nelson/github-action-markdown-link-check@v1
+        with:
+          use-verbose-mode: 'yes'
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 0a45f9bd5..000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Code of Conduct
-
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
diff --git a/README.md b/README.md
index 6447e9426..1b00255fb 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,6 @@ versions of Chrome and Chromedriver with just a slight limitations.
 The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
 [Selenium project](https://github.com/SeleniumHQ/selenium/).
 
-Looking for API documentation of php-webdriver? See [https://php-webdriver.github.io/php-webdriver/](https://php-webdriver.github.io/php-webdriver/latest/)
-
 ## Installation
 
 Installation is possible using [Composer](https://getcomposer.org/).
@@ -59,7 +57,7 @@ This could be Selenium standalone server, but for local development, you can sen
 
 #### a) Chromedriver
 
-📙 Below you find only simple example, make sure to read our wiki for [more information on Chrome/Chromedriver](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
+📙 Below you will find a simple example. Make sure to read our wiki for [more information on Chrome/Chromedriver](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
 
 Install the latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
 Make sure to have a compatible version of Chromedriver and Chrome!
@@ -83,13 +81,13 @@ geckodriver
 
 #### c) Selenium standalone server
 
-Selenium server is useful especially when you need to execute multiple tests at once, if your tests are run
-in different browsers (like on your CI server) or eg. when you need to distribute tests amongst multiple machines
-in grid mode (one Selenium server hub and multiple Selenium nodes).
+Selenium server can be useful when you need to execute multiple tests at once,
+when you run tests in several different browsers (like on your CI server), or when you need to distribute tests amongst
+several machines in grid mode (where one Selenium server acts as a hub, and others connect to it as nodes).
 
 Selenium server then act like a proxy and takes care of distributing commands to the respective nodes.
 
-The latest version can be found on [Selenium download page](https://www.selenium.dev/downloads/).
+The latest version can be found on the [Selenium download page](https://www.selenium.dev/downloads/).
 
 📙 You can find [further Selenium server information](https://github.com/php-webdriver/php-webdriver/wiki/Selenium-server)
 in our wiki.
@@ -148,7 +146,7 @@ $desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless
 $driver = RemoteWebDriver::create($serverUrl, $desiredCapabilities);
 ```
 
-Capabilities can also be used to [📙 configure proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
+Capabilities can also be used to [📙 configure a proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
 To configure Chrome capabilities, you may use [📙 ChromeOptions](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chromeoptions).
 
 * See [legacy JsonWire protocol](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities) documentation or [W3C WebDriver specification](https://w3c.github.io/webdriver/#capabilities) for more details.
@@ -189,7 +187,9 @@ Some basic usage example is provided in [example.php](example.php) file.
 
 How-tos are provided right here in [📙 our GitHub wiki](https://github.com/php-webdriver/php-webdriver/wiki).
 
-You may also want to check out the Selenium [docs](https://selenium.dev/documentation/en/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
+If you don't use IDE, you may use [API documentation of php-webdriver](https://php-webdriver.github.io/php-webdriver/latest/).
+
+You may also want to check out the Selenium project [docs](https://selenium.dev/documentation/en/) and [wiki](https://github.com/SeleniumHQ/selenium/wiki).
 
 ## Testing framework integration
 

From f205354c58baeededdcb26f294ceb7012cacb8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 20:52:46 +0100
Subject: [PATCH 600/784] Add no-response bot to automatically close stale
 requests for information

---
 .github/no-response.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/no-response.yml

diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 000000000..04a666fa5
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,17 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+
+# Label requiring a response
+responseRequiredLabel: waiting for reaction
+
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action.
+
+  If the original issue author adds comment with more information,
+  this issue will be automatically reopened and we can investigate further.

From 9bd9fd5acac07f034b10266f0aa6aec004e1011b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 16:12:55 +0100
Subject: [PATCH 601/784] Add links to Discussions, improve Contributing
 guidance

---
 .github/CONTRIBUTING.md | 14 ++++++++++----
 README.md               | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8dc3409f5..f8d7cf34f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,17 +5,23 @@ We love to have your help to make php-webdriver better!
 Feel free to open an [issue](https://github.com/php-webdriver/php-webdriver/issues) if you run into any problem, or
 send a pull request (see bellow) with your contribution.
 
+## Before you contribute
+
+Do not hesitate to ask for a guidance before you implement notable change, or a new feature - use the associated [issue](https://github.com/php-webdriver/php-webdriver/issues) or use [Discussions](https://github.com/php-webdriver/php-webdriver/discussions).
+Because any new code means increased effort in library maintenance (which is being done by volunteers in their free time),
+please understand not every pull request is automatically accepted. This is why we recommend using the mentioned channels to discuss bigger changes in the source code first.
+
+When you are going to contribute, also please keep in mind that this webdriver client aims to be similar to clients in languages Java/Ruby/Python/C#.
+Here is the [official documentation](https://www.selenium.dev/documentation/en/) and overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
+
 ## Workflow when contributing a patch
 
 1. Fork the project on GitHub
 2. Implement your code changes into separate branch
-3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have Travis CI build which will automatically run tests on your pull request.
+3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have CI builds which will automatically run tests on your pull request. Make sure to fix any reported issues reported by these automated tests.
 4. When implementing a notable change, fix or a new feature, add record to the Unreleased section of [CHANGELOG.md](../CHANGELOG.md)
 5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `main` branch
  
-When you are going to contribute, please keep in mind that this webdriver client aims to be similar to clients in languages Java/Ruby/Python/C#.
-Here is the [official documentation](https://www.selenium.dev/documentation/en/) and overview of [the official Java API](http://seleniumhq.github.io/selenium/docs/api/java/)
-
 ### Run unit tests
 
 There are two test-suites: one with unit tests only, second with functional tests, which require running selenium server.
diff --git a/README.md b/README.md
index 1b00255fb..f673907f5 100644
--- a/README.md
+++ b/README.md
@@ -206,10 +206,16 @@ There are some projects already providing this:
 
 We have a great community willing to help you!
 
-- **Via StackOverflow** - You can [ask a question](https://stackoverflow.com/questions/ask?tags=php+selenium-webdriver+php-webdriver) or find many already answered question on StackOverflow
-- **Via our Facebook Group** - If you have questions or are an active contributor consider joining our [facebook group](https://www.facebook.com/groups/phpwebdriver/) and contribute to communal discussion and support
-- **Via GitHub** - Another option if you have a question (or bug report) is to [submit it here](https://github.com/php-webdriver/php-webdriver/issues/new) as a new issue
+❓ Do you have a **question, idea or some general feedback**? Visit our [Discussions](https://github.com/php-webdriver/php-webdriver/discussions) page.
+(Alternatively, you can [look for many answered questions also on StackOverflow](https://stackoverflow.com/questions/tagged/php+selenium-webdriver)).
 
-## Contributing
+🐛 Something isn't working, and you want to **report a bug**? [Submit it here](https://github.com/php-webdriver/php-webdriver/issues/new) as a new issue.
+
+📙 Looking for a **how-to** or **reference documentation**? See [our wiki](https://github.com/php-webdriver/php-webdriver/wiki).
+
+## Contributing ❤️
 
 We love to have your help to make php-webdriver better. See [CONTRIBUTING.md](.github/CONTRIBUTING.md) for more information about contributing and developing php-webdriver.
+
+Php-webdriver is community project - if you want to join the effort with maintaining and developing this library, the best is to look on [issues marked with "help wanted"](https://github.com/php-webdriver/php-webdriver/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
+label. Let us know in the issue comments if you want to contribute and if you want any guidance, and we will be delighted to help you to prepare your pull request.

From a626825914477cc5ef1790a778a4c89072314b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 16:33:19 +0100
Subject: [PATCH 602/784] Cleanup contributing howto a bit

---
 .github/CONTRIBUTING.md | 61 ++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index f8d7cf34f..c7e430022 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,43 +24,60 @@ Here is the [official documentation](https://www.selenium.dev/documentation/en/)
  
 ### Run unit tests
 
-There are two test-suites: one with unit tests only, second with functional tests, which require running selenium server.
+There are two test-suites: one with **unit tests** only (called `unit`), second with **functional tests** (called `functional`),
+which requires running Selenium server and local PHP server.
 
-To execute all tests simply run:
+To execute **all tests** in both suites run:
 
-    ./vendor/bin/phpunit
+```sh
+./vendor/bin/phpunit
+```
 
-If you want to execute just the unit tests, run:
+If you want to execute **just the unit tests**, run:
 
-    ./vendor/bin/phpunit --testsuite unit
+```sh
+./vendor/bin/phpunit --testsuite unit
+```
 
-For the functional tests you must first [download](http://selenium-release.storage.googleapis.com/index.html) and start
-the selenium standalone server, start the local PHP server which will serve the test pages and then run the `functional`
-test suite:
+**Functional tests** are run against a real browser. It means they take a bit longer and also require an additional setup:
+you must first [download](https://www.selenium.dev/downloads/) and start the Selenium standalone server,
+then start the local PHP server which will serve the test pages and then run the `functional` test suite:
 
-    java -jar selenium-server-standalone-3.9.1.jar -log selenium.log &
-    php -S localhost:8000 -t tests/functional/web/ &
-    ./vendor/bin/phpunit --testsuite functional
+```sh
+java -jar selenium-server-standalone-X.X.X.jar -log selenium.log &
+php -S localhost:8000 -t tests/functional/web/ &
+./vendor/bin/phpunit --testsuite functional
+```
 
-The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in eg. Firefox,
-simply set the `BROWSER_NAME` environment variable:
+The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in other browser
+like Chrome, set the `BROWSER_NAME` environment variable:
 
-    ...
-    export BROWSER_NAME="firefox"
-    ./vendor/bin/phpunit --testsuite functional
+```sh
+...
+export BROWSER_NAME="chrome"
+./vendor/bin/phpunit --testsuite functional
+```
 
-To test with Geckodriver, [download](https://github.com/mozilla/geckodriver/releases) and start the server, then run:
+Don't forget you also need to setup browser driver (Chromedriver/Geckodriver), as its [explained in wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
 
-    export GECKODRIVER=1
-    export BROWSER_NAME=firefox
-    ./vendor/bin/phpunit --testsuite functional
+To test with Firefox/Geckodriver, you must also set `GECKODRIVER` environment variable:
+
+```sh
+export GECKODRIVER=1
+export BROWSER_NAME=firefox
+./vendor/bin/phpunit --testsuite functional
+```
 
 ### Check coding style
 
 Your code-style should comply with [PSR-2](http://www.php-fig.org/psr/psr-2/). To make sure your code matches this requirement run:
 
-    composer codestyle:check
+```sh
+composer codestyle:check
+```
 
 To auto-fix the codestyle simply run:
 
-    composer codestyle:fix
+```sh
+composer codestyle:fix
+```

From 49b2352ff543cf1a30e46f5627c07e04130ae478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 17:34:02 +0100
Subject: [PATCH 603/784] Rearrange composer scripts

---
 .github/workflows/php.yaml | 17 +++++------------
 composer.json              | 26 +++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 5c32f6abc..32a0860db 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -20,20 +20,13 @@ jobs:
           extensions: mbstring, intl, zip
 
       - name: Install dependencies
-        run: |
-          composer update --no-interaction
-          composer require --dev phpstan/phpstan # Not part of require-dev, because it won't install on PHP 5.6
-          composer require --dev ergebnis/composer-normalize
+        run: composer preinstall
 
-      - name: Check composer.json
-        run: |
-          composer validate --strict
-          composer normalize --dry-run
+      - name: Lint
+        run: composer lint
 
-      - name: Run checks
-        run: |
-          composer analyze
-          composer codestyle:check
+      - name: Run analysis
+        run: composer analyze
 
   markdown-link-check:
     name: "Markdown link check"
diff --git a/composer.json b/composer.json
index f0dcbf5a2..385dc5e0d 100644
--- a/composer.json
+++ b/composer.json
@@ -64,17 +64,33 @@
   },
   "minimum-stability": "beta",
   "scripts": {
-    "analyze": [
-      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
-      "vendor/bin/phpstan analyze -c phpstan.neon --ansi"
+    "all": [
+      "@lint",
+      "@analyze",
+      "@test"
     ],
-    "codestyle:check": [
+    "analyze": [
+      "vendor/bin/phpstan analyze -c phpstan.neon --ansi",
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
     ],
-    "codestyle:fix": [
+    "fix": [
+      "@composer normalize",
       "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff -vvv || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
+    ],
+    "lint": [
+      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
+      "@composer validate",
+      "@composer normalize --dry-run"
+    ],
+    "preinstall": [
+      "@composer update --no-progress --no-interaction",
+      "@composer require --dev phpstan/phpstan",
+      "@composer require --dev ergebnis/composer-normalize"
+    ],
+    "test": [
+      "vendor/bin/phpunit --colors=always"
     ]
   }
 }

From c073410b31cf06b747d9c4c5b512568a818b4086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 17:35:18 +0100
Subject: [PATCH 604/784] Update and simplify information for contributors
 about code checks

---
 .github/CONTRIBUTING.md                | 60 ++++++++++++++------------
 tests/functional/WebDriverTestCase.php |  9 ++--
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c7e430022..c10d85094 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -21,22 +21,40 @@ Here is the [official documentation](https://www.selenium.dev/documentation/en/)
 3. Make sure all PHPUnit tests passes and code-style matches PSR-2 (see below). We also have CI builds which will automatically run tests on your pull request. Make sure to fix any reported issues reported by these automated tests.
 4. When implementing a notable change, fix or a new feature, add record to the Unreleased section of [CHANGELOG.md](../CHANGELOG.md)
 5. Submit your [pull request](https://github.com/php-webdriver/php-webdriver/pulls) against `main` branch
- 
-### Run unit tests
 
-There are two test-suites: one with **unit tests** only (called `unit`), second with **functional tests** (called `functional`),
+### Run automated code checks
+
+To make sure your code comply with [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style, tests passes and to execute other automated checks, run locally:
+
+```sh
+composer preinstall # Run this only on the first run - this will install some additional dependencies
+
+composer all
+```
+
+To run functional tests locally there is some additional setup needed - see below. Without this setup, functional tests will be skipped.
+
+
+For easier development there are also few other prepared commands:
+- `composer fix` - to auto-fix the codestyle and composer.json
+- `composer analyze` - to run only code analysis (without tests)
+- `composer test` - to run all tests
+
+### Unit tests
+
+There are two test-suites: one with **unit tests** only (`unit`), and second with **functional tests** (`functional`),
 which requires running Selenium server and local PHP server.
 
 To execute **all tests** in both suites run:
 
 ```sh
-./vendor/bin/phpunit
+composer test
 ```
 
 If you want to execute **just the unit tests**, run:
 
 ```sh
-./vendor/bin/phpunit --testsuite unit
+composer test -- --testsuite unit
 ```
 
 **Functional tests** are run against a real browser. It means they take a bit longer and also require an additional setup:
@@ -44,40 +62,28 @@ you must first [download](https://www.selenium.dev/downloads/) and start the Sel
 then start the local PHP server which will serve the test pages and then run the `functional` test suite:
 
 ```sh
+export BROWSER_NAME="htmlunit" # see below for other browsers
 java -jar selenium-server-standalone-X.X.X.jar -log selenium.log &
 php -S localhost:8000 -t tests/functional/web/ &
-./vendor/bin/phpunit --testsuite functional
+# Use following to run both unit and functional tests
+composer all
+# Or this to run only functional tests:
+composer test -- --testsuite functional
 ```
 
-The functional tests will be started in HtmlUnit headless browser by default. If you want to run them in other browser
-like Chrome, set the `BROWSER_NAME` environment variable:
+If you want to run tests in different browser then "htmlunit" (Chrome or Firefox), you need to setup the browser driver (Chromedriver/Geckodriver), as it is [explained in wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome)
+and then the `BROWSER_NAME` environment variable:
 
 ```sh
 ...
 export BROWSER_NAME="chrome"
-./vendor/bin/phpunit --testsuite functional
+composer all
 ```
 
-Don't forget you also need to setup browser driver (Chromedriver/Geckodriver), as its [explained in wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
-
 To test with Firefox/Geckodriver, you must also set `GECKODRIVER` environment variable:
 
 ```sh
 export GECKODRIVER=1
-export BROWSER_NAME=firefox
-./vendor/bin/phpunit --testsuite functional
-```
-
-### Check coding style
-
-Your code-style should comply with [PSR-2](http://www.php-fig.org/psr/psr-2/). To make sure your code matches this requirement run:
-
-```sh
-composer codestyle:check
-```
-
-To auto-fix the codestyle simply run:
-
-```sh
-composer codestyle:fix
+export BROWSER_NAME="firefox"
+composer all
 ```
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 0ade1c509..0113a5fe0 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -36,10 +36,11 @@ protected function setUp(): void
         if (static::isSauceLabsBuild()) {
             $this->setUpSauceLabs();
         } else {
-            if (getenv('BROWSER_NAME')) {
-                $browserName = getenv('BROWSER_NAME');
-            } else {
-                $browserName = WebDriverBrowserType::HTMLUNIT;
+            $browserName = (string) getenv('BROWSER_NAME');
+            if ($browserName === '') {
+                $this->markTestSkipped(
+                    'To execute functional tests browser name must be provided in BROWSER_NAME environment variable'
+                );
             }
 
             if ($browserName === WebDriverBrowserType::CHROME) {

From 6779c149dfb2df1968f2da7c1ee54fec156fccc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 11 Dec 2020 18:45:39 +0100
Subject: [PATCH 605/784] Add issue templates

---
 .github/ISSUE_TEMPLATE.md            | 21 ----------
 .github/ISSUE_TEMPLATE/bug_report.md | 59 ++++++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml    |  8 ++++
 3 files changed, 67 insertions(+), 21 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 3eef8cde7..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### What are you trying to achieve? (Expected behavior)
-<!-- Please fill -->
-
-### What do you get instead? (Actual behavior)
-<!-- Please fill -->
-
-### How could the issue be reproduced? (Steps to reproduce)
-<!-- Please fill everything relevant - the exact code you use, how you initialize the WebDriver, HTML snippet or URL of the page where you encounter the issue etc. -->
-
-```php
-// You can insert your PHP code here (or remove this block if it is not relevant for the issue).
-```
-
-### Details
-<!-- Please fill relevant following versions: -->
-
-* Php-webdriver version: 
-* PHP version: 
-* Selenium server version: 
-* Operating system: 
-* Browser used + version: 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..089c3468f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,59 @@
+---
+name: 🐛 Bug report
+about: Create a bug report to help us improve php-webdriver
+title: ''
+labels: bug
+assignees: ''
+---
+
+<!--
+For questions, ask in Discussions: https://github.com/php-webdriver/php-webdriver/discussions
+-->
+
+### Bug description
+<!-- A clear description of what the bug is. -->
+
+### How could the issue be reproduced
+
+Steps to reproduce the behavior:
+1. 
+2. 
+3. ...
+
+<!-- Please fill everything relevant - the exact code you use, how you initialize the WebDriver, HTML snippet or URL of the page where you encounter the issue etc. -->
+
+```php
+// You can insert your PHP code here (or remove this block if it is not relevant for the issue).
+
+// For example you can provide how you create WebDrivere instance:
+$driver = RemoteWebDriver::create('http://localhost:4444/', $capabilities);
+
+// And the code you use to execute the php-webdriver commands, for example:
+$driver->get('http://site.localhost/foo.html');
+$button = $driver->findElement(WebDriverBy::cssSelector('#foo');
+$button->click();
+```
+
+```html
+<!-- You can also provide HTML snippet of the relevant part of page -->
+<div>
+  <button id="foo">Foo</button>
+</div>
+```
+
+### Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Details
+<!-- Please fill relevant following items: -->
+
+* Php-webdriver version: 
+* PHP version: 
+* How do you start the browser: (for example: via Selenium server / with chromedriver command / using Laravel Dusk / in Docker etc.)
+* Selenium server version: 
+* Operating system: 
+* Browser used + version: 
+* Browser driver (chromedriver/geckodriver...) version: 
+
+### Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..e9a259980
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: ❓ Questions and Help
+    url: https://github.com/php-webdriver/php-webdriver/discussions
+    about: Please ask and answer questions here
+  - name: 💡 Ideas and feature requests
+    url: https://github.com/php-webdriver/php-webdriver/discussions
+    about: Suggest an idea for php-webdriver

From c6dae057a61aff0bad66ce7071ee722b0f66f802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 12 Dec 2020 17:01:54 +0100
Subject: [PATCH 606/784] Attempt to fix no-response bot configuration

---
 .github/no-response.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/no-response.yml b/.github/no-response.yml
index 04a666fa5..320baf22f 100644
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -4,7 +4,7 @@
 daysUntilClose: 14
 
 # Label requiring a response
-responseRequiredLabel: waiting for reaction
+responseRequiredLabel: "waiting for reaction"
 
 # Comment to post when closing an Issue for lack of response. Set to `false` to disable
 closeComment: >

From 4d18d3d86b3f5f84dddfffe8a0a66a6b968d5aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 7 Jan 2021 18:47:09 +0100
Subject: [PATCH 607/784] Start chromedriver in W3C mode when supported

By sending capabilities in W3C format, we make behavior of `ChromeDriver::start()` the same as `RemoteWebDriver::create().
---
 CHANGELOG.md                | 3 +++
 lib/Chrome/ChromeDriver.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08abc738f..867045a41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Support for sending Chrome DevTools Protocol commands (see details in [wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chrome-devtools-protocol-cdp)).
 
+### Fixed
+- Actually start ChromeDriver in W3C mode if it is supported by the browser driver. Until now, when it was initialized using `ChromeDriver::start()`, it has always been unintentionally started in OSS mode.
+
 ### Changed
 - Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.
 - Do not require `WEBDRIVER_CHROME_DRIVER` environment variable to be set if `chromedriver` binary is already available via system PATH.
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 83a1745d0..4363ca30e 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -38,6 +38,9 @@ public function startSession(DesiredCapabilities $desired_capabilities)
             null,
             DriverCommand::NEW_SESSION,
             [
+                'capabilities' => [
+                    'firstMatch' => [(object) $desired_capabilities->toW3cCompatibleArray()],
+                ],
                 'desiredCapabilities' => (object) $desired_capabilities->toArray(),
             ]
         );

From 7f9be381a2d17f0714ce7c29f2b6d7f0290e4d3d Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 30 Dec 2020 14:50:21 +0800
Subject: [PATCH 608/784] Make the capability conversion JsonSerializable

By making the ChromeOptions implement JsonSerializable, both the
ChromeOptions::CAPABILITY and ChromeOptions::CAPABILITY_W3C will be
serializable when converting to JSON for the Desired Capabilities.

This also solves an issue whereby it is not possible to specify
CAPABILITY_W3C as the capability key as merging then works correctly
following this change.

Fixes #849
---
 lib/Chrome/ChromeOptions.php                  | 13 ++++++++++++-
 tests/unit/Remote/DesiredCapabilitiesTest.php | 18 +++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index d14105a74..168a93e6d 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -3,13 +3,14 @@
 namespace Facebook\WebDriver\Chrome;
 
 use Facebook\WebDriver\Remote\DesiredCapabilities;
+use JsonSerializable;
 
 /**
  * The class manages the capabilities in ChromeDriver.
  *
  * @see https://sites.google.com/a/chromium.org/chromedriver/capabilities
  */
-class ChromeOptions
+class ChromeOptions implements JsonSerializable
 {
     /**
      * The key of chrome options desired capabilities (in legacy OSS JsonWire protocol)
@@ -37,6 +38,16 @@ class ChromeOptions
      */
     private $experimentalOptions = [];
 
+    /**
+     * Return a version of the class which can JSON serialized.
+     *
+     * @return array
+     */
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
+
     /**
      * Sets the path of the Chrome executable. The path should be either absolute
      * or relative to the location running ChromeDriver server.
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 056ac1039..63bd734a4 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -143,9 +143,9 @@ public function testShouldConvertCapabilitiesToW3cCompatible(
         DesiredCapabilities $inputJsonWireCapabilities,
         array $expectedW3cCapabilities
     ) {
-        $this->assertEquals(
-            $expectedW3cCapabilities,
-            $inputJsonWireCapabilities->toW3cCompatibleArray()
+        $this->assertJsonStringEqualsJsonString(
+            json_encode($expectedW3cCapabilities),
+            json_encode($inputJsonWireCapabilities->toW3cCompatibleArray())
         );
     }
 
@@ -233,6 +233,18 @@ public function provideW3cCapabilities()
                     ),
                 ],
             ],
+            'chromeOptions as W3C capability should be converted' => [
+                new DesiredCapabilities([
+                    ChromeOptions::CAPABILITY_W3C => $chromeOptions,
+                ]),
+                [
+                    'goog:chromeOptions' => new \ArrayObject(
+                        [
+                            'args' => ['--headless'],
+                        ]
+                    ),
+                ],
+            ],
             'chromeOptions should be merged if already defined' => [
                 new DesiredCapabilities([
                     ChromeOptions::CAPABILITY => $chromeOptions,

From f7bb2b75c74cacc09962eef792a7e8dfda53d1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 12 Jan 2021 02:17:12 +0100
Subject: [PATCH 609/784] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 867045a41..502007420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Actually start ChromeDriver in W3C mode if it is supported by the browser driver. Until now, when it was initialized using `ChromeDriver::start()`, it has always been unintentionally started in OSS mode.
+- ChromeOptions were ignored when passed to DesiredCapabilities as `ChromeOptions::CAPABILITY_W3C`.
 
 ### Changed
 - Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.

From 5f3dcf1be61a58e4aa69f0b46779bee49433490d Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 12 Jan 2021 08:36:52 +0800
Subject: [PATCH 610/784] Work around a bug in Geckodriver (653)

This issue works around a long-standing bug in Geckodriver whereby if
the first child of an anchor is a block-level element, that element
covers the click-point of the anchor. This causes an
ElementNotInteractable exception to be thrown as Marionette believes
that it cannot be scrolled into view.

The workaround to this issue is to attempt to click on an immediate
child node instead. Usually the first child will be sufficient, but if
that first child is a hidden element, then a sibling should instead be
used.

This issue has existed for several years and there is no timeframe for
fixing it upstream.
---
 .travis.yml                               |  1 +
 lib/Remote/RemoteWebElement.php           | 50 +++++++++++++++--
 tests/functional/RemoteWebElementTest.php | 65 +++++++++++++++++++++++
 tests/functional/WebDriverTestCase.php    | 21 +++++++-
 tests/functional/web/gecko653.html        | 35 ++++++++++++
 5 files changed, 167 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/web/gecko653.html

diff --git a/.travis.yml b/.travis.yml
index fa5d0d2f6..3f393841e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,6 +131,7 @@ script:
   - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
   - if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
   - if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
+  - if [ "$BROWSER_NAME" = "htmlunit" ]; then EXCLUDE_GROUP+="exclude-htmlunit,"; fi
   - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
   - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index b4b640374..3efd3bd89 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\ElementNotInteractableException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
@@ -69,10 +70,17 @@ public function clear()
      */
     public function click()
     {
-        $this->executor->execute(
-            DriverCommand::CLICK_ELEMENT,
-            [':id' => $this->id]
-        );
+        try {
+            $this->executor->execute(
+                DriverCommand::CLICK_ELEMENT,
+                [':id' => $this->id]
+            );
+        } catch (ElementNotInteractableException $e) {
+            // An issue with geckodriver (https://github.com/mozilla/geckodriver/issues/653) prevents clicking on a link
+            // if the first child is a block-level element.
+            // The workaround in this case is to click on a child element.
+            $this->clickChildElement($e);
+        }
 
         return $this;
     }
@@ -477,6 +485,40 @@ public function equals(WebDriverElement $other)
         ]);
     }
 
+    /**
+     * Attempt to click on a child level element.
+     *
+     * This provides a workaround for geckodriver bug 653 whereby a link whose first element is a block-level element
+     * throws an ElementNotInteractableException could not scroll into view exception.
+     *
+     * The workaround provided here attempts to click on a child node of the element.
+     * In case the first child is hidden, other elements are processed until we run out of elements.
+     *
+     * @param ElementNotInteractableException $originalException The exception to throw if unable to click on any child
+     * @see https://github.com/mozilla/geckodriver/issues/653
+     * @see https://bugzilla.mozilla.org/show_bug.cgi?id=1374283
+     */
+    protected function clickChildElement(ElementNotInteractableException $originalException)
+    {
+        $children = $this->findElements(WebDriverBy::xpath('./*'));
+        foreach ($children as $child) {
+            try {
+                // Note: This does not use $child->click() as this would cause recursion into all children.
+                // Where the element is hidden, all children will also be hidden.
+                $this->executor->execute(
+                    DriverCommand::CLICK_ELEMENT,
+                    [':id' => $child->id]
+                );
+
+                return;
+            } catch (ElementNotInteractableException $e) {
+                // Ignore the ElementNotInteractableException exception on this node. Try the next child instead.
+            }
+        }
+
+        throw $originalException;
+    }
+
     /**
      * Return the WebDriverElement with $id
      *
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 21d890ccc..cf05bb1a8 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\ElementNotInteractableException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
@@ -117,6 +118,70 @@ public function testShouldClick()
         );
     }
 
+    /**
+     * This test checks that the workarounds in place for https://github.com/mozilla/geckodriver/issues/653 work as
+     * expected where child links can be clicked.
+     *
+     * @covers ::click
+     * @covers ::clickChildElement
+     * @group exclude-chrome
+     * @group exclude-edge
+     * @group exclude-htmlunit
+     */
+    public function testShouldClickOnBlockLevelElement()
+    {
+        self::skipForUnmatchedBrowsers(['firefox']);
+
+        $links = [
+            'a-index-plain',
+            'a-index-block-child',
+            'a-index-block-child-hidden',
+            'a-index-second-child-hidden',
+        ];
+
+        foreach ($links as $linkid) {
+            $this->driver->get($this->getTestPageUrl('gecko653.html'));
+            $linkElement = $this->driver->findElement(WebDriverBy::id($linkid));
+
+            $linkElement->click();
+            $this->assertStringContainsString('index.html', $this->driver->getCurrentUrl());
+        }
+    }
+
+    /**
+     * This test checks that the workarounds in place for https://github.com/mozilla/geckodriver/issues/653 work as
+     * expected where child links cannot be clicked, and that appropriate exceptions are thrown.
+     *
+     * @covers ::click
+     * @covers ::clickChildElement
+     * @group exclude-chrome
+     * @group exclude-edge
+     * @group exclude-htmlunit
+     */
+    public function testShouldClickNotInteractable()
+    {
+        self::skipForUnmatchedBrowsers(['firefox']);
+        self::skipForJsonWireProtocol('Broken in legacy Firefox');
+
+        $this->driver->get($this->getTestPageUrl('gecko653.html'));
+
+        $linkElement = $this->driver->findElement(WebDriverBy::id('a-index-plain-hidden'));
+        try {
+            $linkElement->click();
+            $this->fail('No exception was thrown when clicking an inaccessible link');
+        } catch (ElementNotInteractableException $e) {
+            $this->assertInstanceOf(ElementNotInteractableException::class, $e);
+        }
+
+        $linkElement = $this->driver->findElement(WebDriverBy::id('a-index-hidden-block-child'));
+        try {
+            $linkElement->click();
+            $this->fail('No exception was thrown when clicking an inaccessible link');
+        } catch (ElementNotInteractableException $e) {
+            $this->assertInstanceOf(ElementNotInteractableException::class, $e);
+        }
+    }
+
     /**
      * @covers ::clear
      */
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 0113a5fe0..5108f3bd3 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -36,7 +36,7 @@ protected function setUp(): void
         if (static::isSauceLabsBuild()) {
             $this->setUpSauceLabs();
         } else {
-            $browserName = (string) getenv('BROWSER_NAME');
+            $browserName = getenv('BROWSER_NAME');
             if ($browserName === '') {
                 $this->markTestSkipped(
                     'To execute functional tests browser name must be provided in BROWSER_NAME environment variable'
@@ -123,6 +123,25 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
         }
     }
 
+    /**
+     * Mark a test as skipped if the current browser is not in the list of browsers.
+     *
+     * @param array $browsers List of browsers for this test
+     * @param string|null $message
+     */
+    public static function skipForUnmatchedBrowsers($browsers = [], $message = null)
+    {
+        $browserName = (string) getenv('BROWSER_NAME');
+        if (array_search($browserName, $browsers) === false) {
+            if (!$message) {
+                $browserlist = implode(', ', $browsers);
+                $message = 'Browser ' . $browserName . ' not supported for this test (' . $browserlist . ')';
+            }
+
+            static::markTestSkipped($message);
+        }
+    }
+
     /**
      * Rerun failed tests.
      * @TODO Replace with PHPUnit 7.3+ builtin functionality once upgraded to PHP 7.1+
diff --git a/tests/functional/web/gecko653.html b/tests/functional/web/gecko653.html
new file mode 100644
index 000000000..fcf943d66
--- /dev/null
+++ b/tests/functional/web/gecko653.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Test page for geckodriver#653 workaround</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <style>
+        .hidden {
+            display: none;
+        }
+    </style>
+</head>
+<body>
+    <a href="http://github.com/index.html" id="a-index-plain">Link text</a>
+
+    <a href="http://github.com/index.html" id="a-index-plain-hidden" class="hidden">Link text</a>
+
+    <a href="http://github.com/index.html" id="a-index-block-child">
+        <div>Link in a block element</div>
+    </a>
+
+    <a href="http://github.com/index.html" id="a-index-hidden-block-child" class="hidden">
+        <div>Link in a block element</div>
+    </a>
+
+    <a href="http://github.com/index.html" id="a-index-block-child-hidden">
+        <div class="hidden">Hidden link</div>
+        <div>Link in a block element</div>
+    </a>
+
+    <a href="http://github.com/index.html" id="a-index-second-child-hidden">
+        Link text
+        <div class="hidden">A description in a block-level element</div>
+    </a>
+</body>
+</html>

From e3db8307d40339f9e6221fb123f187ec23bb9003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 1 Feb 2021 00:42:32 +0100
Subject: [PATCH 611/784] Update tests/functional/WebDriverTestCase.php

Co-authored-by: William Desportes <williamdes@wdes.fr>
---
 tests/functional/WebDriverTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5108f3bd3..0532fc99e 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -126,7 +126,7 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
     /**
      * Mark a test as skipped if the current browser is not in the list of browsers.
      *
-     * @param array $browsers List of browsers for this test
+     * @param string[] $browsers List of browsers for this test
      * @param string|null $message
      */
     public static function skipForUnmatchedBrowsers($browsers = [], $message = null)

From ad9fc7fcb916e91c71a37731802fd24906ff4a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 30 Jan 2021 18:37:45 +0100
Subject: [PATCH 612/784] Remove phpunit deprecations

---
 tests/unit/WebDriverExpectedConditionTest.php | 194 ++++++++----------
 1 file changed, 81 insertions(+), 113 deletions(-)

diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 2d0e743f7..d401a8886 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -107,15 +107,13 @@ public function testShouldDetectPresenceOfElementLocatedCondition()
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
 
-        $this->driverMock->expects($this->at(0))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willThrowException(new NoSuchElementException(''));
-
-        $this->driverMock->expects($this->at(1))
+        $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
             ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new NoSuchElementException('')),
+                $element
+            );
 
         $condition = WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
@@ -126,15 +124,13 @@ public function testShouldDetectNotPresenceOfElementLocatedCondition()
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
 
-        $this->driverMock->expects($this->at(0))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
-
-        $this->driverMock->expects($this->at(1))
+        $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
             ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willThrowException(new NoSuchElementException(''));
+            ->willReturnOnConsecutiveCalls(
+                $element,
+                $this->throwException(new NoSuchElementException(''))
+            );
 
         $condition = WebDriverExpectedCondition::not(
             WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::cssSelector('.foo'))
@@ -148,15 +144,13 @@ public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
     {
         $element = $this->createMock(RemoteWebElement::class);
 
-        $this->driverMock->expects($this->at(0))
-            ->method('findElements')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn([]);
-
-        $this->driverMock->expects($this->at(1))
+        $this->driverMock->expects($this->exactly(2))
             ->method('findElements')
             ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn([$element]);
+            ->willReturnOnConsecutiveCalls(
+                [],
+                [$element]
+            );
 
         $condition = WebDriverExpectedCondition::presenceOfAllElementsLocatedBy(WebDriverBy::cssSelector('.foo'));
 
@@ -172,19 +166,15 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         // Call #4: return Element, isDisplayed will return true and condition will match
 
         $element = $this->createMock(RemoteWebElement::class);
-        $element->expects($this->at(0))
-            ->method('isDisplayed')
-            ->willThrowException(new StaleElementReferenceException(''));
-
-        $element->expects($this->at(1))
-            ->method('isDisplayed')
-            ->willReturn(false);
-
-        $element->expects($this->at(2))
+        $element->expects($this->exactly(3))
             ->method('isDisplayed')
-            ->willReturn(true);
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new StaleElementReferenceException('')),
+                false,
+                true
+            );
 
-        $this->setupDriverToReturnElementAfterAnException($element, 4);
+        $this->setupDriverToReturnElementAfterAnException($element, 3);
 
         $condition = WebDriverExpectedCondition::visibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
@@ -225,20 +215,18 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchEle
     {
         $element = $this->createMock(RemoteWebElement::class);
 
-        $this->driverMock->expects($this->at(0))
+        $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
             ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willReturn($element);
+            ->willReturn(
+                $element,
+                $this->throwException(new NoSuchElementException(''))
+            );
 
-        $element->expects($this->at(0))
+        $element->expects($this->once())
             ->method('isDisplayed')
             ->willReturn(true);
 
-        $this->driverMock->expects($this->at(1))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willThrowException(new NoSuchElementException(''));
-
         $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
         $this->assertTrue($this->wait->until($condition));
@@ -253,13 +241,12 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElem
             ->with($this->isInstanceOf(WebDriverBy::class))
             ->willReturn($element);
 
-        $element->expects($this->at(0))
+        $element->expects($this->exactly(2))
             ->method('isDisplayed')
-            ->willReturn(true);
-
-        $element->expects($this->at(1))
-            ->method('isDisplayed')
-            ->willThrowException(new StaleElementReferenceException(''));
+            ->willReturnOnConsecutiveCalls(
+                true,
+                $this->throwException(new StaleElementReferenceException(''))
+            );
 
         $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
@@ -275,13 +262,12 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElement
             ->with($this->isInstanceOf(WebDriverBy::class))
             ->willReturn($element);
 
-        $element->expects($this->at(0))
-            ->method('isDisplayed')
-            ->willReturn(true);
-
-        $element->expects($this->at(1))
+        $element->expects($this->exactly(2))
             ->method('isDisplayed')
-            ->willReturn(false);
+            ->willReturnOnConsecutiveCalls(
+                true,
+                false
+            );
 
         $condition = WebDriverExpectedCondition::invisibilityOfElementLocated(WebDriverBy::cssSelector('.foo'));
 
@@ -291,13 +277,12 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElement
     public function testShouldDetectVisibilityOfCondition()
     {
         $element = $this->createMock(RemoteWebElement::class);
-        $element->expects($this->at(0))
-            ->method('isDisplayed')
-            ->willReturn(false);
-
-        $element->expects($this->at(1))
+        $element->expects($this->exactly(2))
             ->method('isDisplayed')
-            ->willReturn(true);
+            ->willReturn(
+                false,
+                true
+            );
 
         $condition = WebDriverExpectedCondition::visibilityOf($element);
 
@@ -313,19 +298,15 @@ public function testShouldDetectElementTextContainsCondition()
         // Call #4: return Element, getText will return new text and condition will match
 
         $element = $this->createMock(RemoteWebElement::class);
-        $element->expects($this->at(0))
+        $element->expects($this->exactly(3))
             ->method('getText')
-            ->willReturn('this is an old text');
+            ->willReturnOnConsecutiveCalls(
+                'this is an old text',
+                $this->throwException(new StaleElementReferenceException('')),
+                'this is a new text'
+            );
 
-        $element->expects($this->at(1))
-            ->method('getText')
-            ->willThrowException(new StaleElementReferenceException(''));
-
-        $element->expects($this->at(2))
-            ->method('getText')
-            ->willReturn('this is a new text');
-
-        $this->setupDriverToReturnElementAfterAnException($element, 4);
+        $this->setupDriverToReturnElementAfterAnException($element, 3);
 
         $condition = WebDriverExpectedCondition::elementTextContains(WebDriverBy::cssSelector('.foo'), 'new');
 
@@ -341,19 +322,15 @@ public function testShouldDetectElementTextIsCondition()
         // Call #4: return Element, getText will return new text and condition will match
 
         $element = $this->createMock(RemoteWebElement::class);
-        $element->expects($this->at(0))
+        $element->expects($this->exactly(3))
             ->method('getText')
-            ->willThrowException(new StaleElementReferenceException(''));
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new StaleElementReferenceException('')),
+                'this is a new text, but not exactly',
+                'this is a new text'
+            );
 
-        $element->expects($this->at(1))
-            ->method('getText')
-            ->willReturn('this is a new text, but not exactly');
-
-        $element->expects($this->at(2))
-            ->method('getText')
-            ->willReturn('this is a new text');
-
-        $this->setupDriverToReturnElementAfterAnException($element, 4);
+        $this->setupDriverToReturnElementAfterAnException($element, 3);
 
         $condition = WebDriverExpectedCondition::elementTextIs(
             WebDriverBy::cssSelector('.foo'),
@@ -373,19 +350,15 @@ public function testShouldDetectElementTextMatchesCondition()
 
         $element = $this->createMock(RemoteWebElement::class);
 
-        $element->expects($this->at(0))
-            ->method('getText')
-            ->willThrowException(new StaleElementReferenceException(''));
-
-        $element->expects($this->at(1))
-            ->method('getText')
-            ->willReturn('non-matching');
-
-        $element->expects($this->at(2))
+        $element->expects($this->exactly(3))
             ->method('getText')
-            ->willReturn('matching-123');
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new StaleElementReferenceException('')),
+                'non-matching',
+                'matching-123'
+            );
 
-        $this->setupDriverToReturnElementAfterAnException($element, 4);
+        $this->setupDriverToReturnElementAfterAnException($element, 3);
 
         $condition = WebDriverExpectedCondition::elementTextMatches(
             WebDriverBy::cssSelector('.foo'),
@@ -405,22 +378,16 @@ public function testShouldDetectElementValueContainsCondition()
 
         $element = $this->createMock(RemoteWebElement::class);
 
-        $element->expects($this->at(0))
-            ->method('getAttribute')
-            ->with('value')
-            ->willThrowException(new StaleElementReferenceException(''));
-
-        $element->expects($this->at(1))
+        $element->expects($this->exactly(3))
             ->method('getAttribute')
             ->with('value')
-            ->willReturn('wrong text');
+            ->willReturnOnConsecutiveCalls(
+                $this->throwException(new StaleElementReferenceException('')),
+                'wrong text',
+                'matching text'
+            );
 
-        $element->expects($this->at(2))
-            ->method('getAttribute')
-            ->with('value')
-            ->willReturn('matching text');
-
-        $this->setupDriverToReturnElementAfterAnException($element, 4);
+        $this->setupDriverToReturnElementAfterAnException($element, 3);
 
         $condition = WebDriverExpectedCondition::elementValueContains(
             WebDriverBy::cssSelector('.foo'),
@@ -449,16 +416,17 @@ public function testShouldDetectNumberOfWindowsToBeCondition()
      */
     private function setupDriverToReturnElementAfterAnException($element, $expectedNumberOfFindElementCalls)
     {
-        $this->driverMock->expects($this->at(0))
-            ->method('findElement')
-            ->with($this->isInstanceOf(WebDriverBy::class))
-            ->willThrowException(new NoSuchElementException(''));
+        $consecutiveReturn = [
+            $this->throwException(new NoSuchElementException('')),
+        ];
 
-        for ($i = 1; $i < $expectedNumberOfFindElementCalls; $i++) {
-            $this->driverMock->expects($this->at($i))
-                ->method('findElement')
-                ->with($this->isInstanceOf(WebDriverBy::class))
-                ->willReturn($element);
+        for ($i = 0; $i < $expectedNumberOfFindElementCalls; $i++) {
+            $consecutiveReturn[] = $element;
         }
+
+        $this->driverMock->expects($this->exactly(count($consecutiveReturn)))
+            ->method('findElement')
+            ->with($this->isInstanceOf(WebDriverBy::class))
+            ->willReturnOnConsecutiveCalls(...$consecutiveReturn);
     }
 }

From 0705fc9051c637f4055166db193888a21f9ea63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 2 Feb 2021 23:35:23 +0100
Subject: [PATCH 613/784] Update dependencies

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 385dc5e0d..8453c8169 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.0",
-    "ondram/ci-detector": "^2.1 || ^3.5",
+    "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
     "php-coveralls/php-coveralls": "^2.4",
     "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
     "php-parallel-lint/php-parallel-lint": "^1.2",

From e84017b27e93980c381cca75d26e844a943f21f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 2 Feb 2021 23:42:37 +0100
Subject: [PATCH 614/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502007420..c0a380956 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,18 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Added
 - Support for sending Chrome DevTools Protocol commands (see details in [wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chrome-devtools-protocol-cdp)).
+- Option to specify type of new window (window or tab) when using `$driver->switchTo()->newWindow()`.
 
 ### Fixed
 - Actually start ChromeDriver in W3C mode if it is supported by the browser driver. Until now, when it was initialized using `ChromeDriver::start()`, it has always been unintentionally started in OSS mode.
 - ChromeOptions were ignored when passed to DesiredCapabilities as `ChromeOptions::CAPABILITY_W3C`.
+- Clicking an block element inside `<a>` element (workaround for GeckoDriver bug [1374283](https://bugzilla.mozilla.org/show_bug.cgi?id=1374283)).
 
 ### Changed
 - Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.
 - Do not require `WEBDRIVER_CHROME_DRIVER` environment variable to be set if `chromedriver` binary is already available via system PATH.
 - Mark PhantomJS deprecated, as it is no longer developed and maintained.
+- Deprecate `RemoteWebDriver::newWindow()` in favor of `$driver->switchTo()->newWindow()`.
 
 ## 1.9.0 - 2020-11-19
 ### Added

From 4bb529f1dde17b211b380efc0eacb21481855704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 31 Jan 2021 23:59:30 +0100
Subject: [PATCH 615/784] Run unit tests via github actions

---
 .coveralls.yml                    |  2 +-
 .github/workflows/php.yaml        | 56 +++++++++++++++++++++++++++++++
 .github/workflows/sauce-labs.yaml |  6 ++--
 .travis.yml                       |  2 +-
 scripts/apply-phpunit-patches.sh  |  2 +-
 5 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/.coveralls.yml b/.coveralls.yml
index 8115fc995..5ae55a93b 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,2 +1,2 @@
-coverage_clover: ./logs/coverage-clover.xml
+coverage_clover: ./logs/clover.xml
 json_path: ./logs/coveralls-upload.json
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 32a0860db..3c7d85b1b 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -36,3 +36,59 @@ jobs:
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-verbose-mode: 'yes'
+
+  unit-tests:
+    name: "Unit tests"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version: ['5.6', '7.1', '7.2', '7.3', '7.4']
+        dependencies: ['']
+        include:
+          - { php-version: '5.6', dependencies: '--prefer-lowest' }
+          - { php-version: '8.0', dependencies: '--ignore-platform-req=php' }
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, intl, zip
+          coverage: xdebug
+          ini-values: ${{ matrix.xdebug-ini-values }}
+          tools: composer:v2
+
+      - name: Install dependencies
+        run: composer update --no-interaction ${{ matrix.dependencies }}
+
+      - name: Apply PHPUnit patches
+        if: ${{ matrix.php-version < 7.2 }}
+        run: scripts/apply-phpunit-patches.sh
+
+      - name: Run tests
+        run: vendor/bin/phpunit --testsuite unit --colors=always --coverage-clover ./logs/clover.xml
+
+      - name: Submit coverage to Coveralls
+        # We use php-coveralls library for this, as the official Coveralls GitHub Action lacks support for clover reports:
+        # https://github.com/coverallsapp/github-action/issues/15
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: ${{ github.job }}-PHP-${{ matrix.php-version }} ${{ matrix.dependencies }}
+        run: |
+          composer global require php-coveralls/php-coveralls
+          ~/.composer/vendor/bin/php-coveralls -v
+
+  tests-finished:
+    name: Tests finished
+    needs: [unit-tests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 9398909ae..1f716ade0 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -16,8 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
+#         # Firefox 47 is the last Firefox with OSS protocol support
           - { name: "Firefox 47, OSS protocol", BROWSER_NAME: "firefox", VERSION: "47.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-1" }
-          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-2" } # 74 is the last version which don't use W3C WebDriver by default
+          # Chrome 74 is the last version which doesn't use W3C WebDriver by default and rather use OSS protocol
+          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-2" }
           - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
           - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-4" }
 
@@ -58,7 +60,7 @@ jobs:
           if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
-          ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
+          ./vendor/bin/phpunit --testsuite functional --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
 
       - name: Print logs
         if: ${{ always() }}
diff --git a/.travis.yml b/.travis.yml
index 3f393841e..74e14ccdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -133,7 +133,7 @@ script:
   - if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
   - if [ "$BROWSER_NAME" = "htmlunit" ]; then EXCLUDE_GROUP+="exclude-htmlunit,"; fi
   - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
-  - ./vendor/bin/phpunit --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
+  - ./vendor/bin/phpunit --coverage-clover ./logs/clover.xml $EXTRA_PARAMS
 
 after_script:
   - if [ -f ./logs/selenium.log ]; then cat ./logs/selenium.log; fi
diff --git a/scripts/apply-phpunit-patches.sh b/scripts/apply-phpunit-patches.sh
index ee1dd00f3..478e01c74 100755
--- a/scripts/apply-phpunit-patches.sh
+++ b/scripts/apply-phpunit-patches.sh
@@ -17,4 +17,4 @@ sed -i '/<listeners>/,+2d' phpunit.xml.dist;
 sed -i 's/function runBare(): void/function runBare()/g' tests/functional/WebDriverTestCase.php;
 
 # Return back to original dir
-cd - > /dev/null
\ No newline at end of file
+cd - > /dev/null

From 6a8437e05f2ea2fa6d3e9ed9fdbdf4d0c0da7fc1 Mon Sep 17 00:00:00 2001
From: sanduluca <56228534+sanduluca@users.noreply.github.com>
Date: Thu, 14 Jan 2021 11:36:10 +0200
Subject: [PATCH 616/784] Update HttpCommandExecutor.php

unescape slashes when encode params
---
 lib/Remote/HttpCommandExecutor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index f853a735e..69790e0e1 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -326,7 +326,7 @@ public function execute(WebDriverCommand $command)
                 $url
             );
             if (is_array($params) && !empty($params)) {
-                $msg .= sprintf(' with params: %s', json_encode($params));
+                $msg .= sprintf(' with params: %s', json_encode($params, JSON_UNESCAPED_SLASHES));
             }
 
             throw new WebDriverCurlException($msg . "\n\n" . $error);

From 3831121150835fdb534fe8c2b4e5ff3754ea41a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 12:47:44 +0100
Subject: [PATCH 617/784] Add GH Actions functional tests build

---
 .github/workflows/php.yaml                | 69 ++++++++++++++++++++++-
 .github/workflows/sauce-labs.yaml         |  2 +-
 lib/Remote/Service/DriverService.php      |  2 +-
 tests/functional/RemoteWebElementTest.php |  4 +-
 tests/functional/WebDriverTestCase.php    |  2 +-
 tests/functional/WebDriverWindowTest.php  |  2 -
 6 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 3c7d85b1b..71d212619 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -19,7 +19,7 @@ jobs:
           php-version: '7.4'
           extensions: mbstring, intl, zip
 
-      - name: Install dependencies
+      - name: Install PHP dependencies
         run: composer preinstall
 
       - name: Lint
@@ -61,7 +61,7 @@ jobs:
           ini-values: ${{ matrix.xdebug-ini-values }}
           tools: composer:v2
 
-      - name: Install dependencies
+      - name: Install PHP dependencies
         run: composer update --no-interaction ${{ matrix.dependencies }}
 
       - name: Apply PHPUnit patches
@@ -82,9 +82,72 @@ jobs:
           composer global require php-coveralls/php-coveralls
           ~/.composer/vendor/bin/php-coveralls -v
 
+  functional-tests:
+    name: "Functional tests"
+    runs-on: ubuntu-latest
+
+    env:
+      SELENIUM_SERVER_DOWNLOAD_URL: http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: mbstring, intl, zip
+          coverage: xdebug
+          tools: composer:v2
+
+      - name: Install PHP dependencies
+        run: composer update --no-interaction
+
+      - name: Start Selenium standalone server
+        # If you want to run your Selenium WebDriver tests on GitHub actions, we recommend using service containers
+        # with eg. selenium/standalone-chrome image. See https://docs.github.com/en/actions/guides/about-service-containers
+        # But for the purpose of testing this library itself, we need more control so we set everything up manually.
+        run: |
+          google-chrome --version
+          chromedriver --version
+          mkdir -p build
+          wget -q -t 3 -O build/selenium-server-standalone.jar $SELENIUM_SERVER_DOWNLOAD_URL
+          java -jar build/selenium-server-standalone.jar -version
+          xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum java -jar build/selenium-server-standalone.jar -log logs/selenium-server.log &
+          while ! nc -z localhost 4444 </dev/null; do echo Waiting for Selenium server to start...; sleep 1; done
+
+      - name: Start local PHP server
+        run: |
+          php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+
+      - name: Run tests
+        env:
+          BROWSER_NAME: chrome # TODO: add browser from matrix
+        run: |
+          if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
+          if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
+          vendor/bin/phpunit --testsuite functional --colors=always --coverage-clover ./logs/clover.xml $EXTRA_PARAMS
+
+      - name: Submit coverage to Coveralls
+        # We use php-coveralls library for this, as the official Coveralls GitHub Action lacks support for clover reports:
+        # https://github.com/coverallsapp/github-action/issues/15
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_PARALLEL: true
+          COVERALLS_FLAG_NAME: ${{ github.job }} # TODO: add browser name
+        run: |
+          composer global require php-coveralls/php-coveralls
+          ~/.composer/vendor/bin/php-coveralls -v
+
+      - name: Print logs
+        if: ${{ always() }}
+        run: |
+          if [ -f ./logs/selenium-server.log ]; then cat ./logs/selenium-server.log; fi
+          if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
+
   tests-finished:
     name: Tests finished
-    needs: [unit-tests]
+    needs: [unit-tests, functional-tests]
     runs-on: ubuntu-latest
     steps:
       - name: Notify Coveralls
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 1f716ade0..481eb78ed 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -33,7 +33,7 @@ jobs:
           php-version: '7.4'
           extensions: mbstring, intl, zip
 
-      - name: Install dependencies
+      - name: Install PHP dependencies
         run: composer update --no-interaction
 
       - name: Start local PHP server
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index ef386d98f..6c6a0cacc 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -122,7 +122,7 @@ protected static function checkExecutable($executable)
             throw new Exception(
                 sprintf(
                     '"%s" is not executable. Make sure the path is correct or use environment variable to specify'
-                     . 'location of the executable.',
+                     . ' location of the executable.',
                     $executable
                 )
             );
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index cf05bb1a8..7e70e4230 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -128,7 +128,7 @@ public function testShouldClick()
      * @group exclude-edge
      * @group exclude-htmlunit
      */
-    public function testShouldClickOnBlockLevelElement()
+    public function testGeckoDriverShouldClickOnBlockLevelElement()
     {
         self::skipForUnmatchedBrowsers(['firefox']);
 
@@ -158,7 +158,7 @@ public function testShouldClickOnBlockLevelElement()
      * @group exclude-edge
      * @group exclude-htmlunit
      */
-    public function testShouldClickNotInteractable()
+    public function testGeckoDriverShouldClickNotInteractable()
     {
         self::skipForUnmatchedBrowsers(['firefox']);
         self::skipForJsonWireProtocol('Broken in legacy Firefox');
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 0532fc99e..648ce549b 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -37,7 +37,7 @@ protected function setUp(): void
             $this->setUpSauceLabs();
         } else {
             $browserName = getenv('BROWSER_NAME');
-            if ($browserName === '') {
+            if ($browserName === '' || $browserName === false) {
                 $this->markTestSkipped(
                     'To execute functional tests browser name must be provided in BROWSER_NAME environment variable'
                 );
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 62756f847..74baf3599 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -51,8 +51,6 @@ public function testShouldMaximizeWindow()
     /**
      * @group exclude-saucelabs
      * @group exclude-edge
-     * @group exclude-chrome
-     * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1049336
      */
     public function testShouldFullscreenWindow()
     {

From 003fd2b676ba3df40a5e44c0a132a99314778e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 13:45:51 +0100
Subject: [PATCH 618/784] Fix risky tests

---
 tests/functional/RemoteTargetLocatorTest.php   | 1 -
 tests/functional/RemoteWebDriverCreateTest.php | 2 ++
 tests/functional/RemoteWebElementTest.php      | 4 +++-
 tests/functional/WebDriverNavigationTest.php   | 2 ++
 tests/functional/WebDriverTimeoutsTest.php     | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index cbb448ff0..2a00132d3 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -113,7 +113,6 @@ public function testShouldSwitchToFrameByElement()
 
     /**
      * @group exclude-saucelabs
-     * @covers ::window
      */
     public function testShouldCreateNewWindow()
     {
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 29302e16a..0e30dd929 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -59,6 +59,8 @@ public function testShouldAcceptCapabilitiesAsAnArray()
             $this->connectionTimeout,
             $this->requestTimeout
         );
+
+        $this->assertNotNull($this->driver->getCapabilities());
     }
 
     public function testShouldCreateWebDriverWithRequiredCapabilities()
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 7e70e4230..13c0a50ab 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -85,7 +85,7 @@ public function testShouldGetCssValue()
         $this->assertSame('none', $elementWithoutBorder->getCSSValue('border-left-style'));
 
         // Browser could report color in either rgb (like MS Edge) or rgba (like everyone else)
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             '/rgba?\(0, 0, 0(, 1)?\)/',
             $elementWithBorder->getCSSValue('border-left-color')
         );
@@ -116,6 +116,8 @@ public function testShouldClick()
         $this->driver->wait()->until(
             WebDriverExpectedCondition::urlContains('form.html')
         );
+
+        $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
     }
 
     /**
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index 6de24d1c0..630656ea4 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -44,6 +44,8 @@ public function testShouldNavigateBackAndForward()
         $this->driver->wait()->until(
             WebDriverExpectedCondition::urlContains('form.html')
         );
+
+        $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
     }
 
     /**
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 61f49c18a..652147b7d 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -57,5 +57,7 @@ public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
         } catch (TimeoutException $e) { // thrown by Selenium 3.0.0+
         } catch (ScriptTimeoutException $e) { // thrown by Selenium 2
         }
+
+        $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
     }
 }

From 723f5056bc8dc55d35fbb663015d674cbdfb96c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 16:44:37 +0100
Subject: [PATCH 619/784] Add build matrix

---
 .github/workflows/php.yaml | 27 ++++++++++++++++++++-------
 README.md                  |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 71d212619..1501b2987 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -1,4 +1,4 @@
-name: PHP
+name: Tests
 
 on:
   push:
@@ -83,12 +83,18 @@ jobs:
           ~/.composer/vendor/bin/php-coveralls -v
 
   functional-tests:
-    name: "Functional tests"
-    runs-on: ubuntu-latest
 
+    runs-on: ubuntu-latest
     env:
       SELENIUM_SERVER_DOWNLOAD_URL: http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
 
+    strategy:
+      matrix:
+        browser: ['chrome']
+        selenium-server: [true, false] # Whether to run via Selenium server or directly via browser driver
+
+    name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }})"
+
     steps:
       - uses: actions/checkout@v2
 
@@ -107,22 +113,28 @@ jobs:
         # If you want to run your Selenium WebDriver tests on GitHub actions, we recommend using service containers
         # with eg. selenium/standalone-chrome image. See https://docs.github.com/en/actions/guides/about-service-containers
         # But for the purpose of testing this library itself, we need more control so we set everything up manually.
+        if: ${{ matrix.selenium-server }}
         run: |
-          google-chrome --version
-          chromedriver --version
           mkdir -p build
           wget -q -t 3 -O build/selenium-server-standalone.jar $SELENIUM_SERVER_DOWNLOAD_URL
           java -jar build/selenium-server-standalone.jar -version
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum java -jar build/selenium-server-standalone.jar -log logs/selenium-server.log &
           while ! nc -z localhost 4444 </dev/null; do echo Waiting for Selenium server to start...; sleep 1; done
 
+      - name: Start ChromeDriver
+        if: ${{ !matrix.selenium-server && matrix.browser == 'chrome' }}
+        run: |
+          google-chrome --version
+          chromedriver --port=4444 --url-base=/wd/hub --log-level=DEBUG &> ./logs/chromedriver.log &
+          while ! nc -z localhost 4444 </dev/null; do echo Waiting for ChromeDriver to start...; sleep 1; done
+
       - name: Start local PHP server
         run: |
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
       - name: Run tests
         env:
-          BROWSER_NAME: chrome # TODO: add browser from matrix
+          BROWSER_NAME: ${{ matrix.browser }}
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
@@ -134,7 +146,7 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
-          COVERALLS_FLAG_NAME: ${{ github.job }} # TODO: add browser name
+          COVERALLS_FLAG_NAME: ${{ github.job }}-${{ matrix.browser }}-selenium-${{ matrix.selenium-server }}
         run: |
           composer global require php-coveralls/php-coveralls
           ~/.composer/vendor/bin/php-coveralls -v
@@ -143,6 +155,7 @@ jobs:
         if: ${{ always() }}
         run: |
           if [ -f ./logs/selenium-server.log ]; then cat ./logs/selenium-server.log; fi
+          if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
           if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
 
   tests-finished:
diff --git a/README.md b/README.md
index f673907f5..b73cfbd2d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Latest stable version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square&label=Packagist)](https://packagist.org/packages/php-webdriver/webdriver)
 [![Travis build status](https://img.shields.io/travis/php-webdriver/php-webdriver/main.svg?style=flat-square&label=Travis)](https://travis-ci.com/php-webdriver/php-webdriver)
-[![GitHub Actions build status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/PHP?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
+[![GitHub Actions build status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Tests?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
 [![SauceLabs test status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Sauce%20Labs?style=flat-square&label=SauceLabs)](https://saucelabs.com/u/php-webdriver)
 [![Total downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square&label=Downloads)](https://packagist.org/packages/php-webdriver/webdriver)
 

From 2296b146e070215cd03d9594ff728eb464407493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 19:24:55 +0100
Subject: [PATCH 620/784] Workaround for chromedriver crash bug

https://bugs.chromium.org/p/chromedriver/issues/detail?id=3736
---
 tests/functional/RemoteWebDriverTest.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index ae289de5d..a3ed2fb6b 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -100,15 +100,19 @@ public function testShouldQuitAndUnsetExecutor()
 
         $this->assertCount(
             1,
-            RemoteWebDriver::getAllSessions($this->serverUrl, 30000)
+            RemoteWebDriver::getAllSessions($this->serverUrl)
         );
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
 
         $this->driver->quit();
 
+        // Wait a while until chromedriver finishes deleting the session.
+        // https://bugs.chromium.org/p/chromedriver/issues/detail?id=3736
+        usleep(250000); // 250 ms
+
         $this->assertCount(
             0,
-            RemoteWebDriver::getAllSessions($this->serverUrl, 30000)
+            RemoteWebDriver::getAllSessions($this->serverUrl)
         );
         $this->assertNull($this->driver->getCommandExecutor());
     }

From 20cf97075c364edecedc58aa482600eadf815283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 19:40:48 +0100
Subject: [PATCH 621/784] Add Firefox/GeckoDriver builds

---
 .github/workflows/php.yaml                     | 16 +++++++++++++++-
 tests/functional/RemoteWebDriverCreateTest.php |  4 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index 1501b2987..f5bda4f5a 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -90,7 +90,7 @@ jobs:
 
     strategy:
       matrix:
-        browser: ['chrome']
+        browser: ['chrome', 'firefox']
         selenium-server: [true, false] # Whether to run via Selenium server or directly via browser driver
 
     name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }})"
@@ -125,9 +125,19 @@ jobs:
         if: ${{ !matrix.selenium-server && matrix.browser == 'chrome' }}
         run: |
           google-chrome --version
+          xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
           chromedriver --port=4444 --url-base=/wd/hub --log-level=DEBUG &> ./logs/chromedriver.log &
           while ! nc -z localhost 4444 </dev/null; do echo Waiting for ChromeDriver to start...; sleep 1; done
 
+      - name: Start GeckoDriver
+        if: ${{ !matrix.selenium-server && matrix.browser == 'firefox' }}
+        run: |
+          firefox --version
+          geckodriver --version
+          xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
+          geckodriver &> ./logs/geckodriver.log &
+          while ! nc -z localhost 4444 </dev/null; do echo Waiting for GeckoDriver to start...; sleep 1; done
+
       - name: Start local PHP server
         run: |
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
@@ -135,8 +145,11 @@ jobs:
       - name: Run tests
         env:
           BROWSER_NAME: ${{ matrix.browser }}
+          # When running directly against Firefox, we test only using geckodriver (not against legacy Firefox =<45), so we must declare GECKODRIVER=1
+          GECKODRIVER: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '1' || '0' }}"
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
+          if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
           if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
           vendor/bin/phpunit --testsuite functional --colors=always --coverage-clover ./logs/clover.xml $EXTRA_PARAMS
 
@@ -156,6 +169,7 @@ jobs:
         run: |
           if [ -f ./logs/selenium-server.log ]; then cat ./logs/selenium-server.log; fi
           if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
+          if [ -f ./logs/geckodriver.log ]; then cat ./logs/geckodriver.log; fi
           if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
 
   tests-finished:
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 0e30dd929..e985f3eea 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -81,7 +81,9 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
     }
 
     /**
-     * Capabilities (browser name) must be defined when executing via Selenium proxy (standalone server, Saucelabs etc.)
+     * Capabilities (browser name) must be defined when executing via Selenium proxy (standalone server,
+     * Saucelabs etc.). But when running directly via browser driver, they could be empty.
+     * However the the browser driver must be able to create non-headless instance (eg. inside xvfb).
      * @group exclude-saucelabs
      */
     public function testShouldCreateWebDriverWithoutCapabilities()

From 382354c3defcec72b276329f78db02b75824f936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 10 Feb 2021 20:07:17 +0100
Subject: [PATCH 622/784] Add Chrome build with OSS JsonWire protocol

---
 .github/workflows/php.yaml                          | 11 +++++++++--
 tests/functional/Chrome/ChromeDriverServiceTest.php |  4 +++-
 tests/functional/Chrome/ChromeDriverTest.php        |  4 +++-
 tests/functional/RemoteWebDriverCreateTest.php      |  2 +-
 tests/functional/WebDriverOptionsCookiesTest.php    |  1 -
 tests/functional/WebDriverTestCase.php              | 11 ++++-------
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index f5bda4f5a..a1c675edd 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -92,8 +92,12 @@ jobs:
       matrix:
         browser: ['chrome', 'firefox']
         selenium-server: [true, false] # Whether to run via Selenium server or directly via browser driver
+        w3c: [true] # Although all builds negotiate protocol by default, it implies W3C protocol for both Chromedriver and Geckodriver
+        include:
+          # Force OSS (JsonWire) protocol on ChromeDriver - to make sure we keep compatibility
+          - { browser: 'chrome', selenium-server: false, w3c: false }
 
-    name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }})"
+    name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }}, W3C: ${{ matrix.w3c }})"
 
     steps:
       - uses: actions/checkout@v2
@@ -147,6 +151,9 @@ jobs:
           BROWSER_NAME: ${{ matrix.browser }}
           # When running directly against Firefox, we test only using geckodriver (not against legacy Firefox =<45), so we must declare GECKODRIVER=1
           GECKODRIVER: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '1' || '0' }}"
+          # We must provide CHROMEDRIVER_PATH so that ChromeDriverTest is able to start Chromedriver itself
+          CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chrome_driver/chromedriver' || '' }}"
+          DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
@@ -159,7 +166,7 @@ jobs:
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true
-          COVERALLS_FLAG_NAME: ${{ github.job }}-${{ matrix.browser }}-selenium-${{ matrix.selenium-server }}
+          COVERALLS_FLAG_NAME: ${{ github.job }}-${{ matrix.browser }}-selenium-${{ matrix.selenium-server }}-w3c-${{ matrix.w3c }}
         run: |
           composer global require php-coveralls/php-coveralls
           ~/.composer/vendor/bin/php-coveralls -v
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 4c41b86a0..334c6c089 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Chrome;
 
+use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -16,7 +17,8 @@ class ChromeDriverServiceTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
+        if (getenv('BROWSER_NAME') !== 'chrome' || empty(getenv('CHROMEDRIVER_PATH'))
+            || WebDriverTestCase::isSauceLabsBuild()) {
             $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
         }
     }
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index a37de2f5b..de049f59d 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,7 +19,8 @@ class ChromeDriverTest extends TestCase
 
     protected function setUp(): void
     {
-        if (!getenv('BROWSER_NAME') === 'chrome' || getenv('SAUCELABS') || !getenv('CHROMEDRIVER_PATH')) {
+        if (getenv('BROWSER_NAME') !== 'chrome' || empty(getenv('CHROMEDRIVER_PATH'))
+            || WebDriverTestCase::isSauceLabsBuild()) {
             $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
         }
     }
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index e985f3eea..e4436b731 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -88,7 +88,7 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
      */
     public function testShouldCreateWebDriverWithoutCapabilities()
     {
-        if (getenv('GECKODRIVER') !== '1' && getenv('CHROMEDRIVER') !== '1') {
+        if (getenv('GECKODRIVER') !== '1' && empty(getenv('CHROMEDRIVER_PATH'))) {
             $this->markTestSkipped('This test makes sense only when run directly via specific browser driver');
         }
 
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index cba3d6833..2b0301256 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -20,7 +20,6 @@ public function testShouldSetGetAndDeleteCookies()
     {
         $cookie1 = new Cookie('cookie1', 'cookie1Value');
         $cookie2 = new Cookie('cookie2', 'cookie2Value');
-        $cookie3 = new Cookie('cookie3', 'cookie3Value');
 
         // Verify initial state - no cookies are present
         $this->assertSame([], $this->driver->manage()->getCookies());
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 648ce549b..42289fd46 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -48,7 +48,7 @@ protected function setUp(): void
                 // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
                 $chromeOptions->addArguments(['--headless', 'window-size=1024,768', '--no-sandbox']);
 
-                if (getenv('DISABLE_W3C_PROTOCOL')) {
+                if (!static::isW3cProtocolBuild()) {
                     $chromeOptions->setExperimentalOption('w3c', false);
                 }
 
@@ -103,9 +103,7 @@ public static function isSauceLabsBuild()
      */
     public static function isW3cProtocolBuild()
     {
-        return getenv('GECKODRIVER') === '1'
-            || (getenv('BROWSER_NAME') === 'chrome' && getenv('DISABLE_W3C_PROTOCOL') !== '1')
-            || (self::isSauceLabsBuild() && getenv('DISABLE_W3C_PROTOCOL') !== '1');
+        return getenv('DISABLE_W3C_PROTOCOL') !== '1';
     }
 
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
@@ -117,8 +115,7 @@ public static function skipForW3cProtocol($message = 'Not supported by W3C speci
 
     public static function skipForJsonWireProtocol($message = 'Not supported by JsonWire protocol')
     {
-        if (getenv('GECKODRIVER') !== '1'
-            && (getenv('BROWSER_NAME') !== 'chrome' || getenv('DISABLE_W3C_PROTOCOL') === '1')) {
+        if (!static::isW3cProtocolBuild()) {
             static::markTestSkipped($message);
         }
     }
@@ -209,7 +206,7 @@ protected function setUpSauceLabs()
             $tunnelIdentifier = getenv('SAUCE_TUNNEL_IDENTIFIER');
         }
 
-        if (!getenv('DISABLE_W3C_PROTOCOL')) {
+        if (static::isW3cProtocolBuild()) {
             $sauceOptions = [
                 'name' => $name,
                 'tags' => $tags,

From 4e91f97ea56c5e017afc0cfac782497a6f8913e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Feb 2021 00:56:21 +0100
Subject: [PATCH 623/784] Improve detection of whether driver binary is present
 in system PATH

---
 lib/Remote/Service/DriverService.php          | 61 +++++++++++++++----
 .../Chrome/ChromeDriverServiceTest.php        |  2 +-
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 6c6a0cacc..165412b7c 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -45,7 +45,7 @@ class DriverService
      */
     public function __construct($executable, $port, $args = [], $environment = null)
     {
-        $this->executable = self::checkExecutable($executable);
+        $this->setExecutable($executable);
         $this->url = sprintf('http://localhost:%d', $port);
         $this->args = $args;
         $this->environment = $environment ?: $_ENV;
@@ -110,25 +110,35 @@ public function isRunning()
     }
 
     /**
-     * Check if the executable is executable.
-     *
+     * @deprecated Has no effect. Will be removed in next major version. Executable is now checked
+     * when calling setExecutable().
      * @param string $executable
-     * @throws Exception
      * @return string
      */
     protected static function checkExecutable($executable)
     {
-        if (!is_executable($executable)) {
-            throw new Exception(
-                sprintf(
-                    '"%s" is not executable. Make sure the path is correct or use environment variable to specify'
-                     . ' location of the executable.',
-                    $executable
-                )
-            );
+        return $executable;
+    }
+
+    /**
+     * @param string $executable
+     * @throws Exception
+     */
+    protected function setExecutable($executable)
+    {
+        if ($this->isExecutable($executable)) {
+            $this->executable = $executable;
+
+            return;
         }
 
-        return $executable;
+        throw new Exception(
+            sprintf(
+                '"%s" is not executable. Make sure the path is correct or use environment variable to specify'
+                 . ' location of the executable.',
+                $executable
+            )
+        );
     }
 
     /**
@@ -170,4 +180,29 @@ private function createProcess()
 
         return new Process($commandLine, null, $this->environment);
     }
+
+    /**
+     * Check whether given file is executable directly or using system PATH
+     *
+     * @param string $filename
+     * @return bool
+     */
+    private function isExecutable($filename)
+    {
+        if (is_executable($filename)) {
+            return true;
+        }
+        if ($filename !== basename($filename)) { // $filename is an absolute path, do no try to search it in PATH
+            return false;
+        }
+
+        $paths = explode(PATH_SEPARATOR, getenv('PATH'));
+        foreach ($paths as $path) {
+            if (is_executable($path . DIRECTORY_SEPARATOR . $filename)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 334c6c089..fa1e2d437 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -74,7 +74,7 @@ public function testShouldThrowExceptionIfExecutableIsNotExecutable()
 
     public function testShouldUseDefaultExecutableIfNoneProvided()
     {
-        // Put path where ChromeDriver was downloaded to system PATH
+        // Put path where ChromeDriver binary is actually located to system PATH, to make sure we can locate it
         putenv('PATH=' . getenv('PATH') . ':' . dirname(getenv('CHROMEDRIVER_PATH')));
 
         // Unset CHROME_DRIVER_EXECUTABLE so that ChromeDriverService will attempt to run the binary from system PATH

From 63b0025b58e5affe897f4459d59b192f06af678a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Feb 2021 01:03:58 +0100
Subject: [PATCH 624/784] Cleanup tests from legacy firefox conditions

We no longer test against this 5+ years old version.
---
 tests/functional/RemoteWebElementTest.php | 1 -
 tests/functional/WebDriverActionsTest.php | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 13c0a50ab..9d8c3ddc3 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -163,7 +163,6 @@ public function testGeckoDriverShouldClickOnBlockLevelElement()
     public function testGeckoDriverShouldClickNotInteractable()
     {
         self::skipForUnmatchedBrowsers(['firefox']);
-        self::skipForJsonWireProtocol('Broken in legacy Firefox');
 
         $this->driver->get($this->getTestPageUrl('gecko653.html'));
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index b9c617142..82c4b2b90 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -131,10 +131,6 @@ public function testShouldSendKeysUpAndDown()
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::FIREFOX) {
-            self::skipForJsonWireProtocol('Broken in legacy Firefox');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $this->driver->action()
@@ -212,10 +208,6 @@ public function testShouldDragAndDrop()
             $this->markTestSkipped('Not supported by HtmlUnit browser');
         }
 
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::FIREFOX) {
-            self::skipForJsonWireProtocol('Broken in legacy Firefox');
-        }
-
         $this->driver->get($this->getTestPageUrl('sortable.html'));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));

From a560d319518b018b50f8f84bbaac4f68c3981c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Feb 2021 01:23:26 +0100
Subject: [PATCH 625/784] Cleanup tests from htmlunit conditions

We no longer run htmlunit tests, we use headless chrome to keep OSS protocol compatibility. Also htmlunit is no longer included in Selenium jar"
---
 tests/functional/RemoteKeyboardTest.php    |  6 ----
 tests/functional/RemoteWebDriverTest.php   |  9 ------
 tests/functional/RemoteWebElementTest.php  |  6 ----
 tests/functional/WebDriverActionsTest.php  | 36 ----------------------
 tests/functional/WebDriverAlertTest.php    | 11 -------
 tests/functional/WebDriverTimeoutsTest.php |  5 ---
 6 files changed, 73 deletions(-)

diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index 45c9be151..150b0fb05 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -2,8 +2,6 @@
 
 namespace Facebook\WebDriver;
 
-use Facebook\WebDriver\Remote\WebDriverBrowserType;
-
 /**
  * @covers  \Facebook\WebDriver\Remote\RemoteKeyboard
  */
@@ -21,10 +19,6 @@ class RemoteKeyboardTest extends WebDriverTestCase
      */
     public function testShouldPressSendAndReleaseKeys()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not peorperly supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $this->driver->getKeyboard()->sendKeys('ab');
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index a3ed2fb6b..322ce0707 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -4,7 +4,6 @@
 
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebDriver
@@ -261,10 +260,6 @@ public function testShouldTakeScreenshot()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('index.html'));
 
         $outputPng = $this->driver->takeScreenshot();
@@ -284,10 +279,6 @@ public function testShouldSaveScreenshotToFile()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
-        }
-
         // Intentionally save screenshot to subdirectory to tests it is being created
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/selenium-screenshot.png';
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 9d8c3ddc3..1c51e971d 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -5,7 +5,6 @@
 use Facebook\WebDriver\Exception\ElementNotInteractableException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
-use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebElement
@@ -128,7 +127,6 @@ public function testShouldClick()
      * @covers ::clickChildElement
      * @group exclude-chrome
      * @group exclude-edge
-     * @group exclude-htmlunit
      */
     public function testGeckoDriverShouldClickOnBlockLevelElement()
     {
@@ -158,7 +156,6 @@ public function testGeckoDriverShouldClickOnBlockLevelElement()
      * @covers ::clickChildElement
      * @group exclude-chrome
      * @group exclude-edge
-     * @group exclude-htmlunit
      */
     public function testGeckoDriverShouldClickNotInteractable()
     {
@@ -413,9 +410,6 @@ public function testShouldTakeAndSaveElementScreenshot()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Screenshots are not supported by HtmlUnit browser');
-        }
 
         // Intentionally save screenshot to subdirectory to tests it is being created
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/element-screenshot.png';
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 82c4b2b90..b40ab62a9 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -27,10 +27,6 @@ class WebDriverActionsTest extends WebDriverTestCase
 
     public function testShouldClickOnElement()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
@@ -53,10 +49,6 @@ public function testShouldClickOnElement()
 
     public function testShouldClickAndHoldOnElementAndRelease()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
@@ -82,10 +74,6 @@ public function testShouldClickAndHoldOnElementAndRelease()
      */
     public function testShouldContextClickOnElement()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::MICROSOFT_EDGE) {
             $this->markTestSkipped('Getting stuck in EdgeDriver');
         }
@@ -107,10 +95,6 @@ public function testShouldContextClickOnElement()
 
     public function testShouldDoubleClickOnElement()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-3'));
@@ -127,10 +111,6 @@ public function testShouldDoubleClickOnElement()
      */
     public function testShouldSendKeysUpAndDown()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('events.html'));
 
         $this->driver->action()
@@ -156,10 +136,6 @@ public function testShouldSendKeysUpAndDown()
 
     public function testShouldMoveToElement()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('sortable.html'));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
@@ -179,10 +155,6 @@ public function testShouldMoveToElement()
 
     public function testShouldMoveByOffset()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('sortable.html'));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
@@ -204,10 +176,6 @@ public function testShouldMoveByOffset()
      */
     public function testShouldDragAndDrop()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('sortable.html'));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
@@ -236,10 +204,6 @@ public function testShouldDragAndDrop()
 
     public function testShouldDragAndDropBy()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->get($this->getTestPageUrl('sortable.html'));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 1eb665b75..e75533b8d 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -4,7 +4,6 @@
 
 use Facebook\WebDriver\Exception\NoAlertOpenException;
 use Facebook\WebDriver\Exception\NoSuchAlertException;
-use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @covers \Facebook\WebDriver\Remote\RemoteTargetLocator
@@ -42,11 +41,6 @@ public function testShouldAcceptAlert()
 
     public function testShouldAcceptAndDismissConfirmation()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         // Open confirmation
         $this->driver->findElement(WebDriverBy::id('open-confirm'))->click();
 
@@ -69,11 +63,6 @@ public function testShouldAcceptAndDismissConfirmation()
 
     public function testShouldSubmitPromptText()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            /** @see https://github.com/SeleniumHQ/htmlunit-driver/issues/14 */
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         // Open confirmation
         $this->driver->findElement(WebDriverBy::id('open-prompt'))->click();
 
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 652147b7d..72e5fd567 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -6,7 +6,6 @@
 use Facebook\WebDriver\Exception\ScriptTimeoutException;
 use Facebook\WebDriver\Exception\TimeoutException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
-use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
  * @coversDefaultClass \Facebook\WebDriver\WebDriverTimeouts
@@ -45,10 +44,6 @@ public function testShouldGetDelayedElementWithImplicitWait()
      */
     public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
     {
-        if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::HTMLUNIT) {
-            $this->markTestSkipped('Not supported by HtmlUnit browser');
-        }
-
         $this->driver->manage()->timeouts()->pageLoadTimeout(1);
 
         try {

From f9b3c6d6e5eb16b38951111520a63e9963dac2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Feb 2021 01:25:32 +0100
Subject: [PATCH 626/784] Remove Travis - So long, and thanks for all the fish!

---
 .gitattributes |   1 -
 .travis.yml    | 145 -------------------------------------------------
 README.md      |   1 -
 3 files changed, 147 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.gitattributes b/.gitattributes
index 8a5e272b2..47a5c0fdf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,7 +4,6 @@
 /tests export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.travis.yml export-ignore
 /example.php export-ignore
 /phpunit.xml.dist export-ignore
 /.github export-ignore
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 74e14ccdb..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-language: php
-dist: xenial
-
-php:
-  - '7.1'
-  - '7.2'
-  - '7.3'
-  - '7.4'
-
-env:
-  global:
-    - DISPLAY=:99.0
-    - BROWSER_NAME="htmlunit"
-    - SELENIUM_SERVER="https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar" # Latest version including HtmlUnit
-    - COMPOSER_MEMORY_LIMIT=-1
-    - XDEBUG_MODE=coverage
-
-services:
-  - xvfb
-
-matrix:
-  include:
-    - name: 'PHP nightly build'
-      php: 'nightly'
-      env: DEPENDENCIES="--ignore-platform-req=php"
-
-    - name: 'PHP 7.0'
-      php: '7.0'
-      env: RUN_PHPUNIT_PATCHES="true"
-
-    - name: 'PHP 5.6'
-      php: '5.6'
-      env: RUN_PHPUNIT_PATCHES="true"
-
-    # Build with lowest possible dependencies on lowest possible PHP
-    - name: 'Lowest dependencies build'
-      php: '5.6'
-      env:
-        - DEPENDENCIES="--prefer-lowest"
-        - RUN_PHPUNIT_PATCHES="true"
-
-
-    # Firefox inside Travis environment
-    - name: 'Firefox 45 on Travis (OSS protocol); via legacy Selenium server'
-      php: '7.3'
-      env:
-        - BROWSER_NAME="firefox"
-        - SELENIUM_SERVER="legacy"
-      addons:
-        firefox: "45.8.0esr"
-
-    # Firefox with Geckodriver (W3C mode) inside Travis environment
-    - name: 'Firefox latest on Travis (W3C protocol); no Selenium server'
-      php: '7.3'
-      env:
-        - BROWSER_NAME="firefox"
-        - GECKODRIVER="1"
-      addons:
-        firefox: latest
-
-    # Stable Chrome + Chromedriver (W3C mode) inside Travis environment via Selenium server proxy
-    - name: 'Chrome stable on Travis (W3C protocol); via Selenium server'
-      php: '7.3'
-      env:
-        - BROWSER_NAME="chrome"
-      addons:
-        chrome: stable
-
-    # Stable Chrome + Chromedriver (W3C mode) inside Travis environment directly via Chromedriver
-    - name: 'Chrome stable on Travis (W3C protocol); no Selenium server'
-      php: '7.3'
-      env:
-        - BROWSER_NAME="chrome"
-        - CHROMEDRIVER="1"
-      addons:
-        chrome: stable
-
-    # Stable Chrome + Chromedriver (JsonWire OSS mode) inside Travis environment directly via Chromedriver
-    - name: 'Chrome stable on Travis (OSS protocol); no Selenium server'
-      php: '7.3'
-      env:
-        - BROWSER_NAME="chrome"
-        - CHROMEDRIVER="1"
-        - DISABLE_W3C_PROTOCOL="1"
-      addons:
-        chrome: stable
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-install:
-  - travis_retry composer self-update
-  - travis_retry composer update --no-interaction $DEPENDENCIES
-
-before_script:
-  - if [ "$RUN_PHPUNIT_PATCHES" = "true" ]; then ./scripts/apply-phpunit-patches.sh; fi
-  - if [ "$BROWSER_NAME" = "chrome" ]; then
-      mkdir chromedriver;
-      CHROME_VERSION=$(google-chrome --product-version);
-      CHROME_VERSION=${CHROME_VERSION%.*};
-      wget -q -t 3 https://chromedriver.storage.googleapis.com/$(curl -L https://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_VERSION})/chromedriver_linux64.zip;
-      unzip chromedriver_linux64.zip -d chromedriver;
-    fi
-  - if [ "$BROWSER_NAME" = "chrome" ]; then export CHROMEDRIVER_PATH=$PWD/chromedriver/chromedriver; fi
-  - if [ "$GECKODRIVER" = "1" ]; then mkdir -p geckodriver; wget -q -t 3 https://github.com/mozilla/geckodriver/releases/download/v0.28.0/geckodriver-v0.28.0-linux64.tar.gz; tar xzf geckodriver-v0.28.0-linux64.tar.gz -C geckodriver; fi
-  - if [ ! -f jar/selenium-server-standalone.jar ] && [ -n "$SELENIUM_SERVER" ]; then
-      mkdir -p jar;
-      if [ "$SELENIUM_SERVER" = "legacy" ]; then
-        wget -q -t 3 -O jar/selenium-server-standalone.jar https://selenium-release.storage.googleapis.com/3.8/selenium-server-standalone-3.8.1.jar;
-      else
-        wget -q -t 3 -O jar/selenium-server-standalone.jar $SELENIUM_SERVER;
-      fi
-    fi
-  - if [ "$GECKODRIVER" = "1" ]; then
-      geckodriver/geckodriver &> ./logs/geckodriver.log &
-    elif [ "$CHROMEDRIVER" = "1" ]; then
-      chromedriver/chromedriver --port=4444 --url-base=/wd/hub &> ./logs/chromedriver.log &
-    elif [ "$SELENIUM_SERVER" = "legacy" ]; then
-      java -Dwebdriver.firefox.marionette=false -Dwebdriver.chrome.driver="$PWD/chromedriver/chromedriver" -jar jar/selenium-server-standalone.jar -enablePassThrough false -log ./logs/selenium.log &
-    else
-      java -Dwebdriver.chrome.driver="$PWD/chromedriver/chromedriver" -Dwebdriver.gecko.driver="$PWD/geckodriver/geckodriver" -jar jar/selenium-server-standalone.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"
-
-script:
-  - if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
-  - if [ -n "$SAUCELABS" ]; then export SAUCE_TUNNEL_IDENTIFIER="$TRAVIS_JOB_NUMBER"; fi
-  - if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
-  - if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
-  - if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
-  - if [ "$BROWSER_NAME" = "htmlunit" ]; then EXCLUDE_GROUP+="exclude-htmlunit,"; fi
-  - if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
-  - ./vendor/bin/phpunit --coverage-clover ./logs/clover.xml $EXTRA_PARAMS
-
-after_script:
-  - if [ -f ./logs/selenium.log ]; then cat ./logs/selenium.log; fi
-  - if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
-  - if [ -f ./logs/geckodriver.log ]; then cat ./logs/geckodriver.log; fi
-  - if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
-
-after_success:
-  - if [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then travis_retry php vendor/bin/php-coveralls -v; fi
diff --git a/README.md b/README.md
index b73cfbd2d..2d2fef286 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest stable version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square&label=Packagist)](https://packagist.org/packages/php-webdriver/webdriver)
-[![Travis build status](https://img.shields.io/travis/php-webdriver/php-webdriver/main.svg?style=flat-square&label=Travis)](https://travis-ci.com/php-webdriver/php-webdriver)
 [![GitHub Actions build status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Tests?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
 [![SauceLabs test status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Sauce%20Labs?style=flat-square&label=SauceLabs)](https://saucelabs.com/u/php-webdriver)
 [![Total downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square&label=Downloads)](https://packagist.org/packages/php-webdriver/webdriver)

From 8305895d5cca4046115abbd9f790f8df62ecdf34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Feb 2021 01:46:20 +0100
Subject: [PATCH 627/784] Simplify waiting for remote driver to start

---
 .github/workflows/php.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
index a1c675edd..74df67fa6 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/php.yaml
@@ -123,15 +123,13 @@ jobs:
           wget -q -t 3 -O build/selenium-server-standalone.jar $SELENIUM_SERVER_DOWNLOAD_URL
           java -jar build/selenium-server-standalone.jar -version
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum java -jar build/selenium-server-standalone.jar -log logs/selenium-server.log &
-          while ! nc -z localhost 4444 </dev/null; do echo Waiting for Selenium server to start...; sleep 1; done
 
       - name: Start ChromeDriver
         if: ${{ !matrix.selenium-server && matrix.browser == 'chrome' }}
         run: |
           google-chrome --version
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
-          chromedriver --port=4444 --url-base=/wd/hub --log-level=DEBUG &> ./logs/chromedriver.log &
-          while ! nc -z localhost 4444 </dev/null; do echo Waiting for ChromeDriver to start...; sleep 1; done
+          chromedriver --port=4444 --url-base=/wd/hub &> ./logs/chromedriver.log &
 
       - name: Start GeckoDriver
         if: ${{ !matrix.selenium-server && matrix.browser == 'firefox' }}
@@ -140,12 +138,16 @@ jobs:
           geckodriver --version
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
           geckodriver &> ./logs/geckodriver.log &
-          while ! nc -z localhost 4444 </dev/null; do echo Waiting for GeckoDriver to start...; sleep 1; done
 
       - name: Start local PHP server
         run: |
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
+      - name: Wait for browser & PHP to start
+        run: |
+          while ! nc -z localhost 4444 </dev/null; do echo Waiting for remote driver to start...; sleep 1; done
+          while ! nc -z localhost 8000 </dev/null; do echo Waiting for PHP server to start...; sleep 1; done
+
       - name: Run tests
         env:
           BROWSER_NAME: ${{ matrix.browser }}

From 098a38ad68bd2ab26807aa81b6e2f56a663db755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 16 Feb 2021 12:16:01 +0100
Subject: [PATCH 628/784] Remove FF47 build from saucelabs

However OSS protocol compatibility is still tested via one Chrome build
---
 .github/workflows/sauce-labs.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 481eb78ed..bb708b744 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -16,12 +16,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-#         # Firefox 47 is the last Firefox with OSS protocol support
-          - { name: "Firefox 47, OSS protocol", BROWSER_NAME: "firefox", VERSION: "47.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-1" }
           # Chrome 74 is the last version which doesn't use W3C WebDriver by default and rather use OSS protocol
-          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-2" }
-          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
-          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-4" }
+          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-1" }
+          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-2" }
+          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
 
     name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
     steps:

From 30bc1d325d2da0f053471add4d6734b7db939901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 16 Feb 2021 12:25:19 +0100
Subject: [PATCH 629/784] Unify and simplify GH Actions builds

---
 .github/workflows/sauce-labs.yaml          | 8 +++++---
 .github/workflows/{php.yaml => tests.yaml} | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename .github/workflows/{php.yaml => tests.yaml} (99%)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index bb708b744..d48c6b5a9 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -15,9 +15,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        w3c: [true]
         include:
           # Chrome 74 is the last version which doesn't use W3C WebDriver by default and rather use OSS protocol
-          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", DISABLE_W3C_PROTOCOL: "1", tunnel-id: "gh-1" }
+          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", w3c: false, tunnel-id: "gh-1" }
           - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-2" }
           - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
 
@@ -30,6 +31,7 @@ jobs:
         with:
           php-version: '7.4'
           extensions: mbstring, intl, zip
+          coverage: none
 
       - name: Install PHP dependencies
         run: composer update --no-interaction
@@ -50,7 +52,7 @@ jobs:
           BROWSER_NAME: ${{ matrix.BROWSER_NAME }}
           VERSION: ${{ matrix.VERSION }}
           PLATFORM: ${{ matrix.PLATFORM }}
-          DISABLE_W3C_PROTOCOL: ${{ matrix.DISABLE_W3C_PROTOCOL }}
+          DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
           SAUCE_TUNNEL_IDENTIFIER: ${{ matrix.tunnel-id }}
         run: |
           if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
@@ -58,7 +60,7 @@ jobs:
           if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
-          ./vendor/bin/phpunit --testsuite functional --coverage-clover ./logs/coverage-clover.xml $EXTRA_PARAMS
+          ./vendor/bin/phpunit --testsuite functional $EXTRA_PARAMS
 
       - name: Print logs
         if: ${{ always() }}
diff --git a/.github/workflows/php.yaml b/.github/workflows/tests.yaml
similarity index 99%
rename from .github/workflows/php.yaml
rename to .github/workflows/tests.yaml
index 74df67fa6..acf039873 100644
--- a/.github/workflows/php.yaml
+++ b/.github/workflows/tests.yaml
@@ -59,7 +59,6 @@ jobs:
           extensions: mbstring, intl, zip
           coverage: xdebug
           ini-values: ${{ matrix.xdebug-ini-values }}
-          tools: composer:v2
 
       - name: Install PHP dependencies
         run: composer update --no-interaction ${{ matrix.dependencies }}
@@ -83,12 +82,12 @@ jobs:
           ~/.composer/vendor/bin/php-coveralls -v
 
   functional-tests:
-
     runs-on: ubuntu-latest
     env:
       SELENIUM_SERVER_DOWNLOAD_URL: http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
 
     strategy:
+      fail-fast: false
       matrix:
         browser: ['chrome', 'firefox']
         selenium-server: [true, false] # Whether to run via Selenium server or directly via browser driver
@@ -108,7 +107,6 @@ jobs:
           php-version: 7.4
           extensions: mbstring, intl, zip
           coverage: xdebug
-          tools: composer:v2
 
       - name: Install PHP dependencies
         run: composer update --no-interaction

From 93897df3155c5984cfe842c0ea308a1b389a4d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 25 Feb 2021 14:35:53 +0100
Subject: [PATCH 630/784] Update changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0a380956..ffd3042ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,13 +9,14 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Actually start ChromeDriver in W3C mode if it is supported by the browser driver. Until now, when it was initialized using `ChromeDriver::start()`, it has always been unintentionally started in OSS mode.
 - ChromeOptions were ignored when passed to DesiredCapabilities as `ChromeOptions::CAPABILITY_W3C`.
-- Clicking an block element inside `<a>` element (workaround for GeckoDriver bug [1374283](https://bugzilla.mozilla.org/show_bug.cgi?id=1374283)).
+- Clicking a block element inside `<a>` element in Firefox (workaround for GeckoDriver bug [1374283](https://bugzilla.mozilla.org/show_bug.cgi?id=1374283)).
 
 ### Changed
 - Throw `DriverServerDiedException` on local driver process terminating unexpectedly and provide full details of original exception to improve debugging.
 - Do not require `WEBDRIVER_CHROME_DRIVER` environment variable to be set if `chromedriver` binary is already available via system PATH.
 - Mark PhantomJS deprecated, as it is no longer developed and maintained.
 - Deprecate `RemoteWebDriver::newWindow()` in favor of `$driver->switchTo()->newWindow()`.
+- Don't escape slashes in CURL exception message to improve readability.
 
 ## 1.9.0 - 2020-11-19
 ### Added

From cd9290b95b7651d495bd69253d6e3ef469a7f211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 25 Feb 2021 14:37:02 +0100
Subject: [PATCH 631/784] Release 1.10.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffd3042ba..63e70c72e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.10.0 - 2021-02-25
 ### Added
 - Support for sending Chrome DevTools Protocol commands (see details in [wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chrome-devtools-protocol-cdp)).
 - Option to specify type of new window (window or tab) when using `$driver->switchTo()->newWindow()`.

From d5dc361748d9196acbbda3b51bd97550ff76828d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 5 Mar 2021 19:05:06 +0000
Subject: [PATCH 632/784] Use proper version of sauce connect

---
 .github/workflows/sauce-labs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index d48c6b5a9..e183bdfac 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -41,7 +41,7 @@ jobs:
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
       - name: Start Sauce Connect
-        uses: saucelabs/sauce-connect-action@master
+        uses: saucelabs/sauce-connect-action@v1
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

From 101fedbd7877f35b1234f3baf94eaac055278091 Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Mon, 22 Mar 2021 01:42:43 +0200
Subject: [PATCH 633/784] Force Chrome to use srgb color profile in tests
 (#872)

* forcing chrome force-color-profile=srgb
---
 tests/functional/RemoteWebElementTest.php | 6 ++++++
 tests/functional/WebDriverTestCase.php    | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 1c51e971d..0aeb33dde 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -437,6 +437,12 @@ public function testShouldTakeAndSaveElementScreenshot()
         $this->assertEquals(5, imagesx($imageFromString));
         $this->assertEquals(5, imagesy($imageFromString));
 
+        // Validate element is actually red
+        $this->assertSame(
+            ['red' => 255, 'green' => 0, 'blue' => 0, 'alpha' => 0],
+            imagecolorsforindex($imageFromString, imagecolorat($imageFromString, 0, 0))
+        );
+
         unlink($screenshotPath);
         rmdir(dirname($screenshotPath));
     }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 42289fd46..6d274de17 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -46,7 +46,12 @@ protected function setUp(): void
             if ($browserName === WebDriverBrowserType::CHROME) {
                 $chromeOptions = new ChromeOptions();
                 // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
-                $chromeOptions->addArguments(['--headless', 'window-size=1024,768', '--no-sandbox']);
+                $chromeOptions->addArguments([
+                    '--headless',
+                    '--window-size=1024,768',
+                    '--no-sandbox',
+                    '--force-color-profile=srgb',
+                ]);
 
                 if (!static::isW3cProtocolBuild()) {
                     $chromeOptions->setExperimentalOption('w3c', false);

From 102b6ce77e471c88025c26560f78dcf3f4543f11 Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Tue, 23 Jun 2020 20:54:41 +0300
Subject: [PATCH 634/784] Throw an exception if key is not a "modifier key"

---
 .../Internal/WebDriverKeyDownAction.php       |  4 +--
 .../Internal/WebDriverKeyUpAction.php         |  4 +--
 .../Internal/WebDriverSingleKeyAction.php     | 31 ++++++++++++++++++-
 .../Internal/WebDriverKeyDownActionTest.php   | 13 ++++----
 .../Internal/WebDriverKeyUpActionTest.php     |  8 ++---
 .../Internal/WebDriverSingleKeyActionTest.php | 31 +++++++++++++++++++
 6 files changed, 74 insertions(+), 17 deletions(-)
 create mode 100644 tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php

diff --git a/lib/Interactions/Internal/WebDriverKeyDownAction.php b/lib/Interactions/Internal/WebDriverKeyDownAction.php
index 24ffe4eed..415ebe7f1 100644
--- a/lib/Interactions/Internal/WebDriverKeyDownAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyDownAction.php
@@ -2,9 +2,7 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-use Facebook\WebDriver\WebDriverAction;
-
-class WebDriverKeyDownAction extends WebDriverSingleKeyAction implements WebDriverAction
+class WebDriverKeyDownAction extends WebDriverSingleKeyAction
 {
     public function perform()
     {
diff --git a/lib/Interactions/Internal/WebDriverKeyUpAction.php b/lib/Interactions/Internal/WebDriverKeyUpAction.php
index 7df738c64..0cdb3a84f 100644
--- a/lib/Interactions/Internal/WebDriverKeyUpAction.php
+++ b/lib/Interactions/Internal/WebDriverKeyUpAction.php
@@ -2,9 +2,7 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
-use Facebook\WebDriver\WebDriverAction;
-
-class WebDriverKeyUpAction extends WebDriverSingleKeyAction implements WebDriverAction
+class WebDriverKeyUpAction extends WebDriverSingleKeyAction
 {
     public function perform()
     {
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index ccdf68cea..9b1a014d5 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -5,13 +5,33 @@
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverKeys;
 use Facebook\WebDriver\WebDriverMouse;
 
 abstract class WebDriverSingleKeyAction extends WebDriverKeysRelatedAction implements WebDriverAction
 {
+    const MODIFIER_KEYS = [
+        WebDriverKeys::SHIFT,
+        WebDriverKeys::LEFT_SHIFT,
+        WebDriverKeys::RIGHT_SHIFT,
+        WebDriverKeys::CONTROL,
+        WebDriverKeys::LEFT_CONTROL,
+        WebDriverKeys::RIGHT_CONTROL,
+        WebDriverKeys::ALT,
+        WebDriverKeys::LEFT_ALT,
+        WebDriverKeys::RIGHT_ALT,
+        WebDriverKeys::META,
+        WebDriverKeys::RIGHT_META,
+        WebDriverKeys::COMMAND,
+    ];
+
     /** @var string */
-    protected $key = '';
+    protected $key;
 
+    /**
+     * @param string $key
+     * @todo Remove default $key value in next major version (BC)
+     */
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
@@ -19,6 +39,15 @@ public function __construct(
         $key = ''
     ) {
         parent::__construct($keyboard, $mouse, $location_provider);
+
+        if (!in_array($key, self::MODIFIER_KEYS, true)) {
+            throw new \InvalidArgumentException(
+                sprintf(
+                    'keyDown / keyUp actions can only be used for modifier keys, but "%s" was given',
+                    $key
+                )
+            );
+        }
         $this->key = $key;
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 25e30415b..edf522b25 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -4,6 +4,7 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverKeys;
 use Facebook\WebDriver\WebDriverMouse;
 use PHPUnit\Framework\TestCase;
 
@@ -20,21 +21,21 @@ class WebDriverKeyDownActionTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->webDriverKeyboard = $this->getMockBuilder(WebDriverKeyboard::class)->getMock();
-        $this->webDriverMouse = $this->getMockBuilder(WebDriverMouse::class)->getMock();
-        $this->locationProvider = $this->getMockBuilder(WebDriverLocatable::class)->getMock();
+        $this->webDriverKeyboard = $this->createMock(WebDriverKeyboard::class);
+        $this->webDriverMouse = $this->createMock(WebDriverMouse::class);
+        $this->locationProvider = $this->createMock(WebDriverLocatable::class);
 
         $this->webDriverKeyDownAction = new WebDriverKeyDownAction(
             $this->webDriverKeyboard,
             $this->webDriverMouse,
-            $this->locationProvider
+            $this->locationProvider,
+            WebDriverKeys::LEFT_SHIFT
         );
     }
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
-            ->disableOriginalConstructor()->getMock();
+        $coords = $this->createMock(WebDriverCoordinates::class);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
         $this->webDriverKeyboard->expects($this->once())->method('pressKey');
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 0dfa50af6..275a4b968 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -4,6 +4,7 @@
 
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverKeys;
 use Facebook\WebDriver\WebDriverMouse;
 use PHPUnit\Framework\TestCase;
 
@@ -28,17 +29,16 @@ protected function setUp(): void
             $this->webDriverKeyboard,
             $this->webDriverMouse,
             $this->locationProvider,
-            'a'
+            WebDriverKeys::LEFT_SHIFT
         );
     }
 
     public function testPerformFocusesOnElementAndSendPressKeyCommand()
     {
-        $coords = $this->getMockBuilder(WebDriverCoordinates::class)
-            ->disableOriginalConstructor()->getMock();
+        $coords = $this->createMock(WebDriverCoordinates::class);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
         $this->locationProvider->expects($this->once())->method('getCoordinates')->willReturn($coords);
-        $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with('a');
+        $this->webDriverKeyboard->expects($this->once())->method('releaseKey')->with(WebDriverKeys::LEFT_SHIFT);
         $this->webDriverKeyUpAction->perform();
     }
 }
diff --git a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
new file mode 100644
index 000000000..ddded93bb
--- /dev/null
+++ b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Facebook\WebDriver\Interactions\Internal;
+
+use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\WebDriverKeyboard;
+use Facebook\WebDriver\WebDriverMouse;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @covers \Facebook\WebDriver\Interactions\Internal\WebDriverSingleKeyAction
+ */
+class WebDriverSingleKeyActionTest extends TestCase
+{
+    public function testShouldThrowExceptionWhenNotUsedForModifier()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage(
+            'keyDown / keyUp actions can only be used for modifier keys, but "foo" was given'
+        );
+
+        new WebDriverKeyUpAction(
+            $this->createMock(WebDriverKeyboard::class),
+            $this->createMock(WebDriverMouse::class),
+            $this->createMock(WebDriverLocatable::class),
+            'foo'
+        );
+
+        $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
+    }
+}

From d86f66f00391660378a0825b6ffec8526cf421e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 15 Apr 2021 13:13:29 +0200
Subject: [PATCH 635/784] Improve bug template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 089c3468f..dcfc43785 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,6 +8,9 @@ assignees: ''
 
 <!--
 For questions, ask in Discussions: https://github.com/php-webdriver/php-webdriver/discussions
+
+If reporting a bug, please FILL THE TEMPLATE COMPLETELY, otherwise the community and maintainers
+cannot provide a prompt feedback and help solving the issue.
 -->
 
 ### Bug description
@@ -26,11 +29,12 @@ Steps to reproduce the behavior:
 // You can insert your PHP code here (or remove this block if it is not relevant for the issue).
 
 // For example you can provide how you create WebDrivere instance:
+$capabilities = DesiredCapabilities::chrome();
 $driver = RemoteWebDriver::create('http://localhost:4444/', $capabilities);
 
 // And the code you use to execute the php-webdriver commands, for example:
 $driver->get('http://site.localhost/foo.html');
-$button = $driver->findElement(WebDriverBy::cssSelector('#foo');
+$button = $driver->findElement(WebDriverBy::cssSelector('#foo'));
 $button->click();
 ```
 
@@ -47,13 +51,15 @@ $button->click();
 ### Details
 <!-- Please fill relevant following items: -->
 
-* Php-webdriver version: 
-* PHP version: 
-* How do you start the browser: (for example: via Selenium server / with chromedriver command / using Laravel Dusk / in Docker etc.)
-* Selenium server version: 
-* Operating system: 
-* Browser used + version: 
-* Browser driver (chromedriver/geckodriver...) version: 
+* Php-webdriver version: <!-- You can run `composer show php-webdriver/webdriver` to find the version -->
+* PHP version:  <!-- You can run `php -v` to find the version -->
+* How do you start the browser driver or Selenium server:
+  <!-- For example Selenium server, chromedriver command, Laravel Dusk, Docker, SauceLabs etc. -->
+  <!-- If relevant, provide the complete command you use to start the browser driver or Selenium server -->
+* Selenium server version: <!-- Relevant only if you use Selenium server -->
+* Browser driver (chromedriver/geckodriver...) version: <!-- Run `chromedriver --version` or `geckodriver --version` -->
+* Browser used + version:
+* Operating system:
 
 ### Additional context
 <!-- Add any other context about the problem here. -->

From 8cea6ffc81f8e98fe8e59d6e3e7b58e6713c72a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 16 Apr 2021 21:26:16 +0200
Subject: [PATCH 636/784] Add links to new Firefox wiki page

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d2fef286..cd977bab3 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,8 @@ chromedriver --port=4444
 
 #### b) Geckodriver
 
+📙 Below you will find a simple example. Make sure to read our wiki for [more information on Firefox/Geckodriver](https://github.com/php-webdriver/php-webdriver/wiki/Firefox).
+
 Install the latest Firefox and [Geckodriver](https://github.com/mozilla/geckodriver/releases).
 Make sure to have a compatible version of Geckodriver and Firefox!
 
@@ -146,7 +148,8 @@ $driver = RemoteWebDriver::create($serverUrl, $desiredCapabilities);
 ```
 
 Capabilities can also be used to [📙 configure a proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
-To configure Chrome capabilities, you may use [📙 ChromeOptions](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chromeoptions).
+To configure browser-specific capabilities, you may use [📙 ChromeOptions](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chromeoptions)
+or [📙 FirefoxOptions](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefox-options).
 
 * See [legacy JsonWire protocol](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities) documentation or [W3C WebDriver specification](https://w3c.github.io/webdriver/#capabilities) for more details.
 

From 905af4bbdbe270400f4760603f640b02c722086a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 16 Apr 2021 21:32:11 +0200
Subject: [PATCH 637/784] Add constant for firefoxOptions

---
 lib/Chrome/ChromeOptions.php   |  4 ++--
 lib/Firefox/FirefoxDriver.php  |  1 +
 lib/Firefox/FirefoxOptions.php | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 lib/Firefox/FirefoxOptions.php

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 168a93e6d..6599197b6 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -13,12 +13,12 @@
 class ChromeOptions implements JsonSerializable
 {
     /**
-     * The key of chrome options desired capabilities (in legacy OSS JsonWire protocol)
+     * The key of chromeOptions in desired capabilities (in legacy OSS JsonWire protocol)
      * @todo Replace value with 'goog:chromeOptions' after JsonWire protocol support is removed
      */
     const CAPABILITY = 'chromeOptions';
     /**
-     * The key of chrome options desired capabilities (in W3C compatible protocol)
+     * The key of chromeOptions in desired capabilities (in W3C compatible protocol)
      */
     const CAPABILITY_W3C = 'goog:chromeOptions';
     /**
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index a713834b2..e13279905 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -3,6 +3,7 @@
 namespace Facebook\WebDriver\Firefox;
 
 /**
+ * @todo Implement service to start local geckodriver
  * @codeCoverageIgnore
  */
 class FirefoxDriver
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
new file mode 100644
index 000000000..325de0d8e
--- /dev/null
+++ b/lib/Firefox/FirefoxOptions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Facebook\WebDriver\Firefox;
+
+/**
+ * @see https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions
+ * @codeCoverageIgnore
+ */
+class FirefoxOptions
+{
+    /**
+     * The key of FirefoxOptions in desired capabilities
+     */
+    const CAPABILITY = 'moz:firefoxOptions';
+
+    private function __construct()
+    {
+    }
+}

From 34d778c828bf21a2a16e5016cd573e3eaf3384ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 17 Apr 2021 00:40:55 +0200
Subject: [PATCH 638/784] Implement FirefoxOption class

See https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions
---
 CHANGELOG.md                                  |   1 +
 README.md                                     |  10 +-
 lib/Firefox/FirefoxOptions.php                |  99 ++++++++++++++-
 lib/Remote/DesiredCapabilities.php            |  32 +++--
 tests/functional/WebDriverTestCase.php        |   9 +-
 tests/unit/Firefox/FirefoxOptionsTest.php     | 120 ++++++++++++++++++
 tests/unit/Remote/DesiredCapabilitiesTest.php |  63 +++++++--
 7 files changed, 300 insertions(+), 34 deletions(-)
 create mode 100644 tests/unit/Firefox/FirefoxOptionsTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63e70c72e..535823ac6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+- Add `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).
 
 ## 1.10.0 - 2021-02-25
 ### Added
diff --git a/README.md b/README.md
index cd977bab3..f0ac71d3b 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,7 @@ Desired capabilities define properties of the browser you are about to start.
 They can be customized:
 
 ```php
+use Facebook\WebDriver\Firefox\FirefoxOptions;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 
 $desiredCapabilities = DesiredCapabilities::firefox();
@@ -141,15 +142,18 @@ $desiredCapabilities = DesiredCapabilities::firefox();
 // Disable accepting SSL certificates
 $desiredCapabilities->setCapability('acceptSslCerts', false);
 
-// Run headless firefox
-$desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless']]);
+// Add arguments via FirefoxOptions to start headless firefox
+$firefoxOptions = new FirefoxOptions();
+$firefoxOptions->addArguments(['-headless']);
+$desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
 
 $driver = RemoteWebDriver::create($serverUrl, $desiredCapabilities);
 ```
 
 Capabilities can also be used to [📙 configure a proxy server](https://github.com/php-webdriver/php-webdriver/wiki/HowTo-Work-with-proxy) which the browser should use.
+
 To configure browser-specific capabilities, you may use [📙 ChromeOptions](https://github.com/php-webdriver/php-webdriver/wiki/Chrome#chromeoptions)
-or [📙 FirefoxOptions](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefox-options).
+or [📙 FirefoxOptions](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).
 
 * See [legacy JsonWire protocol](https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities) documentation or [W3C WebDriver specification](https://w3c.github.io/webdriver/#capabilities) for more details.
 
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index 325de0d8e..fc16fdb75 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -3,17 +3,106 @@
 namespace Facebook\WebDriver\Firefox;
 
 /**
+ * Class to manage Firefox-specific capabilities
+ *
  * @see https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions
- * @codeCoverageIgnore
  */
-class FirefoxOptions
+class FirefoxOptions implements \JsonSerializable
 {
+    /** @var string The key of FirefoxOptions in desired capabilities */
+    const CAPABILITY = 'moz:firefoxOptions';
+    /** @var string */
+    const OPTION_ARGS = 'args';
+    /** @var string */
+    const OPTION_PREFS = 'prefs';
+
+    /** @var array */
+    private $options = [];
+    /** @var array */
+    private $arguments = [];
+    /** @var array */
+    private $preferences = [];
+
+    public function __construct()
+    {
+        // Set default preferences:
+        // disable the "Reader View" help tooltip, which can hide elements in the window.document
+        $this->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
+        // disable JSON viewer and let JSON be rendered as raw data
+        $this->setPreference(FirefoxPreferences::DEVTOOLS_JSONVIEW, false);
+    }
+
     /**
-     * The key of FirefoxOptions in desired capabilities
+     * Directly set firefoxOptions.
+     * Use `addArguments` to add command line arguments and `setPreference` to set Firefox about:config entry.
+     *
+     * @param string $name
+     * @param mixed $value
+     * @return self
      */
-    const CAPABILITY = 'moz:firefoxOptions';
+    public function setOption($name, $value)
+    {
+        if ($name === self::OPTION_PREFS) {
+            throw new \InvalidArgumentException('Use setPreference() method to set Firefox preferences');
+        }
+        if ($name === self::OPTION_ARGS) {
+            throw new \InvalidArgumentException('Use addArguments() method to add Firefox arguments');
+        }
+
+        $this->options[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Command line arguments to pass to the Firefox binary.
+     * These must include the leading dash (-) where required, e.g. ['-headless'].
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions#args
+     * @param string[] $arguments
+     * @return self
+     */
+    public function addArguments(array $arguments)
+    {
+        $this->arguments = array_merge($this->arguments, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Set Firefox preference (about:config entry).
+     *
+     * @see http://kb.mozillazine.org/About:config_entries
+     * @see https://developer.mozilla.org/en-US/docs/Web/WebDriver/Capabilities/firefoxOptions#prefs
+     * @param string $name
+     * @param string|bool|int $value
+     * @return self
+     */
+    public function setPreference($name, $value)
+    {
+        $this->preferences[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = $this->options;
+        if (!empty($this->arguments)) {
+            $array[self::OPTION_ARGS] = $this->arguments;
+        }
+        if (!empty($this->preferences)) {
+            $array[self::OPTION_PREFS] = $this->preferences;
+        }
+
+        return $array;
+    }
 
-    private function __construct()
+    public function jsonSerialize()
     {
+        return new \ArrayObject($this->toArray());
     }
 }
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 8bbb9423f..5b726406d 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -5,7 +5,7 @@
 use Exception;
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Firefox\FirefoxDriver;
-use Facebook\WebDriver\Firefox\FirefoxPreferences;
+use Facebook\WebDriver\Firefox\FirefoxOptions;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
 use Facebook\WebDriver\WebDriverCapabilities;
 use Facebook\WebDriver\WebDriverPlatform;
@@ -96,6 +96,15 @@ public function getCapability($name)
      */
     public function setCapability($name, $value)
     {
+        // When setting 'moz:firefoxOptions' from an array and not from instance of FirefoxOptions, we must merge
+        // it with default FirefoxOptions to keep previous behavior (where the default preferences were added
+        // using FirefoxProfile, thus not overwritten by adding 'moz:firefoxOptions')
+        // TODO: remove in next major version, once FirefoxOptions are only accepted as object instance and not as array
+        if ($name === FirefoxOptions::CAPABILITY && is_array($value)) {
+            $defaultOptions = (new FirefoxOptions())->toArray();
+            $value = array_merge($defaultOptions, $value);
+        }
+
         $this->set($name, $value);
 
         return $this;
@@ -175,6 +184,13 @@ public function toArray()
                 $this->capabilities[ChromeOptions::CAPABILITY]->toArray();
         }
 
+        if (isset($this->capabilities[FirefoxOptions::CAPABILITY]) &&
+            $this->capabilities[FirefoxOptions::CAPABILITY] instanceof FirefoxOptions
+        ) {
+            $this->capabilities[FirefoxOptions::CAPABILITY] =
+                $this->capabilities[FirefoxOptions::CAPABILITY]->toArray();
+        }
+
         if (isset($this->capabilities[FirefoxDriver::PROFILE]) &&
             $this->capabilities[FirefoxDriver::PROFILE] instanceof FirefoxProfile
         ) {
@@ -249,9 +265,9 @@ public function toW3cCompatibleArray()
         // Convert Firefox profile
         if (array_key_exists(FirefoxDriver::PROFILE, $ossCapabilities)) {
             // Convert profile only if not already set in moz:firefoxOptions
-            if (!array_key_exists('moz:firefoxOptions', $ossCapabilities)
-                || !array_key_exists('profile', $ossCapabilities['moz:firefoxOptions'])) {
-                $w3cCapabilities['moz:firefoxOptions']['profile'] = $ossCapabilities[FirefoxDriver::PROFILE];
+            if (!array_key_exists(FirefoxOptions::CAPABILITY, $ossCapabilities)
+                || !array_key_exists('profile', $ossCapabilities[FirefoxOptions::CAPABILITY])) {
+                $w3cCapabilities[FirefoxOptions::CAPABILITY]['profile'] = $ossCapabilities[FirefoxDriver::PROFILE];
             }
         }
 
@@ -290,13 +306,7 @@ public static function firefox()
             WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY,
         ]);
 
-        $profile = new FirefoxProfile();
-        // disable the "Reader View" help tooltip, which can hide elements in the window.document
-        $profile->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, false);
-        // disable JSON viewer and let JSON be rendered as raw data
-        $profile->setPreference(FirefoxPreferences::DEVTOOLS_JSONVIEW, false);
-
-        $caps->setCapability(FirefoxDriver::PROFILE, $profile);
+        $caps->setCapability(FirefoxOptions::CAPABILITY, new FirefoxOptions()); // to add default options
 
         return $caps;
     }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 6d274de17..5a6acc432 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Exception\NoSuchWindowException;
 use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Firefox\FirefoxOptions;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
@@ -62,10 +63,10 @@ protected function setUp(): void
                 if (getenv('GECKODRIVER') === '1') {
                     $this->serverUrl = 'http://localhost:4444/';
                 }
-                $this->desiredCapabilities->setCapability(
-                    'moz:firefoxOptions',
-                    ['args' => ['-headless']]
-                );
+
+                $firefoxOptions = new FirefoxOptions();
+                $firefoxOptions->addArguments(['-headless']);
+                $this->desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
             }
 
             $this->desiredCapabilities->setBrowserName($browserName);
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
new file mode 100644
index 000000000..cd6948167
--- /dev/null
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Facebook\WebDriver\Firefox;
+
+use PHPUnit\Framework\TestCase;
+
+class FirefoxOptionsTest extends TestCase
+{
+    /** @var [] */
+    const EXPECTED_DEFAULT_PREFS = [
+        FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED => false,
+        FirefoxPreferences::DEVTOOLS_JSONVIEW => false,
+    ];
+
+    public function testShouldBeConstructedWithDefaultOptions()
+    {
+        $options = new FirefoxOptions();
+
+        $this->assertSame(
+            [
+                'prefs' => self::EXPECTED_DEFAULT_PREFS,
+            ],
+            $options->toArray()
+        );
+    }
+
+    public function testShouldAddCustomOptions()
+    {
+        $options = new FirefoxOptions();
+
+        $options->setOption('binary', '/usr/local/firefox/bin/firefox');
+
+        $this->assertSame(
+            [
+                'binary' => '/usr/local/firefox/bin/firefox',
+                'prefs' => self::EXPECTED_DEFAULT_PREFS,
+            ],
+            $options->toArray()
+        );
+    }
+
+    public function testShouldOverwriteDefaultOptionsWhenSpecified()
+    {
+        $options = new FirefoxOptions();
+
+        $options->setPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED, true);
+
+        $this->assertSame(
+            [
+                'prefs' => [
+                    FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED => true,
+                    FirefoxPreferences::DEVTOOLS_JSONVIEW => false,
+                ],
+            ],
+            $options->toArray()
+        );
+    }
+
+    public function testShouldSetCustomPreference()
+    {
+        $options = new FirefoxOptions();
+
+        $options->setPreference('browser.startup.homepage', 'https://github.com/php-webdriver/php-webdriver/');
+
+        $this->assertSame(
+            [
+                'prefs' => [
+                    FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED => false,
+                    FirefoxPreferences::DEVTOOLS_JSONVIEW => false,
+                    'browser.startup.homepage' => 'https://github.com/php-webdriver/php-webdriver/',
+                ],
+            ],
+            $options->toArray()
+        );
+    }
+
+    public function testShouldAddArguments()
+    {
+        $options = new FirefoxOptions();
+
+        $options->addArguments(['-headless', '-profile', '/path/to/profile']);
+
+        $this->assertSame(
+            [
+                'args' => ['-headless', '-profile', '/path/to/profile'],
+                'prefs' => self::EXPECTED_DEFAULT_PREFS,
+            ],
+            $options->toArray()
+        );
+    }
+
+    public function testShouldJsonSerializeToArrayObject()
+    {
+        $options = new FirefoxOptions();
+        $options->setOption('binary', '/usr/local/firefox/bin/firefox');
+
+        $jsonSerialized = $options->jsonSerialize();
+
+        $this->assertInstanceOf(\ArrayObject::class, $jsonSerialized);
+        $this->assertSame('/usr/local/firefox/bin/firefox', $jsonSerialized['binary']);
+    }
+
+    public function testShouldNotAllowToSetArgumentsOptionDirectly()
+    {
+        $options = new FirefoxOptions();
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Use addArguments() method to add Firefox arguments');
+        $options->setOption('args', []);
+    }
+
+    public function testShouldNotAllowToSetPreferencesOptionDirectly()
+    {
+        $options = new FirefoxOptions();
+
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Use setPreference() method to set Firefox preferences');
+        $options->setOption('prefs', []);
+    }
+}
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 63bd734a4..0d96831aa 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -4,7 +4,8 @@
 
 use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\Firefox\FirefoxDriver;
-use Facebook\WebDriver\Firefox\FirefoxPreferences;
+use Facebook\WebDriver\Firefox\FirefoxOptions;
+use Facebook\WebDriver\Firefox\FirefoxOptionsTest;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
 use Facebook\WebDriver\WebDriverPlatform;
 use PHPUnit\Framework\TestCase;
@@ -123,15 +124,53 @@ public function provideBrowserCapabilities()
         ];
     }
 
-    public function testShouldSetupFirefoxProfileAndDisableReaderViewForFirefoxBrowser()
+    public function testShouldSetupFirefoxWithDefaultOptions()
     {
+        $capabilitiesArray = DesiredCapabilities::firefox()->toArray();
+
+        $this->assertSame('firefox', $capabilitiesArray['browserName']);
+        $this->assertSame(
+            [
+                'prefs' => FirefoxOptionsTest::EXPECTED_DEFAULT_PREFS,
+            ],
+            $capabilitiesArray['moz:firefoxOptions']
+        );
+    }
+
+    public function testShouldSetupFirefoxWithCustomOptions()
+    {
+        $firefoxOptions = new FirefoxOptions();
+        $firefoxOptions->addArguments(['-headless']);
+        $firefoxOptions->setOption('binary', '/foo/bar/firefox');
+
         $capabilities = DesiredCapabilities::firefox();
+        $capabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
+
+        $capabilitiesArray = $capabilities->toArray();
+
+        $this->assertSame('firefox', $capabilitiesArray['browserName']);
+        $this->assertSame(
+            [
+                'binary' => '/foo/bar/firefox',
+                'args' => ['-headless'],
+                'prefs' => FirefoxOptionsTest::EXPECTED_DEFAULT_PREFS,
+            ],
+            $capabilitiesArray['moz:firefoxOptions']
+        );
+    }
 
-        /** @var FirefoxProfile $firefoxProfile */
-        $firefoxProfile = $capabilities->getCapability(FirefoxDriver::PROFILE);
-        $this->assertInstanceOf(FirefoxProfile::class, $firefoxProfile);
+    public function testShouldNotOverwriteDefaultFirefoxOptionsWhenAddingFirefoxOptionAsArray()
+    {
+        $capabilities = DesiredCapabilities::firefox();
+        $capabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless']]);
 
-        $this->assertSame('false', $firefoxProfile->getPreference(FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED));
+        $this->assertSame(
+            [
+                'prefs' => FirefoxOptionsTest::EXPECTED_DEFAULT_PREFS,
+                'args' => ['-headless'],
+            ],
+            $capabilities->toArray()['moz:firefoxOptions']
+        );
     }
 
     /**
@@ -155,9 +194,10 @@ public function testShouldConvertCapabilitiesToW3cCompatible(
     public function provideW3cCapabilities()
     {
         $chromeOptions = new ChromeOptions();
-        $chromeOptions->addArguments([
-            '--headless',
-        ]);
+        $chromeOptions->addArguments(['--headless']);
+
+        $firefoxOptions = new FirefoxOptions();
+        $firefoxOptions->addArguments(['-headless']);
 
         $firefoxProfileEncoded = (new FirefoxProfile())->encode();
 
@@ -275,7 +315,7 @@ public function provideW3cCapabilities()
             'firefox_profile should not be overwritten if already present' => [
                 new DesiredCapabilities([
                     FirefoxDriver::PROFILE => $firefoxProfileEncoded,
-                    'moz:firefoxOptions' => ['profile' => 'w3cProfile'],
+                    FirefoxOptions::CAPABILITY => ['profile' => 'w3cProfile'],
                 ]),
                 [
                     'moz:firefoxOptions' => [
@@ -286,12 +326,13 @@ public function provideW3cCapabilities()
             'firefox_profile should be merged with moz:firefoxOptions if they already exists' => [
                 new DesiredCapabilities([
                     FirefoxDriver::PROFILE => $firefoxProfileEncoded,
-                    'moz:firefoxOptions' => ['args' => ['-headless']],
+                    FirefoxOptions::CAPABILITY => $firefoxOptions,
                 ]),
                 [
                     'moz:firefoxOptions' => [
                         'profile' => $firefoxProfileEncoded,
                         'args' => ['-headless'],
+                        'prefs' => FirefoxOptionsTest::EXPECTED_DEFAULT_PREFS,
                     ],
                 ],
             ],

From 5401c145098b263bf247a8db30f272741dfdab05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 19 Apr 2021 18:41:10 +0200
Subject: [PATCH 639/784] Add FirefoxDriverService to start geckodriver process

---
 .github/workflows/tests.yaml                  |  3 +-
 lib/Chrome/ChromeDriverService.php            |  2 +-
 lib/Firefox/FirefoxDriverService.php          | 34 ++++++++
 lib/Remote/Service/DriverService.php          |  1 +
 .../Chrome/ChromeDriverServiceTest.php        |  2 +-
 tests/functional/Chrome/ChromeDriverTest.php  |  2 +-
 .../Firefox/FirefoxDriverServiceTest.php      | 80 +++++++++++++++++++
 7 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 lib/Firefox/FirefoxDriverService.php
 create mode 100644 tests/functional/Firefox/FirefoxDriverServiceTest.php

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index acf039873..1d0c4f524 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -151,8 +151,9 @@ jobs:
           BROWSER_NAME: ${{ matrix.browser }}
           # When running directly against Firefox, we test only using geckodriver (not against legacy Firefox =<45), so we must declare GECKODRIVER=1
           GECKODRIVER: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '1' || '0' }}"
-          # We must provide CHROMEDRIVER_PATH so that ChromeDriverTest is able to start Chromedriver itself
+          # Provide CHROMEDRIVER_PATH and GECKODRIVER_PATH so that tests for local web drivers are able to start the browser
           CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chrome_driver/chromedriver' || '' }}"
+          GECKODRIVER_PATH: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '/usr/local/share/gecko_driver/geckodriver' || '' }}"
           DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index 8c4dd6ea4..a6d3eb834 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -25,7 +25,7 @@ class ChromeDriverService extends DriverService
     public static function createDefaultService()
     {
         $pathToExecutable = getenv(self::CHROME_DRIVER_EXECUTABLE) ?: getenv(self::CHROME_DRIVER_EXE_PROPERTY);
-        if ($pathToExecutable === false) {
+        if ($pathToExecutable === false || $pathToExecutable === '') {
             $pathToExecutable = static::DEFAULT_EXECUTABLE;
         }
 
diff --git a/lib/Firefox/FirefoxDriverService.php b/lib/Firefox/FirefoxDriverService.php
new file mode 100644
index 000000000..525c5b5bc
--- /dev/null
+++ b/lib/Firefox/FirefoxDriverService.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Facebook\WebDriver\Firefox;
+
+use Facebook\WebDriver\Remote\Service\DriverService;
+
+class FirefoxDriverService extends DriverService
+{
+    /**
+     * @var string Name of the environment variable storing the path to the driver binary
+     */
+    const WEBDRIVER_FIREFOX_DRIVER = 'WEBDRIVER_FIREFOX_DRIVER';
+    /**
+     * @var string Default executable used when no other is provided
+     * @internal
+     */
+    const DEFAULT_EXECUTABLE = 'geckodriver';
+
+    /**
+     * @return static
+     */
+    public static function createDefaultService()
+    {
+        $pathToExecutable = getenv(static::WEBDRIVER_FIREFOX_DRIVER);
+        if ($pathToExecutable === false || $pathToExecutable === '') {
+            $pathToExecutable = static::DEFAULT_EXECUTABLE;
+        }
+
+        $port = 9515; // TODO: Get another free port if the default port is used.
+        $args = ['-p=' . $port];
+
+        return new static($pathToExecutable, $port, $args);
+    }
+}
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 165412b7c..8b8914815 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -9,6 +9,7 @@
 
 /**
  * Start local WebDriver service (when remote WebDriver server is not used).
+ * This will start new process of respective browser driver and take care of its lifecycle.
  */
 class DriverService
 {
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index fa1e2d437..d83ca6af4 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
     {
         if (getenv('BROWSER_NAME') !== 'chrome' || empty(getenv('CHROMEDRIVER_PATH'))
             || WebDriverTestCase::isSauceLabsBuild()) {
-            $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
+            $this->markTestSkipped('The test is run only when running against local chrome');
         }
     }
 
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index de049f59d..f965bbc0c 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     {
         if (getenv('BROWSER_NAME') !== 'chrome' || empty(getenv('CHROMEDRIVER_PATH'))
             || WebDriverTestCase::isSauceLabsBuild()) {
-            $this->markTestSkipped('ChromeDriverServiceTest is run only when running against local chrome');
+            $this->markTestSkipped('The test is run only when running against local chrome');
         }
     }
 
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
new file mode 100644
index 000000000..2fb574e1c
--- /dev/null
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Facebook\WebDriver\Firefox;
+
+use Facebook\WebDriver\WebDriverTestCase;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group exclude-saucelabs
+ * @covers \Facebook\WebDriver\Firefox\FirefoxDriverService
+ */
+class FirefoxDriverServiceTest extends TestCase
+{
+    /** @var FirefoxDriverService */
+    private $driverService;
+
+    protected function setUp(): void
+    {
+        if (getenv('BROWSER_NAME') !== 'firefox' || empty(getenv('GECKODRIVER_PATH'))
+            || WebDriverTestCase::isSauceLabsBuild()) {
+            $this->markTestSkipped('The test is run only when running against local chrome');
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->driverService !== null && $this->driverService->isRunning()) {
+            $this->driverService->stop();
+        }
+    }
+
+    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
+    {
+        // The createDefaultService() method expect path to the executable to be present in the environment variable
+        putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
+
+        $this->driverService = FirefoxDriverService::createDefaultService();
+
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
+
+        $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->start());
+        $this->assertTrue($this->driverService->isRunning());
+
+        $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->start());
+
+        $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->stop());
+        $this->assertFalse($this->driverService->isRunning());
+
+        $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->stop());
+    }
+
+    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
+    {
+        $this->driverService = new FirefoxDriverService(getenv('GECKODRIVER_PATH'), 9515, ['-p=9515']);
+
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
+
+        $this->driverService->start();
+        $this->assertTrue($this->driverService->isRunning());
+
+        $this->driverService->stop();
+        $this->assertFalse($this->driverService->isRunning());
+    }
+
+    public function testShouldUseDefaultExecutableIfNoneProvided()
+    {
+        // Put path where geckodriver binary is actually located to system PATH, to make sure we can locate it
+        putenv('PATH=' . getenv('PATH') . ':' . dirname(getenv('GECKODRIVER_PATH')));
+
+        // Unset WEBDRIVER_FIREFOX_BINARY so that FirefoxDriverService will attempt to run the binary from system PATH
+        putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=');
+
+        $this->driverService = FirefoxDriverService::createDefaultService();
+
+        $this->assertSame('http://localhost:9515/', $this->driverService->getURL());
+
+        $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->start());
+        $this->assertTrue($this->driverService->isRunning());
+    }
+}

From ade6a090b09927ddfe9f63d5ea6c70f8a8b011ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 19 Apr 2021 18:48:33 +0200
Subject: [PATCH 640/784] Add common ancestor for local web drivers

---
 lib/Chrome/ChromeDriver.php                  | 53 +++----------------
 lib/Local/LocalWebDriver.php                 | 55 ++++++++++++++++++++
 tests/functional/Chrome/ChromeDriverTest.php |  1 +
 3 files changed, 62 insertions(+), 47 deletions(-)
 create mode 100644 lib/Local/LocalWebDriver.php

diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 4363ca30e..db88f39fe 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -2,14 +2,13 @@
 
 namespace Facebook\WebDriver\Chrome;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Local\LocalWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\DriverCommand;
-use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
 
-class ChromeDriver extends RemoteWebDriver
+class ChromeDriver extends LocalWebDriver
 {
     /** @var ChromeDevToolsDriver */
     private $devTools;
@@ -32,6 +31,10 @@ public static function start(DesiredCapabilities $desired_capabilities = null, C
         return $driver;
     }
 
+    /**
+     * @todo Make the class protected
+     * @internal
+     */
     public function startSession(DesiredCapabilities $desired_capabilities)
     {
         $command = new WebDriverCommand(
@@ -54,50 +57,6 @@ public function startSession(DesiredCapabilities $desired_capabilities)
         $this->sessionID = $response->getSessionID();
     }
 
-    /**
-     * Always throws an exception. Use ChromeDriver::start() instead.
-     *
-     * @param string $selenium_server_url
-     * @param DesiredCapabilities|array $desired_capabilities
-     * @param int|null $connection_timeout_in_ms
-     * @param int|null $request_timeout_in_ms
-     * @param string|null $http_proxy
-     * @param int|null $http_proxy_port
-     * @param DesiredCapabilities $required_capabilities
-     * @throws WebDriverException
-     * @return RemoteWebDriver
-     */
-    public static function create(
-        $selenium_server_url = 'http://localhost:4444/wd/hub',
-        $desired_capabilities = null,
-        $connection_timeout_in_ms = null,
-        $request_timeout_in_ms = null,
-        $http_proxy = null,
-        $http_proxy_port = null,
-        DesiredCapabilities $required_capabilities = null
-    ) {
-        throw new WebDriverException('Please use ChromeDriver::start() instead.');
-    }
-
-    /**
-     * Always throws an exception. Use ChromeDriver::start() instead.
-     *
-     * @param string $session_id The existing session id
-     * @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
-     * @throws WebDriverException
-     * @return RemoteWebDriver|void
-     */
-    public static function createBySessionID(
-        $session_id,
-        $selenium_server_url = 'http://localhost:4444/wd/hub',
-        $connection_timeout_in_ms = null,
-        $request_timeout_in_ms = null
-    ) {
-        throw new WebDriverException('Please use ChromeDriver::start() instead.');
-    }
-
     /**
      * @return ChromeDevToolsDriver
      */
diff --git a/lib/Local/LocalWebDriver.php b/lib/Local/LocalWebDriver.php
new file mode 100644
index 000000000..d695ff016
--- /dev/null
+++ b/lib/Local/LocalWebDriver.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Facebook\WebDriver\Local;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+
+/**
+ * @todo Break inheritance from RemoteWebDriver in next major version. (Composition over inheritance!)
+ */
+abstract class LocalWebDriver extends RemoteWebDriver
+{
+    /**
+     * @param string $selenium_server_url
+     * @param null $desired_capabilities
+     * @param null $connection_timeout_in_ms
+     * @param null $request_timeout_in_ms
+     * @param null $http_proxy
+     * @param null $http_proxy_port
+     * @param DesiredCapabilities|null $required_capabilities
+     * @throws WebDriverException
+     * @return RemoteWebDriver
+     * @todo Remove in next major version (should not be inherited)
+     */
+    public static function create(
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
+        $desired_capabilities = null,
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null,
+        $http_proxy = null,
+        $http_proxy_port = null,
+        DesiredCapabilities $required_capabilities = null
+    ) {
+        throw new WebDriverException('Use start() method to start local WebDriver.');
+    }
+
+    /**
+     * @param string $session_id
+     * @param string $selenium_server_url
+     * @param null $connection_timeout_in_ms
+     * @param null $request_timeout_in_ms
+     * @throws WebDriverException
+     * @return RemoteWebDriver
+     * @todo Remove in next major version (should not be inherited)
+     */
+    public static function createBySessionID(
+        $session_id,
+        $selenium_server_url = 'http://localhost:4444/wd/hub',
+        $connection_timeout_in_ms = null,
+        $request_timeout_in_ms = null
+    ) {
+        throw new WebDriverException('Use start() method to start local WebDriver.');
+    }
+}
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index f965bbc0c..16e893d1f 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -11,6 +11,7 @@
 /**
  * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\Chrome\ChromeDriver
+ * @covers \Facebook\WebDriver\Local\LocalWebDriver
  */
 class ChromeDriverTest extends TestCase
 {

From 66184c84c589856c6f90ae44df616288a5b6b8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 19 Apr 2021 19:17:55 +0200
Subject: [PATCH 641/784] Implement local FirefoxDriver (fixes #891)

---
 CHANGELOG.md                                  |  3 +-
 lib/Firefox/FirefoxDriver.php                 | 60 +++++++++++++++--
 .../functional/Firefox/FirefoxDriverTest.php  | 64 +++++++++++++++++++
 3 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 tests/functional/Firefox/FirefoxDriverTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 535823ac6..0e790e570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- Add `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).
+- Add `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).`
+- Add `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually.
 
 ## 1.10.0 - 2021-02-25
 ### Added
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index e13279905..1d525da85 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -2,15 +2,63 @@
 
 namespace Facebook\WebDriver\Firefox;
 
-/**
- * @todo Implement service to start local geckodriver
- * @codeCoverageIgnore
- */
-class FirefoxDriver
+use Facebook\WebDriver\Local\LocalWebDriver;
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use Facebook\WebDriver\Remote\WebDriverCommand;
+
+class FirefoxDriver extends LocalWebDriver
 {
     const PROFILE = 'firefox_profile';
 
-    private function __construct()
+    /**
+     * Creates a new FirefoxDriver using default configuration.
+     * This includes starting a new geckodriver process  each time this method is called. However this may be
+     * unnecessary overhead - instead, you can start the process once using FirefoxDriverService and pass
+     * this instance to startUsingDriverService() method.
+     *
+     * @return static
+     */
+    public static function start(DesiredCapabilities $capabilities = null)
     {
+        $service = FirefoxDriverService::createDefaultService();
+
+        return static::startUsingDriverService($service, $capabilities);
+    }
+
+    /**
+     * Creates a new FirefoxDriver using given FirefoxDriverService.
+     * This is usable when you for example don't want to start new geckodriver process for each individual test
+     * and want to reuse the already started geckodriver, which will lower the overhead associated with spinning up
+     * a new process.
+     *
+     * @return static
+     */
+    public static function startUsingDriverService(
+        FirefoxDriverService $service,
+        DesiredCapabilities $capabilities = null
+    ) {
+        if ($capabilities === null) {
+            $capabilities = DesiredCapabilities::firefox();
+        }
+
+        $executor = new DriverCommandExecutor($service);
+        $newSessionCommand = new WebDriverCommand(
+            null,
+            DriverCommand::NEW_SESSION,
+            [
+                'capabilities' => [
+                    'firstMatch' => [(object) $capabilities->toW3cCompatibleArray()],
+                ],
+            ]
+        );
+
+        $response = $executor->execute($newSessionCommand);
+
+        $returnedCapabilities = DesiredCapabilities::createFromW3cCapabilities($response->getValue()['capabilities']);
+        $sessionId = $response->getSessionID();
+
+        return new static($executor, $sessionId, $returnedCapabilities, true);
     }
 }
diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
new file mode 100644
index 000000000..ab6a03846
--- /dev/null
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Facebook\WebDriver\Firefox;
+
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use Facebook\WebDriver\WebDriverTestCase;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @group exclude-saucelabs
+ * @covers \Facebook\WebDriver\Firefox\FirefoxDriver
+ * @covers \Facebook\WebDriver\Local\LocalWebDriver
+ */
+class FirefoxDriverTest extends TestCase
+{
+    /** @var FirefoxDriver */
+    protected $driver;
+
+    protected function setUp(): void
+    {
+        if (getenv('BROWSER_NAME') !== 'firefox' || empty(getenv('GECKODRIVER_PATH'))
+            || WebDriverTestCase::isSauceLabsBuild()) {
+            $this->markTestSkipped('The test is run only when running against local chrome');
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor() !== null) {
+            $this->driver->quit();
+        }
+    }
+
+    public function testShouldStartFirefoxDriver()
+    {
+        $this->startFirefoxDriver();
+        $this->assertInstanceOf(FirefoxDriver::class, $this->driver);
+        $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
+
+        // Make sure actual browser capabilities were set
+        $this->assertNotEmpty($this->driver->getCapabilities()->getVersion());
+        $this->assertNotEmpty($this->driver->getCapabilities()->getCapability('moz:profile'));
+        $this->assertTrue($this->driver->getCapabilities()->getCapability('moz:headless'));
+
+        // Ensure browser is responding to basic command
+        $this->driver->get('http://localhost:8000/');
+        $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
+    }
+
+    private function startFirefoxDriver()
+    {
+        // The createDefaultService() method expect path to the executable to be present in the environment variable
+        putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
+
+        $firefoxOptions = new FirefoxOptions();
+        $firefoxOptions->addArguments(['-headless']);
+        $desiredCapabilities = DesiredCapabilities::firefox();
+        $desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
+
+        $this->driver = FirefoxDriver::start($desiredCapabilities);
+    }
+}

From f12ccef6ba1ff23a6bb7f9830bc4f359923a81b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 23 Apr 2021 18:32:42 +0200
Subject: [PATCH 642/784] Improve submit event polyfill for W3C protocol

With previous implementation some edge cases were not properly covered. This seems to be working better.
---
 lib/Remote/RemoteWebElement.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 3efd3bd89..fac2d52a6 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -410,12 +410,23 @@ public function setFileDetector(FileDetector $detector)
     public function submit()
     {
         if ($this->isW3cCompliant) {
+            // Submit method cannot be called directly in case an input of this form is named "submit".
+            // We use this polyfill to trigger 'submit' event using form.dispatchEvent().
+            $submitPolyfill = $script = <<<HTXT
+                var form = arguments[0];
+                while (form.nodeName !== "FORM" && form.parentNode) { // find the parent form of this element
+                    form = form.parentNode;
+                }
+                if (!form) {
+                    throw Error('Unable to find containing form element');
+                }
+                var event = new Event('submit', {bubbles: true, cancelable: true});
+                if (form.dispatchEvent(event)) {
+                    HTMLFormElement.prototype.submit.call(form);
+                }
+HTXT;
             $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
-                // cannot call the submit method directly in case an input of this form is named "submit"
-                'script' => sprintf(
-                    'return Object.getPrototypeOf(%1$s).submit.call(%1$s);',
-                    $this->getTagName() === 'form' ? 'arguments[0]' : 'arguments[0].form'
-                ),
+                'script' => $submitPolyfill,
                 'args' => [[JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $this->id]],
             ]);
 

From a22b99425b9f7b6b0287c3d13a5e3d3cea0711de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 20 Apr 2021 15:49:58 +0200
Subject: [PATCH 643/784] Extract driver creation to allow DRY

---
 lib/Remote/RemoteWebDriver.php               | 39 +++++++++++++-------
 tests/functional/Chrome/ChromeDriverTest.php |  5 ++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 45b41fb35..215b7fd21 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -133,21 +133,8 @@ public static function create(
         );
 
         $response = $executor->execute($command);
-        $value = $response->getValue();
 
-        if (!$isW3cCompliant = isset($value['capabilities'])) {
-            $executor->disableW3cCompliance();
-        }
-
-        if ($isW3cCompliant) {
-            $returnedCapabilities = DesiredCapabilities::createFromW3cCapabilities($value['capabilities']);
-        } else {
-            $returnedCapabilities = new DesiredCapabilities($value);
-        }
-
-        $driver = new static($executor, $response->getSessionID(), $returnedCapabilities, $isW3cCompliant);
-
-        return $driver;
+        return static::createFromResponse($response, $executor);
     }
 
     /**
@@ -646,6 +633,30 @@ public function isW3cCompliant()
         return $this->isW3cCompliant;
     }
 
+    /**
+     * Create instance based on response to NEW_SESSION command.
+     * Also detect W3C/OSS dialect and setup the driver/executor accordingly.
+     *
+     * @internal
+     * @return static
+     */
+    protected static function createFromResponse(WebDriverResponse $response, HttpCommandExecutor $commandExecutor)
+    {
+        $responseValue = $response->getValue();
+
+        if (!$isW3cCompliant = isset($responseValue['capabilities'])) {
+            $commandExecutor->disableW3cCompliance();
+        }
+
+        if ($isW3cCompliant) {
+            $returnedCapabilities = DesiredCapabilities::createFromW3cCapabilities($responseValue['capabilities']);
+        } else {
+            $returnedCapabilities = new DesiredCapabilities($responseValue);
+        }
+
+        return new static($commandExecutor, $response->getSessionID(), $returnedCapabilities, $isW3cCompliant);
+    }
+
     /**
      * Prepare arguments for JavaScript injection
      *
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 16e893d1f..8252852a8 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -36,10 +36,13 @@ protected function tearDown(): void
     public function testShouldStartChromeDriver()
     {
         $this->startChromeDriver();
-
         $this->assertInstanceOf(ChromeDriver::class, $this->driver);
         $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
 
+        // Make sure actual browser capabilities were set
+        $this->assertNotEmpty($this->driver->getCapabilities()->getVersion());
+        $this->assertNotEmpty($this->driver->getCapabilities()->getCapability('goog:chromeOptions'));
+
         $this->driver->get('http://localhost:8000/');
 
         $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());

From 2ea92878bc1367226003f4799d831dfa2ae43ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 20 Apr 2021 15:55:07 +0200
Subject: [PATCH 644/784] Fix browser capabilities to be set to driver instance
 when using ChromeDriver::create

---
 CHANGELOG.md                                 | 13 ++++-
 lib/Chrome/ChromeDriver.php                  | 55 +++++++++++++++++---
 tests/functional/Chrome/ChromeDriverTest.php | 22 ++++++--
 3 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e790e570..bf810c434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,17 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- Add `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).`
-- Add `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually.
+
+### Added
+- `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).`
+- `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually.
+- Method `ChromeDriver::startUsingDriverService()` to be used for creating ChromeDriver instance with custom service.
+
+### Fixed
+- Driver capabilities received from the browser when creating now session were not set to the instance of ChromeDriver (when ChromeDriver::start() was used).
+
+### Changed
+- Deprecate `ChromeDriver::startSession`. However the method was supposed to be used only internally.
 
 ## 1.10.0 - 2021-02-25
 ### Added
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index db88f39fe..a8feac7b8 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -14,25 +14,64 @@ class ChromeDriver extends LocalWebDriver
     private $devTools;
 
     /**
+     * Creates a new ChromeDriver using default configuration.
+     * This includes starting a new chromedriver process each time this method is called. However this may be
+     * unnecessary overhead - instead, you can start the process once using ChromeDriverService and pass
+     * this instance to startUsingDriverService() method.
+     *
+     * @todo Remove $service parameter. Use `ChromeDriver::startUsingDriverService` to pass custom $service instance.
      * @return static
      */
     public static function start(DesiredCapabilities $desired_capabilities = null, ChromeDriverService $service = null)
     {
-        if ($desired_capabilities === null) {
-            $desired_capabilities = DesiredCapabilities::chrome();
-        }
-        if ($service === null) {
+        if ($service === null) { // TODO: Remove the condition (always create default service)
             $service = ChromeDriverService::createDefaultService();
         }
+
+        return static::startUsingDriverService($service, $desired_capabilities);
+    }
+
+    /**
+     * Creates a new ChromeDriver using given ChromeDriverService.
+     * This is usable when you for example don't want to start new chromedriver process for each individual test
+     * and want to reuse the already started chromedriver, which will lower the overhead associated with spinning up
+     * a new process.
+
+     * @return static
+     */
+    public static function startUsingDriverService(
+        ChromeDriverService $service,
+        DesiredCapabilities $capabilities = null
+    ) {
+        if ($capabilities === null) {
+            $capabilities = DesiredCapabilities::chrome();
+        }
+
         $executor = new DriverCommandExecutor($service);
-        $driver = new static($executor, null, $desired_capabilities);
-        $driver->startSession($desired_capabilities);
+        $newSessionCommand = new WebDriverCommand(
+            null,
+            DriverCommand::NEW_SESSION,
+            [
+                'capabilities' => [
+                    'firstMatch' => [(object) $capabilities->toW3cCompatibleArray()],
+                ],
+                'desiredCapabilities' => (object) $capabilities->toArray(),
+            ]
+        );
+
+        $response = $executor->execute($newSessionCommand);
 
-        return $driver;
+        /*
+         * TODO: in next major version we may not need to use this method, because without OSS compatibility the
+         * driver creation is straightforward.
+         */
+        return static::createFromResponse($response, $executor);
     }
 
     /**
-     * @todo Make the class protected
+     * @todo Remove in next major version. The class is internally no longer used and is kept only to keep BC.
+     * @deprecated Use start or startUsingDriverService method instead.
+     * @codeCoverageIgnore
      * @internal
      */
     public function startSession(DesiredCapabilities $desired_capabilities)
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 8252852a8..695fa57e3 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -33,9 +33,13 @@ protected function tearDown(): void
         }
     }
 
-    public function testShouldStartChromeDriver()
+    /**
+     * @dataProvider provideDialect
+     * @param bool $isW3cDialect
+     */
+    public function testShouldStartChromeDriver($isW3cDialect)
     {
-        $this->startChromeDriver();
+        $this->startChromeDriver($isW3cDialect);
         $this->assertInstanceOf(ChromeDriver::class, $this->driver);
         $this->assertInstanceOf(DriverCommandExecutor::class, $this->driver->getCommandExecutor());
 
@@ -48,6 +52,17 @@ public function testShouldStartChromeDriver()
         $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
     }
 
+    /**
+     * @return array[]
+     */
+    public function provideDialect()
+    {
+        return [
+            'w3c' => [true],
+            'oss' => [false],
+        ];
+    }
+
     public function testShouldInstantiateDevTools()
     {
         $this->startChromeDriver();
@@ -66,7 +81,7 @@ public function testShouldInstantiateDevTools()
         $this->assertSame(['result' => ['type' => 'string', 'value' => 'http://localhost:8000/']], $cdpResult);
     }
 
-    private function startChromeDriver()
+    private function startChromeDriver($w3cDialect = true)
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
@@ -74,6 +89,7 @@ private function startChromeDriver()
         // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
         $chromeOptions = new ChromeOptions();
         $chromeOptions->addArguments(['--no-sandbox', '--headless']);
+        $chromeOptions->setExperimentalOption('w3c', $w3cDialect);
         $desiredCapabilities = DesiredCapabilities::chrome();
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
 

From bc59372d9fa27e7f7e92189470b1d2f600b8f9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 3 May 2021 12:16:16 +0200
Subject: [PATCH 645/784] Update CHANGELOG

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf810c434..00a698906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,16 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 ### Added
-- `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).`
-- `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually.
+- `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).
+g- `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually. [See wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#start-directly-using-firefoxdriver-class) for usage examples.
 - Method `ChromeDriver::startUsingDriverService()` to be used for creating ChromeDriver instance with custom service.
 
 ### Fixed
 - Driver capabilities received from the browser when creating now session were not set to the instance of ChromeDriver (when ChromeDriver::start() was used).
 
 ### Changed
-- Deprecate `ChromeDriver::startSession`. However the method was supposed to be used only internally.
+- Deprecate `ChromeDriver::startSession`. However, the method was supposed to be used only internally.
+- KeyDown and KeyUp actions will throw an exception when not used with modifier keys.
 
 ## 1.10.0 - 2021-02-25
 ### Added

From 66adc952127dd1314af94ce28f8fc332d38f229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 3 May 2021 12:19:43 +0200
Subject: [PATCH 646/784] Release 1.11.0

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a698906..3e5353858 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,10 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 1.11.0 - 2021-05-03
 ### Added
 - `FirefoxOptions` class to simplify passing Firefox capabilities. Usage is covered [in our wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefoxoptions).
-g- `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually. [See wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#start-directly-using-firefoxdriver-class) for usage examples.
+- `FirefoxDriver` to easy local start of Firefox instance without a need to start the `geckodriver` process manually. [See wiki](https://github.com/php-webdriver/php-webdriver/wiki/Firefox#start-directly-using-firefoxdriver-class) for usage examples.
 - Method `ChromeDriver::startUsingDriverService()` to be used for creating ChromeDriver instance with custom service.
 
 ### Fixed

From 0510696880e8f88026d9266344e3af7ee79040dd Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Sun, 14 Mar 2021 20:18:17 +0200
Subject: [PATCH 647/784] Add php 8.1 build

---
 .github/workflows/tests.yaml              | 4 ++--
 tests/functional/RemoteWebDriverTest.php  | 4 ++--
 tests/functional/RemoteWebElementTest.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 1d0c4f524..7e40ed6ad 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -43,11 +43,11 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.1', '7.2', '7.3', '7.4']
+        php-version: ['5.6', '7.1', '7.2', '7.3', '7.4', '8.0']
         dependencies: ['']
         include:
           - { php-version: '5.6', dependencies: '--prefer-lowest' }
-          - { php-version: '8.0', dependencies: '--ignore-platform-req=php' }
+          - { php-version: '8.1', dependencies: '--ignore-platform-req=php' }
 
     steps:
       - uses: actions/checkout@v2
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 322ce0707..83cde5e69 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -265,7 +265,7 @@ public function testShouldTakeScreenshot()
         $outputPng = $this->driver->takeScreenshot();
 
         $image = imagecreatefromstring($outputPng);
-        $this->assertTrue(is_resource($image));
+        $this->assertNotFalse($image);
 
         $this->assertGreaterThan(0, imagesx($image));
         $this->assertGreaterThan(0, imagesy($image));
@@ -287,7 +287,7 @@ public function testShouldSaveScreenshotToFile()
         $this->driver->takeScreenshot($screenshotPath);
 
         $image = imagecreatefrompng($screenshotPath);
-        $this->assertTrue(is_resource($image));
+        $this->assertNotFalse($image);
 
         $this->assertGreaterThan(0, imagesx($image));
         $this->assertGreaterThan(0, imagesy($image));
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 0aeb33dde..ef9c71be4 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -433,7 +433,7 @@ public function testShouldTakeAndSaveElementScreenshot()
 
         // Assert string output
         $imageFromString = imagecreatefromstring($outputPngString);
-        $this->assertTrue(is_resource($imageFromString));
+        $this->assertNotFalse($imageFromString);
         $this->assertEquals(5, imagesx($imageFromString));
         $this->assertEquals(5, imagesy($imageFromString));
 

From f6b2e10e896c4c24e8a5605551f78aa844676955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 6 May 2021 18:40:08 +0200
Subject: [PATCH 648/784] Add quit() in the readme examples (see #902)

---
 README.md   | 3 +++
 example.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0ac71d3b..689a497ab 100644
--- a/README.md
+++ b/README.md
@@ -177,6 +177,9 @@ echo 'About to click to a button with text: ' . $historyButton->getText();
 
 // Click the element to navigate to revision history page
 $historyButton->click();
+
+// Make sure to always call quit() at the end to terminate the browser session
+$driver->quit();
 ```
 
 See [example.php](example.php) for full example scenario.
diff --git a/example.php b/example.php
index b7daac7bc..4491df386 100644
--- a/example.php
+++ b/example.php
@@ -70,5 +70,5 @@
 $cookies = $driver->manage()->getCookies();
 print_r($cookies);
 
-// close the browser
+// terminate the session and close the browser
 $driver->quit();

From ec1f0924cbc767c3a139a7a15648692c6f9cd231 Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Thu, 18 Mar 2021 22:16:50 +0200
Subject: [PATCH 649/784] Add build for Safari on macos-latest

---
 .github/workflows/tests.yaml                  | 20 ++++++++---
 lib/Remote/RemoteWebElement.php               | 23 +++++++++---
 .../Chrome/ChromeDevToolsDriverTest.php       |  3 +-
 .../Firefox/FirefoxDriverServiceTest.php      |  3 ++
 tests/functional/RemoteKeyboardTest.php       |  2 ++
 .../functional/RemoteWebDriverCreateTest.php  | 11 ++++--
 tests/functional/RemoteWebDriverTest.php      | 16 ++++-----
 tests/functional/RemoteWebElementTest.php     | 31 +++++++++++++---
 tests/functional/RetrieveEventsTrait.php      | 18 +++++++---
 tests/functional/WebDriverActionsTest.php     | 26 +++++++++++---
 tests/functional/WebDriverTestCase.php        | 35 ++++++++++++-------
 tests/functional/WebDriverWindowTest.php      |  4 +++
 tests/functional/web/events.html              |  2 +-
 13 files changed, 146 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7e40ed6ad..45e5761e9 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -82,19 +82,21 @@ jobs:
           ~/.composer/vendor/bin/php-coveralls -v
 
   functional-tests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     env:
       SELENIUM_SERVER_DOWNLOAD_URL: http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
 
     strategy:
       fail-fast: false
       matrix:
+        os: ['ubuntu-latest']
         browser: ['chrome', 'firefox']
         selenium-server: [true, false] # Whether to run via Selenium server or directly via browser driver
         w3c: [true] # Although all builds negotiate protocol by default, it implies W3C protocol for both Chromedriver and Geckodriver
         include:
-          # Force OSS (JsonWire) protocol on ChromeDriver - to make sure we keep compatibility
-          - { browser: 'chrome', selenium-server: false, w3c: false }
+          - { browser: 'safari', os: 'macos-latest', selenium-server: false, w3c: true }
+          # Force OSS (JsonWire) protocol on ChromeDriver - to make sure we keep compatibility:
+          - { browser: 'chrome', os: 'ubuntu-latest', selenium-server: false, w3c: false }
 
     name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }}, W3C: ${{ matrix.w3c }})"
 
@@ -137,9 +139,15 @@ jobs:
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
           geckodriver &> ./logs/geckodriver.log &
 
+      - name: Start SafariDriver
+        if: ${{ !matrix.selenium-server && matrix.browser == 'safari' }}
+        run: |
+          defaults read /Applications/Safari.app/Contents/Info CFBundleShortVersionString
+          /usr/bin/safaridriver -p 4444 --diagnose &
+
       - name: Start local PHP server
         run: |
-          php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
+          php -S 127.0.0.1:8000 -t tests/functional/web/ &> ./logs/php-server.log &
 
       - name: Wait for browser & PHP to start
         run: |
@@ -158,6 +166,7 @@ jobs:
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
+          if [ "$BROWSER_NAME" = "safari" ]; then EXCLUDE_GROUP+="exclude-safari,"; fi
           if [ -n "$EXCLUDE_GROUP" ]; then EXTRA_PARAMS+=" --exclude-group $EXCLUDE_GROUP"; fi
           vendor/bin/phpunit --testsuite functional --colors=always --coverage-clover ./logs/clover.xml $EXTRA_PARAMS
 
@@ -179,6 +188,9 @@ jobs:
           if [ -f ./logs/chromedriver.log ]; then cat ./logs/chromedriver.log; fi
           if [ -f ./logs/geckodriver.log ]; then cat ./logs/geckodriver.log; fi
           if [ -f ./logs/php-server.log ]; then cat ./logs/php-server.log; fi
+          if [ "$BROWSER_NAME" = "safari" ]; then
+            cat  ~/Library/Logs/com.apple.WebDriver/safaridriver.*
+          fi
 
   tests-finished:
     name: Tests finished
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index fac2d52a6..6dc379378 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -204,10 +204,25 @@ public function getLocation()
      */
     public function getLocationOnScreenOnceScrolledIntoView()
     {
-        $location = $this->executor->execute(
-            DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
-            [':id' => $this->id]
-        );
+        if ($this->isW3cCompliant) {
+            $script = <<<JS
+var e = arguments[0];
+e.scrollIntoView({ behavior: 'instant', block: 'end', inline: 'nearest' }); 
+var rect = e.getBoundingClientRect(); 
+return {'x': rect.left, 'y': rect.top};
+JS;
+
+            $result = $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
+                'script' => $script,
+                'args' => [[JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $this->id]],
+            ]);
+            $location = ['x' => $result['x'], 'y' => $result['y']];
+        } else {
+            $location = $this->executor->execute(
+                DriverCommand::GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW,
+                [':id' => $this->id]
+            );
+        }
 
         return new WebDriverPoint($location['x'], $location['y']);
     }
diff --git a/tests/functional/Chrome/ChromeDevToolsDriverTest.php b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
index b395edea7..acbedb806 100644
--- a/tests/functional/Chrome/ChromeDevToolsDriverTest.php
+++ b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
@@ -7,8 +7,9 @@
 
 /**
  * @group exclude-saucelabs
- * @group exclude-firefox
  * @group exclude-edge
+ * @group exclude-firefox
+ * @group exclude-safari
  */
 class ChromeDevToolsDriverTest extends WebDriverTestCase
 {
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
index 2fb574e1c..e39259e2b 100644
--- a/tests/functional/Firefox/FirefoxDriverServiceTest.php
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -7,6 +7,9 @@
 
 /**
  * @group exclude-saucelabs
+ * @group exclude-edge
+ * @group exclude-chrome
+ * @group exclude-safari
  * @covers \Facebook\WebDriver\Firefox\FirefoxDriverService
  */
 class FirefoxDriverServiceTest extends TestCase
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index 150b0fb05..947c8b6f9 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -16,6 +16,8 @@ class RemoteKeyboardTest extends WebDriverTestCase
      * https://github.com/mozilla/geckodriver/issues/646
      * https://github.com/mozilla/geckodriver/issues/944
      * @group exclude-edge
+     * @group exclude-safari
+     * https://feedbackassistant.apple.com/feedback/9051272
      */
     public function testShouldPressSendAndReleaseKeys()
     {
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index e4436b731..6473e9b4a 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -13,8 +13,6 @@
  */
 class RemoteWebDriverCreateTest extends WebDriverTestCase
 {
-    protected $createWebDriver = false;
-
     public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
     {
         $this->driver = RemoteWebDriver::create(
@@ -40,7 +38,10 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
 
         // MicrosoftEdge on Sauce Labs started to identify itself back as "msedge"
         if ($this->desiredCapabilities->getBrowserName() !== WebDriverBrowserType::MICROSOFT_EDGE) {
-            $this->assertSame($this->desiredCapabilities->getBrowserName(), $returnedCapabilities->getBrowserName());
+            $this->assertEqualsIgnoringCase(
+                $this->desiredCapabilities->getBrowserName(),
+                $returnedCapabilities->getBrowserName()
+            );
         }
 
         $this->assertNotEmpty($returnedCapabilities->getPlatform());
@@ -123,4 +124,8 @@ public function testShouldCreateInstanceFromExistingSessionId()
         // Do some interaction with the new driver
         $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
     }
+
+    protected function createWebDriver()
+    {
+    }
 }
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 83cde5e69..25b01c40f 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -72,9 +72,7 @@ public function testShouldGetSessionId()
      */
     public function testShouldGetAllSessions()
     {
-        if (getenv('GECKODRIVER') === '1') {
-            $this->markTestSkipped('"getAllSessions" is not supported by the W3C specification');
-        }
+        self::skipForW3cProtocol();
 
         $sessions = RemoteWebDriver::getAllSessions($this->serverUrl, 30000);
 
@@ -93,9 +91,7 @@ public function testShouldGetAllSessions()
      */
     public function testShouldQuitAndUnsetExecutor()
     {
-        if (getenv('GECKODRIVER') === '1') {
-            $this->markTestSkipped('"getAllSessions" is not supported by the W3C specification');
-        }
+        self::skipForW3cProtocol();
 
         $this->assertCount(
             1,
@@ -273,6 +269,8 @@ public function testShouldTakeScreenshot()
 
     /**
      * @covers ::takeScreenshot
+     * @group exclude-safari
+     *        Safari is returning different color profile and it does not have way to configure "force-color-profile"
      */
     public function testShouldSaveScreenshotToFile()
     {
@@ -319,8 +317,10 @@ public function testShouldGetRemoteEndStatus()
         $status = $this->driver->getStatus();
 
         $this->assertTrue(is_bool($status->isReady()));
-        $this->assertNotEmpty($status->getMessage());
-
         $this->assertTrue(is_array($status->getMeta()));
+
+        if (getenv('BROWSER_NAME') !== 'safari') {
+            $this->assertNotEmpty($status->getMessage());
+        }
     }
 }
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index ef9c71be4..b166fbd06 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Exception\ElementNotInteractableException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
+use OndraM\CiDetector\CiDetector;
 
 /**
  * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebElement
@@ -14,7 +15,9 @@ class RemoteWebElementTest extends WebDriverTestCase
     /**
      * @covers ::getText
      * @group exclude-edge
-     * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/5569343/
+     *        https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/5569343/
+     * @group exclude-safari
+     *      Safari does not normalize white-spaces
      */
     public function testShouldGetText()
     {
@@ -23,6 +26,7 @@ public function testShouldGetText()
         $elementWithTextWithSpaces = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
 
         $this->assertEquals('Foo bar text', $elementWithSimpleText->getText());
+
         $this->assertEquals('Multiple spaces are stripped', $elementWithTextWithSpaces->getText());
     }
 
@@ -411,6 +415,10 @@ public function testShouldTakeAndSaveElementScreenshot()
             $this->markTestSkipped('GD extension must be enabled');
         }
 
+        // When running this test on real devices, it has a retina display so 5px will be converted into 10px
+        $isCi = (new CiDetector())->isCiDetected();
+        $isSafari = getenv('BROWSER_NAME') === 'safari';
+
         // Intentionally save screenshot to subdirectory to tests it is being created
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/element-screenshot.png';
 
@@ -422,8 +430,14 @@ public function testShouldTakeAndSaveElementScreenshot()
 
         // Assert file output
         $imageFromFile = imagecreatefrompng($screenshotPath);
-        $this->assertEquals(5, imagesx($imageFromFile));
-        $this->assertEquals(5, imagesy($imageFromFile));
+
+        if ($isSafari && !$isCi) {
+            $this->assertEquals(10, imagesx($imageFromFile));
+            $this->assertEquals(10, imagesy($imageFromFile));
+        } else {
+            $this->assertEquals(5, imagesx($imageFromFile));
+            $this->assertEquals(5, imagesy($imageFromFile));
+        }
 
         // Validate element is actually red
         $this->assertSame(
@@ -434,8 +448,15 @@ public function testShouldTakeAndSaveElementScreenshot()
         // Assert string output
         $imageFromString = imagecreatefromstring($outputPngString);
         $this->assertNotFalse($imageFromString);
-        $this->assertEquals(5, imagesx($imageFromString));
-        $this->assertEquals(5, imagesy($imageFromString));
+        $this->assertTrue(is_resource($imageFromString));
+
+        if ($isSafari && !$isCi) {
+            $this->assertEquals(10, imagesx($imageFromString));
+            $this->assertEquals(10, imagesy($imageFromString));
+        } else {
+            $this->assertEquals(5, imagesx($imageFromString));
+            $this->assertEquals(5, imagesy($imageFromString));
+        }
 
         // Validate element is actually red
         $this->assertSame(
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
index 3a4a3d512..32653e05a 100644
--- a/tests/functional/RetrieveEventsTrait.php
+++ b/tests/functional/RetrieveEventsTrait.php
@@ -14,9 +14,7 @@ trait RetrieveEventsTrait
      */
     private function retrieveLoggedKeyboardEvents()
     {
-        $logElement = $this->driver->findElement(WebDriverBy::id('keyboardEventsLog'));
-
-        return explode("\n", $logElement->getText());
+        return $this->retrieveLoggerEvents(WebDriverBy::id('keyboardEventsLog'));
     }
 
     /**
@@ -24,8 +22,18 @@ private function retrieveLoggedKeyboardEvents()
      */
     private function retrieveLoggedMouseEvents()
     {
-        $logElement = $this->driver->findElement(WebDriverBy::id('mouseEventsLog'));
+        return $this->retrieveLoggerEvents(WebDriverBy::id('mouseEventsLog'));
+    }
+
+    /**
+     * @return false|string[]
+     */
+    private function retrieveLoggerEvents(WebDriverBy $by)
+    {
+        $logElement = $this->driver->findElement($by);
+
+        $text = trim($logElement->getText());
 
-        return explode("\n", $logElement->getText());
+        return array_map('trim', explode("\n", $text));
     }
 }
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index b40ab62a9..91336c473 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -93,6 +93,10 @@ public function testShouldContextClickOnElement()
         $this->assertContains('contextmenu item-2', $loggedEvents);
     }
 
+    /**
+     * @group exclude-safari
+     *        https://github.com/webdriverio/webdriverio/issues/231
+     */
     public function testShouldDoubleClickOnElement()
     {
         $this->driver->get($this->getTestPageUrl('events.html'));
@@ -134,6 +138,10 @@ public function testShouldSendKeysUpAndDown()
         );
     }
 
+    /**
+     * @group exclude-safari
+     *        https://developer.apple.com/forums/thread/662677
+     */
     public function testShouldMoveToElement()
     {
         $this->driver->get($this->getTestPageUrl('sortable.html'));
@@ -153,6 +161,10 @@ public function testShouldMoveToElement()
         );
     }
 
+    /**
+     * @group exclude-safari
+     *        https://developer.apple.com/forums/thread/662677
+     */
     public function testShouldMoveByOffset()
     {
         $this->driver->get($this->getTestPageUrl('sortable.html'));
@@ -173,6 +185,8 @@ public function testShouldMoveByOffset()
 
     /**
      * @group exclude-saucelabs
+     * @group exclude-safari
+     *        https://developer.apple.com/forums/thread/662677
      */
     public function testShouldDragAndDrop()
     {
@@ -202,6 +216,11 @@ public function testShouldDragAndDrop()
         );
     }
 
+    /**
+     * @group exclude-safari
+     *        https://developer.apple.com/forums/thread/662677
+     *        it does not work even with Python Selenium, looks like Safaridriver does not implements Interaction API
+     */
     public function testShouldDragAndDropBy()
     {
         $this->driver->get($this->getTestPageUrl('sortable.html'));
@@ -236,12 +255,9 @@ public function testShouldDragAndDropBy()
      */
     private function retrieveListContent()
     {
-        $list1 = $this->driver->findElement(WebDriverBy::cssSelector('#sortable1'));
-        $list2 = $this->driver->findElement(WebDriverBy::cssSelector('#sortable2'));
-
         return [
-            explode("\n", $list1->getText()),
-            explode("\n", $list2->getText()),
+            $this->retrieveLoggerEvents(WebDriverBy::cssSelector('#sortable1')),
+            $this->retrieveLoggerEvents(WebDriverBy::cssSelector('#sortable2')),
         ];
     }
 }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5a6acc432..74c4d41e9 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -67,32 +67,30 @@ protected function setUp(): void
                 $firefoxOptions = new FirefoxOptions();
                 $firefoxOptions->addArguments(['-headless']);
                 $this->desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
+            } elseif ($browserName === WebDriverBrowserType::SAFARI) {
+                $this->serverUrl = 'http://localhost:4444/';
             }
 
             $this->desiredCapabilities->setBrowserName($browserName);
         }
 
-        if ($this->createWebDriver) {
-            $this->driver = RemoteWebDriver::create(
-                $this->serverUrl,
-                $this->desiredCapabilities,
-                $this->connectionTimeout,
-                $this->requestTimeout,
-                null,
-                null,
-                null
-            );
-        }
+        $this->createWebDriver();
     }
 
     protected function tearDown(): void
     {
-        if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor()) {
+        if ($this->driver !== null) {
             try {
                 $this->driver->quit();
             } catch (NoSuchWindowException $e) {
                 // browser may have died or is already closed
             }
+            $this->driver = null;
+
+            if (getenv('BROWSER_NAME') === 'safari') {
+                // The Safari instance is already paired with another WebDriver session
+                usleep(2e5); // 200ms
+            }
         }
     }
 
@@ -252,4 +250,17 @@ protected function compatAssertStringContainsString($needle, $haystack, $message
         }
         parent::assertContains($needle, $haystack, $message);
     }
+
+    protected function createWebDriver()
+    {
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout,
+            null,
+            null,
+            null
+        );
+    }
 }
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 74baf3599..3b100d8f7 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -76,6 +76,7 @@ public function testShouldFullscreenWindow()
     /**
      * @group exclude-saucelabs
      * @group exclude-chrome
+     * @group exclude-safari
      * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1038050
      */
     public function testShouldMinimizeWindow()
@@ -114,6 +115,9 @@ public function testShouldSetSize()
         $this->assertSame(666, $sizeAfter->getHeight());
     }
 
+    /**
+     * @todo Skip when running headless mode
+     */
     public function testShouldSetWindowPosition()
     {
         $this->driver->manage()
diff --git a/tests/functional/web/events.html b/tests/functional/web/events.html
index 5511d321a..45241e1c2 100644
--- a/tests/functional/web/events.html
+++ b/tests/functional/web/events.html
@@ -37,7 +37,7 @@ <h2>Keyboard events:</h2>
 <script>
     function logMouseEvent(event) {
         var logElement = document.getElementById('mouseEventsLog');
-        logElement.innerHTML += '<strong>' + event.type + '</strong> <span>' + event.target.id +'</span><br>';
+        logElement.innerHTML += '<strong>' + event.type + '</strong> <span>' + event.target.id +'</span>' + "\n";
         console.log(event);
     }
 

From 249f0160f2db12f6bf23350bb0f536fe63605f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 May 2021 17:50:09 +0200
Subject: [PATCH 650/784] Add test for getLocationOnScreenOnceScrolledIntoView

---
 tests/functional/RemoteWebElementTest.php | 25 +++++++++++++++++++++++
 tests/functional/web/index.html           |  3 +++
 2 files changed, 28 insertions(+)

diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index b166fbd06..f10c7487b 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -59,6 +59,31 @@ public function testShouldGetLocation()
         $this->assertSame(500, $elementLocation->getY());
     }
 
+    /**
+     * @covers ::getLocationOnScreenOnceScrolledIntoView
+     */
+    public function testShouldGetLocationOnScreenOnceScrolledIntoView()
+    {
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('element-out-of-viewport'));
+
+        // Location before scrolling into view is out of viewport
+        $elementLocation = $element->getLocation();
+        $this->assertInstanceOf(WebDriverPoint::class, $elementLocation);
+        $this->assertSame(33, $elementLocation->getX());
+        $this->assertSame(5000, $elementLocation->getY());
+
+        // Location once scrolled into view
+        $elementLocationOnceScrolledIntoView = $element->getLocationOnScreenOnceScrolledIntoView();
+        $this->assertInstanceOf(WebDriverPoint::class, $elementLocationOnceScrolledIntoView);
+        $this->assertSame(33, $elementLocationOnceScrolledIntoView->getX());
+        $this->assertLessThan(
+            1000, // screen size is ~768, so this should be less
+            $elementLocationOnceScrolledIntoView->getY()
+        );
+    }
+
     /**
      * @covers ::getSize
      */
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 0f9c4e279..6107856ed 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -64,6 +64,9 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     Foo
 </div>
 
+<div id="element-out-of-viewport" style="position: absolute; top: 5000px; left: 33px; width: 333px; height: 66px;">
+    Bar
+</div>
 
 </body>
 </html>

From 403435e5ad0e5dd9a82656d5c755b9f615e00577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 May 2021 11:58:24 +0200
Subject: [PATCH 651/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e5353858..4fed880b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- `RemoteWebElement::getLocationOnScreenOnceScrolledIntoView()` was missing polyfill implementation for W3C mode and not working in eg. Safari.
 
 ## 1.11.0 - 2021-05-03
 ### Added

From 73a75476e3b7e46f40f967d7401cdad0afbe393b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 May 2021 12:51:01 +0200
Subject: [PATCH 652/784] Stabilize flaky testShouldSwitchToWindow test, which
 sometimes fails in Firefox

---
 tests/functional/RemoteTargetLocatorTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 2a00132d3..a9e03e514 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -37,6 +37,11 @@ public function testShouldSwitchToWindow()
 
         $this->driver->switchTo()->window($newWindowHandle);
 
+        $this->driver->wait()->until(function () {
+            // The window contents is sometimes not yet loaded and needs a while to actually show the index.html page
+            return mb_strpos($this->driver->getCurrentURL(), 'index.html') !== false;
+        });
+
         // After switchTo() is called, the active window should be changed
         $this->compatAssertStringContainsString('index.html', $this->driver->getCurrentURL());
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());

From 744004ed0cdb0c2b5ed2bd1a59ea012607775b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 May 2021 22:58:29 +0200
Subject: [PATCH 653/784] Remove dev branch alias

---
 composer.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/composer.json b/composer.json
index 8453c8169..d5d3f22f5 100644
--- a/composer.json
+++ b/composer.json
@@ -38,11 +38,6 @@
   "config": {
     "sort-packages": true
   },
-  "extra": {
-    "branch-alias": {
-      "dev-main": "1.8.x-dev"
-    }
-  },
   "autoload": {
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"

From da16e39968f8dd5cfb7d07eef91dc2b731c69880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 21 May 2021 17:12:49 +0200
Subject: [PATCH 654/784] Release version 1.11.1

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fed880b4..085f24450 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.11.1 - 2021-05-21
 ### Fixed
 - `RemoteWebElement::getLocationOnScreenOnceScrolledIntoView()` was missing polyfill implementation for W3C mode and not working in eg. Safari.
 

From 6b551c314873c7c4a0950ca9cb3c51c27635ee3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 24 Aug 2021 12:11:32 +0200
Subject: [PATCH 655/784] Update codestyle, remove php-cs-fixer deprecations

---
 .php_cs.dist => .php-cs-fixer.dist.php        | 68 +++++++++++++------
 lib/AbstractWebDriverCheckboxOrRadio.php      |  2 +-
 lib/Net/URLChecker.php                        |  1 +
 lib/Remote/HttpCommandExecutor.php            |  2 +-
 lib/Remote/RemoteMouse.php                    |  2 +-
 lib/Remote/RemoteWebDriver.php                |  4 +-
 lib/Remote/RemoteWebElement.php               |  3 +-
 lib/Remote/Service/DriverCommandExecutor.php  |  2 +-
 lib/Remote/Service/DriverService.php          |  2 +-
 lib/Support/Events/EventFiringWebDriver.php   |  2 +
 .../Events/EventFiringWebDriverNavigation.php |  2 +
 lib/Support/Events/EventFiringWebElement.php  |  3 +
 lib/WebDriverExpectedCondition.php            |  1 +
 lib/WebDriverWait.php                         |  2 +-
 lib/WebDriverWindow.php                       |  2 +-
 .../Chrome/ChromeDevToolsDriverTest.php       |  2 +-
 .../Firefox/FirefoxDriverServiceTest.php      |  4 +-
 tests/functional/RemoteKeyboardTest.php       |  2 +-
 tests/functional/RemoteWebElementTest.php     |  2 +
 tests/functional/WebDriverActionsTest.php     |  2 +-
 tests/functional/WebDriverTestCase.php        |  6 +-
 tests/functional/WebDriverWindowTest.php      |  6 +-
 tests/functional/web/slow_pixel.png.php       |  3 +-
 tests/unit/Firefox/FirefoxOptionsTest.php     |  2 +-
 24 files changed, 82 insertions(+), 45 deletions(-)
 rename .php_cs.dist => .php-cs-fixer.dist.php (58%)

diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 58%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index a438f2095..5ffcc38ed 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -3,23 +3,34 @@
 $finder = PhpCsFixer\Finder::create()
     ->in([__DIR__ . '/lib', __DIR__ . '/tests']);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'binary_operator_spaces' => true,
-        'blank_line_before_return' => true,
+        'blank_line_before_statement' => ['statements' => ['return', 'try']],
+        'braces' => ['allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => true],
         'cast_spaces' => true,
+        'class_attributes_separation' => ['elements' => ['method' => 'one']],
+        'clean_namespace' => true,
+        'compact_nullable_typehint' => true,
         'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => true,
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'full_opening_tag' => true,
         'function_typehint_space' => true,
-        'general_phpdoc_annotation_remove' => ['author'],
         'implode_call' => true,
         'is_null' => true,
+        'lambda_not_used_import' => true,
         'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
         'mb_str_functions' => true,
-        'method_separation' => true,
         'native_function_casing' => true,
+        'native_function_type_declaration_casing' => true,
         'new_with_braces' => true,
         'no_alias_functions' => true,
         'no_blank_lines_after_class_opening' => true,
@@ -27,17 +38,23 @@
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
         'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => [
-            'use',
-            'break',
-            'continue',
-            'extra',
-            'return',
-            'throw',
-            'useTrait',
-            'curly_brace_block',
-            'parenthesis_brace_block',
-            'square_brace_block',
+        'normalize_index_brace' => true,
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'break',
+                'case',
+                'continue',
+                'curly_brace_block',
+                'default',
+                'extra',
+                'parenthesis_brace_block',
+                'return',
+                'square_brace_block',
+                'switch',
+                'throw',
+                'use',
+                'use_trait',
+            ],
         ],
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
@@ -47,6 +64,7 @@
         'no_unused_imports' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
+        'no_useless_sprintf' => true,
         'no_whitespace_in_blank_line' => true,
         'object_operator_without_whitespace' => true,
         'ordered_class_elements' => true,
@@ -55,11 +73,10 @@
         'php_unit_dedicate_assert' => false,
         'php_unit_expectation' => ['target' => '5.6'],
         'php_unit_method_casing' => ['case' => 'camel_case'],
-        'php_unit_mock' => true,
         'php_unit_mock_short_will_return' => true,
+        'php_unit_mock' => true,
         'php_unit_namespaced' => ['target' => '5.7'],
         'php_unit_no_expectation_annotation' => true,
-        'php_unit_ordered_covers' => true,
         'php_unit_set_up_tear_down_visibility' => true,
         'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
         'phpdoc_add_missing_param_annotation' => true,
@@ -67,25 +84,34 @@
         'phpdoc_no_access' => true,
         'phpdoc_no_empty_return' => true,
         'phpdoc_no_package' => true,
+        'phpdoc_order_by_value' => ['annotations' => ['covers', 'group', 'throws']],
         'phpdoc_order' => true,
+        'phpdoc_return_self_reference' => true,
         'phpdoc_scalar' => true,
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_trim' => true,
         'phpdoc_types' => true,
-        'psr4' => true,
+        'phpdoc_var_annotation_correct_order' => true,
+        'psr_autoloading' => true,
         'self_accessor' => true,
+        'set_type_to_cast' => true,
         'short_scalar_cast' => true,
         'single_blank_line_before_namespace' => true,
         'single_quote' => true,
+        'single_space_after_construct' => true,
+        'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => true,
         'standardize_not_equals' => true,
+        'strict_param' => true,
+        'switch_continue_to_break' => true,
         'ternary_operator_spaces' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'ternary_to_elvis_operator' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => true,
+        'visibility_required' => ['elements' => ['method', 'property']],
         'whitespace_after_comma_in_array' => true,
-        'yoda_style' => false,
+        'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder);
diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index 9cd04c967..450bc387e 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -66,7 +66,7 @@ public function getFirstSelectedOption()
         }
 
         throw new NoSuchElementException(
-            sprintf('No %s are selected', 'radio' === $this->type ? 'radio buttons' : 'checkboxes')
+            sprintf('No %s are selected', $this->type === 'radio' ? 'radio buttons' : 'checkboxes')
         );
     }
 
diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index a4ff2df00..05e9cf1f6 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -59,6 +59,7 @@ private function getHTTPResponseCode($url)
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS, self::CONNECT_TIMEOUT_MS);
 
         $code = null;
+
         try {
             curl_exec($ch);
             $info = curl_getinfo($ch);
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 69790e0e1..ea625c3c6 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -296,7 +296,7 @@ public function execute(WebDriverCommand $command)
             curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $http_method);
         }
 
-        if (in_array($http_method, ['POST', 'PUT'])) {
+        if (in_array($http_method, ['POST', 'PUT'], true)) {
             // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
             // https://tools.ietf.org/html/rfc7231#section-5.1.1
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array_merge(static::DEFAULT_HTTP_HEADERS, ['Expect:']));
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 3495ea745..d2429967e 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -116,7 +116,7 @@ public function doubleClick(WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $clickActions = $this->createClickActions();
-            $moveAction = null === $where ? [] : [$this->createMoveAction($where)];
+            $moveAction = $where === null ? [] : [$this->createMoveAction($where)];
             $this->executor->execute(DriverCommand::ACTIONS, [
                 'actions' => [
                     [
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 215b7fd21..cb162265d 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -368,9 +368,7 @@ public function executeAsyncScript($script, array $arguments = [])
      */
     public function takeScreenshot($save_as = null)
     {
-        $screenshot = base64_decode(
-            $this->execute(DriverCommand::SCREENSHOT)
-        );
+        $screenshot = base64_decode($this->execute(DriverCommand::SCREENSHOT), true);
 
         if ($save_as !== null) {
             $directoryPath = dirname($save_as);
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 6dc379378..2554848a0 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -478,7 +478,8 @@ public function takeElementScreenshot($save_as = null)
             $this->executor->execute(
                 DriverCommand::TAKE_ELEMENT_SCREENSHOT,
                 [':id' => $this->id]
-            )
+            ),
+            true
         );
 
         if ($save_as !== null) {
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 36dc2f751..d16ec943d 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -28,8 +28,8 @@ public function __construct(DriverService $service)
     /**
      * @param WebDriverCommand $command
      *
-     * @throws WebDriverException
      * @throws \Exception
+     * @throws WebDriverException
      * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command)
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 8b8914815..237ca46b9 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -167,7 +167,7 @@ private function createProcess()
     {
         // BC: ProcessBuilder deprecated since Symfony 3.4 and removed in Symfony 4.0.
         if (class_exists(ProcessBuilder::class)
-            && false === mb_strpos('@deprecated', (new \ReflectionClass(ProcessBuilder::class))->getDocComment())
+            && mb_strpos('@deprecated', (new \ReflectionClass(ProcessBuilder::class))->getDocComment()) === false
         ) {
             $processBuilder = (new ProcessBuilder())
                 ->setPrefix($this->executable)
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 81a27816b..a4a74e346 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -63,6 +63,7 @@ public function getWebDriver()
     public function get($url)
     {
         $this->dispatch('beforeNavigateTo', $url, $this);
+
         try {
             $this->driver->get($url);
         } catch (WebDriverException $exception) {
@@ -162,6 +163,7 @@ public function executeAsyncScript($script, array $arguments = [])
         }
 
         $this->dispatch('beforeScript', $script, $this);
+
         try {
             $result = $this->driver->executeAsyncScript($script, $arguments);
         } catch (WebDriverException $exception) {
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 59eab3fd7..5070076d8 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -49,6 +49,7 @@ public function back()
             'beforeNavigateBack',
             $this->getDispatcher()->getDefaultDriver()
         );
+
         try {
             $this->navigator->back();
         } catch (WebDriverException $exception) {
@@ -68,6 +69,7 @@ public function forward()
             'beforeNavigateForward',
             $this->getDispatcher()->getDefaultDriver()
         );
+
         try {
             $this->navigator->forward();
         } catch (WebDriverException $exception) {
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index 0e9271665..a2fe4bb97 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -56,6 +56,7 @@ public function getElement()
     public function sendKeys($value)
     {
         $this->dispatch('beforeChangeValueOf', $this);
+
         try {
             $this->element->sendKeys($value);
         } catch (WebDriverException $exception) {
@@ -74,6 +75,7 @@ public function sendKeys($value)
     public function click()
     {
         $this->dispatch('beforeClickOn', $this);
+
         try {
             $this->element->click();
         } catch (WebDriverException $exception) {
@@ -129,6 +131,7 @@ public function findElements(WebDriverBy $by)
             $this,
             $this->dispatcher->getDefaultDriver()
         );
+
         try {
             $elements = [];
             foreach ($this->element->findElements($by) as $element) {
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 02d2e71e0..26914a161 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -422,6 +422,7 @@ function (WebDriver $driver) use ($visibility_of_element_located) {
                     $visibility_of_element_located->getApply(),
                     $driver
                 );
+
                 try {
                     if ($element !== null && $element->isEnabled()) {
                         return $element;
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 34dd057ae..5b2009b3c 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -38,9 +38,9 @@ public function __construct(WebDriver $driver, $timeout_in_second = null, $inter
      * @param callable|WebDriverExpectedCondition $func_or_ec
      * @param string $message
      *
+     * @throws \Exception
      * @throws NoSuchElementException
      * @throws TimeoutException
-     * @throws \Exception
      * @return mixed The return value of $func_or_ec
      */
     public function until($func_or_ec, $message = '')
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index e212f92ed..57754eb76 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -175,7 +175,7 @@ public function getScreenOrientation()
     public function setScreenOrientation($orientation)
     {
         $orientation = mb_strtoupper($orientation);
-        if (!in_array($orientation, ['PORTRAIT', 'LANDSCAPE'])) {
+        if (!in_array($orientation, ['PORTRAIT', 'LANDSCAPE'], true)) {
             throw new IndexOutOfBoundsException(
                 'Orientation must be either PORTRAIT, or LANDSCAPE'
             );
diff --git a/tests/functional/Chrome/ChromeDevToolsDriverTest.php b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
index acbedb806..b927c73d6 100644
--- a/tests/functional/Chrome/ChromeDevToolsDriverTest.php
+++ b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
@@ -6,10 +6,10 @@
 use Facebook\WebDriver\WebDriverTestCase;
 
 /**
- * @group exclude-saucelabs
  * @group exclude-edge
  * @group exclude-firefox
  * @group exclude-safari
+ * @group exclude-saucelabs
  */
 class ChromeDevToolsDriverTest extends WebDriverTestCase
 {
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
index e39259e2b..ce110acb7 100644
--- a/tests/functional/Firefox/FirefoxDriverServiceTest.php
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -6,10 +6,10 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @group exclude-saucelabs
- * @group exclude-edge
  * @group exclude-chrome
+ * @group exclude-edge
  * @group exclude-safari
+ * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\Firefox\FirefoxDriverService
  */
 class FirefoxDriverServiceTest extends TestCase
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index 947c8b6f9..a97b3343d 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -10,12 +10,12 @@ class RemoteKeyboardTest extends WebDriverTestCase
     use RetrieveEventsTrait;
 
     /**
+     * @group exclude-edge
      * @group exclude-firefox
      * Firefox does not properly support keyboard actions:
      * https://github.com/mozilla/geckodriver/issues/245
      * https://github.com/mozilla/geckodriver/issues/646
      * https://github.com/mozilla/geckodriver/issues/944
-     * @group exclude-edge
      * @group exclude-safari
      * https://feedbackassistant.apple.com/feedback/9051272
      */
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index f10c7487b..20a9a3882 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -193,6 +193,7 @@ public function testGeckoDriverShouldClickNotInteractable()
         $this->driver->get($this->getTestPageUrl('gecko653.html'));
 
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-index-plain-hidden'));
+
         try {
             $linkElement->click();
             $this->fail('No exception was thrown when clicking an inaccessible link');
@@ -201,6 +202,7 @@ public function testGeckoDriverShouldClickNotInteractable()
         }
 
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-index-hidden-block-child'));
+
         try {
             $linkElement->click();
             $this->fail('No exception was thrown when clicking an inaccessible link');
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 91336c473..8a01fb998 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -184,9 +184,9 @@ public function testShouldMoveByOffset()
     }
 
     /**
-     * @group exclude-saucelabs
      * @group exclude-safari
      *        https://developer.apple.com/forums/thread/662677
+     * @group exclude-saucelabs
      */
     public function testShouldDragAndDrop()
     {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 74c4d41e9..dbd6606ac 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -133,10 +133,10 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
     public static function skipForUnmatchedBrowsers($browsers = [], $message = null)
     {
         $browserName = (string) getenv('BROWSER_NAME');
-        if (array_search($browserName, $browsers) === false) {
+        if (!in_array($browserName, $browsers, true)) {
             if (!$message) {
-                $browserlist = implode(', ', $browsers);
-                $message = 'Browser ' . $browserName . ' not supported for this test (' . $browserlist . ')';
+                $browserList = implode(', ', $browsers);
+                $message = 'Browser ' . $browserName . ' not supported for this test (' . $browserList . ')';
             }
 
             static::markTestSkipped($message);
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 3b100d8f7..3cd91e587 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -49,8 +49,8 @@ public function testShouldMaximizeWindow()
     }
 
     /**
-     * @group exclude-saucelabs
      * @group exclude-edge
+     * @group exclude-saucelabs
      */
     public function testShouldFullscreenWindow()
     {
@@ -74,10 +74,10 @@ public function testShouldFullscreenWindow()
     }
 
     /**
-     * @group exclude-saucelabs
+     * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1038050
      * @group exclude-chrome
      * @group exclude-safari
-     * @see https://bugs.chromium.org/p/chromium/issues/detail?id=1038050
+     * @group exclude-saucelabs
      */
     public function testShouldMinimizeWindow()
     {
diff --git a/tests/functional/web/slow_pixel.png.php b/tests/functional/web/slow_pixel.png.php
index d95805e21..a834089ad 100644
--- a/tests/functional/web/slow_pixel.png.php
+++ b/tests/functional/web/slow_pixel.png.php
@@ -6,5 +6,6 @@
 header('Content-Type: image/png');
 echo base64_decode(
     'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAAACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjY'
-    . 'AAAAAIAAeIhvDMAAAAASUVORK5CYII='
+    . 'AAAAAIAAeIhvDMAAAAASUVORK5CYII=',
+    true
 );
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
index cd6948167..332f55de9 100644
--- a/tests/unit/Firefox/FirefoxOptionsTest.php
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -6,7 +6,7 @@
 
 class FirefoxOptionsTest extends TestCase
 {
-    /** @var [] */
+    /** @var array<string,bool> */
     const EXPECTED_DEFAULT_PREFS = [
         FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED => false,
         FirefoxPreferences::DEVTOOLS_JSONVIEW => false,

From b0d446169e7b3638cfb162b7101144bd793102c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 24 Aug 2021 12:44:06 +0200
Subject: [PATCH 656/784] Move php-cs-fixer to separate composer.json

---
 .gitattributes                   |  1 +
 .gitignore                       |  2 ++
 composer.json                    | 11 ++++++++---
 tools/php-cs-fixer/composer.json |  5 +++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 tools/php-cs-fixer/composer.json

diff --git a/.gitattributes b/.gitattributes
index 47a5c0fdf..e6146bc76 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,7 @@
 
 /scripts export-ignore
 /tests export-ignore
+/tools export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /example.php export-ignore
diff --git a/.gitignore b/.gitignore
index d5605367c..697c5cce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 composer.phar
 composer.lock
 vendor
+tools/php-cs-fixer/vendor
 .php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 phpunit.xml
 logs/
diff --git a/composer.json b/composer.json
index d5d3f22f5..03f038316 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,6 @@
     "facebook/webdriver": "*"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^2.0",
     "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
     "php-coveralls/php-coveralls": "^2.4",
     "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
@@ -59,6 +58,12 @@
   },
   "minimum-stability": "beta",
   "scripts": {
+    "post-install-cmd": [
+      "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction"
+    ],
+    "post-update-cmd": [
+      "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer update --working-dir=tools/php-cs-fixer --no-progress --no-interaction"
+    ],
     "all": [
       "@lint",
       "@analyze",
@@ -66,12 +71,12 @@
     ],
     "analyze": [
       "vendor/bin/phpstan analyze -c phpstan.neon --ansi",
-      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run -vvv --ansi",
+      "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
     ],
     "fix": [
       "@composer normalize",
-      "vendor/bin/php-cs-fixer fix --diff --diff-format=udiff -vvv || exit 0",
+      "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff -vvv || exit 0",
       "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
     ],
     "lint": [
diff --git a/tools/php-cs-fixer/composer.json b/tools/php-cs-fixer/composer.json
new file mode 100644
index 000000000..029b32c27
--- /dev/null
+++ b/tools/php-cs-fixer/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "friendsofphp/php-cs-fixer": "^3.0"
+    }
+}

From 108ee3c487d351b3f4606f2b5c147efd0b4bcd6e Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 25 Aug 2021 22:11:04 +0200
Subject: [PATCH 657/784] Disable sauce labs tests on forks (#917)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Disable sauce labs tests on forks

Source: https://github.com/phpmyadmin/phpmyadmin/commit/8021847847714a6546b6af20579b82ab98da59e5

Co-authored-by: Ondřej Machulda <ondrej.machulda@gmail.com>
---
 .github/workflows/sauce-labs.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index e183bdfac..427afc6fd 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -8,6 +8,8 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    # Source: https://github.community/t/do-not-run-cron-workflows-in-forks/17636/2
+    if: (github.event_name == 'schedule' && github.repository == 'php-webdriver/php-webdriver') || (github.event_name != 'schedule')
     env:
       SAUCELABS: 1
       SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}

From 429d6615750580cf764d478019f1534531216a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 23 Aug 2021 13:53:12 +0200
Subject: [PATCH 658/784] Allow Symfony 6

---
 CHANGELOG.md  | 2 ++
 composer.json | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085f24450..a765afa00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Allow installation of Symfony 6 components.
 
 ## 1.11.1 - 2021-05-21
 ### Fixed
diff --git a/composer.json b/composer.json
index 03f038316..9eb616cf2 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "ext-json": "*",
     "ext-zip": "*",
     "symfony/polyfill-mbstring": "^1.12",
-    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
+    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0"
   },
   "replace": {
     "facebook/webdriver": "*"
@@ -29,7 +29,7 @@
     "php-parallel-lint/php-parallel-lint": "^1.2",
     "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
+    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0"
   },
   "suggest": {
     "ext-SimpleXML": "For Firefox profile creation"
@@ -56,7 +56,7 @@
       "tests/functional/"
     ]
   },
-  "minimum-stability": "beta",
+  "minimum-stability": "dev",
   "scripts": {
     "post-install-cmd": [
       "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction"

From d4bb05460fa247295b69b401c5ab87892805fd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 26 Aug 2021 14:07:34 +0200
Subject: [PATCH 659/784] Add getDomProperty method to read IDL properties of
 elements (fixes #929)

---
 CHANGELOG.md                              |  3 +++
 lib/Remote/RemoteWebElement.php           | 25 +++++++++++++++++++++++
 lib/WebDriverElement.php                  | 15 +++++++++++++-
 tests/functional/RemoteWebElementTest.php | 25 ++++++++++++++++++++++-
 tests/functional/web/index.html           |  7 ++++++-
 5 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a765afa00..6e62cdcf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- `RemoteWebElement::getDomProperty()` method to read JavaScript properties of an element (like the value of `innerHTML` etc.) in W3C mode.
+
 ### Changed
 - Allow installation of Symfony 6 components.
 
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 2554848a0..216044279 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -3,6 +3,7 @@
 namespace Facebook\WebDriver\Remote;
 
 use Facebook\WebDriver\Exception\ElementNotInteractableException;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
@@ -132,6 +133,8 @@ public function findElements(WebDriverBy $by)
 
     /**
      * Get the value of the given attribute of the element.
+     * Attribute is meant what is declared in the HTML markup of the element.
+     * To read a value of a IDL "JavaScript" property (like `innerHTML`), use `getDomProperty()` method.
      *
      * @param string $attribute_name The name of the attribute.
      * @return string|null The value of the attribute.
@@ -162,6 +165,28 @@ public function getAttribute($attribute_name)
         return $this->executor->execute(DriverCommand::GET_ELEMENT_ATTRIBUTE, $params);
     }
 
+    /**
+     * Gets the value of a IDL JavaScript property of this element (for example `innerHTML`, `tagName` etc.).
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Glossary/IDL
+     * @see https://developer.mozilla.org/en-US/docs/Web/API/Element#properties
+     * @param string $propertyName
+     * @return string|null The property's current value or null if the value is not set or the property does not exist.
+     */
+    public function getDomProperty($propertyName)
+    {
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('This method is only supported in W3C mode');
+        }
+
+        $params = [
+            ':name' => $propertyName,
+            ':id' => $this->id,
+        ];
+
+        return $this->executor->execute(DriverCommand::GET_ELEMENT_PROPERTY, $params);
+    }
+
     /**
      * Get the value of a given CSS property.
      *
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 538e0a8e5..3409dde18 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -22,13 +22,26 @@ public function clear();
     public function click();
 
     /**
-     * Get the value of a the given attribute of the element.
+     * Get the value of the given attribute of the element.
+     * Attribute is meant what is declared in the HTML markup of the element.
+     * To read a value of a IDL "JavaScript" property (like `innerHTML`), use `getDomProperty()` method.
      *
      * @param string $attribute_name The name of the attribute.
      * @return string|null The value of the attribute.
      */
     public function getAttribute($attribute_name);
 
+    /*
+     * Gets the value of a IDL JavaScript property of this element (for example `innerHTML`, `tagName` etc.).
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Glossary/IDL
+     * @see https://developer.mozilla.org/en-US/docs/Web/API/Element#properties
+     * @param string $propertyName
+     * @return string|null The property's current value or null if the value is not set or the property does not exist.
+     * @todo Add in next major release (BC)
+     */
+    // public function getDomProperty($propertyName);
+
     /**
      * Get the value of a given CSS property.
      *
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 20a9a3882..086e905ae 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -42,6 +42,29 @@ public function testShouldGetAttributeValue()
         $this->assertSame('note', $element->getAttribute('role'));
         $this->assertSame('height: 5em; border: 1px solid black;', $element->getAttribute('style'));
         $this->assertSame('text-simple', $element->getAttribute('id'));
+        $this->assertNull($element->getAttribute('notExisting'));
+    }
+
+    /**
+     * @covers ::getDomProperty
+     */
+    public function testShouldGetDomPropertyValue()
+    {
+        self::skipForJsonWireProtocol();
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $element = $this->driver->findElement(WebDriverBy::id('div-with-html'));
+
+        $this->assertStringContainsString(
+            ' <p>This <code>div</code> has some more <strong>html</strong> inside.</p>',
+            $element->getDomProperty('innerHTML')
+        );
+        $this->assertSame('foo bar', $element->getDomProperty('className')); // IDL property
+        $this->assertSame('foo bar', $element->getAttribute('class')); // HTML attribute should be the same
+        $this->assertSame('DIV', $element->getDomProperty('tagName'));
+        $this->assertSame(2, $element->getDomProperty('childElementCount'));
+        $this->assertNull($element->getDomProperty('notExistingProperty'));
     }
 
     /**
@@ -56,7 +79,7 @@ public function testShouldGetLocation()
         $elementLocation = $element->getLocation();
         $this->assertInstanceOf(WebDriverPoint::class, $elementLocation);
         $this->assertSame(33, $elementLocation->getX());
-        $this->assertSame(500, $elementLocation->getY());
+        $this->assertSame(550, $elementLocation->getY());
     }
 
     /**
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 6107856ed..f94c7bc53 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -60,7 +60,12 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     stripped
 </p>
 
-<div id="element-with-location" style="position: absolute; top: 500px; left: 33px; width: 333px; height: 66px;">
+<div id="div-with-html" style="font-size: inherit;" title="Title" class="foo bar">
+    <p>This <code>div</code> has some more <strong>html</strong> inside.</p>
+    <hr />
+</div>
+
+<div id="element-with-location" style="position: absolute; top: 550px; left: 33px; width: 333px; height: 66px;">
     Foo
 </div>
 

From 94db34ff5a1b1519ee8427b54002134b4232cb21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Oct 2021 13:47:19 +0200
Subject: [PATCH 660/784] Do not use unsafe static when accessing private
 propery

---
 lib/Remote/DesiredCapabilities.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 5b726406d..a7bde312e 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -30,7 +30,7 @@ public function __construct(array $capabilities = [])
 
     public static function createFromW3cCapabilities(array $capabilities = [])
     {
-        $w3cToOss = array_flip(static::$ossToW3c);
+        $w3cToOss = array_flip(self::$ossToW3c);
 
         foreach ($w3cToOss as $w3cCapability => $ossCapability) {
             // Copy W3C capabilities to OSS ones
@@ -229,16 +229,16 @@ public function toW3cCompatibleArray()
             }
 
             // Convert capabilities with changed name
-            if (array_key_exists($capabilityKey, static::$ossToW3c)) {
+            if (array_key_exists($capabilityKey, self::$ossToW3c)) {
                 if ($capabilityKey === WebDriverCapabilityType::PLATFORM) {
-                    $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
+                    $w3cCapabilities[self::$ossToW3c[$capabilityKey]] = mb_strtolower($capabilityValue);
 
                     // Remove platformName if it is set to "any"
-                    if ($w3cCapabilities[static::$ossToW3c[$capabilityKey]] === 'any') {
-                        unset($w3cCapabilities[static::$ossToW3c[$capabilityKey]]);
+                    if ($w3cCapabilities[self::$ossToW3c[$capabilityKey]] === 'any') {
+                        unset($w3cCapabilities[self::$ossToW3c[$capabilityKey]]);
                     }
                 } else {
-                    $w3cCapabilities[static::$ossToW3c[$capabilityKey]] = $capabilityValue;
+                    $w3cCapabilities[self::$ossToW3c[$capabilityKey]] = $capabilityValue;
                 }
             }
 

From 8ffa927b270e932449e8015abf4d38bb0eff24b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 11 Oct 2021 17:05:03 +0200
Subject: [PATCH 661/784] Add newSession constructor to create new session
 command without typehint violation

---
 CHANGELOG.md                               |  1 +
 lib/Chrome/ChromeDriver.php                |  9 ++-------
 lib/Firefox/FirefoxDriver.php              |  5 +----
 lib/Remote/RemoteWebDriver.php             |  6 +-----
 lib/Remote/WebDriverCommand.php            | 14 ++++++++++++--
 tests/unit/Remote/WebDriverCommandTest.php |  9 +++++++++
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e62cdcf0..f36782390 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 ### Added
 - `RemoteWebElement::getDomProperty()` method to read JavaScript properties of an element (like the value of `innerHTML` etc.) in W3C mode.
+- `WebDriverCommand::newSession()` constructor to create new session command without violating typehints.
 
 ### Changed
 - Allow installation of Symfony 6 components.
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index a8feac7b8..1d840eaed 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -4,7 +4,6 @@
 
 use Facebook\WebDriver\Local\LocalWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
-use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
 
@@ -48,9 +47,7 @@ public static function startUsingDriverService(
         }
 
         $executor = new DriverCommandExecutor($service);
-        $newSessionCommand = new WebDriverCommand(
-            null,
-            DriverCommand::NEW_SESSION,
+        $newSessionCommand = WebDriverCommand::newSession(
             [
                 'capabilities' => [
                     'firstMatch' => [(object) $capabilities->toW3cCompatibleArray()],
@@ -76,9 +73,7 @@ public static function startUsingDriverService(
      */
     public function startSession(DesiredCapabilities $desired_capabilities)
     {
-        $command = new WebDriverCommand(
-            null,
-            DriverCommand::NEW_SESSION,
+        $command = WebDriverCommand::newSession(
             [
                 'capabilities' => [
                     'firstMatch' => [(object) $desired_capabilities->toW3cCompatibleArray()],
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 1d525da85..34dd13de2 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -4,7 +4,6 @@
 
 use Facebook\WebDriver\Local\LocalWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
-use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
 use Facebook\WebDriver\Remote\WebDriverCommand;
 
@@ -44,9 +43,7 @@ public static function startUsingDriverService(
         }
 
         $executor = new DriverCommandExecutor($service);
-        $newSessionCommand = new WebDriverCommand(
-            null,
-            DriverCommand::NEW_SESSION,
+        $newSessionCommand = WebDriverCommand::newSession(
             [
                 'capabilities' => [
                     'firstMatch' => [(object) $capabilities->toW3cCompatibleArray()],
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index cb162265d..9bc3c7a89 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -126,11 +126,7 @@ public static function create(
 
         $parameters['desiredCapabilities'] = (object) $desired_capabilities->toArray();
 
-        $command = new WebDriverCommand(
-            null,
-            DriverCommand::NEW_SESSION,
-            $parameters
-        );
+        $command = WebDriverCommand::newSession($parameters);
 
         $response = $executor->execute($command);
 
diff --git a/lib/Remote/WebDriverCommand.php b/lib/Remote/WebDriverCommand.php
index e21fbdaae..27f21b605 100644
--- a/lib/Remote/WebDriverCommand.php
+++ b/lib/Remote/WebDriverCommand.php
@@ -4,7 +4,7 @@
 
 class WebDriverCommand
 {
-    /** @var string */
+    /** @var string|null */
     protected $sessionID;
     /** @var string */
     protected $name;
@@ -16,6 +16,7 @@ class WebDriverCommand
      * @param string $name Constant from DriverCommand
      * @param array $parameters
      * @todo In 2.0 force parameters to be an array, then remove is_array() checks in HttpCommandExecutor
+     * @todo In 2.0 make constructor private. Use by default static `::create()` with sessionID type string.
      */
     public function __construct($session_id, $name, $parameters)
     {
@@ -24,6 +25,15 @@ public function __construct($session_id, $name, $parameters)
         $this->parameters = $parameters;
     }
 
+    /**
+     * @return self
+     */
+    public static function newSession(array $parameters)
+    {
+        // TODO: In 2.0 call empty constructor and assign properties directly.
+        return new self(null, DriverCommand::NEW_SESSION, $parameters);
+    }
+
     /**
      * @return string
      */
@@ -33,7 +43,7 @@ public function getName()
     }
 
     /**
-     * @return string
+     * @return string|null Could be null for newSession command
      */
     public function getSessionID()
     {
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 0bf6efb20..8ba7abf33 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -14,4 +14,13 @@ public function testShouldSetOptionsUsingConstructor()
         $this->assertSame('bar-baz-name', $command->getName());
         $this->assertSame(['foo' => 'bar'], $command->getParameters());
     }
+
+    public function testShouldCreateNewSessionCommand()
+    {
+        $command = WebDriverCommand::newSession(['bar' => 'baz']);
+
+        $this->assertNull($command->getSessionID());
+        $this->assertSame('newSession', $command->getName());
+        $this->assertSame(['bar' => 'baz'], $command->getParameters());
+    }
 }

From e55e6ab0dc42a48a98b04e5229d319482c6a9908 Mon Sep 17 00:00:00 2001
From: Kyle <kylekatarnls@users.noreply.github.com>
Date: Thu, 14 Oct 2021 11:28:08 +0200
Subject: [PATCH 662/784] Fix PHP 8.1 compatibility (#935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix PHP 8.1 compatibility

Co-authored-by: Ondřej Machulda <ondrej.machulda@gmail.com>
---
 lib/Chrome/ChromeOptions.php       | 2 ++
 lib/Firefox/FirefoxOptions.php     | 3 +++
 lib/Remote/HttpCommandExecutor.php | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 6599197b6..7c81955d8 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -4,6 +4,7 @@
 
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 /**
  * The class manages the capabilities in ChromeDriver.
@@ -43,6 +44,7 @@ class ChromeOptions implements JsonSerializable
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index fc16fdb75..06e61c3d5 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -2,6 +2,8 @@
 
 namespace Facebook\WebDriver\Firefox;
 
+use ReturnTypeWillChange;
+
 /**
  * Class to manage Firefox-specific capabilities
  *
@@ -101,6 +103,7 @@ public function toArray()
         return $array;
     }
 
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return new \ArrayObject($this->toArray());
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index ea625c3c6..2d510a038 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -268,7 +268,8 @@ public function execute(WebDriverCommand $command)
         $http_method = $http_options['method'];
         $url = $http_options['url'];
 
-        $url = str_replace(':sessionId', $command->getSessionID(), $url);
+        $sessionID = $command->getSessionID();
+        $url = str_replace(':sessionId', $sessionID === null ? '' : $sessionID, $url);
         $params = $command->getParameters();
         foreach ($params as $name => $value) {
             if ($name[0] === ':') {

From 0769f3cacbd0de57dc6c27c2d8167d04502bfecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 14 Oct 2021 11:29:23 +0200
Subject: [PATCH 663/784] Update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f36782390..4254aeb41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Allow installation of Symfony 6 components.
 
+### Fixed
+- PHP 8.1 compatibility.
+
 ## 1.11.1 - 2021-05-21
 ### Fixed
 - `RemoteWebElement::getLocationOnScreenOnceScrolledIntoView()` was missing polyfill implementation for W3C mode and not working in eg. Safari.

From 99d4856ed7dffcdf6a52eccd6551e83d8d557ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 14 Oct 2021 11:30:02 +0200
Subject: [PATCH 664/784] Release version 1.12.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4254aeb41..0d66e7cf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## 1.12.0 - 2021-10-14
 ### Added
 - `RemoteWebElement::getDomProperty()` method to read JavaScript properties of an element (like the value of `innerHTML` etc.) in W3C mode.
 - `WebDriverCommand::newSession()` constructor to create new session command without violating typehints.

From c16f8ee103da236d93d9bed406de49b424c064c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 8 Nov 2021 17:50:46 +0100
Subject: [PATCH 665/784] Fix phpdoc for getAttribute and getDomProperty to
 match the specs

---
 lib/Remote/RemoteWebElement.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 216044279..9a4515083 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -137,7 +137,8 @@ public function findElements(WebDriverBy $by)
      * To read a value of a IDL "JavaScript" property (like `innerHTML`), use `getDomProperty()` method.
      *
      * @param string $attribute_name The name of the attribute.
-     * @return string|null The value of the attribute.
+     * @return string|true|null The value of the attribute. If this is boolean attribute, return true if the element
+     *      has it, otherwise return null.
      */
     public function getAttribute($attribute_name)
     {
@@ -171,7 +172,7 @@ public function getAttribute($attribute_name)
      * @see https://developer.mozilla.org/en-US/docs/Glossary/IDL
      * @see https://developer.mozilla.org/en-US/docs/Web/API/Element#properties
      * @param string $propertyName
-     * @return string|null The property's current value or null if the value is not set or the property does not exist.
+     * @return mixed|null The property's current value or null if the value is not set or the property does not exist.
      */
     public function getDomProperty($propertyName)
     {

From ac1b5fab5691f5231b49cabacf2528d91e94fd36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 11 Dec 2021 11:40:57 +0100
Subject: [PATCH 666/784] Normalize composer.json to new schema

---
 composer.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 9eb616cf2..2b72e5bad 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
   "name": "php-webdriver/webdriver",
-  "type": "library",
   "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
+  "license": "MIT",
+  "type": "library",
   "keywords": [
     "webdriver",
     "selenium",
@@ -10,7 +11,6 @@
     "chromedriver"
   ],
   "homepage": "https://github.com/php-webdriver/php-webdriver",
-  "license": "MIT",
   "require": {
     "php": "^5.6 || ~7.0 || ^8.0",
     "ext-curl": "*",
@@ -19,9 +19,6 @@
     "symfony/polyfill-mbstring": "^1.12",
     "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0"
   },
-  "replace": {
-    "facebook/webdriver": "*"
-  },
   "require-dev": {
     "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
     "php-coveralls/php-coveralls": "^2.4",
@@ -31,12 +28,13 @@
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0"
   },
+  "replace": {
+    "facebook/webdriver": "*"
+  },
   "suggest": {
     "ext-SimpleXML": "For Firefox profile creation"
   },
-  "config": {
-    "sort-packages": true
-  },
+  "minimum-stability": "dev",
   "autoload": {
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"
@@ -56,7 +54,9 @@
       "tests/functional/"
     ]
   },
-  "minimum-stability": "dev",
+  "config": {
+    "sort-packages": true
+  },
   "scripts": {
     "post-install-cmd": [
       "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction"

From 0d4bc565c6f03369ff8b54772a8be6beb8befbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 5 Jan 2022 13:28:31 +0100
Subject: [PATCH 667/784] Docs: Extend findElement(s) documentation to better
 explain XPath behavior (#956)

---
 lib/Remote/RemoteWebElement.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 9a4515083..e0503698e 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -89,6 +89,10 @@ public function click()
     /**
      * Find the first WebDriverElement within this element using the given mechanism.
      *
+     * When using xpath be aware that webdriver follows standard conventions: a search prefixed with "//" will
+     * search the entire document from the root, not just the children (relative context) of this current node.
+     * Use ".//" to limit your search to the children of this element.
+     *
      * @param WebDriverBy $by
      * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
@@ -109,6 +113,10 @@ public function findElement(WebDriverBy $by)
     /**
      * Find all WebDriverElements within this element using the given mechanism.
      *
+     * When using xpath be aware that webdriver follows standard conventions: a search prefixed with "//" will
+     * search the entire document from the root, not just the children (relative context) of this current node.
+     * Use ".//" to limit your search to the children of this element.
+     *
      * @param WebDriverBy $by
      * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
      *    array if nothing matches

From 289d043ae62eed17cefa3292abd4da7cb938ba7a Mon Sep 17 00:00:00 2001
From: Johnny van de Laar <j.vandelaar@pararius.nl>
Date: Thu, 6 Jan 2022 11:02:33 +0100
Subject: [PATCH 668/784] Fix PHP 8.1 deprecations in the Cookie class

---
 lib/Cookie.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 1005bd0dc..9570f5d6d 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -207,16 +207,19 @@ public function toArray()
         return $cookie;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->cookie[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->offsetExists($offset) ? $this->cookie[$offset] : null;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($value === null) {

From 25ba0d63a99496095ecb6560b110fb330824e387 Mon Sep 17 00:00:00 2001
From: Johnny van de Laar <j.vandelaar@pararius.nl>
Date: Thu, 6 Jan 2022 11:13:17 +0100
Subject: [PATCH 669/784] Also offsetUnset

---
 lib/Cookie.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 9570f5d6d..b02e0c58f 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -229,6 +229,7 @@ public function offsetSet($offset, $value)
         }
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->cookie[$offset]);

From 3d84328de3d7c87edeaf3b5d8213b9c119675bef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 29 Mar 2022 15:59:29 +0200
Subject: [PATCH 670/784] Allow composer-normalize plugin

---
 composer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 2b72e5bad..90f2d0f28 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,9 @@
     ]
   },
   "config": {
+    "allow-plugins": {
+      "ergebnis/composer-normalize": true
+    },
     "sort-packages": true
   },
   "scripts": {

From 20b831f76253f492bc5edd11babbdb4e282f0c05 Mon Sep 17 00:00:00 2001
From: tomsykes <tom@tomarq.co.uk>
Date: Wed, 12 Jan 2022 10:20:42 +0000
Subject: [PATCH 671/784] Add PHPDoc return types to ArrayAccess methods, to
 suppress deprecation warnings in Symfony 5.4/PHP7.4

---
 lib/Cookie.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index b02e0c58f..1a31c7df8 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -207,18 +207,27 @@ public function toArray()
         return $cookie;
     }
 
+    /**
+     * @return bool
+     */
     #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->cookie[$offset]);
     }
 
+    /**
+     * @return mixed
+     */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->offsetExists($offset) ? $this->cookie[$offset] : null;
     }
 
+    /**
+     * @return void
+     */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
@@ -229,6 +238,9 @@ public function offsetSet($offset, $value)
         }
     }
 
+    /**
+     * @return void
+     */
     #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {

From 301923820e757cc867c0bfc18e79f09e3c0cbb0f Mon Sep 17 00:00:00 2001
From: tomsykes <tom@tomarq.co.uk>
Date: Wed, 12 Jan 2022 10:32:28 +0000
Subject: [PATCH 672/784] Adding param annotations

Automated checks failed previously due to lack of param annotations
---
 lib/Cookie.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 1a31c7df8..77b04687c 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -208,6 +208,7 @@ public function toArray()
     }
 
     /**
+     * @param mixed $offset
      * @return bool
      */
     #[\ReturnTypeWillChange]
@@ -217,6 +218,7 @@ public function offsetExists($offset)
     }
 
     /**
+     * @param mixed $offset
      * @return mixed
      */
     #[\ReturnTypeWillChange]
@@ -226,6 +228,8 @@ public function offsetGet($offset)
     }
 
     /**
+     * @param mixed $offset
+     * @param mixed $value
      * @return void
      */
     #[\ReturnTypeWillChange]
@@ -239,6 +243,7 @@ public function offsetSet($offset, $value)
     }
 
     /**
+     * @param mixed $offset
      * @return void
      */
     #[\ReturnTypeWillChange]

From 1ddc140bd636080979cc28021d0a23fddcafba7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 29 Mar 2022 15:54:00 +0200
Subject: [PATCH 673/784] Disable phpdoc_no_empty_return fixer to allow forward
 compatibility with PHP 8.1

---
 .php-cs-fixer.dist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 5ffcc38ed..051fb6579 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -82,7 +82,7 @@
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_indent' => true,
         'phpdoc_no_access' => true,
-        'phpdoc_no_empty_return' => true,
+        // 'phpdoc_no_empty_return' => true, // disabled to allow forward compatibility with PHP 8.1
         'phpdoc_no_package' => true,
         'phpdoc_order_by_value' => ['annotations' => ['covers', 'group', 'throws']],
         'phpdoc_order' => true,

From 6fb804b74e3ec74816be4d5111f0591824026205 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Fri, 16 Apr 2021 15:22:42 +0200
Subject: [PATCH 674/784] use Doctum to re-build API docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Ondřej Machulda <ondrej.machulda@gmail.com>
---
 .github/workflows/docs-lint.yml    | 23 ++++++++++++++
 .github/workflows/docs-publish.yml | 35 +++++++++++++++++++++
 .gitignore                         |  1 +
 scripts/docs-template.html         |  7 +++++
 scripts/doctum.php                 | 30 ++++++++++++++++++
 scripts/update-built-docs.sh       | 50 ++++++++++++++++++++++++++++++
 6 files changed, 146 insertions(+)
 create mode 100644 .github/workflows/docs-lint.yml
 create mode 100755 .github/workflows/docs-publish.yml
 create mode 100644 scripts/docs-template.html
 create mode 100644 scripts/doctum.php
 create mode 100755 scripts/update-built-docs.sh

diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml
new file mode 100644
index 000000000..56667ce70
--- /dev/null
+++ b/.github/workflows/docs-lint.yml
@@ -0,0 +1,23 @@
+name: Lint PHP documentation
+
+on:
+  push:
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  lint-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Lint PHP documentation
+        uses: sudo-bot/action-doctum@v5
+        with:
+          config-file: scripts/doctum.php
+          method: 'parse'
+          cli-args: '--output-format=github --no-ansi --no-progress -v --ignore-parse-errors'
diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
new file mode 100755
index 000000000..35941e2dd
--- /dev/null
+++ b/.github/workflows/docs-publish.yml
@@ -0,0 +1,35 @@
+name: Publish API documentation
+
+on:
+  repository_dispatch:
+    types: [ run-build-api-docs ]
+  workflow_dispatch:
+  schedule:
+    - cron: "00 12 * * *"
+
+jobs:
+  publish-pages:
+    environment:
+      name: API documentation
+      url: https://php-webdriver.github.io/php-webdriver/
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_KEY_DEPLOY }}
+
+      - name: Build PHP documentation
+        uses: sudo-bot/action-doctum@v5
+        with:
+          config-file: scripts/doctum.php
+          method: 'update'
+          cli-args: '--output-format=github --no-ansi --no-progress -v --ignore-parse-errors'
+
+      - name: Set commit author
+        run: |
+          git config user.name "Automated"
+          git config user.email "actions@users.noreply.github.com"
+      - name: Push the changes
+        run: ./scripts/update-built-docs.sh
diff --git a/.gitignore b/.gitignore
index 697c5cce5..a9384110d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ tools/php-cs-fixer/vendor
 .phpunit.result.cache
 phpunit.xml
 logs/
+build/
 
 # generic files to ignore
 *.lock
diff --git a/scripts/docs-template.html b/scripts/docs-template.html
new file mode 100644
index 000000000..4814f5ec5
--- /dev/null
+++ b/scripts/docs-template.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<html>
+
+    <meta http-equiv="refresh" content="0;URL=./latest">
+    Taking you to the <a href="http://github.com/latest">latest</a> documentation.
+
+</html>
\ No newline at end of file
diff --git a/scripts/doctum.php b/scripts/doctum.php
new file mode 100644
index 000000000..9cb2cc784
--- /dev/null
+++ b/scripts/doctum.php
@@ -0,0 +1,30 @@
+<?php
+use Doctum\RemoteRepository\GitHubRemoteRepository;
+use Doctum\Doctum;
+use Doctum\Version\GitVersionCollection;
+use Symfony\Component\Finder\Finder;
+
+$root = realpath(__DIR__ . '/../') . DIRECTORY_SEPARATOR;
+$srcRoot = $root;
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->in($srcRoot . 'lib');
+
+$versions = GitVersionCollection::create($srcRoot)
+    ->addFromTags('1.*') // only latest minor version
+    ->addFromTags('0.6.0')
+    ->add('main', 'main branch')
+;
+
+return new Doctum($iterator, [
+    'title' => 'php-webdriver API',
+    'theme' => 'default',
+    'build_dir' => $root . '/build/dist/%version%/',
+    'cache_dir' => $root . '/build/cache/%version%/',
+    'include_parent_data' => true,
+    'remote_repository'    => new GitHubRemoteRepository('php-webdriver/php-webdriver', $srcRoot),
+    'versions' => $versions,
+    'base_url' => 'https://php-webdriver.github.io/php-webdriver/%version/'
+]);
diff --git a/scripts/update-built-docs.sh b/scripts/update-built-docs.sh
new file mode 100755
index 000000000..76646bed5
--- /dev/null
+++ b/scripts/update-built-docs.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+set -e
+
+cleanup() {
+    git ls-files ./ | xargs -r -n 1 rm
+    rm -rfd ./*
+}
+
+copyToTemp() {
+    TEMP_DIR="$(mktemp -d --suffix=_doctum-build-php-webdriver)"
+    cp -rp build/dist/* "${TEMP_DIR}"
+    cp ./scripts/docs-template.html "${TEMP_DIR}/index.html"
+}
+
+emptyAndRemoveTemp() {
+    mv "${TEMP_DIR}"/* ./
+    # Create symlink for main to latest
+    ln -s -r ./main ./latest
+    # Create symlink for main to master
+    ln -s -r ./main ./master
+    # Create symlink for main to community
+    ln -s -r ./main ./community
+    rm -rf "${TEMP_DIR}"
+}
+
+commitAndPushChanges() {
+    # Push the changes, only if there is changes
+    git add -A
+    git diff-index --quiet HEAD || git commit -m "Api documentations update ($(date --rfc-3339=seconds --utc))" -m "#apidocs" && if [ -z "${SKIP_PUSH}" ]; then git push; fi
+}
+
+if [ ! -d ./build/dist ]; then
+    echo 'Missing built docs'
+    exit 1
+fi
+
+# Remove cache dir, do not upload it
+rm -rf ./build/cache
+
+copyToTemp
+# Remove build dir, do not upload it
+rm -rf ./build
+
+git checkout gh-pages
+
+cleanup
+emptyAndRemoveTemp
+commitAndPushChanges
+
+git checkout - > /dev/null

From de0b3f0714a0a48f48b3c02c34e075dc27141105 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Mon, 2 May 2022 13:35:41 +0200
Subject: [PATCH 675/784] Bump actions/checkout to v3

---
 .github/workflows/docs-publish.yml | 2 +-
 .github/workflows/sauce-labs.yaml  | 2 +-
 .github/workflows/tests.yaml       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
index 35941e2dd..02a50534b 100755
--- a/.github/workflows/docs-publish.yml
+++ b/.github/workflows/docs-publish.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_KEY_DEPLOY }}
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 427afc6fd..878743ef1 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -26,7 +26,7 @@ jobs:
 
     name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 45e5761e9..ccf4bd0c0 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -11,7 +11,7 @@ jobs:
     name: "Code style and static analysis"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -32,7 +32,7 @@ jobs:
     name: "Markdown link check"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-verbose-mode: 'yes'
@@ -50,7 +50,7 @@ jobs:
           - { php-version: '8.1', dependencies: '--ignore-platform-req=php' }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -101,7 +101,7 @@ jobs:
     name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }}, W3C: ${{ matrix.w3c }})"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From f5d8821d33d0ff791fc4a238d1551ad830f97053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 2 May 2022 14:18:32 +0200
Subject: [PATCH 676/784] Update changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d66e7cf6..47445f7a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+### Fixed
+- Improper PHP documentation for `getAttribute()` and `getDomProperty()`.
+- Unsafe use of `static::` when accessing private property in `DesiredCapabilities`.
+- PHP 8.1 deprecations in the `Cookie` class.
+
+### Changed
+- Docs: Extend `findElement()`/`findElements()` method documentation to better explain XPath behavior.
+- Add `@return` and `@param` type annotations to Cookie class to avoid deprecations in PHP 8.1.
+
 ## 1.12.0 - 2021-10-14
 ### Added
 - `RemoteWebElement::getDomProperty()` method to read JavaScript properties of an element (like the value of `innerHTML` etc.) in W3C mode.

From 3cca205d3d0d72eb0e191488fac76cfed99a17f4 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 3 May 2022 11:36:28 +0200
Subject: [PATCH 677/784] Fix #977 - broken open-search URL

---
 scripts/doctum.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/doctum.php b/scripts/doctum.php
index 9cb2cc784..08e722917 100644
--- a/scripts/doctum.php
+++ b/scripts/doctum.php
@@ -24,7 +24,7 @@
     'build_dir' => $root . '/build/dist/%version%/',
     'cache_dir' => $root . '/build/cache/%version%/',
     'include_parent_data' => true,
-    'remote_repository'    => new GitHubRemoteRepository('php-webdriver/php-webdriver', $srcRoot),
+    'remote_repository' => new GitHubRemoteRepository('php-webdriver/php-webdriver', $srcRoot),
     'versions' => $versions,
-    'base_url' => 'https://php-webdriver.github.io/php-webdriver/%version/'
+    'base_url' => 'https://php-webdriver.github.io/php-webdriver/%version%/'
 ]);

From b27ddf458d273c7d4602106fcaf978aa0b7fe15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 3 May 2022 14:08:51 +0200
Subject: [PATCH 678/784] Release version 1.12.1

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47445f7a7..f90ff9039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.12.1 - 2022-05-03
 ### Fixed
 - Improper PHP documentation for `getAttribute()` and `getDomProperty()`.
 - Unsafe use of `static::` when accessing private property in `DesiredCapabilities`.

From eed18d3ce1cce6c1833dacced516b43bef75e916 Mon Sep 17 00:00:00 2001
From: Nikhil <6836536+qwertynik@users.noreply.github.com>
Date: Tue, 28 Jun 2022 19:20:07 +0530
Subject: [PATCH 679/784] Removing link to deprecated site

The linked site for Chromedriver will soon be deprecated. Adding link to the latest site.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 689a497ab..2eb411645 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ This could be Selenium standalone server, but for local development, you can sen
 
 📙 Below you will find a simple example. Make sure to read our wiki for [more information on Chrome/Chromedriver](https://github.com/php-webdriver/php-webdriver/wiki/Chrome).
 
-Install the latest Chrome and [Chromedriver](https://sites.google.com/a/chromium.org/chromedriver/downloads).
+Install the latest Chrome and [Chromedriver](https://sites.google.com/chromium.org/driver/downloads).
 Make sure to have a compatible version of Chromedriver and Chrome!
 
 Run `chromedriver` binary, you can pass `port` argument, so that it listens on port 4444:

From e31d1f792ec71e777de1bee71e1260df2108d078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 23 Aug 2022 18:07:24 +0200
Subject: [PATCH 680/784] Replace no-response probot with
 'lee-dohm/no-response' action

---
 .github/no-response.yml            | 17 -----------------
 .github/workflows/no-response.yaml | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 17 deletions(-)
 delete mode 100644 .github/no-response.yml
 create mode 100644 .github/workflows/no-response.yaml

diff --git a/.github/no-response.yml b/.github/no-response.yml
deleted file mode 100644
index 320baf22f..000000000
--- a/.github/no-response.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 14
-
-# Label requiring a response
-responseRequiredLabel: "waiting for reaction"
-
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action.
-
-  If the original issue author adds comment with more information,
-  this issue will be automatically reopened and we can investigate further.
diff --git a/.github/workflows/no-response.yaml b/.github/workflows/no-response.yaml
new file mode 100644
index 000000000..2970c7d72
--- /dev/null
+++ b/.github/workflows/no-response.yaml
@@ -0,0 +1,26 @@
+name: No Response
+
+# Both `issue_comment` and `scheduled` event types are required for this Action to work properly.
+on:
+  issue_comment:
+    types: [created]
+  schedule:
+    - cron: '33 * * * *' # every hour at :33
+
+jobs:
+  noResponse:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: lee-dohm/no-response@v0.5.0
+        with:
+          token: ${{ github.token }}
+          daysUntilClose: 14
+          responseRequiredLabel: 'waiting for reaction'
+          closeComment: >
+            This issue has been automatically closed because there has been no response
+            to our request for more information from the original author. With only the
+            information that is currently in the issue, we don't have enough information
+            to take action.
+
+            If the original issue author adds comment with more information,
+            this issue will be automatically reopened and we can investigate further.

From 518a8822432a8440864c40154a5c5fd44a38e9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 23 Aug 2022 13:28:31 +0200
Subject: [PATCH 681/784] Mark getAllSessions() deprecated in W3C WebDriver

---
 lib/Remote/RemoteWebDriver.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 9bc3c7a89..fc068a8f3 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -555,6 +555,7 @@ public function getCapabilities()
     /**
      * Returns a list of the currently active sessions.
      *
+     * @deprecated Removed in W3C WebDriver.
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param int $timeout_in_ms
      * @return array

From c51f35d9c6681e890a6d0a05b26cfc463bbc990c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 24 Aug 2022 17:11:09 +0200
Subject: [PATCH 682/784] Separate takeScreenshot logic to better handle
 errors, DRY and to fix PHP 8.1 deprecations

---
 CHANGELOG.md                                |   2 +
 lib/Remote/RemoteWebDriver.php              |  15 +--
 lib/Remote/RemoteWebElement.php             |  20 +---
 lib/Support/ScreenshotHelper.php            |  77 +++++++++++++++
 tests/functional/RemoteWebDriverTest.php    |   4 +-
 tests/functional/RemoteWebElementTest.php   |   2 +-
 tests/unit/Support/ScreenshotHelperTest.php | 103 ++++++++++++++++++++
 7 files changed, 190 insertions(+), 33 deletions(-)
 create mode 100644 lib/Support/ScreenshotHelper.php
 create mode 100644 tests/unit/Support/ScreenshotHelperTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f90ff9039..71c0f3904 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
 
 ## 1.12.1 - 2022-05-03
 ### Fixed
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index fc068a8f3..f45ae8da1 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -4,6 +4,7 @@
 
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\Support\ScreenshotHelper;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverCapabilities;
@@ -364,19 +365,7 @@ public function executeAsyncScript($script, array $arguments = [])
      */
     public function takeScreenshot($save_as = null)
     {
-        $screenshot = base64_decode($this->execute(DriverCommand::SCREENSHOT), true);
-
-        if ($save_as !== null) {
-            $directoryPath = dirname($save_as);
-
-            if (!file_exists($directoryPath)) {
-                mkdir($directoryPath, 0777, true);
-            }
-
-            file_put_contents($save_as, $screenshot);
-        }
-
-        return $screenshot;
+        return (new ScreenshotHelper($this->getExecuteMethod()))->takePageScreenshot($save_as);
     }
 
     /**
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index e0503698e..add916934 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -7,6 +7,7 @@
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
+use Facebook\WebDriver\Support\ScreenshotHelper;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverDimension;
 use Facebook\WebDriver\WebDriverElement;
@@ -508,24 +509,7 @@ public function getID()
      */
     public function takeElementScreenshot($save_as = null)
     {
-        $screenshot = base64_decode(
-            $this->executor->execute(
-                DriverCommand::TAKE_ELEMENT_SCREENSHOT,
-                [':id' => $this->id]
-            ),
-            true
-        );
-
-        if ($save_as !== null) {
-            $directoryPath = dirname($save_as);
-            if (!file_exists($directoryPath)) {
-                mkdir($directoryPath, 0777, true);
-            }
-
-            file_put_contents($save_as, $screenshot);
-        }
-
-        return $screenshot;
+        return (new ScreenshotHelper($this->executor))->takeElementScreenshot($this->id, $save_as);
     }
 
     /**
diff --git a/lib/Support/ScreenshotHelper.php b/lib/Support/ScreenshotHelper.php
new file mode 100644
index 000000000..5fe18efd1
--- /dev/null
+++ b/lib/Support/ScreenshotHelper.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Facebook\WebDriver\Support;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\RemoteExecuteMethod;
+
+/**
+ * Helper class to handle taking, decoding and screenshots using WebDriver.
+ */
+class ScreenshotHelper
+{
+    /** @var RemoteExecuteMethod */
+    private $executor;
+
+    public function __construct(RemoteExecuteMethod $executor)
+    {
+        $this->executor = $executor;
+    }
+
+    /**
+     * @param string|null $saveAs
+     * @throws WebDriverException
+     * @return string
+     */
+    public function takePageScreenshot($saveAs = null)
+    {
+        $commandToExecute = [DriverCommand::SCREENSHOT];
+
+        return $this->takeScreenshot($commandToExecute, $saveAs);
+    }
+
+    public function takeElementScreenshot($elementId, $saveAs = null)
+    {
+        $commandToExecute = [DriverCommand::TAKE_ELEMENT_SCREENSHOT, [':id' => $elementId]];
+
+        return $this->takeScreenshot($commandToExecute, $saveAs);
+    }
+
+    private function takeScreenshot(array $commandToExecute, $saveAs = null)
+    {
+        $response = $this->executor->execute(...$commandToExecute);
+
+        if (!is_string($response)) {
+            throw new WebDriverException('Error taking screenshot, no data received from the remote end');
+        }
+
+        $screenshot = base64_decode($response, true);
+
+        if ($screenshot === false) {
+            throw new WebDriverException('Error decoding screenshot data');
+        }
+
+        if ($saveAs !== null) {
+            $this->saveScreenshotToPath($screenshot, $saveAs);
+        }
+
+        return $screenshot;
+    }
+
+    private function saveScreenshotToPath($screenshot, $path)
+    {
+        $this->createDirectoryIfNotExists(dirname($path));
+
+        file_put_contents($path, $screenshot);
+    }
+
+    private function createDirectoryIfNotExists($directoryPath)
+    {
+        if (!file_exists($directoryPath)) {
+            if (!mkdir($directoryPath, 0777, true) && !is_dir($directoryPath)) {
+                throw new WebDriverException(sprintf('Directory "%s" was not created', $directoryPath));
+            }
+        }
+    }
+}
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 25b01c40f..984c11978 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -250,6 +250,7 @@ public function testShouldExecuteScriptWithParamsAndReturnValue()
 
     /**
      * @covers ::takeScreenshot
+     * @covers \Facebook\WebDriver\Support\ScreenshotHelper
      */
     public function testShouldTakeScreenshot()
     {
@@ -269,6 +270,7 @@ public function testShouldTakeScreenshot()
 
     /**
      * @covers ::takeScreenshot
+     * @covers \Facebook\WebDriver\Support\ScreenshotHelper
      * @group exclude-safari
      *        Safari is returning different color profile and it does not have way to configure "force-color-profile"
      */
@@ -277,7 +279,7 @@ public function testShouldSaveScreenshotToFile()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        // Intentionally save screenshot to subdirectory to tests it is being created
+
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/selenium-screenshot.png';
 
         $this->driver->get($this->getTestPageUrl('index.html'));
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 086e905ae..bb6568f6d 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -455,6 +455,7 @@ public function testShouldFindMultipleChildElements()
 
     /**
      * @covers ::takeElementScreenshot
+     * @covers \Facebook\WebDriver\Support\ScreenshotHelper
      * @group exclude-saucelabs
      */
     public function testShouldTakeAndSaveElementScreenshot()
@@ -469,7 +470,6 @@ public function testShouldTakeAndSaveElementScreenshot()
         $isCi = (new CiDetector())->isCiDetected();
         $isSafari = getenv('BROWSER_NAME') === 'safari';
 
-        // Intentionally save screenshot to subdirectory to tests it is being created
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/element-screenshot.png';
 
         $this->driver->get($this->getTestPageUrl('index.html'));
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
new file mode 100644
index 000000000..edc3f661f
--- /dev/null
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Facebook\WebDriver\Support;
+
+use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Remote\DriverCommand;
+use Facebook\WebDriver\Remote\RemoteExecuteMethod;
+use PHPUnit\Framework\TestCase;
+
+class ScreenshotHelperTest extends TestCase
+{
+    const BLACK_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
+
+    public function testShouldSavePageScreenshotToSubdirectoryIfNotExists()
+    {
+        $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
+        $directoryPath = dirname($fullFilePath);
+        $this->assertDirectoryNotExists($directoryPath);
+
+        $executorMock = $this->createMock(RemoteExecuteMethod::class);
+        $executorMock->expects($this->once())
+            ->method('execute')
+            ->with($this->equalTo(DriverCommand::SCREENSHOT))
+            ->willReturn(self::BLACK_PIXEL);
+
+        $helper = new ScreenshotHelper($executorMock);
+        $output = $helper->takePageScreenshot($fullFilePath);
+
+        $this->assertSame(base64_decode(self::BLACK_PIXEL, true), $output);
+
+        $this->assertDirectoryExists($directoryPath);
+        $this->assertFileExists($fullFilePath);
+
+        unlink($fullFilePath);
+        rmdir($directoryPath);
+    }
+
+    public function testShouldOnlyReturnBase64IfDirectoryNotProvided()
+    {
+        $executorMock = $this->createMock(RemoteExecuteMethod::class);
+        $executorMock->expects($this->once())
+            ->method('execute')
+            ->with($this->equalTo(DriverCommand::SCREENSHOT))
+            ->willReturn(self::BLACK_PIXEL);
+
+        $helper = new ScreenshotHelper($executorMock);
+        $output = $helper->takePageScreenshot();
+
+        $this->assertSame(base64_decode(self::BLACK_PIXEL, true), $output);
+    }
+
+    public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists()
+    {
+        $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
+        $directoryPath = dirname($fullFilePath);
+        $this->assertDirectoryNotExists($directoryPath);
+        $elementId = 'foo-id';
+
+        $executorMock = $this->createMock(RemoteExecuteMethod::class);
+        $executorMock->expects($this->once())
+            ->method('execute')
+            ->with(DriverCommand::TAKE_ELEMENT_SCREENSHOT, [':id' => $elementId])
+            ->willReturn(self::BLACK_PIXEL);
+
+        $helper = new ScreenshotHelper($executorMock);
+        $output = $helper->takeElementScreenshot($elementId, $fullFilePath);
+
+        $this->assertSame(base64_decode(self::BLACK_PIXEL, true), $output);
+        $this->assertDirectoryExists($directoryPath);
+        $this->assertFileExists($fullFilePath);
+
+        unlink($fullFilePath);
+        rmdir($directoryPath);
+    }
+
+    /**
+     * @dataProvider provideInvalidData
+     * @param mixed $data
+     * @param string $expectedExceptionMessage
+     */
+    public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expectedExceptionMessage)
+    {
+        $executorMock = $this->createMock(RemoteExecuteMethod::class);
+        $executorMock->expects($this->once())
+            ->method('execute')
+            ->with($this->equalTo(DriverCommand::SCREENSHOT))
+            ->willReturn($data);
+
+        $helper = new ScreenshotHelper($executorMock);
+
+        $this->expectException(WebDriverException::class);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        $helper->takePageScreenshot();
+    }
+
+    public function provideInvalidData()
+    {
+        return [
+            'empty response' => [null, 'Error taking screenshot, no data received from the remote end'],
+            'not valid base64 response' => ['invalid%base64', 'Error decoding screenshot data'],
+        ];
+    }
+}

From 1dcffc8af811b9485c3df1c1e95577ae39ed2bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 27 Aug 2022 10:37:11 +0200
Subject: [PATCH 683/784] Run functional tests on Selenium server 4.3

---
 .github/workflows/tests.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ccf4bd0c0..2cea57936 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -84,7 +84,7 @@ jobs:
   functional-tests:
     runs-on: ${{ matrix.os }}
     env:
-      SELENIUM_SERVER_DOWNLOAD_URL: http://selenium-release.storage.googleapis.com/3.141/selenium-server-standalone-3.141.59.jar
+      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-server-4.3.0.jar
 
     strategy:
       fail-fast: false
@@ -116,13 +116,13 @@ jobs:
       - name: Start Selenium standalone server
         # If you want to run your Selenium WebDriver tests on GitHub actions, we recommend using service containers
         # with eg. selenium/standalone-chrome image. See https://docs.github.com/en/actions/guides/about-service-containers
-        # But for the purpose of testing this library itself, we need more control so we set everything up manually.
+        # But for the purpose of testing this library itself, we need more control, so we set everything up manually.
         if: ${{ matrix.selenium-server }}
         run: |
-          mkdir -p build
-          wget -q -t 3 -O build/selenium-server-standalone.jar $SELENIUM_SERVER_DOWNLOAD_URL
-          java -jar build/selenium-server-standalone.jar -version
-          xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum java -jar build/selenium-server-standalone.jar -log logs/selenium-server.log &
+          mkdir -p build logs
+          wget -q -t 3 -O build/selenium-server.jar $SELENIUM_SERVER_DOWNLOAD_URL
+          java -jar build/selenium-server.jar standalone --version
+          xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum java -jar build/selenium-server.jar standalone --log logs/selenium-server.log &
 
       - name: Start ChromeDriver
         if: ${{ !matrix.selenium-server && matrix.browser == 'chrome' }}

From 02a17b3843693cc1f994606aa0b7f8d8531ae540 Mon Sep 17 00:00:00 2001
From: Maxim Leontyev <leontyevmax@gmail.com>
Date: Thu, 16 Aug 2018 13:25:05 +0300
Subject: [PATCH 684/784] Add new firefox xpi extensions support

---
 lib/Firefox/FirefoxProfile.php                |  73 ++++++++-----
 .../functional/Firefox/FirefoxProfileTest.php |  96 ++++++++++++++++++
 .../FirefoxWebdriverTestExtension-0.1-fx.xpi  | Bin 0 -> 5384 bytes
 3 files changed, 143 insertions(+), 26 deletions(-)
 create mode 100644 tests/functional/Firefox/FirefoxProfileTest.php
 create mode 100644 tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index cce9baaf4..645d5cae9 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -185,44 +185,65 @@ public function encode()
     /**
      * @param string $extension The path to the extension.
      * @param string $profile_dir The path to the profile directory.
+     * @throws WebDriverException
+     * @throws \Exception
      * @return string The path to the directory of this extension.
      */
     private function installExtension($extension, $profile_dir)
     {
-        $temp_dir = $this->createTempDirectory('WebDriverFirefoxProfileExtension');
+        $temp_dir = $this->createTempDirectory();
+
         $this->extractTo($extension, $temp_dir);
 
-        // This is a hacky way to parse the id since there is no offical RDF parser library.
-        // Find the correct namespace for the id element.
-        $install_rdf_path = $temp_dir . '/install.rdf';
-        $xml = simplexml_load_file($install_rdf_path);
-        $ns = $xml->getDocNamespaces();
-        $prefix = '';
-        if (!empty($ns)) {
-            foreach ($ns as $key => $value) {
-                if (mb_strpos($value, '//www.mozilla.org/2004/em-rdf') > 0) {
-                    if ($key != '') {
-                        $prefix = $key . ':'; // Separate the namespace from the name.
-                    }
-                    break;
-                }
-            }
+        $mozilla_rsa_path = $temp_dir . '/META-INF/mozilla.rsa';
+        $mozilla_rsa_binary_data = file_get_contents($mozilla_rsa_path);
+        $mozilla_rsa_hex = bin2hex($mozilla_rsa_binary_data);
+
+        //We need to find plugin id. This is second occurrence of object identifier "2.5.4.3 commonName"
+
+        //That is marker "2.5.4.3 commonName" in hex:
+        $object_identifier_hex_marker = '0603550403';
+
+        $first_marker_pos_in_hex = strpos($mozilla_rsa_hex, $object_identifier_hex_marker); // phpcs:ignore
+
+        $second_marker_pos_in_hex_string =
+            strpos($mozilla_rsa_hex, $object_identifier_hex_marker, $first_marker_pos_in_hex + 2);
+
+        if ($second_marker_pos_in_hex_string === false) {
+            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
         }
-        // Get the extension id from the install manifest.
-        $matches = [];
-        preg_match('#<' . $prefix . 'id>([^<]+)</' . $prefix . 'id>#', $xml->asXML(), $matches);
-        if (isset($matches[1])) {
-            $ext_dir = $profile_dir . '/extensions/' . $matches[1];
-            mkdir($ext_dir, 0777, true);
-            $this->extractTo($extension, $ext_dir);
-        } else {
-            $this->deleteDirectory($temp_dir);
 
-            throw new WebDriverException('Cannot get the extension id from the install manifest.');
+        $common_name_string_position_in_binary =
+            ($second_marker_pos_in_hex_string + strlen($object_identifier_hex_marker)) / 2;
+
+        $common_name_string_length = ord($mozilla_rsa_binary_data[$common_name_string_position_in_binary + 1]);
+        $addon_common_name = substr(
+            $mozilla_rsa_binary_data,
+            $common_name_string_position_in_binary + 2,
+            $common_name_string_length
+        );
+
+        if (!preg_match('/^\\{[0-9a-f-]{36}\\}$/', $addon_common_name)) {
+            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
         }
 
         $this->deleteDirectory($temp_dir);
 
+        //install extension to profile directory
+        $ext_dir = $profile_dir . '/extensions/';
+        if (!is_dir($ext_dir) && !mkdir($ext_dir, 0777, true) && !is_dir($ext_dir)) {
+            throw new WebDriverException('Cannot install extension - cannot create directory');
+        }
+
+        if (!copy($extension, $ext_dir . $addon_common_name . '.xpi')) {
+            throw new WebDriverException('Cannot install extension - cannot copy file');
+        }
+
+        //extension installation with empty preferences (empty users.js) fails:
+        if (empty($this->preferences)) {
+            $this->setPreference('dom.webdriver.enabled', true);
+        }
+
         return $ext_dir;
     }
 
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
new file mode 100644
index 000000000..469308553
--- /dev/null
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -0,0 +1,96 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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\WebDriver\Firefox;
+
+use Facebook\WebDriver\Remote\DesiredCapabilities;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverTestCase;
+
+/**
+ * @group firefox
+ * @covers \Facebook\WebDriver\Firefox\FirefoxProfile
+ */
+class FirefoxProfileTest extends WebDriverTestCase
+{
+    protected $firefoxTestExtensionFilename =
+        __DIR__ . DIRECTORY_SEPARATOR .
+        '..' . DIRECTORY_SEPARATOR .
+        'Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi';
+
+    protected function setUp()
+    {
+        if (getenv('BROWSER_NAME') !== 'firefox' || getenv('SAUCELABS')) {
+            $this->markTestSkipped('FirefoxProfileTest is run only when running against local firefox');
+        }
+    }
+
+    public function testShouldInstallExtension()
+    {
+        $this->desiredCapabilities = DesiredCapabilities::firefox();
+
+        $firefoxProfile = new FirefoxProfile();
+        $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
+
+        $this->desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
+
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout
+        );
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+
+        $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
+        $this->assertInstanceOf(RemoteWebElement::class, $element);
+
+        $this->driver->quit();
+    }
+
+    public function testShouldInstallExtensionInHeadlessMode()
+    {
+        $this->desiredCapabilities = DesiredCapabilities::firefox();
+
+        $firefoxProfile = new FirefoxProfile();
+        $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
+
+        $this->desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
+
+        $arguments[] = '--headless';
+        $this->desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => $arguments]);
+
+        $this->driver = RemoteWebDriver::create(
+            $this->serverUrl,
+            $this->desiredCapabilities,
+            $this->connectionTimeout,
+            $this->requestTimeout
+        );
+
+        $this->driver->get($this->getTestPageUrl('index.html'));
+
+        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+
+        $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
+        $this->assertInstanceOf(RemoteWebElement::class, $element);
+
+        $this->driver->quit();
+    }
+}
diff --git a/tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi b/tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi
new file mode 100644
index 0000000000000000000000000000000000000000..854e14c081de304c0143efb610e544e6dd4d9cdb
GIT binary patch
literal 5384
zcmZ`-2UL^Gwhl!)h!mxl0HH|eO#(;}kS4vCNbfxe7)n5q-a(Kmf*?guiu52o^w1)L
zH0fPB2*Jm>=iTGG=bbzM+H1}F*X%tr-`?}hnomaq51$4A01yG1#Wl5TXV0RZkpln+
zlmNgVf3=hi6u@eaR0Q2UpE|p_Squ31T2E#KN~O8a_YT>(nf4;%-AoxOg+&JqP(~<Z
zm3^G>%Rv(k648FWm%9(5fOfIKRCbVgUkVi$Cuo{?^i4zHyHn&Aa{eM<zAbO*Uf%t-
zwLQ4im*eJyLwHC6tNfj(giE6jCA6<PZhptTGagY4XhP%D;VbR~EQB6u;SiZHEL=F_
z(2k!|1EdG3UMu;<us^1x8w9UTW&^v<$4D1`jT26H^x>fSbb<gk$-a|Cw6_l@@R-U!
z)&J44h?$uB{EU#81T^tO$3===BuQPt84oqY$7*q$Se9J(KHO4jQZS~$S;vcvQy-Vt
z?uM$~S%Ex|_$>*Krw8Km3NXYV3P0_3`$(dCG@9gmp9t(CMPElNe|c^x!{&V})I}3N
zy5Zs`X)*&YO5;bN7Z2bq-nz{Plepd&UB7@hX46o}IcqyPVK!Ys7tW|w`;E2wVijE=
zaTv{w40$~<b+4t+AkRAvN7zCgFZnao$d>!fKMUPaw<o32?!R1U+gIVlXh%NpS`g;p
zOo##kvBzFK`~-=rOFBh`0OpFbtwaKEANlpi3JLLkRzl2V-|3#!Jfo1S@As<!-boOs
zI$1FoblvI38vR({ffm2&_o;=Pn%WkL+KTzD_q`I{7`X_>t<d)un+_&(VWJZv4q|pr
zhAhej*`36AYhU7aYV((O*F->C%JnEm23wLscfw3(++R6)=7SnG8}t0(LXW1UljU(4
zeZU}~oOa5@!_wQ)8k;{Y^1ozUyz3bC(&}%iJ?^+z{@g9_HBFYmfNH2^@x7$f_G|S*
z-A;}3?ciw0w_`JZ#<HCS55MDCq&lC`7pV~V7Wh4=Z^Vm!rm<zNM5izyggdwZF@Z(`
zIo58utZXQ#kU`({L~1M7*Jy@@su&Fi?EFm9Jt)?iqYl%|b)v@T$0+7h(;RI(DjJQj
zHX5*|o|L(&xtsZ?oLV)CULqLpDP10Ff|1x|0r8B!$Gzz9^xwoTl(o8)-IHO)@gnuq
zz$)?jbfh5*YMaq5)G*J)H8N5uUw!xs|Lo5<zNd)vxBA?drNxb3)9CnXt+{>IpQ{^q
zbhM<qOd+<0A_o_nwUiXuhlsX<Rxazz2`no!IB>aA6NOT%W<(rH>{<z`B<R_)jKj9P
zoe~Wrobv4&%hb8r(@g|AbMhMN6Vw|0`@vjI#W4`FL-Kr+O#3QSqRA8nS{5$=3+CbT
zD-VO7M3HLwS2~_ozBxTKMi(=AvshR?PNurB#&+#L*`O4{@514Gy8@^kM||!XO`*mQ
z!xZQcW#0AXAYwEl<|B^cj)`HcKvjB<4qC}^OT_T+1l>{!5V^@TB}Sw)3%Junt&+GN
zskrpfL^h2gLB7NG7%e4+;C8F{?$sm(1zSSJ%n0Lq&kDThaCHfn_7YVJ{9qqL0Eq5|
z%i}BdxX@-GTQ=dR@Fanx6PIB{-4(s&uU@biE|`YKVCD_xpm%7)oyNymld;X`bK9aL
z=E0`57siK^9XTkS&H-IZ@ZO!}w<e`CxhnJnbYo%C=B@G>OJ%3LM*^1n0lpQv)vA`O
z#xM45zOn7VR=4$6yoPiprd;8x8+YS2w=OAMp&CVxnF&d1b36%yAi$@kOECWnRK&pQ
zlGV)Q)4duMX&+i~FRJwy{Vioyc8_3%0$Xt#i)S$HlLN21quL$i+SEp;?bxFB25aX?
zeeS6dzo&N_^5HLbNQcQpMs+N#j|NQCm_R<;u3!A2;KSwR<b!4c@hkUVThy^<-8h&h
z@KQO*fvIrzBGsD$rOT|n($n5)w<pN9k;WuWUd7!|URLYN%$*MXZUN&vwip-TlUU@?
zCZ*{7P*b=`a0}f3U{0IEnSSHzA;htt^U@d;8O?_uKf5Dyxi)2Mf56`VQu4iH?^00E
z2^c2%KIFRx{gThPerPK4=g#F<%QpC08`O`A?EW^3n<Cs*b|x7lB>d?)>k%Ycqc2BS
zZ{OSI6We>%{KMgpv*M36URP<DZeP|z9uW6(-Y5+N6GiCc#13wC9=&iQ3I>ULIRS@b
zNEoZ+%sR|D*hcplnYh}L?mxrpW(m2&ce{u;#ObA%ODO{DEoDjM9nx~N9fGkuMZ~6w
z`#&no9d-_h1W4bZdhHv7eNFrz3h$?X5)-!G2OkH8U5E;hN@s}Xq)I9X%}Rbwx#=&x
zj$;DA0{~bGFLEi`P``k~*wF0;)15$J@vY6_O*>Ry-g&|)OTHEB^w(kr$x(X9B0TBy
z2bm9hBv91S%oz3EV%J{Qp6xm<s^BI9+mj5AIIrFOfstd2QqSzjypMWT_~l&?Z&CA{
z;gWbk<G^w>6@iRW$<nbXxJIy&cx{CMxvv}vQ?Ufv<k9=0ptQ0r+#VjBa4+`rqcaQi
z<w~ZtOK5hT$QF}icDJ8rn4A$Kr2^KyHKUXd6~y$zoG%o^5ynO^ROfwQt5%OhCe-hI
z8=V{rq90u)R`;WXPL_3Z@A9fD+YdjH^%<~#_%mGDo`;O1$bQ31QPEPR`k1JhRBR?s
z=9Y1>hr6{^Ys?MgG(B0utO+h{qvS*DviiOT%UU92=*85Pm#a-&-n+SyR*)g>1jQo%
zTAEN*;=EZ|P`x_$MuT>apl-Sqh}d{@SiEFtcx}sq+WJ`Cw+yMIWup+7yHQwrI+@9X
z5v^^$sCNnLsKgwWH(d@v$<ESQOv+!H&Z%Ey9<itUI-W+@?S^?**Dn_ZJ9uK%R?F0e
zKbeSo!Mzjv9X$&77kC9y*N5w*6P1D`IW=66T$WA#GUMQ9-J3z?>6>Y2BggbNMd>*K
z7H?B0TPNO+io^LFYWdzy<VZP{2Ln^40zcNl0%z>Dj>F$^{eXN`^|!Nn2$^b_+UTj&
zue{%H8#HZO|L*0Ota#bgGiI0$gFGQK;U~8a0L2PE8zcVtT@865`5^srw@olWFwUHs
z;QR7&xI8ja?Gb>F0_)g;<_i^yG9p9AP$^f{A-!WOto3cg7+grwm+wZ;j7X%To$QH!
zEuzO2*Z|~9`)U$|T!M_xUh5couOLt;H1qWIFUZsB2jLRJm#>X@c=11cb<<{Px+8Q~
z7>8#4fU&XgK?+YYYUl?Qu&_fdbdfz=;53x+3MccYudGBXXHe5a#jwj)erS5X#FVV^
znH%voo%yTbXZBNMpxwNyRvhd>D$45NeX_%#g7eGP;D`ItGxTMQHQ^fZCfQ{<K5XK-
z&7NZo*_wIq0$GD(%5*BqC$-|V?HB976Y`qd$(T_7t6?ri8I`oSSp};4(5<@|<8SK?
zN79-}#?F@-cUzrqzRdk3_V~4-DKsD$zHdn(u<xzrH;R~MKRYq<W|XXI;(&A2Jc2c>
zgG)G~`MYl#z+&UZ?y>aPW`%drfA#*B83{uN>69AiH&u1Oz&Z_ip1;JJs%Ow-3Mz97
za{H3><hyP&Ka)12%*5QTqzcdKh8o{Vo5j_4ig2x3#j-$y<7Em<{Tm<NQ|;E?&2tC?
z{o*CznfOq;d*gCoFxyavrmQ44h26rRTlG8MuATPH&)#1?<(Ov(p1HU!?p$!)tDip}
zv!zCt?imN9o%@;6EB|zqBa&DqaZPiN=jo$mRx|TrTfIkWcKn&?PL;f!pfhw=pS2y;
zJG=38Hn730#8GJPDXPv@%GU&p=QwX%4YDYptS&Dotf6#^;CB)<H-|z~+Swdh^DI0*
z%Z8P@ZYEK4+HyHL(n7v#W~*k6ISidNytbhqsUO-lh2x5QrrK~N$4`+q_wR@bM2eYk
zkM{Ez*q1Ab-NdPSQ9Vc4GU6d)q?{m=t1`+SfS_pi&~yg8-)|$l-=-N88uzk$4zWC9
zNjXuK3Szsc>4>JfoQWdf!B!~hGS+K}Hse`&=BuH*&e$4|XAkI})4afnG=@tRz=Twv
zJ1$l-7THz`lhWR7tc=Po4Gr5Jy2peOj;{_0w7fbsp6B;}eHn}#eBHZ2aVHaENQw`_
ze45r^b!b`~?6D#*$3QBbZ>3I)pc-yR4OZ6YDgv9o_yst4zF^?_BJt)aXu<W6t18W>
z6y&2*^_C}MVd4|dY(_L6L#G5e-Xg0q#^v>hh>tZ43+S5QnVvD!93H6T&HXsCa=Ha$
z8f}s<ob72SHtH1A;C;s(99%38Vo7JVSbGFsI2D5f=`nC2NE?qddqt$ZtK2a{8+BxG
z+p^)HC_SDA3gz!q_O;GhMvKxPiGN2-HLr5qV1d3WRyN-9`IxAHV|y+Gk}l>uE-lV%
z2$UP2Tw+m)>uA3H?66p^NZBZ2A*=Ii*83&S?5~oxqRT7Ey~J|SS+G9Nt;R0W)|rXs
z3ro4dk0Mq_I$2YM<sfowi*T!a*(1U;-TAugy#!S^=b{v2D*tWC*sC9iaqegb3=sv0
zWMn$N)Gt3m%k_{NU*&CkmIU`cmM~W1+>A7lp`>hY&Gd+63oPVcQ!@{-w_v5!PtW8k
zr&)DHEZ&AnNgH^txNS7g=cjS8z+a{Ag2iA@BYuqvcnu<4X22Pcy<1Ti8?(_XO76W)
zBRA5>zagu3`49A(As795_ydLG1^PriMfDq*VHM-?>|?DNL^$2a2^g+kb|2#2Hh|6_
zkGAW}kqDrXs-ZOp-pEb3eyn}IHsWiuwzGTS{6xUT*F9dA^qCNivVUlVIZX_#61E=c
z%3VLk{!`#YK~wRdcBsws`B>@riqGC+g>+iiR`R!o!4G3`IA&;ixA%I1`hMoiPQYbO
zssI!GbQ?X$afcUq3lQcR7QgM5$nz_Vr;kmvYm_mU;;rB9ofB}#0r7!&ukYqDY}^+_
zsH!%3iY*+S>l|C@dr{_w+9v$>q5*)M>qTF$^RGs5-E+3}^zaq@_ZT98Ijy+{hfJ%%
zT^s;l0T%!u`)iDsuz>Fq$L<s@?JhRT7ki*9LZ*?l-I6BW*=NyKE$80i<jlPN9WTB=
zIh}{VX4c!cbsImE?X}1V(QILRs+nJ40=TVHRz9P7p^PP5GWTcqT}?999F?2LD@6U=
zIQf03#GPQ&kq8-!y9LqS%~Wr;nkusG<(!0v4lQ&x*i1(cisByGbl+IpmUvA2v6#cQ
zlLfka4+9bzeqlCt@=6n41*Q^o==a25%HdCmeq>Y;1v2AjEyE*_;O!FL_D>`32f{@$
z>N<1E-&FH}kKM_x@VG2iv2@femD9x}1=0__^5+#j;ye94zX>`Uy7yL0Yh;d~v~;mB
zg;+LgwbW8BbcEF!TY?jg;ib}tE@i7|z9FRy_{7J7an{U%TZd4qADdlxb4-0C$yv}M
zZM_hj-=G#<1D_WwD>-uwX3;gU*Drm5yS0b2gS{{8x?Vgz?2~3=I)o@A_JU)CGL+3|
zzqCQxRZXTyjny@Kq?;wkwRlL!{O4f|buJzqIeUXSnw1>4DALBz#JMAk70iYN5;hXM
z$;n(VsE|Jz%6Yx^>Em#J$uN9UnJ=UUZ5$Q5z{)^d9A8~_o)@c}shgNC45^ff2+&np
zREt6V$jOkR5G_mn2a-$2-<d_-mr(K@q``A*{+*{E;govnRl_LC6s?zBrnr#`{o08|
z7>LW54l~g8Ji#alWA(7lV;}=eV$e33+Eslh&YPcMM{u8lbpVFzZ_7HGFdh0Y6t4IC
zr_d2-wo>SHjez-eY5k|r@ozZX9nwdJe5!?L5R0<L?c@ej_yxlal+TFLS!rzshLb6Q
zib+v=Rmh*%2JcBNhv7l^@bbRD_&~H&oAnq;&(=pWLiv<%OXZ#efdR^9G73e-IJq|)
z$p<fUW7XsASvL+Ggd-AFCsoISLoTx8?Pd8!E_hgQHREy)5*KFOzQ9D1Sx84>(An?9
zoI^MxzTfWDL*NgI#J%_VRnh_t{^UDV$;8r#;%69}34Y|X782-&d6h9T=VDU?c;Dn<
zuF3tY4T`Oq#c8<$w-d`CKWw5+>27UTYj}KJ-H1rylrSTG)03Q`AoHb7Co`|LM_Vd@
zD~)@tp_SLtMO;H(w*6yaxg_RY>qd#kTly^BvfF+yFSx^Y0>Nnn6kQQlMz1Y$9a!|5
z%*+>i7o%=YEwslzo|!fyj}-v8k{Fh#XADk}saj`)1aU1YTMP%sUL^;uaWt#Wme$nA
z%%q;ug<xI<H}&M<+Ik)Dg|q%=W_-$ZeP3PY33+YQ*Y^J;C|?Kr0WH#SApm0WA|%3J
zSo}V<3|%L$D^&t`2lU4G!EN7g?8Te%`qLkB1~HA}<qZ6C@05|NU0ydS*n~d3rs;eG
z9vkwxRJI9t6`*Z3<C%`7tM6HrE3JK~FCRNNyVq(dACh;F$9E%Gz=U&;2x2+GAL>Ka
zA=~lL`tXw#eZ9u3d(r~=9+~+%k((z}<7Ih9sVc1D^cpy4xH=j*xHNeGT~52+&c7Ps
zy7K;EXV>D|9}({3{daEv)1M7d8&-FHc>iMh-){fRu7A2wBCrZB6u-Il_f-GHw!f!J
z_{--{?)^O*5#XOF<+tb3&A$=M-x2!zIsDTV06^euTuYF@bN~BP{yoCq>*aTZXH@?;
d!v6}Gz79GXH~zSA0EE}y+v`MV{ZVCr{{iA}wu%4%

literal 0
HcmV?d00001


From dddfd3bd1845dba840bc7e5a796d27140084cd74 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Sun, 23 Jan 2022 18:19:37 +0100
Subject: [PATCH 685/784] Fix tests and add codestyle exception for Firefox
 extension

---
 .php-cs-fixer.dist.php                        |  1 +
 lib/Firefox/FirefoxProfile.php                | 12 +--
 .../Firefox/FirefoxDriverServiceTest.php      |  2 +-
 .../functional/Firefox/FirefoxDriverTest.php  |  2 +-
 .../functional/Firefox/FirefoxProfileTest.php | 75 +++++++++----------
 5 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 051fb6579..5cf7d36f6 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,6 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
+    ->notPath('Firefox/FirefoxProfile.php') // need to use str_* instead of mb_str_* methods
     ->in([__DIR__ . '/lib', __DIR__ . '/tests']);
 
 return (new PhpCsFixer\Config())
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 645d5cae9..b211c97ca 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -185,8 +185,8 @@ public function encode()
     /**
      * @param string $extension The path to the extension.
      * @param string $profile_dir The path to the profile directory.
-     * @throws WebDriverException
      * @throws \Exception
+     * @throws WebDriverException
      * @return string The path to the directory of this extension.
      */
     private function installExtension($extension, $profile_dir)
@@ -207,26 +207,22 @@ private function installExtension($extension, $profile_dir)
         $first_marker_pos_in_hex = strpos($mozilla_rsa_hex, $object_identifier_hex_marker); // phpcs:ignore
 
         $second_marker_pos_in_hex_string =
-            strpos($mozilla_rsa_hex, $object_identifier_hex_marker, $first_marker_pos_in_hex + 2);
+            strpos($mozilla_rsa_hex, $object_identifier_hex_marker, $first_marker_pos_in_hex + 2); // phpcs:ignore
 
         if ($second_marker_pos_in_hex_string === false) {
             throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
         }
 
         $common_name_string_position_in_binary =
-            ($second_marker_pos_in_hex_string + strlen($object_identifier_hex_marker)) / 2;
+            ($second_marker_pos_in_hex_string + strlen($object_identifier_hex_marker)) / 2; // phpcs:ignore
 
         $common_name_string_length = ord($mozilla_rsa_binary_data[$common_name_string_position_in_binary + 1]);
-        $addon_common_name = substr(
+        $addon_common_name = substr( // phpcs:ignore
             $mozilla_rsa_binary_data,
             $common_name_string_position_in_binary + 2,
             $common_name_string_length
         );
 
-        if (!preg_match('/^\\{[0-9a-f-]{36}\\}$/', $addon_common_name)) {
-            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
-        }
-
         $this->deleteDirectory($temp_dir);
 
         //install extension to profile directory
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
index ce110acb7..190286847 100644
--- a/tests/functional/Firefox/FirefoxDriverServiceTest.php
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     {
         if (getenv('BROWSER_NAME') !== 'firefox' || empty(getenv('GECKODRIVER_PATH'))
             || WebDriverTestCase::isSauceLabsBuild()) {
-            $this->markTestSkipped('The test is run only when running against local chrome');
+            $this->markTestSkipped('The test is run only when running against local firefox');
         }
     }
 
diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
index ab6a03846..cc107793a 100644
--- a/tests/functional/Firefox/FirefoxDriverTest.php
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         if (getenv('BROWSER_NAME') !== 'firefox' || empty(getenv('GECKODRIVER_PATH'))
             || WebDriverTestCase::isSauceLabsBuild()) {
-            $this->markTestSkipped('The test is run only when running against local chrome');
+            $this->markTestSkipped('The test is run only when running against local firefox');
         }
     }
 
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 469308553..420dc87f6 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -20,40 +20,42 @@
 use Facebook\WebDriver\Remote\RemoteWebElement;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverTestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
- * @group firefox
+ * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\Firefox\FirefoxProfile
  */
-class FirefoxProfileTest extends WebDriverTestCase
+class FirefoxProfileTest extends TestCase
 {
+    /** @var FirefoxDriver */
+    protected $driver;
+
     protected $firefoxTestExtensionFilename =
         __DIR__ . DIRECTORY_SEPARATOR .
         '..' . DIRECTORY_SEPARATOR .
         'Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi';
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        if (getenv('BROWSER_NAME') !== 'firefox' || getenv('SAUCELABS')) {
-            $this->markTestSkipped('FirefoxProfileTest is run only when running against local firefox');
+        if (getenv('BROWSER_NAME') !== 'firefox' || empty(getenv('GECKODRIVER_PATH'))
+            || WebDriverTestCase::isSauceLabsBuild()) {
+            $this->markTestSkipped('The test is run only when running against local firefox');
         }
     }
 
-    public function testShouldInstallExtension()
+    protected function tearDown(): void
     {
-        $this->desiredCapabilities = DesiredCapabilities::firefox();
+        if ($this->driver instanceof RemoteWebDriver && $this->driver->getCommandExecutor() !== null) {
+            $this->driver->quit();
+        }
+    }
 
+    public function testShouldInstallExtension()
+    {
         $firefoxProfile = new FirefoxProfile();
         $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
-
-        $this->desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
-
-        $this->driver = RemoteWebDriver::create(
-            $this->serverUrl,
-            $this->desiredCapabilities,
-            $this->connectionTimeout,
-            $this->requestTimeout
-        );
+        $this->driver = $this->startFirefoxDriver($firefoxProfile, ['-headless']);
 
         $this->driver->get($this->getTestPageUrl('index.html'));
 
@@ -61,36 +63,29 @@ public function testShouldInstallExtension()
 
         $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
         $this->assertInstanceOf(RemoteWebElement::class, $element);
-
-        $this->driver->quit();
     }
 
-    public function testShouldInstallExtensionInHeadlessMode()
+    protected function getTestPageUrl($path)
     {
-        $this->desiredCapabilities = DesiredCapabilities::firefox();
-
-        $firefoxProfile = new FirefoxProfile();
-        $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
-
-        $this->desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
-
-        $arguments[] = '--headless';
-        $this->desiredCapabilities->setCapability('moz:firefoxOptions', ['args' => $arguments]);
-
-        $this->driver = RemoteWebDriver::create(
-            $this->serverUrl,
-            $this->desiredCapabilities,
-            $this->connectionTimeout,
-            $this->requestTimeout
-        );
+        $host = 'http://localhost:8000/';
+        if ($alternateHost = getenv('FIXTURES_HOST')) {
+            $host = $alternateHost;
+        }
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        return $host . '/' . $path;
+    }
 
-        $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
+    private function startFirefoxDriver(FirefoxProfile $firefoxProfile, array $arguments = [])
+    {
+        // The createDefaultService() method expect path to the executable to be present in the environment variable
+        putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
 
-        $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
-        $this->assertInstanceOf(RemoteWebElement::class, $element);
+        $firefoxOptions = new FirefoxOptions();
+        $firefoxOptions->addArguments($arguments);
+        $desiredCapabilities = DesiredCapabilities::firefox();
+        $desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
+        $desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
 
-        $this->driver->quit();
+        return FirefoxDriver::start($desiredCapabilities);
     }
 }

From e297e2b9c301406baa60b01df2dcef53f505c8de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 26 Aug 2022 14:59:48 +0200
Subject: [PATCH 686/784] Refactor installing Firefox extensions

---
 lib/Firefox/FirefoxProfile.php | 97 ++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index b211c97ca..8e6e1094e 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -184,63 +184,28 @@ public function encode()
 
     /**
      * @param string $extension The path to the extension.
-     * @param string $profile_dir The path to the profile directory.
+     * @param string $profileDir The path to the profile directory.
      * @throws \Exception
      * @throws WebDriverException
-     * @return string The path to the directory of this extension.
      */
-    private function installExtension($extension, $profile_dir)
+    private function installExtension($extension, $profileDir)
     {
-        $temp_dir = $this->createTempDirectory();
-
-        $this->extractTo($extension, $temp_dir);
-
-        $mozilla_rsa_path = $temp_dir . '/META-INF/mozilla.rsa';
-        $mozilla_rsa_binary_data = file_get_contents($mozilla_rsa_path);
-        $mozilla_rsa_hex = bin2hex($mozilla_rsa_binary_data);
-
-        //We need to find plugin id. This is second occurrence of object identifier "2.5.4.3 commonName"
-
-        //That is marker "2.5.4.3 commonName" in hex:
-        $object_identifier_hex_marker = '0603550403';
-
-        $first_marker_pos_in_hex = strpos($mozilla_rsa_hex, $object_identifier_hex_marker); // phpcs:ignore
-
-        $second_marker_pos_in_hex_string =
-            strpos($mozilla_rsa_hex, $object_identifier_hex_marker, $first_marker_pos_in_hex + 2); // phpcs:ignore
+        $extensionCommonName = $this->parseExtensionName($extension);
 
-        if ($second_marker_pos_in_hex_string === false) {
-            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
+        // install extension to profile directory
+        $extensionDir = $profileDir . '/extensions/';
+        if (!is_dir($extensionDir) && !mkdir($extensionDir, 0777, true) && !is_dir($extensionDir)) {
+            throw new WebDriverException('Cannot install Firefox extension - cannot create directory');
         }
 
-        $common_name_string_position_in_binary =
-            ($second_marker_pos_in_hex_string + strlen($object_identifier_hex_marker)) / 2; // phpcs:ignore
-
-        $common_name_string_length = ord($mozilla_rsa_binary_data[$common_name_string_position_in_binary + 1]);
-        $addon_common_name = substr( // phpcs:ignore
-            $mozilla_rsa_binary_data,
-            $common_name_string_position_in_binary + 2,
-            $common_name_string_length
-        );
-
-        $this->deleteDirectory($temp_dir);
-
-        //install extension to profile directory
-        $ext_dir = $profile_dir . '/extensions/';
-        if (!is_dir($ext_dir) && !mkdir($ext_dir, 0777, true) && !is_dir($ext_dir)) {
-            throw new WebDriverException('Cannot install extension - cannot create directory');
+        if (!copy($extension, $extensionDir . $extensionCommonName . '.xpi')) {
+            throw new WebDriverException('Cannot install Firefox extension - cannot copy file');
         }
 
-        if (!copy($extension, $ext_dir . $addon_common_name . '.xpi')) {
-            throw new WebDriverException('Cannot install extension - cannot copy file');
-        }
-
-        //extension installation with empty preferences (empty users.js) fails:
+        // extension installation with empty preferences (empty users.js) fails, thus add some dummy data
         if (empty($this->preferences)) {
-            $this->setPreference('dom.webdriver.enabled', true);
+            $this->setPreference('dummy.preference', true);
         }
-
-        return $ext_dir;
     }
 
     /**
@@ -305,4 +270,44 @@ private function extractTo($xpi, $target_dir)
 
         return $this;
     }
+
+    private function parseExtensionName($extensionPath)
+    {
+        $temp_dir = $this->createTempDirectory();
+
+        $this->extractTo($extensionPath, $temp_dir);
+
+        $mozillaRsaPath = $temp_dir . '/META-INF/mozilla.rsa';
+        $mozillaRsaBinaryData = file_get_contents($mozillaRsaPath);
+        $mozillaRsaHex = bin2hex($mozillaRsaBinaryData);
+
+        //We need to find the plugin id. This is the second occurrence of object identifier "2.5.4.3 commonName".
+
+        //That is marker "2.5.4.3 commonName" in hex:
+        $objectIdentifierHexMarker = '0603550403';
+
+        $firstMarkerPosInHex = strpos($mozillaRsaHex, $objectIdentifierHexMarker); // phpcs:ignore
+
+        $secondMarkerPosInHexString =
+            strpos($mozillaRsaHex, $objectIdentifierHexMarker, $firstMarkerPosInHex + 2); // phpcs:ignore
+
+        if ($secondMarkerPosInHexString === false) {
+            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
+        }
+
+        // phpcs:ignore
+        $commonNameStringPositionInBinary = ($secondMarkerPosInHexString + strlen($objectIdentifierHexMarker)) / 2;
+
+        $commonNameStringLength = ord($mozillaRsaBinaryData[$commonNameStringPositionInBinary + 1]);
+        // phpcs:ignore
+        $extensionCommonName = substr(
+            $mozillaRsaBinaryData,
+            $commonNameStringPositionInBinary + 2,
+            $commonNameStringLength
+        );
+
+        $this->deleteDirectory($temp_dir);
+
+        return $extensionCommonName;
+    }
 }

From 62ee7d0a5695c883308cc4dfd307b78e1281c0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 26 Aug 2022 15:05:46 +0200
Subject: [PATCH 687/784] Update and re-sign Firefox text extension fixture

Also add step-by-step instructions for extension re-validation and re-signing using web-ext tool
---
 .../functional/Firefox/FirefoxProfileTest.php |  23 +++++++++++++-----
 .../Firefox/Fixtures/FirefoxExtension.xpi     | Bin 0 -> 8630 bytes
 .../FirefoxWebdriverTestExtension-0.1-fx.xpi  | Bin 5384 -> 0 bytes
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 tests/functional/Firefox/Fixtures/FirefoxExtension.xpi
 delete mode 100644 tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi

diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 420dc87f6..2d44cc6e5 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -17,12 +17,26 @@
 
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
-use Facebook\WebDriver\Remote\RemoteWebElement;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
 
 /**
+ * ## Generating/updating the Firefox extension fixture ##
+ *
+ * For testing purposes, we use dummy Firefox extension (`Fixtures/FirefoxExtension.xpi`), which adds `<div>` element
+ * with some text at the end of each page Firefox renders.
+ *
+ * In case the extension will need to be modified, steps below must be followed,
+ * otherwise firefox won't load the modified extension:
+ *
+ * - Extract the xpi file (it is a zip archive) to some temporary directory
+ * - Make needed changes in the files
+ * - Install web-ext tool from Mozilla (@see https://github.com/mozilla/web-ext)
+ * - Sign in to https://addons.mozilla.org/cs/developers/addon/api/key/ to get your JWT API key and JWT secret
+ * - Run `web-ext sign --channel=unlisted --api-key=[you-api-key] --api-secret=[your-api-secret]` in the extension dir
+ * - Store the output file (`web-ext-artifacts/[...].xpi`) to the Fixtures/ directory
+ *
  * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\Firefox\FirefoxProfile
  */
@@ -31,10 +45,7 @@ class FirefoxProfileTest extends TestCase
     /** @var FirefoxDriver */
     protected $driver;
 
-    protected $firefoxTestExtensionFilename =
-        __DIR__ . DIRECTORY_SEPARATOR .
-        '..' . DIRECTORY_SEPARATOR .
-        'Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi';
+    protected $firefoxTestExtensionFilename = __DIR__ . '/Fixtures/FirefoxExtension.xpi';
 
     protected function setUp(): void
     {
@@ -62,7 +73,7 @@ public function testShouldInstallExtension()
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 
         $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
-        $this->assertInstanceOf(RemoteWebElement::class, $element);
+        $this->assertEquals('This element was added by browser extension', $element->getText());
     }
 
     protected function getTestPageUrl($path)
diff --git a/tests/functional/Firefox/Fixtures/FirefoxExtension.xpi b/tests/functional/Firefox/Fixtures/FirefoxExtension.xpi
new file mode 100644
index 0000000000000000000000000000000000000000..c5805fbeb821161ab0e7644ef0bdfdcf5ba0b7e2
GIT binary patch
literal 8630
zcma)?1yGz_viETYch}(V5`tR@t`j^s!JXh9JOp?5;K3PSaCdi?;O_pB+Hd#GzW46d
z?Ww7nd1}s?)Bn@YneP6Lk}Na~HU!}H@pnUby<lK$EMfkI#lq1l5^QlHf-dPH*xjc7
z4dy+Q9>F?=u#IXF68#s!*=yfs#xK2$dq)A%X$;%U$9!q~oS`$|yv?I9vnTdWB2=v7
z5|i<P<*|^NmbQ%Hs-V<t6P%SZ|I>t83bK#lOeq^7hLHh1Ap(Zn3s{kO%wKJpm|LRo
z{FLVCwra4AI|AB$?!v6GTzlV`h<fL|T*y$%GhB}H?I;wkms@-DkNnIGIj@R%emt%)
z<D;5yc(BU^XMUD&1MgCmnH>fFVuXNrc~O#u2P_V0fID8@LV|>VQ2LLKqr85?+Q7!#
z)Wp&0)pc7N<ET-K01@=y6QORlUUcsHBpP?dEeu4#IEsT~GupC}hHz~ElTTl2X=-TC
zQf;3fuW=#u8Bu19b@?XrL7W=CbNBwy%m$FRGSen&(QvMB4t!fklF8u?Rsx$OhU8*_
z&^I>gqgvWy0{#bCi73OEB_kS4ZDf$X^YbN;1y4eiMp#@BLz&M&3SW9;<#c;v9ln!`
z%@wgp0j@m9{ea^@2wuq)n+X(_Ew2Yly_XP`1Ek3Q>2ix(h4G26RVS?)(wUcUWX1QZ
zwS6GR8vWuKwRzAgzV)hBbvpA}j@ks5zGGlEE_JXEtJX@}EM6en5NG+Zf;3PSMx!&D
zl(R?sPxZ{!@g|{PmFxMh>LI_XXKrL`<H%~q&f@sxb61S8?IIg`w+r+$>g<7B^z-5j
z`gXQRlapmCH~J5x?yoc`G0|JLWJ(E9$bP*N;isfzXu?ZIZo~?>?-0jbY3+dk7>5Dg
z9`n$bmnXy3GYw`ulS8h{0_n1@baVhS!E%8#GVMW57f=3$-$lzwxVP$U)}0oh-Kemz
z@6DHc(^4&#tj7-gM`Sfxi!9!vz*d)50&W_}fIXYT%U$dR4{PbWAjEA&V*HYXZ~=)O
zWhI(eCZNwg60Ao2BSSBiiGLLgT8~!fK$C>Hq2`+|>_;r=M}{6-9u3vrI@Iiz4^E>M
zqNWkKQnpL{b;YCAC2*mO5h6->p$F+A0L&Yxb}me#!jt;G3Nt^ody$_*)aV?*XGP}7
zAC7|uyh#rP7pgqBM?FwJI{h*kgRB>nMW3MlsW+tnSdHgZ>$TS_|2bN5U-g!kR1;;E
zR(Q{9Wb0_c^3T|f8*3WL5y5Ud%P7oxIfo2@k}+)WD0TU`RX0)j4mlS&kpSazkGD&g
zh%q%*^-=MBaK3=LAHCIED#TtTz5qZaiM|v^p(>|H8@!aqiAU@o+{a+o-N#+Hg#8o<
z8<cI)$ac6o+JikQj2IxQ8<iRTZpEZ&rM&lDYo}Ff8p3FRx;8<7NA}KAD)BYJT@|#$
zW{uJH`vf;@FA{vzLA!KC<(l*-^>H8Ly`hqG%K66)A@8n0TMsl|5!|bgZ?$#M>~CB8
z%bnudi(7e1hmFYi7<zj0(&uEY(=G5yG;!{Gf=4jsAE_yOi?<w5sJuJL+701)sr$6m
z=Z&&P%&Xo62~YS`Qh5eQ;@NJ)QdLHrX6*fRSttmsY(5<4f@mGYvTD?)4iMQ3N_={~
z<Nt9$q<N2Du>O|(zlJ!*|B&3#{PR@&XEoKm`X0xaD19mwu~<wcazlhPY(Sqcd58wZ
z2ecni#A3nvW&{%C?J!F4Fa`SJDdLVI=y@s1=#V%+m0^@cyOhJoB}L+zC^#KI{~Bpr
zJ#IYk5lUZOco4J{KG7Vle$b%BH`8K?85M~YflL7)=EXUn+d-g8^|j}TGFc4cMyKym
z;zAhb>95&OXxX74uKP=@udyglp(x2i;S+x!2}J;)np$W(HW(1Ia8meU$#B4g#_Vem
zuSXW+EPq<`8$1jBN`<nZ0O_3#neDxxU}d8Q(M4nKml6XFNaINC3?&znGn~sDmM{gt
zca`W%zbD7Z^VcIo!(qCs0GuPeDDF`DHkMqN2UUC|r|I|I+w4R@;RR?ueT57@kXnGS
zcyhD0gfM~CLuE}v(R?0<vKJG9^xV`t!Hx2N17oL&Pv>j22K5%=p|*>YmG7unGZbK7
z?7T7K5eceSHsuBM!lf9(X|xaRgFihC%m!U9D-+!sUr5dkFIs2*xP3$_zFsk5X2j}w
z+`cH=#^I%jT0NP4f|w0=OeimN8By5NqZ2Cajch$3xaJrUaJDsF!MiIZgI=kmdm|q$
zEIzfK&h`lGwzZCo5bi%r!!)^!gjdj67yPx<Bsz<enMjJ6+f)Ff=yQg)lUGqQi)n26
z@HiP;X)bsGRdQzo45$Xx4-fYTAN5AE?qmYhONju?2s+x$&7T$S11I0>7Nv5v-ZO?w
zs(OTVD5>!UfWOlMc}hxndQiEcDS0KKdl7jiZ|35ei2TA)anluvOnt+@4O~sd$nPJ!
zdH9nq@!5Zs4R+;{Tv)O>*bp0GzT-;F%MCV7+z;0zn!@b==69&$zW}A((&yUDVq(0(
zbeH1aperB7CQZl%Rh6P}LnAy^K^+=QkKCiu--t9EF+bQd*BFVbkuK#V*1nPuH{Z2q
zOkcg2C^2#K@Pt}|N-Aev@fO%*_0(B_?{zzz_7Uu6Uh<rUXLhh#z-mIO>_VjGD4U4s
zbBtNg=tGOk8-YX1-@8h;n3-opE`z?$9cnwev@#*!5Hzcu7H13Zyg-!k%{S$o@B)tq
zh3Atn9v^h()ULTI8PHK+ZC{_b8q*z2TjD-4vmW3*afAm>T?atGZ6Wz$D?tE639vgP
zv4Z2EFd%+HmB&UgL6nk51K#>V#Z#Bk8W5ld#H@rt<>ie5y3{$%%f%TeapIYU%uD;M
zhIQUnOvw(}5^l3+%KJW2NbAD)k3!zzVPRKrw>U=9ksxkc7cqge0$Ba)p44IocksGi
zgi}93K#;@M_GlZ!hv0sJ`amVBIV(&-Vbzqq{!)|iri<%qLpz+oA^NGW1Su(qXer(j
z#RBOR4xN_EpM+2}F6s49?KgS3qWVES_P9#)Od1FXl?A80^X5uZHp>G(otu61y0iZ}
zc-k4w=(4Xh{QXPg7W`3_Q{P*I2%qtii-<Wz8`aFB2ym4Ot#xNf(f5-3tL&yv3@e$3
z!r-cyCmE(gT#MWi#8IUtB)dSH9Wufc{tOv~J2@%-5jq~BD$v#a6Yjie?!L5~d=CmH
zlbL+u_XQUwWm2-brIhB2mP{3(!!pJ_pIxq{-W_H({)1`7Do@%dYBO69d2UJdl8MPI
z&eQYo__BZKsw++DbLer1`q<15M;W1ts|N`I%6+`Z`GMI)CZeA%)oCAQ*^d@SU3(kd
zGM}ukCtV6HiiIbd2>FK%9a~ULjqz=orYZ6En3obwSJjOxiw?A92~J(nphS2D4tqTo
zVxa0Hf^EohiMYvzp3l2-reH6A<gfN!Ok=;<fUibd1kX61-I-%49vpulsj+A?zKs7=
zey3wcQXx~WqodATv7GOdbfllFG=5jok94H$nIh@q6(~BDUF~;Epc|Xfq^L*J1?na|
zQ5+*qFlgff`k%Atc2O1pqjRlcgy1-%d9bg}-s*q{mS=1RMkvB*LZpuoW^FZzLlDp;
z7WTh0MCTJL?$bqeBJ<je(?x6=SZVC_D%?N!c`@dJgmoq++e3*-0;Q(iH?A_ichxs&
z)Kx}Rxy2ejgyqjn)cZN9SZs`O16JKw=waCkw`jMAF0cstWZfVj`$bIsptf$ZAV`}U
zh4O(j5#Q#|5_z8;gP(Vp=$jD}<lyA{dZ;*HsiFnceqtl2cuPfPp1V-D25_O;SWBwF
z;ZXbb80@9>jR8zWe$-h)@TX8A8LDsRl(wKscKDr_AhN%d?W4^D2s+pi<4s`hqLL;0
z;^Zh*y!vS*aKk0usL1tO>0u_z=U2`3io%76XV-@uz8hYLkhwoVf)b(p(h=1~%X_E3
z$ewgR%+0|=biFn3S!JRSr^cpFJ1No`XRwj9vcb}sF=cK1aexYoGrYN)Ubjy*k<V$t
zDPKyt)q#OEQxEF(_aLKj7Y6-?+xZ0pq*W4KjL1Oy=&|cAO}G_(oK@16EEi-Z)Iz0-
z+h;l<m()UIOj*ntZZhQGhaL+j2B*fbixmAPfqouf811FOqz9njOfFywk<0x_PxErF
z{lc72mw6tEc9uGorn)RI=$X4@42J#2yHdlUZqyUlhL!tfdb=jt<&#@sAeI?@AI9{#
zTyVp|r^#u$CX7kc<ck7s>IZo@!uG+43E1ObMm^V~J2*G=Uj)J{s|n9$+*7zeLoT+H
z7`{~ti=FTo*4iM`abAvGfCJ?Aj}NK&prqFYS{y}0H04^6d5&O?Yw-uo!y@ss2Q#<O
z#~i(kop5~us~pE}9GI7u9V)pRm`6s%HUN;^Jqm`1`{oQL=XfG*Q`1m~(1wT^C&@iI
zSC~KPEREbsdZ&s8?&Q7bB#wH-ACe3XgUP<2bigT~wAxu^H-A4k%&LyZGBJqVXSLoR
zdJ^S-(ndq^*4}f9mj&N|_!y6w4ZPyF%}yUOxvZN?;p!{Oygk4T3TuyhYcS_J?Oe6;
zBS0qb)<S(rSC;_KkAfnVJ87l)9Z+nWM!sncH0S5z=N0aKb=;G9A>p0X%K4w4Hj@ke
zXtic`F4p03$`aR2PP2~-A`@m=`?6Rj!&&JC*GzyNB~TphJJG|D97Bp84ChcO2wbM)
zhr<NQzsAo!=AS1|LUt;;EM^|nLiy~;3oKTbVJe`d)h`1hU2LQ3<oX;Rz7FfGI`3+A
zZd|lUl+(I6riqHC?SB*-$LR55vkkU?lXxLMu*n;FtndKFzOfvm1lOE|JS-JlG<tzX
zB%S$=6L9Uv2rePqq{>uZn%6r<h0Y(MFK4c<<UlUNxs0j-((yrON7ZCOV8L0&EEe~g
zaN(fTbX{%l%I$O=5%Ek1s~I2If2Mz~{T8iluXQiYYZ3FGGj8lZ)4zWv+bq_mabx}8
zb3}-H&-fMBmur}+=4iaya&(lGja6-!U~x69sQrbWx-OkY+lSg^^HE!U&ih@6u-}Sa
z-mm8bZB!+p-eUB!y%!mCLhq^!vd#U*L8y>Pc@>j@(vpFYj#`>OAWSA2lf3h?>A^_?
z^JZ40sc{X&81i7e8Xyz5M?w=kjd$U7+Qf|GQxtt@rJxWDgXR}u8|Q>F_min?YQ0E0
zy+booIJ)WSUOBpTOZola2J<`xFDd7VA>@U@+y`nJQ`Mp)*T~3E#_Ajj`tz#?1%e*9
z6JNQ2G)FL{dCuh97G-){5wNuY$a}_4Wlg2J4XMk77T60yI^0JPcZ2u<64Hk4Ps509
z-A#U0HeO!m$sQr4G!Kf-PnHL`?uW%vnLIvBh8iw)Bj-G`PqKA^b@!DVzpT_$xb6{d
zaWNW28dAZi(^6HOJ30FH%OjyZQXlj}0t*ObX}JtR319<P!kvWC5sUNFs-8g!vPlhD
z4>sbGai0+ER=m@n0MxtA!O%MO2pJR$xqBA1;##oRI05aHot?ku@;pPS&>f67-SBsV
zH>3fs?>(YQsZ~dHR#{r{e<{B1<v&vY2$luL#@Dp}4fKE8d#r!kds}yND=PyQM^nTR
zxlvgrdS;nv6j^45k)hFQ6}BnPHN<N>t|{k!IYnlc@hkbEK{;7wmP(Z$=PZ>WGVClI
zH!^ZpOtPrXPQ0Aw3MGBveTsFk=Ik8Yom1H68|k~6K=injjonXC`L;18N!I4a+Q;UH
zrl!Upv9-3=ZLDGlNe}mr4lM_}VPBg!|8PQ3fD``f>k^}0pa0hY{{K!mI2uePy1k8i
zSnXY|Ca8*J9?WA)3j>`b8z@O&Gpkm;uS;g9N~uIPk22*-kdfIA!3?ruo+*_#k>``3
z#vsWDeyQ3z)lq15EM9di-?=*gWgNJ?+_VUvoOpSy+&KFj&t5^gRYAyDd6mi^mQs-;
z4sP|!`3oc~<3orTX3-&nL=jO{A=SO=A(939k;u`u5zf(PlI`#z0<z=tf`Ulo2TrrL
zR)s{M=%E}gvVd9mh{qu!2KwKxqX>UgQFO86BZhC{p^HraG=_z*@-MOy#>MIgaA%wb
z;xFj|kp@1YEb1q?(0O%d8Jz44UK-t7%yIg6KJFp|;4R9CeT}BXTY$T2A2Rokh7E&u
z$)2wPULSw5*5K+~xab-B=A@x93VapieHj${OafOa69WTfCc*X<Ac5|$6HgV&7<0>t
z;DF_=aL(%2)5gS1E~(@#8DdC9U#dity5BoxcWy-NmnYh9Yp;y!!vkv|GH;8}-CB6h
z$fE;=CrUMryt@KZOuC#TGDCTX{_WC?E98e17Y&;yIaGi|4ttIWsnv2ME1^hOn;V-s
zMie|&@R`2v2eOAYD^TWK7S{;OX0(c^_R7aZv8%_eH@Y}4KiS7yJswr-Rvyv>0!0E2
zri&R4r^YwoANEldYl+C4v76tI=;!m1thZvYpu7XmvSf~U#jt`Bls#EnKodIqVC}sT
zNYwn~k<WRg5=W<*8358BhkTBFQ%6B$SDQx=r8|Iz*=2avYxC74I|@1*v%7va{);E-
zh^yCxgd^GE{lTL+X^NnXi`FucbB8sKMgLO)Jty_7IO?>2k-{1kT)N5$t=@5Lx++8S
za(VUURuIr7V*t)`-gNfBvtF|7bg!F|u+aNqGk1de@WbR5Mw4XqSxpX$Lt?G5*ugfD
z7XKj$^`T05p}X89en(0u``HFZjfSNuO!>hj-c@z$5LqVANO#bEr<jA_+fn(`k$QA>
zVL*c8pttb5nIR-=<QB}}=M<G&hj%p<mr8Pet_e4JFYH%Hfsr=t=0TaWw8XeVi%Bc^
zhCWs7h?pqJ<Cof!WWY9O9XlLP=2r4`Ec2AQLd{IVuXuAUR!ODHk?3Y$T!h-J#KU-w
zp8B-Y?YYgcV%W#iaki|(PsqxFRp66G#e}zMs^wsNXF*<JF?pXu$rbk4(BUf7rmJ5`
zpt6DdokBxC%z&hd$})@q?bK-4*5_i38J^&BL46OC6{FQtc#<hby$+|#XPDG-!X4w`
zqG?{nQ30WOhyZ8`Utev2!-WVv_L8zLAw&WO;H}){+Yrt11ptB)ao~zCRMZFMx5PTt
z4yst$$PA>3>Rb=Sbxf7(k2;MVj)J03O?LZ(7-Npz<l%E@@6Lz;Fz@CU;W-NYkQwGf
z_KhUi$nVC?g1FxKDNqMEd0`@4W@GJg8Tmt|zdtP)_uO@Yinox<#p;uQ8{Z|Pxm<lF
zI*qSzU9{j2^6z-&hrPiZrbIbwy89XJhvi%o9&&l8$#}5bZ(VFV!fX{jkg`4|-#bDJ
z99I88<sFU4=OnS~^wH<n(cHJTj{CU7jbU>R;l39YffKDxTv|<0(>qE1dL`w-)*?NV
z<pivL>ig<hd88)(iTUr_j^j{k>Dt^+u)*OL5d5l__jShB%Ssa>=KF|<^th(OVni}F
z_)`ZAD_>9z#@WRO5?QHIUB8x|Z6*bRa6TK?Qz=@60}*($N|yy=$hdpcRy26YRIjB3
zM?Ker604fptlG8pB*dfFCT&c%(kO>nK<lMSAW+RD-PMO&w+il@``o2dc8iX1f{r}=
zJk18no5v*qbInVG`-6sR15!-3@Gy~iqv@{F=IdNk_*U0GCEQ;}ddZ43IaRC8l0N!%
zDDa2#-s1zx1EV6ni@mMY$xU%^Ixv)~9nHyvd#4(P>_=9?3g7&0Lmb>{wQ^J6$*6Je
z+4Bt_I4!y*FSN6!LK*{A<_Z<$+_&Z8LN5!I6{da>_hTJ}mOrsZe$NSX>9n+ywx7Xi
z7$iBf#oO(9P9T#Y?Ya;iD4ITQO0>1^-;Wj)&$^acnObZCIo>8ID)`4jpPN7y3Evls
zA((ir`xc12fxQ-GSW&XF))`W*hPSJp-@eF}4l1`!x_zG!ig$R4K5>`8lHWmT{rw7N
zD|FvaAg_bBtIb4W>_s8*$BSx1Ddco(yCi#3x8cEfk-MKy>eY{6O~yW7WD(2{P%q7|
zhbe;azzg~9ldT9y+m)POsK`~-fay_fu<wa|HaXHD^>~fqexJ{)2Ew9SVN|#NBgwJ(
z$Gr!O+Abel8!+#CZ+!&d6`e~&VDw<((q)1+waa^Syf2pW9W{}BStS<49GLDqh)cDg
zacg)eA7N8>)1A9R>iH?`Rz<Fj_4_ePr-_3yiaEo(+(k+uVZl`)($uAgyRp8jQ`%A~
z7doxi`!7qW#whJ(qo*Bx2DClHkmdv&ZFfA2kzQ5_W@s4Mewx&bC@6rr0cYmo!X~P1
zmpmi|27kn1I!+R8t<ozDY?it%1EC5FwonSAOU8_^n!Bj%;Q_ZB``Y33cRyL_NsO?@
zk?;hD!>u)!X+DH6(65Eb?pdg0f8T#TBzcZZRdj_>-CZ|!JO5T|B1(GDVijYg6Sa6L
zCJ$*{CWG9b&q|3@$k7`$%=@U5&c@{sszgI;1r*(QpY07zUi*A`aogJnj5_5W?>5O+
z+IJAw?a9eDzA8=5GsS~VtgfavcxOsM3Mx9YU}`Lzoz(^TtR~OIr~<<i@SNW^{`5#@
zUeFuE1wU6vFh@?YE<2%kXq2P@YtS9b0(?w;a+EZLb<j`Hy>@;bzm<QQ+w?qgH`r9$
zybsE*ULQr;fZ@5k2H(b7xqE#{*H<WPJ^rG#i*2P=_TabAkJBWmP#2VD^6Th$DlGY^
zF1FD=q9Wtv9EDDR9C8cNQ^^n(4j%^dD|FlWs4t{a)<&kU=D0AYsY%jQK6+S)4-GQ!
z3sFErGWpGb{asa~;={aTz|iSczGNbI<=tgO>qk?25a0OAsQ4%}L{tdoMOZDQ;Z7YC
z07gOifIOAN%)j^LX1sH<$kpA>*PDEkt>H5@DXsyE&0rM_x2uNNyYPNfwt08PPFa&+
zI8N`4b;6AM7pq%%efNcz1pmyK63WEY-IR~Io*iF2m-(E)phgo_rKa3ApHz_bIfCqA
z$xcdYU<=1P!JdyEI5-RamaE@hK9*{CE?qZyE}EU}ZEt_$6?^7v2{LnA(VVCzmdkK-
zr(KykR`cv2!&YvhziVVEd9dxBk>$l#`xd57v+5`D*gaxiOf_Lx4WbBVKGR<G#2MHu
z5u`I;dsmpDjnn|uf5Y#^YuH?`e@C45HQ|?GaG-o|bmficOmj5a`um!d=+B3|mna72
zh%2_v9)_JLA7slX^KC0qW@UurYJ+XU>r>LM!kn%fU(YYgjiP}tO&KZOhl0MLTu7Gw
z+lZSc6EW~@Q_S`CR_dM;F?S+FZsWSIne}JZ>$WeuV?CpCu?AtHoh{$;3r!`zZ|KT{
z;ow)kZO-BG%BQ%>INO1wDOrnCqaT<ox??@U92j5vKoLNixDi=kpM}$IBd1l_mdwHl
zA$Y<ySf1mcjD8%=vB?R*pKmhtblQE=8_6d{cq~-@tkoeYq1!L~u#dy!DMoO14Eddr
zMJR>~pN9xmm3g&w*>tIgDSl|P%O!Z1XZXfm4E0T&C0Lc5{7AuK00ZjmV5S6z1PQM`
zCq4Y_UM%KgwBpJtD61?qw6=N^zQ{?+vK2qf#(~R6MEt|&NW_~2rW$N70SUj6F64yq
z$|G}o1Yde(bojG1<0yFASFpI1@UpYE6MS`6;l(*gqW0{Ki2Bsv?QgNl_~FBSAvj_e
z(Zaief?V>er(U&@t%aTWij!sT2xi><ZOS)bAKC$vuf(Z7g|Uv&RH>JD)B(RMOSW{;
z<PTOf>5n0H<hW95m2K-g$C3l=3zRnxxQKZCNQRw_Z+B~R7EpezXTa}7pV_bs7upg?
z#Zv6EP3#<BAg7Bl>v-h8CO^ej1f$4j5kpQwF=s#IX}@$P-<6d_?)EF#R^uj%PtMfG
z-Pe+3f`oLHO9vC}lUFH-hd#p{y0zAR7hkCL+PM2w-Bc5xBzM?QNyk_(MbY1~^_{VV
z!z<BN&2bSv_&u+L{FAEVPBAgfYE`Il^jTol1BxR}Tett==x8P_b>^nQL|R2;ZR4lP
zq}{HMXz#a%+knIUQk+{u&7F)*lub0mUbJX4-v&Qh5;HeGab$bkh8hgndEe$ulyMJG
zq1;qOjIy*!)@k_IjQlL3JoKbF9sih)j&dc(W`D8oUy3+w4lN5`+(_^+v<JPPk3>4k
z1h8Zkvh^NVtZdYFu9@(A;>&Vi5~<6`Nlf~3f$6e4ENwP2cO$Pa>#!}JtoW+JQq%ED
z_dBcPt^^Ij(CN!o!aHi|7(snWU4hfA?Z>R0P1=cPw1r=pa={+}5(4`c7lSrhKdwRX
znvtJFkG6zS0yZ=RapMaG8ZA5c@4{VixJlHxJZ8$b>_v+fd<EUw-U@us2T$t6dfb?5
z%@?j0pe+@Na$!_&SD~!9mkS*df7;w`^ipnrvf71+yVrXyME_CIEudnzN4@eX*jMPJ
zBnt_J4e=MP{}X5bruF}B|6=!lAND85{mr`nvb)!p|7vLbCf|P_`X`e74SN4F-d9NZ
zC-(jO$Un*2Z)EwG6}}eS|2x3^`y79^XMQudzl`v;h4b%oyb`&;5C5~m|J}p+%Lvf^
z82&E-tWEzu!=L5#?@qv9hV#0fe=WfJUwwhUPw?k%{`(RZ{<jHUYjP!7Sh(L`^ZOqf
Nm#<M#O7{ER{{urVzEA)F

literal 0
HcmV?d00001

diff --git a/tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi b/tests/functional/Fixtures/FirefoxWebdriverTestExtension-0.1-fx.xpi
deleted file mode 100644
index 854e14c081de304c0143efb610e544e6dd4d9cdb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5384
zcmZ`-2UL^Gwhl!)h!mxl0HH|eO#(;}kS4vCNbfxe7)n5q-a(Kmf*?guiu52o^w1)L
zH0fPB2*Jm>=iTGG=bbzM+H1}F*X%tr-`?}hnomaq51$4A01yG1#Wl5TXV0RZkpln+
zlmNgVf3=hi6u@eaR0Q2UpE|p_Squ31T2E#KN~O8a_YT>(nf4;%-AoxOg+&JqP(~<Z
zm3^G>%Rv(k648FWm%9(5fOfIKRCbVgUkVi$Cuo{?^i4zHyHn&Aa{eM<zAbO*Uf%t-
zwLQ4im*eJyLwHC6tNfj(giE6jCA6<PZhptTGagY4XhP%D;VbR~EQB6u;SiZHEL=F_
z(2k!|1EdG3UMu;<us^1x8w9UTW&^v<$4D1`jT26H^x>fSbb<gk$-a|Cw6_l@@R-U!
z)&J44h?$uB{EU#81T^tO$3===BuQPt84oqY$7*q$Se9J(KHO4jQZS~$S;vcvQy-Vt
z?uM$~S%Ex|_$>*Krw8Km3NXYV3P0_3`$(dCG@9gmp9t(CMPElNe|c^x!{&V})I}3N
zy5Zs`X)*&YO5;bN7Z2bq-nz{Plepd&UB7@hX46o}IcqyPVK!Ys7tW|w`;E2wVijE=
zaTv{w40$~<b+4t+AkRAvN7zCgFZnao$d>!fKMUPaw<o32?!R1U+gIVlXh%NpS`g;p
zOo##kvBzFK`~-=rOFBh`0OpFbtwaKEANlpi3JLLkRzl2V-|3#!Jfo1S@As<!-boOs
zI$1FoblvI38vR({ffm2&_o;=Pn%WkL+KTzD_q`I{7`X_>t<d)un+_&(VWJZv4q|pr
zhAhej*`36AYhU7aYV((O*F->C%JnEm23wLscfw3(++R6)=7SnG8}t0(LXW1UljU(4
zeZU}~oOa5@!_wQ)8k;{Y^1ozUyz3bC(&}%iJ?^+z{@g9_HBFYmfNH2^@x7$f_G|S*
z-A;}3?ciw0w_`JZ#<HCS55MDCq&lC`7pV~V7Wh4=Z^Vm!rm<zNM5izyggdwZF@Z(`
zIo58utZXQ#kU`({L~1M7*Jy@@su&Fi?EFm9Jt)?iqYl%|b)v@T$0+7h(;RI(DjJQj
zHX5*|o|L(&xtsZ?oLV)CULqLpDP10Ff|1x|0r8B!$Gzz9^xwoTl(o8)-IHO)@gnuq
zz$)?jbfh5*YMaq5)G*J)H8N5uUw!xs|Lo5<zNd)vxBA?drNxb3)9CnXt+{>IpQ{^q
zbhM<qOd+<0A_o_nwUiXuhlsX<Rxazz2`no!IB>aA6NOT%W<(rH>{<z`B<R_)jKj9P
zoe~Wrobv4&%hb8r(@g|AbMhMN6Vw|0`@vjI#W4`FL-Kr+O#3QSqRA8nS{5$=3+CbT
zD-VO7M3HLwS2~_ozBxTKMi(=AvshR?PNurB#&+#L*`O4{@514Gy8@^kM||!XO`*mQ
z!xZQcW#0AXAYwEl<|B^cj)`HcKvjB<4qC}^OT_T+1l>{!5V^@TB}Sw)3%Junt&+GN
zskrpfL^h2gLB7NG7%e4+;C8F{?$sm(1zSSJ%n0Lq&kDThaCHfn_7YVJ{9qqL0Eq5|
z%i}BdxX@-GTQ=dR@Fanx6PIB{-4(s&uU@biE|`YKVCD_xpm%7)oyNymld;X`bK9aL
z=E0`57siK^9XTkS&H-IZ@ZO!}w<e`CxhnJnbYo%C=B@G>OJ%3LM*^1n0lpQv)vA`O
z#xM45zOn7VR=4$6yoPiprd;8x8+YS2w=OAMp&CVxnF&d1b36%yAi$@kOECWnRK&pQ
zlGV)Q)4duMX&+i~FRJwy{Vioyc8_3%0$Xt#i)S$HlLN21quL$i+SEp;?bxFB25aX?
zeeS6dzo&N_^5HLbNQcQpMs+N#j|NQCm_R<;u3!A2;KSwR<b!4c@hkUVThy^<-8h&h
z@KQO*fvIrzBGsD$rOT|n($n5)w<pN9k;WuWUd7!|URLYN%$*MXZUN&vwip-TlUU@?
zCZ*{7P*b=`a0}f3U{0IEnSSHzA;htt^U@d;8O?_uKf5Dyxi)2Mf56`VQu4iH?^00E
z2^c2%KIFRx{gThPerPK4=g#F<%QpC08`O`A?EW^3n<Cs*b|x7lB>d?)>k%Ycqc2BS
zZ{OSI6We>%{KMgpv*M36URP<DZeP|z9uW6(-Y5+N6GiCc#13wC9=&iQ3I>ULIRS@b
zNEoZ+%sR|D*hcplnYh}L?mxrpW(m2&ce{u;#ObA%ODO{DEoDjM9nx~N9fGkuMZ~6w
z`#&no9d-_h1W4bZdhHv7eNFrz3h$?X5)-!G2OkH8U5E;hN@s}Xq)I9X%}Rbwx#=&x
zj$;DA0{~bGFLEi`P``k~*wF0;)15$J@vY6_O*>Ry-g&|)OTHEB^w(kr$x(X9B0TBy
z2bm9hBv91S%oz3EV%J{Qp6xm<s^BI9+mj5AIIrFOfstd2QqSzjypMWT_~l&?Z&CA{
z;gWbk<G^w>6@iRW$<nbXxJIy&cx{CMxvv}vQ?Ufv<k9=0ptQ0r+#VjBa4+`rqcaQi
z<w~ZtOK5hT$QF}icDJ8rn4A$Kr2^KyHKUXd6~y$zoG%o^5ynO^ROfwQt5%OhCe-hI
z8=V{rq90u)R`;WXPL_3Z@A9fD+YdjH^%<~#_%mGDo`;O1$bQ31QPEPR`k1JhRBR?s
z=9Y1>hr6{^Ys?MgG(B0utO+h{qvS*DviiOT%UU92=*85Pm#a-&-n+SyR*)g>1jQo%
zTAEN*;=EZ|P`x_$MuT>apl-Sqh}d{@SiEFtcx}sq+WJ`Cw+yMIWup+7yHQwrI+@9X
z5v^^$sCNnLsKgwWH(d@v$<ESQOv+!H&Z%Ey9<itUI-W+@?S^?**Dn_ZJ9uK%R?F0e
zKbeSo!Mzjv9X$&77kC9y*N5w*6P1D`IW=66T$WA#GUMQ9-J3z?>6>Y2BggbNMd>*K
z7H?B0TPNO+io^LFYWdzy<VZP{2Ln^40zcNl0%z>Dj>F$^{eXN`^|!Nn2$^b_+UTj&
zue{%H8#HZO|L*0Ota#bgGiI0$gFGQK;U~8a0L2PE8zcVtT@865`5^srw@olWFwUHs
z;QR7&xI8ja?Gb>F0_)g;<_i^yG9p9AP$^f{A-!WOto3cg7+grwm+wZ;j7X%To$QH!
zEuzO2*Z|~9`)U$|T!M_xUh5couOLt;H1qWIFUZsB2jLRJm#>X@c=11cb<<{Px+8Q~
z7>8#4fU&XgK?+YYYUl?Qu&_fdbdfz=;53x+3MccYudGBXXHe5a#jwj)erS5X#FVV^
znH%voo%yTbXZBNMpxwNyRvhd>D$45NeX_%#g7eGP;D`ItGxTMQHQ^fZCfQ{<K5XK-
z&7NZo*_wIq0$GD(%5*BqC$-|V?HB976Y`qd$(T_7t6?ri8I`oSSp};4(5<@|<8SK?
zN79-}#?F@-cUzrqzRdk3_V~4-DKsD$zHdn(u<xzrH;R~MKRYq<W|XXI;(&A2Jc2c>
zgG)G~`MYl#z+&UZ?y>aPW`%drfA#*B83{uN>69AiH&u1Oz&Z_ip1;JJs%Ow-3Mz97
za{H3><hyP&Ka)12%*5QTqzcdKh8o{Vo5j_4ig2x3#j-$y<7Em<{Tm<NQ|;E?&2tC?
z{o*CznfOq;d*gCoFxyavrmQ44h26rRTlG8MuATPH&)#1?<(Ov(p1HU!?p$!)tDip}
zv!zCt?imN9o%@;6EB|zqBa&DqaZPiN=jo$mRx|TrTfIkWcKn&?PL;f!pfhw=pS2y;
zJG=38Hn730#8GJPDXPv@%GU&p=QwX%4YDYptS&Dotf6#^;CB)<H-|z~+Swdh^DI0*
z%Z8P@ZYEK4+HyHL(n7v#W~*k6ISidNytbhqsUO-lh2x5QrrK~N$4`+q_wR@bM2eYk
zkM{Ez*q1Ab-NdPSQ9Vc4GU6d)q?{m=t1`+SfS_pi&~yg8-)|$l-=-N88uzk$4zWC9
zNjXuK3Szsc>4>JfoQWdf!B!~hGS+K}Hse`&=BuH*&e$4|XAkI})4afnG=@tRz=Twv
zJ1$l-7THz`lhWR7tc=Po4Gr5Jy2peOj;{_0w7fbsp6B;}eHn}#eBHZ2aVHaENQw`_
ze45r^b!b`~?6D#*$3QBbZ>3I)pc-yR4OZ6YDgv9o_yst4zF^?_BJt)aXu<W6t18W>
z6y&2*^_C}MVd4|dY(_L6L#G5e-Xg0q#^v>hh>tZ43+S5QnVvD!93H6T&HXsCa=Ha$
z8f}s<ob72SHtH1A;C;s(99%38Vo7JVSbGFsI2D5f=`nC2NE?qddqt$ZtK2a{8+BxG
z+p^)HC_SDA3gz!q_O;GhMvKxPiGN2-HLr5qV1d3WRyN-9`IxAHV|y+Gk}l>uE-lV%
z2$UP2Tw+m)>uA3H?66p^NZBZ2A*=Ii*83&S?5~oxqRT7Ey~J|SS+G9Nt;R0W)|rXs
z3ro4dk0Mq_I$2YM<sfowi*T!a*(1U;-TAugy#!S^=b{v2D*tWC*sC9iaqegb3=sv0
zWMn$N)Gt3m%k_{NU*&CkmIU`cmM~W1+>A7lp`>hY&Gd+63oPVcQ!@{-w_v5!PtW8k
zr&)DHEZ&AnNgH^txNS7g=cjS8z+a{Ag2iA@BYuqvcnu<4X22Pcy<1Ti8?(_XO76W)
zBRA5>zagu3`49A(As795_ydLG1^PriMfDq*VHM-?>|?DNL^$2a2^g+kb|2#2Hh|6_
zkGAW}kqDrXs-ZOp-pEb3eyn}IHsWiuwzGTS{6xUT*F9dA^qCNivVUlVIZX_#61E=c
z%3VLk{!`#YK~wRdcBsws`B>@riqGC+g>+iiR`R!o!4G3`IA&;ixA%I1`hMoiPQYbO
zssI!GbQ?X$afcUq3lQcR7QgM5$nz_Vr;kmvYm_mU;;rB9ofB}#0r7!&ukYqDY}^+_
zsH!%3iY*+S>l|C@dr{_w+9v$>q5*)M>qTF$^RGs5-E+3}^zaq@_ZT98Ijy+{hfJ%%
zT^s;l0T%!u`)iDsuz>Fq$L<s@?JhRT7ki*9LZ*?l-I6BW*=NyKE$80i<jlPN9WTB=
zIh}{VX4c!cbsImE?X}1V(QILRs+nJ40=TVHRz9P7p^PP5GWTcqT}?999F?2LD@6U=
zIQf03#GPQ&kq8-!y9LqS%~Wr;nkusG<(!0v4lQ&x*i1(cisByGbl+IpmUvA2v6#cQ
zlLfka4+9bzeqlCt@=6n41*Q^o==a25%HdCmeq>Y;1v2AjEyE*_;O!FL_D>`32f{@$
z>N<1E-&FH}kKM_x@VG2iv2@femD9x}1=0__^5+#j;ye94zX>`Uy7yL0Yh;d~v~;mB
zg;+LgwbW8BbcEF!TY?jg;ib}tE@i7|z9FRy_{7J7an{U%TZd4qADdlxb4-0C$yv}M
zZM_hj-=G#<1D_WwD>-uwX3;gU*Drm5yS0b2gS{{8x?Vgz?2~3=I)o@A_JU)CGL+3|
zzqCQxRZXTyjny@Kq?;wkwRlL!{O4f|buJzqIeUXSnw1>4DALBz#JMAk70iYN5;hXM
z$;n(VsE|Jz%6Yx^>Em#J$uN9UnJ=UUZ5$Q5z{)^d9A8~_o)@c}shgNC45^ff2+&np
zREt6V$jOkR5G_mn2a-$2-<d_-mr(K@q``A*{+*{E;govnRl_LC6s?zBrnr#`{o08|
z7>LW54l~g8Ji#alWA(7lV;}=eV$e33+Eslh&YPcMM{u8lbpVFzZ_7HGFdh0Y6t4IC
zr_d2-wo>SHjez-eY5k|r@ozZX9nwdJe5!?L5R0<L?c@ej_yxlal+TFLS!rzshLb6Q
zib+v=Rmh*%2JcBNhv7l^@bbRD_&~H&oAnq;&(=pWLiv<%OXZ#efdR^9G73e-IJq|)
z$p<fUW7XsASvL+Ggd-AFCsoISLoTx8?Pd8!E_hgQHREy)5*KFOzQ9D1Sx84>(An?9
zoI^MxzTfWDL*NgI#J%_VRnh_t{^UDV$;8r#;%69}34Y|X782-&d6h9T=VDU?c;Dn<
zuF3tY4T`Oq#c8<$w-d`CKWw5+>27UTYj}KJ-H1rylrSTG)03Q`AoHb7Co`|LM_Vd@
zD~)@tp_SLtMO;H(w*6yaxg_RY>qd#kTly^BvfF+yFSx^Y0>Nnn6kQQlMz1Y$9a!|5
z%*+>i7o%=YEwslzo|!fyj}-v8k{Fh#XADk}saj`)1aU1YTMP%sUL^;uaWt#Wme$nA
z%%q;ug<xI<H}&M<+Ik)Dg|q%=W_-$ZeP3PY33+YQ*Y^J;C|?Kr0WH#SApm0WA|%3J
zSo}V<3|%L$D^&t`2lU4G!EN7g?8Te%`qLkB1~HA}<qZ6C@05|NU0ydS*n~d3rs;eG
z9vkwxRJI9t6`*Z3<C%`7tM6HrE3JK~FCRNNyVq(dACh;F$9E%Gz=U&;2x2+GAL>Ka
zA=~lL`tXw#eZ9u3d(r~=9+~+%k((z}<7Ih9sVc1D^cpy4xH=j*xHNeGT~52+&c7Ps
zy7K;EXV>D|9}({3{daEv)1M7d8&-FHc>iMh-){fRu7A2wBCrZB6u-Il_f-GHw!f!J
z_{--{?)^O*5#XOF<+tb3&A$=M-x2!zIsDTV06^euTuYF@bN~BP{yoCq>*aTZXH@?;
d!v6}Gz79GXH~zSA0EE}y+v`MV{ZVCr{{iA}wu%4%


From bd7687aead26921fb883f1a1938ed88bced998e9 Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Tue, 15 Feb 2022 23:11:46 +0200
Subject: [PATCH 688/784] Add test to make sure Firefox profile creation is
 working

---
 .../functional/Firefox/FirefoxProfileTest.php | 40 +++++++++++++++++--
 tests/functional/web/index.html               |  5 ++-
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 2d44cc6e5..68f2cd4c8 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -62,11 +62,24 @@ protected function tearDown(): void
         }
     }
 
+    public function testShouldStartDriverWithEmptyProfile()
+    {
+        $firefoxProfile = new FirefoxProfile();
+        $this->startFirefoxDriverWithProfile($firefoxProfile);
+
+        $this->driver->get('http://localhost:8000/');
+        $element = $this->driver->findElement(WebDriverBy::id('welcome'));
+        $this->assertSame(
+            'Welcome to the php-webdriver testing page.',
+            $element->getText()
+        );
+    }
+
     public function testShouldInstallExtension()
     {
         $firefoxProfile = new FirefoxProfile();
         $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
-        $this->driver = $this->startFirefoxDriver($firefoxProfile, ['-headless']);
+        $this->startFirefoxDriverWithProfile($firefoxProfile);
 
         $this->driver->get($this->getTestPageUrl('index.html'));
 
@@ -76,6 +89,25 @@ public function testShouldInstallExtension()
         $this->assertEquals('This element was added by browser extension', $element->getText());
     }
 
+    public function testShouldUseProfilePreferences()
+    {
+        $firefoxProfile = new FirefoxProfile();
+
+        // Please note, although it is possible to set preferences right into the profile (what this test does),
+        // we recommend using the setPreference() method on FirefoxOptions instead, so that you don't need to
+        // create FirefoxProfile.
+        $firefoxProfile->setPreference('javascript.enabled', false);
+
+        $this->startFirefoxDriverWithProfile($firefoxProfile);
+        $this->driver->get('http://localhost:8000/');
+
+        $noScriptElement = $this->driver->findElement(WebDriverBy::id('noscript'));
+        $this->assertEquals(
+            'This element is only shown with JavaScript disabled.',
+            $noScriptElement->getText()
+        );
+    }
+
     protected function getTestPageUrl($path)
     {
         $host = 'http://localhost:8000/';
@@ -86,17 +118,17 @@ protected function getTestPageUrl($path)
         return $host . '/' . $path;
     }
 
-    private function startFirefoxDriver(FirefoxProfile $firefoxProfile, array $arguments = [])
+    private function startFirefoxDriverWithProfile(FirefoxProfile $firefoxProfile)
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
 
         $firefoxOptions = new FirefoxOptions();
-        $firefoxOptions->addArguments($arguments);
+        $firefoxOptions->addArguments(['-headless']);
         $desiredCapabilities = DesiredCapabilities::firefox();
         $desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
         $desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
 
-        return FirefoxDriver::start($desiredCapabilities);
+        $this->driver = FirefoxDriver::start($desiredCapabilities);
     }
 }
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index f94c7bc53..0f379e26b 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -15,7 +15,6 @@
     </style>
 </head>
 <body style="background-color: #fafaff;">
-
     <div id="red-box"></div>
 
     <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
@@ -65,6 +64,10 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     <hr />
 </div>
 
+<noscript id="noscript">
+    <p>This element is only shown with JavaScript disabled.</p>
+</noscript>
+
 <div id="element-with-location" style="position: absolute; top: 550px; left: 33px; width: 333px; height: 66px;">
     Foo
 </div>

From f34c2ca85f01f591be9655b659e7c6cb73e8b534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 30 Aug 2022 11:48:12 +0200
Subject: [PATCH 689/784] Add setProfile method for straighforward use of
 FirefoxProfile

---
 CHANGELOG.md                                  |  4 ++++
 lib/Firefox/FirefoxDriver.php                 |  7 ++++++
 lib/Firefox/FirefoxOptions.php                | 22 +++++++++++++++++++
 .../functional/Firefox/FirefoxProfileTest.php |  2 +-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71c0f3904..3e3f018f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,12 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- `setProfile()` method to `FirefoxOptions`, which is now a preferred way to set Firefox Profile.
+
 ### Changed
 - Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
+- Deprecate `FirefoxDriver::PROFILE` constant. Instead, use `setProfile()` method of `FirefoxOptions` to set Firefox Profile.
 
 ## 1.12.1 - 2022-05-03
 ### Fixed
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 34dd13de2..70f6ff0d9 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -9,6 +9,13 @@
 
 class FirefoxDriver extends LocalWebDriver
 {
+    /**
+     * @deprecated Pass Firefox Profile using FirefoxOptions:
+     * $firefoxOptions = new FirefoxOptions();
+     * $firefoxOptions->setProfile($profile->encode());
+     * $capabilities = DesiredCapabilities::firefox();
+     * $capabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
+     */
     const PROFILE = 'firefox_profile';
 
     /**
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index 06e61c3d5..0a3a16744 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -17,6 +17,8 @@ class FirefoxOptions implements \JsonSerializable
     const OPTION_ARGS = 'args';
     /** @var string */
     const OPTION_PREFS = 'prefs';
+    /** @var string */
+    const OPTION_PROFILE = 'profile';
 
     /** @var array */
     private $options = [];
@@ -24,6 +26,8 @@ class FirefoxOptions implements \JsonSerializable
     private $arguments = [];
     /** @var array */
     private $preferences = [];
+    /** @var FirefoxProfile */
+    private $profile;
 
     public function __construct()
     {
@@ -50,6 +54,9 @@ public function setOption($name, $value)
         if ($name === self::OPTION_ARGS) {
             throw new \InvalidArgumentException('Use addArguments() method to add Firefox arguments');
         }
+        if ($name === self::OPTION_PROFILE) {
+            throw new \InvalidArgumentException('Use setProfile() method to set Firefox profile');
+        }
 
         $this->options[$name] = $value;
 
@@ -87,6 +94,18 @@ public function setPreference($name, $value)
         return $this;
     }
 
+    /**
+     * @see https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefox-profile
+     * @param FirefoxProfile $profile
+     * @return self
+     */
+    public function setProfile(FirefoxProfile $profile)
+    {
+        $this->profile = $profile;
+
+        return $this;
+    }
+
     /**
      * @return array
      */
@@ -99,6 +118,9 @@ public function toArray()
         if (!empty($this->preferences)) {
             $array[self::OPTION_PREFS] = $this->preferences;
         }
+        if (!empty($this->profile)) {
+            $array[self::OPTION_PROFILE] = $this->profile->encode();
+        }
 
         return $array;
     }
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 68f2cd4c8..408390407 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -125,9 +125,9 @@ private function startFirefoxDriverWithProfile(FirefoxProfile $firefoxProfile)
 
         $firefoxOptions = new FirefoxOptions();
         $firefoxOptions->addArguments(['-headless']);
+        $firefoxOptions->setProfile($firefoxProfile);
         $desiredCapabilities = DesiredCapabilities::firefox();
         $desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
-        $desiredCapabilities->setCapability(FirefoxDriver::PROFILE, $firefoxProfile);
 
         $this->driver = FirefoxDriver::start($desiredCapabilities);
     }

From d8c07c122e90be74f0e8e455ce20b49b84c5faf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 30 Aug 2022 11:59:26 +0200
Subject: [PATCH 690/784] Add functional test for Firefox setPreference

---
 .../functional/Firefox/FirefoxDriverTest.php  | 26 +++++++++++++++++--
 .../functional/Firefox/FirefoxProfileTest.php |  1 +
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
index cc107793a..7c7b91370 100644
--- a/tests/functional/Firefox/FirefoxDriverTest.php
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -5,10 +5,14 @@
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\Service\DriverCommandExecutor;
+use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @group exclude-chrome
+ * @group exclude-edge
+ * @group exclude-safari
  * @group exclude-saucelabs
  * @covers \Facebook\WebDriver\Firefox\FirefoxDriver
  * @covers \Facebook\WebDriver\Local\LocalWebDriver
@@ -49,12 +53,30 @@ public function testShouldStartFirefoxDriver()
         $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
     }
 
-    private function startFirefoxDriver()
+    public function testShouldSetPreferenceWithFirefoxOptions()
+    {
+        $firefoxOptions = new FirefoxOptions();
+        $firefoxOptions->setPreference('javascript.enabled', false);
+
+        $this->startFirefoxDriver($firefoxOptions);
+
+        $this->driver->get('http://localhost:8000/');
+
+        $noScriptElement = $this->driver->findElement(WebDriverBy::id('noscript'));
+        $this->assertEquals(
+            'This element is only shown with JavaScript disabled.',
+            $noScriptElement->getText()
+        );
+    }
+
+    private function startFirefoxDriver(FirefoxOptions $firefoxOptions = null)
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
 
-        $firefoxOptions = new FirefoxOptions();
+        if ($firefoxOptions === null) {
+            $firefoxOptions = new FirefoxOptions();
+        }
         $firefoxOptions->addArguments(['-headless']);
         $desiredCapabilities = DesiredCapabilities::firefox();
         $desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 408390407..c06ebd4cf 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -97,6 +97,7 @@ public function testShouldUseProfilePreferences()
         // we recommend using the setPreference() method on FirefoxOptions instead, so that you don't need to
         // create FirefoxProfile.
         $firefoxProfile->setPreference('javascript.enabled', false);
+        $this->assertSame('false', $firefoxProfile->getPreference('javascript.enabled'));
 
         $this->startFirefoxDriverWithProfile($firefoxProfile);
         $this->driver->get('http://localhost:8000/');

From 15c4d8ed07ddd93dc3c87e2fde39aad914a17a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 30 Aug 2022 12:00:31 +0200
Subject: [PATCH 691/784] Remove no longer needed FirefoxProfile workaround

Fixed in Geckodriver, see https://github.com/mozilla/geckodriver/issues/1990
---
 lib/Firefox/FirefoxProfile.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 8e6e1094e..6e06db6be 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -201,11 +201,6 @@ private function installExtension($extension, $profileDir)
         if (!copy($extension, $extensionDir . $extensionCommonName . '.xpi')) {
             throw new WebDriverException('Cannot install Firefox extension - cannot copy file');
         }
-
-        // extension installation with empty preferences (empty users.js) fails, thus add some dummy data
-        if (empty($this->preferences)) {
-            $this->setPreference('dummy.preference', true);
-        }
     }
 
     /**

From 563b71c8a5db643cc30d2df51e2abb625ed22876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 30 Aug 2022 15:45:11 +0200
Subject: [PATCH 692/784] Add notice for using 'prefs' in ChromeOptions, as it
 won't work in headless mode

---
 lib/Chrome/ChromeOptions.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 7c81955d8..0e547b209 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -107,6 +107,9 @@ public function addEncodedExtensions(array $encoded_extensions)
     /**
      * Sets an experimental option which has not exposed officially.
      *
+     * When using "prefs" to set Chrome preferences, please be aware they are so far not supported by
+     * Chrome running in headless mode, see https://bugs.chromium.org/p/chromium/issues/detail?id=775911
+     *
      * @param string $name
      * @param mixed $value
      * @return ChromeOptions

From 5a933a3d496ff9b195d21f181619b74bd2f929c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 1 Sep 2022 14:21:58 +0200
Subject: [PATCH 693/784] Throw exception instead of fatal error on invalid
 server response (fixes #945)

---
 CHANGELOG.md                              |  3 +++
 lib/Remote/RemoteWebDriver.php            |  9 +++++++
 tests/unit/Remote/RemoteWebDriverTest.php | 30 +++++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e3f018f2..923eeee4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
 - Deprecate `FirefoxDriver::PROFILE` constant. Instead, use `setProfile()` method of `FirefoxOptions` to set Firefox Profile.
 
+### Fixed
+- Throw `UnknownErrorException` instead of fatal error if remote end returns invalid response for `findElement()`/`findElements()` commands.
+
 ## 1.12.1 - 2022-05-03
 ### Fixed
 - Improper PHP documentation for `getAttribute()` and `getDomProperty()`.
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f45ae8da1..9887d2b42 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\UnknownErrorException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\Support\ScreenshotHelper;
@@ -209,6 +210,10 @@ public function findElement(WebDriverBy $by)
             JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
+        if ($raw_element === null) {
+            throw new UnknownErrorException('Unexpected server response to findElement command');
+        }
+
         return $this->newElement(JsonWireCompat::getElement($raw_element));
     }
 
@@ -226,6 +231,10 @@ public function findElements(WebDriverBy $by)
             JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
+        if ($raw_elements === null) {
+            throw new UnknownErrorException('Unexpected server response to findElements command');
+        }
+
         $elements = [];
         foreach ($raw_elements as $raw_element) {
             $elements[] = $this->newElement(JsonWireCompat::getElement($raw_element));
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 7f0475dec..198fd3997 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -2,7 +2,9 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\UnknownErrorException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
+use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverNavigation;
 use Facebook\WebDriver\WebDriverOptions;
 use Facebook\WebDriver\WebDriverWait;
@@ -102,4 +104,32 @@ public function testShouldCreateWebDriverWaitInstance()
 
         $this->assertInstanceOf(WebDriverWait::class, $wait);
     }
+
+    /**
+     * @param string $method
+     * @param string $expectedExceptionMessage
+     * @dataProvider provideMethods
+     */
+    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($method, $expectedExceptionMessage)
+    {
+        $executorMock = $this->createMock(HttpCommandExecutor::class);
+        $executorMock->expects($this->once())
+            ->method('execute')
+            ->with($this->isInstanceOf(WebDriverCommand::class))
+            ->willReturn(new WebDriverResponse('session-id'));
+
+        $this->driver->setCommandExecutor($executorMock);
+
+        $this->expectException(UnknownErrorException::class);
+        $this->expectExceptionMessage($expectedExceptionMessage);
+        call_user_func([$this->driver, $method], $this->createMock(WebDriverBy::class));
+    }
+
+    public function provideMethods()
+    {
+        return [
+            ['findElement', 'Unexpected server response to findElement command'],
+            ['findElements', 'Unexpected server response to findElements command'],
+        ];
+    }
 }

From 0ae8712a6c4d5f43d048706e1df5664d309ec4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 4 Sep 2022 12:03:09 +0200
Subject: [PATCH 694/784] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 923eeee4d..1c9509664 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,13 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 ### Added
+- Support for current Firefox XPI extension format. Extensions could now be loaded into `FirefoxProfile` using `addExtension()` method.
 - `setProfile()` method to `FirefoxOptions`, which is now a preferred way to set Firefox Profile.
 
 ### Changed
 - Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
 - Deprecate `FirefoxDriver::PROFILE` constant. Instead, use `setProfile()` method of `FirefoxOptions` to set Firefox Profile.
+- Deprecate `getAllSessions()` method of `RemoteWebDriver` (which is not part of W3C WebDriver).
 
 ### Fixed
 - Throw `UnknownErrorException` instead of fatal error if remote end returns invalid response for `findElement()`/`findElements()` commands.

From 7c7cf67114c7ef5344b55809e47ac14d8058ed71 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 4 Sep 2022 11:50:43 +0200
Subject: [PATCH 695/784] Add GitHub permissions on action workflows

Ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
---
 .github/workflows/docs-lint.yml    | 3 +++
 .github/workflows/docs-publish.yml | 3 +++
 .github/workflows/no-response.yaml | 3 +++
 .github/workflows/sauce-labs.yaml  | 3 +++
 .github/workflows/tests.yaml       | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml
index 56667ce70..e0f0bb531 100644
--- a/.github/workflows/docs-lint.yml
+++ b/.github/workflows/docs-lint.yml
@@ -1,5 +1,8 @@
 name: Lint PHP documentation
 
+permissions:
+  contents: read
+
 on:
   push:
   pull_request:
diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
index 02a50534b..edf50d967 100755
--- a/.github/workflows/docs-publish.yml
+++ b/.github/workflows/docs-publish.yml
@@ -1,5 +1,8 @@
 name: Publish API documentation
 
+permissions:
+  contents: read
+
 on:
   repository_dispatch:
     types: [ run-build-api-docs ]
diff --git a/.github/workflows/no-response.yaml b/.github/workflows/no-response.yaml
index 2970c7d72..69b1eb840 100644
--- a/.github/workflows/no-response.yaml
+++ b/.github/workflows/no-response.yaml
@@ -1,5 +1,8 @@
 name: No Response
 
+permissions:
+  issues: write
+
 # Both `issue_comment` and `scheduled` event types are required for this Action to work properly.
 on:
   issue_comment:
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 878743ef1..c966cbacc 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -1,5 +1,8 @@
 name: Sauce Labs
 
+permissions:
+  contents: read
+
 on:
   push:
   schedule:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2cea57936..2452c8619 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -1,5 +1,8 @@
 name: Tests
 
+permissions:
+  contents: read
+
 on:
   push:
   pull_request:

From ed9fd1268681a98ba0b6862ff8370bff51462245 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 4 Sep 2022 11:51:09 +0200
Subject: [PATCH 696/784] Re-order arguments for createBySessionID

---
 lib/Remote/RemoteWebDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 9887d2b42..409cfce2a 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -141,8 +141,8 @@ public static function create(
      * This constructor can boost the performance a lot by reusing the same browser for the whole test suite.
      * You cannot pass the desired capabilities because the session was created before.
      *
-     * @param string $selenium_server_url The url of the remote Selenium WebDriver server
      * @param string $session_id The existing session id
+     * @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
      * @param bool $isW3cCompliant True to use W3C WebDriver (default), false to use the legacy JsonWire protocol

From 5a28a2f3aaf4cc157b6a2f1b461bdd420571d6e3 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 4 Sep 2022 11:54:21 +0200
Subject: [PATCH 697/784] Update .gitattributes

---
 .gitattributes | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index e6146bc76..7800fad58 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@
 /example.php export-ignore
 /phpunit.xml.dist export-ignore
 /.github export-ignore
-/.php_cs.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
 /phpstan.neon export-ignore
 /.coveralls.yml export-ignore
+/logs export-ignore

From 7e3a7e027364ba6ac9927277557f7c4ec2869782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 1 Sep 2022 16:41:05 +0200
Subject: [PATCH 698/784] Increase default request timeout to 3 minutes
 (address #859)

---
 CHANGELOG.md                       | 1 +
 lib/Remote/HttpCommandExecutor.php | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c9509664..f89893ed6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Throw `UnknownErrorException` instead of fatal error if remote end returns invalid response for `findElement()`/`findElements()` commands.
+- Increase default request timeout to 3 minutes (instead of 30 seconds).
 
 ## 1.12.1 - 2022-05-03
 ### Fixed
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 2d510a038..8099535de 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -208,8 +208,9 @@ public function __construct($url, $http_proxy = null, $http_proxy_port = null)
         curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($this->curl, CURLOPT_HTTPHEADER, static::DEFAULT_HTTP_HEADERS);
-        $this->setRequestTimeout(30000);
-        $this->setConnectionTimeout(30000);
+
+        $this->setConnectionTimeout(30 * 1000); // 30 seconds
+        $this->setRequestTimeout(180 * 1000); // 3 minutes
     }
 
     public function disableW3cCompliance()

From 619d27bf5025b99cf9b37a5962434156fd378328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Sep 2022 15:32:28 +0200
Subject: [PATCH 699/784] Use constants for test page names

---
 tests/functional/FileUploadTest.php           |  2 +-
 .../functional/Firefox/FirefoxProfileTest.php |  3 +-
 tests/functional/RemoteKeyboardTest.php       |  2 +-
 tests/functional/RemoteTargetLocatorTest.php  | 24 ++++-----
 .../functional/RemoteWebDriverCreateTest.php  |  2 +-
 .../RemoteWebDriverFindElementTest.php        | 10 ++--
 tests/functional/RemoteWebDriverTest.php      | 20 ++++----
 tests/functional/RemoteWebElementTest.php     | 50 +++++++++----------
 tests/functional/TestPage.php                 | 25 ++++++++++
 tests/functional/WebDriverActionsTest.php     | 18 +++----
 tests/functional/WebDriverAlertTest.php       |  2 +-
 tests/functional/WebDriverByTest.php          |  2 +-
 tests/functional/WebDriverCheckboxesTest.php  |  2 +-
 tests/functional/WebDriverNavigationTest.php  | 12 ++---
 .../WebDriverOptionsCookiesTest.php           |  2 +-
 tests/functional/WebDriverRadiosTest.php      |  2 +-
 tests/functional/WebDriverSelectTest.php      |  2 +-
 tests/functional/WebDriverTimeoutsTest.php    |  6 +--
 18 files changed, 106 insertions(+), 80 deletions(-)
 create mode 100644 tests/functional/TestPage.php

diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index f4728be41..4ca5e1e60 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -18,7 +18,7 @@ class FileUploadTest extends WebDriverTestCase
      */
     public function testShouldUploadAFile()
     {
-        $this->driver->get($this->getTestPageUrl('upload.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::UPLOAD));
 
         $fileElement = $this->driver->findElement(WebDriverBy::name('upload'));
 
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index c06ebd4cf..4e16dd096 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -17,6 +17,7 @@
 
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\TestPage;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
@@ -81,7 +82,7 @@ public function testShouldInstallExtension()
         $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
         $this->startFirefoxDriverWithProfile($firefoxProfile);
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index a97b3343d..dfab3a687 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -21,7 +21,7 @@ class RemoteKeyboardTest extends WebDriverTestCase
      */
     public function testShouldPressSendAndReleaseKeys()
     {
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $this->driver->getKeyboard()->sendKeys('ab');
         $this->driver->getKeyboard()->pressKey(WebDriverKeys::SHIFT);
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index a9e03e514..f3a098be4 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -11,7 +11,7 @@ class RemoteTargetLocatorTest extends WebDriverTestCase
 {
     public function testShouldSwitchToWindow()
     {
-        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
         $originalWindowHandle = $this->driver->getWindowHandle();
         $windowHandlesBefore = $this->driver->getWindowHandles();
 
@@ -49,7 +49,7 @@ public function testShouldSwitchToWindow()
 
     public function testActiveElement()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $activeElement = $this->driver->switchTo()->activeElement();
         $this->assertInstanceOf(RemoteWebElement::class, $activeElement);
@@ -67,7 +67,7 @@ public function testShouldSwitchToFrameByItsId()
         $firstChildFrame = 'This is the content of the iFrame';
         $secondChildFrame = 'open new window';
 
-        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
         $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
@@ -95,7 +95,7 @@ public function testShouldSwitchToParentFrame()
         $parentPage = 'This is the host page which contains an iFrame';
         $firstChildFrame = 'This is the content of the iFrame';
 
-        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
         $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
 
@@ -108,7 +108,7 @@ public function testShouldSwitchToParentFrame()
 
     public function testShouldSwitchToFrameByElement()
     {
-        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
         $element = $this->driver->findElement(WebDriverBy::id('iframe_content'));
         $this->driver->switchTo()->frame($element);
@@ -125,8 +125,8 @@ public function testShouldCreateNewWindow()
 
         // Ensure that the initial context matches.
         $initialHandle = $this->driver->getWindowHandle();
-        $this->driver->get($this->getTestPageUrl('index.html'));
-        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
+        $this->assertEquals($this->getTestPageUrl(TestPage::INDEX), $this->driver->getCurrentUrl());
         $source = $this->driver->getPageSource();
         $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
         $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
@@ -140,13 +140,13 @@ public function testShouldCreateNewWindow()
         $this->assertCount(2, $windowHandles);
 
         $newWindowHandle = $this->driver->getWindowHandle();
-        $this->driver->get($this->getTestPageUrl('upload.html'));
-        $this->assertEquals($this->getTestPageUrl('upload.html'), $this->driver->getCurrentUrl());
+        $this->driver->get($this->getTestPageUrl(TestPage::UPLOAD));
+        $this->assertEquals($this->getTestPageUrl(TestPage::UPLOAD), $this->driver->getCurrentUrl());
         $this->assertNotEquals($initialHandle, $newWindowHandle);
 
         // Switch back to original context.
         $this->driver->switchTo()->window($initialHandle);
-        $this->assertEquals($this->getTestPageUrl('index.html'), $this->driver->getCurrentUrl());
+        $this->assertEquals($this->getTestPageUrl(TestPage::INDEX), $this->driver->getCurrentUrl());
     }
 
     /**
@@ -156,7 +156,7 @@ public function testShouldNotAcceptStringAsFrameIdInW3cMode()
     {
         self::skipForJsonWireProtocol();
 
-        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage(
@@ -173,7 +173,7 @@ public function testShouldAcceptStringAsFrameIdInJsonWireMode()
     {
         self::skipForW3cProtocol();
 
-        $this->driver->get($this->getTestPageUrl('page_with_frame.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
         $this->driver->switchTo()->frame('iframe_content');
 
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 6473e9b4a..3de4b2c93 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -108,7 +108,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
             $this->connectionTimeout,
             $this->requestTimeout
         );
-        $originalDriver->get($this->getTestPageUrl('index.html'));
+        $originalDriver->get($this->getTestPageUrl(TestPage::INDEX));
         $this->compatAssertStringContainsString('/index.html', $originalDriver->getCurrentURL());
 
         // Store session ID
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 5a7d18e70..5887b4fba 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -13,7 +13,7 @@ class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
     public function testShouldThrowExceptionIfElementCannotBeFound()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('not_existing'));
@@ -21,7 +21,7 @@ public function testShouldThrowExceptionIfElementCannotBeFound()
 
     public function testShouldFindElementIfExistsOnAPage()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
 
@@ -30,7 +30,7 @@ public function testShouldFindElementIfExistsOnAPage()
 
     public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('not_existing'));
 
@@ -40,7 +40,7 @@ public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
 
     public function testShouldFindMultipleElements()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
 
@@ -58,7 +58,7 @@ public function testEscapeCssSelector()
             'CSS selectors containing special characters are not supported by the legacy protocol'
         );
 
-        $this->driver->get($this->getTestPageUrl('escape_css.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::ESCAPE_CSS));
 
         $element = $this->driver->findElement(WebDriverBy::id('.fo\'oo'));
         $this->assertSame('Foo', $element->getText());
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 984c11978..81dbbd953 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -15,7 +15,7 @@ class RemoteWebDriverTest extends WebDriverTestCase
      */
     public function testShouldGetPageTitle()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $this->assertEquals(
             'php-webdriver test page',
@@ -29,7 +29,7 @@ public function testShouldGetPageTitle()
      */
     public function testShouldGetCurrentUrl()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $this->assertStringEndsWith('/index.html', $this->driver->getCurrentURL());
     }
@@ -39,7 +39,7 @@ public function testShouldGetCurrentUrl()
      */
     public function testShouldGetPageSource()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $source = $this->driver->getPageSource();
         $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
@@ -118,7 +118,7 @@ public function testShouldQuitAndUnsetExecutor()
      */
     public function testShouldGetWindowHandles()
     {
-        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
 
         $windowHandle = $this->driver->getWindowHandle();
         $windowHandles = $this->driver->getWindowHandles();
@@ -142,7 +142,7 @@ public function testShouldGetWindowHandles()
      */
     public function testShouldCloseWindow()
     {
-        $this->driver->get($this->getTestPageUrl('open_new_window.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
 
         $this->driver->wait()->until(WebDriverExpectedCondition::numberOfWindowsToBe(2));
@@ -160,7 +160,7 @@ public function testShouldCloseWindow()
      */
     public function testShouldExecuteScriptAndDoNotBlockExecution()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
@@ -192,7 +192,7 @@ public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('id_test'));
         $this->assertSame('Test by ID', $element->getText());
@@ -232,7 +232,7 @@ public function testShouldExecuteScriptWithParamsAndReturnValue()
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element1 = $this->driver->findElement(WebDriverBy::id('id_test'));
         $element2 = $this->driver->findElement(WebDriverBy::className('test_class'));
@@ -257,7 +257,7 @@ public function testShouldTakeScreenshot()
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
         }
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $outputPng = $this->driver->takeScreenshot();
 
@@ -282,7 +282,7 @@ public function testShouldSaveScreenshotToFile()
 
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/selenium-screenshot.png';
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $this->driver->takeScreenshot($screenshotPath);
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index bb6568f6d..04e39bf8b 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -21,7 +21,7 @@ class RemoteWebElementTest extends WebDriverTestCase
      */
     public function testShouldGetText()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $elementWithSimpleText = $this->driver->findElement(WebDriverBy::id('text-simple'));
         $elementWithTextWithSpaces = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
 
@@ -35,7 +35,7 @@ public function testShouldGetText()
      */
     public function testShouldGetAttributeValue()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('text-simple'));
 
@@ -52,7 +52,7 @@ public function testShouldGetDomPropertyValue()
     {
         self::skipForJsonWireProtocol();
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('div-with-html'));
 
@@ -72,7 +72,7 @@ public function testShouldGetDomPropertyValue()
      */
     public function testShouldGetLocation()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
 
@@ -87,7 +87,7 @@ public function testShouldGetLocation()
      */
     public function testShouldGetLocationOnScreenOnceScrolledIntoView()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('element-out-of-viewport'));
 
@@ -112,7 +112,7 @@ public function testShouldGetLocationOnScreenOnceScrolledIntoView()
      */
     public function testShouldGetSize()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('element-with-location'));
 
@@ -127,7 +127,7 @@ public function testShouldGetSize()
      */
     public function testShouldGetCssValue()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $elementWithBorder = $this->driver->findElement(WebDriverBy::id('text-simple'));
         $elementWithoutBorder = $this->driver->findElement(WebDriverBy::id('text-with-spaces'));
@@ -147,7 +147,7 @@ public function testShouldGetCssValue()
      */
     public function testShouldGetTagName()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $paragraphElement = $this->driver->findElement(WebDriverBy::id('id_test'));
 
@@ -159,13 +159,13 @@ public function testShouldGetTagName()
      */
     public function testShouldClick()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
 
         $linkElement->click();
 
         $this->driver->wait()->until(
-            WebDriverExpectedCondition::urlContains('form.html')
+            WebDriverExpectedCondition::urlContains(TestPage::FORM)
         );
 
         $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
@@ -192,7 +192,7 @@ public function testGeckoDriverShouldClickOnBlockLevelElement()
         ];
 
         foreach ($links as $linkid) {
-            $this->driver->get($this->getTestPageUrl('gecko653.html'));
+            $this->driver->get($this->getTestPageUrl(TestPage::GECKO_653));
             $linkElement = $this->driver->findElement(WebDriverBy::id($linkid));
 
             $linkElement->click();
@@ -213,7 +213,7 @@ public function testGeckoDriverShouldClickNotInteractable()
     {
         self::skipForUnmatchedBrowsers(['firefox']);
 
-        $this->driver->get($this->getTestPageUrl('gecko653.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::GECKO_653));
 
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-index-plain-hidden'));
 
@@ -239,7 +239,7 @@ public function testGeckoDriverShouldClickNotInteractable()
      */
     public function testShouldClearFormElementText()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $input = $this->driver->findElement(WebDriverBy::id('input-text'));
         $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
@@ -258,7 +258,7 @@ public function testShouldClearFormElementText()
      */
     public function testShouldSendKeysToFormElement()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $input = $this->driver->findElement(WebDriverBy::id('input-text'));
         $textarea = $this->driver->findElement(WebDriverBy::id('textarea'));
@@ -294,7 +294,7 @@ public function testShouldSendKeysToFormElement()
      */
     public function testShouldDetectEnabledInputs()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $inputEnabled = $this->driver->findElement(WebDriverBy::id('input-text'));
         $inputDisabled = $this->driver->findElement(WebDriverBy::id('input-text-disabled'));
@@ -308,7 +308,7 @@ public function testShouldDetectEnabledInputs()
      */
     public function testShouldSelectedInputsOrOptions()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $checkboxSelected = $this->driver->findElement(
             WebDriverBy::cssSelector('input[name=checkbox][value=second]')
@@ -336,7 +336,7 @@ public function testShouldSelectedInputsOrOptions()
      */
     public function testShouldSubmitFormBySubmitEventOnForm()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $formElement = $this->driver->findElement(WebDriverBy::cssSelector('form'));
 
@@ -354,7 +354,7 @@ public function testShouldSubmitFormBySubmitEventOnForm()
      */
     public function testShouldSubmitFormBySubmitEventOnFormInputElement()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $inputTextElement = $this->driver->findElement(WebDriverBy::id('input-text'));
 
@@ -372,7 +372,7 @@ public function testShouldSubmitFormBySubmitEventOnFormInputElement()
      */
     public function testShouldSubmitFormByClickOnSubmitInput()
     {
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
         $submitElement = $this->driver->findElement(WebDriverBy::id('submit'));
 
@@ -390,7 +390,7 @@ public function testShouldSubmitFormByClickOnSubmitInput()
      */
     public function testShouldCompareEqualsElement()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $firstElement = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
         $differentElement = $this->driver->findElement(WebDriverBy::cssSelector('#text-simple'));
@@ -409,7 +409,7 @@ public function testShouldCompareEqualsElement()
      */
     public function testShouldThrowExceptionIfChildElementCannotBeFound()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
 
         $this->expectException(NoSuchElementException::class);
@@ -418,7 +418,7 @@ public function testShouldThrowExceptionIfChildElementCannotBeFound()
 
     public function testShouldFindChildElementIfExistsOnAPage()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
 
         $childElement = $element->findElement(WebDriverBy::cssSelector('li'));
@@ -430,7 +430,7 @@ public function testShouldFindChildElementIfExistsOnAPage()
 
     public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
 
         $childElements = $element->findElements(WebDriverBy::cssSelector('not_existing'));
@@ -441,7 +441,7 @@ public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
 
     public function testShouldFindMultipleChildElements()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
 
         $allElements = $this->driver->findElements(WebDriverBy::cssSelector('li'));
@@ -472,7 +472,7 @@ public function testShouldTakeAndSaveElementScreenshot()
 
         $screenshotPath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-') . '/element-screenshot.png';
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $element = $this->driver->findElement(WebDriverBy::id('red-box'));
 
diff --git a/tests/functional/TestPage.php b/tests/functional/TestPage.php
new file mode 100644
index 000000000..08cb86bec
--- /dev/null
+++ b/tests/functional/TestPage.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+class TestPage
+{
+    const ALERT = 'alert.html';
+    const DELAYED_ELEMENT = 'delayed_element.html';
+    const ESCAPE_CSS = 'escape_css.html';
+    const EVENTS = 'events.html';
+    const FORM = 'form.html';
+    const FORM_CHECKBOX_RADIO = 'form_checkbox_radio.html';
+    const GECKO_653 = 'gecko653.html';
+    const INDEX = 'index.html';
+    const OPEN_NEW_WINDOW = 'open_new_window.html';
+    const PAGE_WITH_FRAME = 'page_with_frame.html';
+    const SLOW_LOADING = 'slow_loading.html';
+    const SORTABLE = 'sortable.html';
+    const UPLOAD = 'upload.html';
+    const WEB_COMPONENTS = 'web_components.html';
+
+    private function __construct()
+    {
+    }
+}
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 8a01fb998..7b71d2a17 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -27,7 +27,7 @@ class WebDriverActionsTest extends WebDriverTestCase
 
     public function testShouldClickOnElement()
     {
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
 
@@ -49,7 +49,7 @@ public function testShouldClickOnElement()
 
     public function testShouldClickAndHoldOnElementAndRelease()
     {
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-1'));
 
@@ -78,7 +78,7 @@ public function testShouldContextClickOnElement()
             $this->markTestSkipped('Getting stuck in EdgeDriver');
         }
 
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-2'));
 
@@ -99,7 +99,7 @@ public function testShouldContextClickOnElement()
      */
     public function testShouldDoubleClickOnElement()
     {
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $element = $this->driver->findElement(WebDriverBy::id('item-3'));
 
@@ -115,7 +115,7 @@ public function testShouldDoubleClickOnElement()
      */
     public function testShouldSendKeysUpAndDown()
     {
-        $this->driver->get($this->getTestPageUrl('events.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
         $this->driver->action()
             ->keyDown(null, WebDriverKeys::CONTROL)
@@ -144,7 +144,7 @@ public function testShouldSendKeysUpAndDown()
      */
     public function testShouldMoveToElement()
     {
-        $this->driver->get($this->getTestPageUrl('sortable.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
         $item24 = $this->driver->findElement(WebDriverBy::id('item-2-4'));
@@ -167,7 +167,7 @@ public function testShouldMoveToElement()
      */
     public function testShouldMoveByOffset()
     {
-        $this->driver->get($this->getTestPageUrl('sortable.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
 
@@ -190,7 +190,7 @@ public function testShouldMoveByOffset()
      */
     public function testShouldDragAndDrop()
     {
-        $this->driver->get($this->getTestPageUrl('sortable.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
         $item24 = $this->driver->findElement(WebDriverBy::id('item-2-4'));
@@ -223,7 +223,7 @@ public function testShouldDragAndDrop()
      */
     public function testShouldDragAndDropBy()
     {
-        $this->driver->get($this->getTestPageUrl('sortable.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
         $item13 = $this->driver->findElement(WebDriverBy::id('item-1-3'));
 
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index e75533b8d..622dd10dd 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -15,7 +15,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPageUrl('alert.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::ALERT));
     }
 
     public function testShouldAcceptAlert()
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 6ff0c8a55..27ee04755 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -23,7 +23,7 @@ public function testShouldFindTextElementByLocator(
         $expectedText = null,
         $expectedAttributeValue = null
     ) {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $by = call_user_func([WebDriverBy::class, $webDriverByLocatorMethod], $webDriverByLocatorValue);
         $element = $this->driver->findElement($by);
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index e42ab144b..4d7f82b52 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -15,7 +15,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPageUrl('form_checkbox_radio.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM_CHECKBOX_RADIO));
     }
 
     public function testIsMultiple()
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index 630656ea4..f3fea87e8 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -13,7 +13,7 @@ class WebDriverNavigationTest extends WebDriverTestCase
      */
     public function testShouldNavigateToUrl()
     {
-        $this->driver->navigate()->to($this->getTestPageUrl('index.html'));
+        $this->driver->navigate()->to($this->getTestPageUrl(TestPage::INDEX));
 
         $this->assertStringEndsWith('/index.html', $this->driver->getCurrentURL());
     }
@@ -24,25 +24,25 @@ public function testShouldNavigateToUrl()
      */
     public function testShouldNavigateBackAndForward()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
 
         $linkElement->click();
 
         $this->driver->wait()->until(
-            WebDriverExpectedCondition::urlContains('form.html')
+            WebDriverExpectedCondition::urlContains(TestPage::FORM)
         );
 
         $this->driver->navigate()->back();
 
         $this->driver->wait()->until(
-            WebDriverExpectedCondition::urlContains('index.html')
+            WebDriverExpectedCondition::urlContains(TestPage::INDEX)
         );
 
         $this->driver->navigate()->forward();
 
         $this->driver->wait()->until(
-            WebDriverExpectedCondition::urlContains('form.html')
+            WebDriverExpectedCondition::urlContains(TestPage::FORM)
         );
 
         $this->assertTrue(true); // To generate coverage, see https://github.com/sebastianbergmann/phpunit/issues/3016
@@ -53,7 +53,7 @@ public function testShouldNavigateBackAndForward()
      */
     public function testShouldRefreshPage()
     {
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         // Change input element content, to make sure it was refreshed (=> cleared to original value)
         $inputElement = $this->driver->findElement(WebDriverBy::name('test_name'));
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index 2b0301256..31b915fd9 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -13,7 +13,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPageUrl('index.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
     }
 
     public function testShouldSetGetAndDeleteCookies()
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index b6f900d8a..d2c28d085 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -16,7 +16,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPageUrl('form_checkbox_radio.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM_CHECKBOX_RADIO));
     }
 
     public function testIsMultiple()
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index aa3cce1f2..01c075188 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -17,7 +17,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->driver->get($this->getTestPageUrl('form.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::FORM));
     }
 
     public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple()
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 72e5fd567..66f61f51a 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -17,7 +17,7 @@ class WebDriverTimeoutsTest extends WebDriverTestCase
      */
     public function testShouldFailGettingDelayedElementWithoutWait()
     {
-        $this->driver->get($this->getTestPageUrl('delayed_element.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::DELAYED_ELEMENT));
 
         $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('delayed'));
@@ -29,7 +29,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
      */
     public function testShouldGetDelayedElementWithImplicitWait()
     {
-        $this->driver->get($this->getTestPageUrl('delayed_element.html'));
+        $this->driver->get($this->getTestPageUrl(TestPage::DELAYED_ELEMENT));
 
         $this->driver->manage()->timeouts()->implicitlyWait(2);
         $element = $this->driver->findElement(WebDriverBy::id('delayed'));
@@ -47,7 +47,7 @@ public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
         $this->driver->manage()->timeouts()->pageLoadTimeout(1);
 
         try {
-            $this->driver->get($this->getTestPageUrl('slow_loading.html'));
+            $this->driver->get($this->getTestPageUrl(TestPage::SLOW_LOADING));
             $this->fail('ScriptTimeoutException or TimeoutException exception should be thrown');
         } catch (TimeoutException $e) { // thrown by Selenium 3.0.0+
         } catch (ScriptTimeoutException $e) { // thrown by Selenium 2

From 41dc36f13aeee6985c10531feee5f3bba70da932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 7 Sep 2022 12:49:52 +0200
Subject: [PATCH 700/784] Update readme, as the W3C WebDriver support is no
 longer experimental

---
 README.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2eb411645..2f2432095 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,11 @@ Php-webdriver library is PHP language binding for Selenium WebDriver, which allo
 
 This library is compatible with Selenium server version 2.x, 3.x and 4.x.
 
-The library supports [JsonWireProtocol](https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol) and also
-implements **experimental support** of [W3C WebDriver](https://w3c.github.io/webdriver/webdriver-spec.html).
-The W3C WebDriver support is not yet full-featured, however it should allow to control Firefox via Geckodriver and new
-versions of Chrome and Chromedriver with just a slight limitations.
+The library supports modern [W3C WebDriver](https://w3c.github.io/webdriver/) protocol, as well
+as legacy [JsonWireProtocol](https://www.selenium.dev/documentation/legacy/json_wire_protocol/).
 
-The concepts of this library are very similar to the "official" Java, .NET, Python and Ruby bindings from the
-[Selenium project](https://github.com/SeleniumHQ/selenium/).
+The concepts of this library are very similar to the "official" Java, JavaScript, .NET, Python and Ruby libraries
+which are developed as part of the [Selenium project](https://github.com/SeleniumHQ/selenium/).
 
 ## Installation
 
@@ -208,8 +206,8 @@ There are some projects already providing this:
 - [Symfony Panther](https://github.com/symfony/panther) uses php-webdriver and integrates with PHPUnit using `PantherTestCase`
 - [Laravel Dusk](https://laravel.com/docs/dusk) is another project using php-webdriver, could be used for testing via `DuskTestCase`
 - [Steward](https://github.com/lmc-eu/steward) integrates php-webdriver directly to [PHPUnit](https://phpunit.de/), and provides parallelization
-- [Codeception](http://codeception.com) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](http://codeception.com/docs/modules/WebDriver)
-- You can also check out this [blogpost](http://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration
+- [Codeception](https://codeception.com/) testing framework provides BDD-layer on top of php-webdriver in its [WebDriver module](https://codeception.com/docs/modules/WebDriver)
+- You can also check out this [blogpost](https://codeception.com/11-12-2013/working-with-phpunit-and-selenium-webdriver.html) + [demo project](https://github.com/DavertMik/php-webdriver-demo), describing simple [PHPUnit](https://phpunit.de/) integration
 
 ## Support
 

From e7e10d016a968c669445c19480bd68ee021d1b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sun, 11 Sep 2022 16:48:07 +0200
Subject: [PATCH 701/784] Run no-response action less often

---
 .github/workflows/no-response.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/no-response.yaml b/.github/workflows/no-response.yaml
index 69b1eb840..7147e3792 100644
--- a/.github/workflows/no-response.yaml
+++ b/.github/workflows/no-response.yaml
@@ -8,7 +8,7 @@ on:
   issue_comment:
     types: [created]
   schedule:
-    - cron: '33 * * * *' # every hour at :33
+    - cron: '* */8 * * *' # every hour at :33
 
 jobs:
   noResponse:

From 8fa5706c6178e1cc73ef1fb4700072d9b879f975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 12 Sep 2022 16:04:09 +0200
Subject: [PATCH 702/784] Add isDisplayed test

---
 lib/Remote/RemoteWebElement.php           |  2 ++
 tests/functional/RemoteWebElementTest.php | 18 ++++++++++++++++++
 tests/functional/web/index.html           |  4 ++++
 3 files changed, 24 insertions(+)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index add916934..499c53989 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -336,6 +336,8 @@ public function getText()
      * Is this element displayed or not? This method avoids the problem of having
      * to parse an element's "style" attribute.
      *
+     * However, not all browsers implement this feature, because it is not part of W3C WebDriver.
+     * @see https://w3c.github.io/webdriver/#element-displayedness
      * @return bool
      */
     public function isDisplayed()
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 04e39bf8b..321a4aa98 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -289,6 +289,24 @@ public function testShouldSendKeysToFormElement()
         $this->assertSame('bat13 37', $textarea->getAttribute('value'));
     }
 
+    /**
+     * @covers ::isDisplayed
+     * @group exclude-safari
+     *      Safari does not support /displayed endpoint.
+     */
+    public function testShouldDetectElementDisplayedness()
+    {
+        $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
+
+        $visibleElement = $this->driver->findElement(WebDriverBy::cssSelector('.test_class'));
+        $elementOutOfViewport = $this->driver->findElement(WebDriverBy::id('element-out-of-viewport'));
+        $hiddenElement = $this->driver->findElement(WebDriverBy::id('hidden-element'));
+
+        $this->assertTrue($visibleElement->isDisplayed());
+        $this->assertTrue($elementOutOfViewport->isDisplayed());
+        $this->assertFalse($hiddenElement->isDisplayed());
+    }
+
     /**
      * @covers ::isEnabled
      */
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index 0f379e26b..ca989677a 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -76,5 +76,9 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     Bar
 </div>
 
+<div id="hidden-element" style="display: none;">
+    This is not visible!
+</div>
+
 </body>
 </html>

From 09b3fd1db208ca7052db78c405fa6f5874da3605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 5 Sep 2022 12:36:00 +0200
Subject: [PATCH 703/784] Add missing method to EventFiringWebElement, as it
 will be part of the parent interface in the future

---
 lib/Support/Events/EventFiringWebElement.php | 10 ++++++++++
 phpstan.neon                                 | 15 +++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index a2fe4bb97..a791fa9f5 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -368,6 +368,16 @@ public function equals(WebDriverElement $other)
         }
     }
 
+    public function takeElementScreenshot($save_as = null)
+    {
+        try {
+            return $this->element->takeElementScreenshot($save_as);
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+            throw $exception;
+        }
+    }
+
     /**
      * @param WebDriverException $exception
      */
diff --git a/phpstan.neon b/phpstan.neon
index 846484976..d2b36c437 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -5,10 +5,17 @@ parameters:
         - tests/
 
     ignoreErrors:
-        # To be fixed:
-        - '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
-        - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
-        - '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
+        # To be fixed in next major version:
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
+          path: 'lib/Interactions/WebDriverTouchActions.php'
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriver::getTouch\(\)#'
+          path: 'lib/Support/Events/EventFiringWebDriver.php'
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getCoordinates\(\)#'
+          path: 'lib/Support/Events/EventFiringWebElement.php'
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::equals\(\)#'
+          path: 'lib/Support/Events/EventFiringWebElement.php'
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::takeElementScreenshot\(\)#'
+          path: 'lib/Support/Events/EventFiringWebElement.php'
         - '#Unsafe usage of new static\(\)#'
 
         # Parameter is intentionally not part of signature to not break BC

From 8c1cc96a3147c69c767e895d9df4361c648c90ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 6 Sep 2022 17:38:09 +0200
Subject: [PATCH 704/784] Add Shadow DOM support (fixes #1003)

---
 lib/Exception/DetachedShadowRootException.php | 10 ++
 lib/Exception/NoSuchShadowRootException.php   | 10 ++
 lib/Exception/WebDriverException.php          |  4 +
 lib/Remote/DriverCommand.php                  |  3 +
 lib/Remote/HttpCommandExecutor.php            | 12 +++
 lib/Remote/RemoteWebElement.php               | 21 ++++
 lib/Remote/ShadowRoot.php                     | 95 +++++++++++++++++++
 lib/Support/Events/EventFiringWebElement.php  | 10 ++
 lib/WebDriverElement.php                      | 10 ++
 lib/WebDriverSearchContext.php                | 12 +--
 phpstan.neon                                  |  2 +
 tests/functional/ShadowDomTest.php            | 85 +++++++++++++++++
 tests/functional/web/index.html               |  2 +
 tests/functional/web/web_components.html      | 38 ++++++++
 14 files changed, 306 insertions(+), 8 deletions(-)
 create mode 100644 lib/Exception/DetachedShadowRootException.php
 create mode 100644 lib/Exception/NoSuchShadowRootException.php
 create mode 100644 lib/Remote/ShadowRoot.php
 create mode 100644 tests/functional/ShadowDomTest.php
 create mode 100644 tests/functional/web/web_components.html

diff --git a/lib/Exception/DetachedShadowRootException.php b/lib/Exception/DetachedShadowRootException.php
new file mode 100644
index 000000000..b9bfb39cb
--- /dev/null
+++ b/lib/Exception/DetachedShadowRootException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+/**
+ * A command failed because the referenced shadow root is no longer attached to the DOM.
+ */
+class DetachedShadowRootException extends WebDriverException
+{
+}
diff --git a/lib/Exception/NoSuchShadowRootException.php b/lib/Exception/NoSuchShadowRootException.php
new file mode 100644
index 000000000..1e526b8f4
--- /dev/null
+++ b/lib/Exception/NoSuchShadowRootException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+/**
+ * The element does not have a shadow root.
+ */
+class NoSuchShadowRootException extends WebDriverException
+{
+}
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index 11a8fff45..d80689426 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -119,12 +119,16 @@ public static function throwException($status_code, $message, $results)
                     throw new NoSuchFrameException($message, $results);
                 case 'no such window':
                     throw new NoSuchWindowException($message, $results);
+                case 'no such shadow root':
+                    throw new NoSuchShadowRootException($message, $results);
                 case 'script timeout':
                     throw new ScriptTimeoutException($message, $results);
                 case 'session not created':
                     throw new SessionNotCreatedException($message, $results);
                 case 'stale element reference':
                     throw new StaleElementReferenceException($message, $results);
+                case 'detached shadow root':
+                    throw new DetachedShadowRootException($message, $results);
                 case 'timeout':
                     throw new TimeoutException($message, $results);
                 case 'unable to set cookie':
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 97b9090ef..3d35549bd 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -143,6 +143,9 @@ class DriverCommand
     const NEW_WINDOW = 'newWindow';
     const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
     const MINIMIZE_WINDOW = 'minimizeWindow';
+    const GET_ELEMENT_SHADOW_ROOT = 'getElementShadowRoot';
+    const FIND_ELEMENT_FROM_SHADOW_ROOT = 'findElementFromShadowRoot';
+    const FIND_ELEMENTS_FROM_SHADOW_ROOT = 'findElementsFromShadowRoot';
 
     private function __construct()
     {
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 8099535de..94e2cb5d5 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -141,6 +141,14 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
         DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
         DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::FIND_ELEMENT_FROM_SHADOW_ROOT => [
+            'method' => 'POST',
+            'url' => '/session/:sessionId/shadow/:id/element',
+        ],
+        DriverCommand::FIND_ELEMENTS_FROM_SHADOW_ROOT => [
+            'method' => 'POST',
+            'url' => '/session/:sessionId/shadow/:id/elements',
+        ],
         DriverCommand::FULLSCREEN_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/fullscreen'],
         DriverCommand::GET_ACTIVE_ELEMENT => ['method' => 'GET', 'url' => '/session/:sessionId/element/active'],
         DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
@@ -150,6 +158,10 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
             'method' => 'GET',
             'url' => '/session/:sessionId/element/:id/property/:name',
         ],
+        DriverCommand::GET_ELEMENT_SHADOW_ROOT => [
+            'method' => 'GET',
+            'url' => '/session/:sessionId/element/:id/shadow',
+        ],
         DriverCommand::GET_ELEMENT_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
         DriverCommand::GET_WINDOW_HANDLES => ['method' => 'GET', 'url' => '/session/:sessionId/window/handles'],
         DriverCommand::GET_WINDOW_POSITION => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 499c53989..2e5eae131 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -532,6 +532,27 @@ public function equals(WebDriverElement $other)
         ]);
     }
 
+    /**
+     * Get representation of an element's shadow root for accessing the shadow DOM of a web component.
+     *
+     * @return ShadowRoot
+     */
+    public function getShadowRoot()
+    {
+        if (!$this->isW3cCompliant) {
+            throw new UnsupportedOperationException('This method is only supported in W3C mode');
+        }
+
+        $response = $this->executor->execute(
+            DriverCommand::GET_ELEMENT_SHADOW_ROOT,
+            [
+                ':id' => $this->id,
+            ]
+        );
+
+        return ShadowRoot::createFromResponse($this->executor, $response);
+    }
+
     /**
      * Attempt to click on a child level element.
      *
diff --git a/lib/Remote/ShadowRoot.php b/lib/Remote/ShadowRoot.php
new file mode 100644
index 000000000..1ec13a217
--- /dev/null
+++ b/lib/Remote/ShadowRoot.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Exception\UnknownErrorException;
+use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverElement;
+use Facebook\WebDriver\WebDriverSearchContext;
+
+class ShadowRoot implements WebDriverSearchContext
+{
+    /**
+     * Shadow root identifier defined in the W3CWebDriver protocol.
+     *
+     * @see https://w3c.github.io/webdriver/#shadow-root
+     */
+    const SHADOW_ROOT_IDENTIFIER = 'shadow-6066-11e4-a52e-4f735466cecf';
+
+    /**
+     * @var RemoteExecuteMethod
+     */
+    private $executor;
+
+    /**
+     * @var string
+     */
+    private $id;
+
+    public function __construct(RemoteExecuteMethod $executor, $id)
+    {
+        $this->executor = $executor;
+        $this->id = $id;
+    }
+
+    /**
+     * @param RemoteExecuteMethod $executor
+     * @param array $response
+     * @return self
+     */
+    public static function createFromResponse(RemoteExecuteMethod $executor, array $response)
+    {
+        if (empty($response[self::SHADOW_ROOT_IDENTIFIER])) {
+            throw new UnknownErrorException('Shadow root is missing in server response');
+        }
+
+        return new self($executor, $response[self::SHADOW_ROOT_IDENTIFIER]);
+    }
+
+    /**
+     * @param WebDriverBy $locator
+     * @return RemoteWebElement
+     */
+    public function findElement(WebDriverBy $locator)
+    {
+        $params = JsonWireCompat::getUsing($locator, true);
+        $params[':id'] = $this->id;
+
+        $rawElement = $this->executor->execute(
+            DriverCommand::FIND_ELEMENT_FROM_SHADOW_ROOT,
+            $params
+        );
+
+        return new RemoteWebElement($this->executor, JsonWireCompat::getElement($rawElement), true);
+    }
+
+    /**
+     * @param WebDriverBy $locator
+     * @return WebDriverElement[]
+     */
+    public function findElements(WebDriverBy $locator)
+    {
+        $params = JsonWireCompat::getUsing($locator, true);
+        $params[':id'] = $this->id;
+
+        $rawElements = $this->executor->execute(
+            DriverCommand::FIND_ELEMENTS_FROM_SHADOW_ROOT,
+            $params
+        );
+
+        $elements = [];
+        foreach ($rawElements as $rawElement) {
+            $elements[] = new RemoteWebElement($this->executor, JsonWireCompat::getElement($rawElement), true);
+        }
+
+        return $elements;
+    }
+
+    /**
+     * @return string
+     */
+    public function getID()
+    {
+        return $this->id;
+    }
+}
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index a791fa9f5..fa18b1a93 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -378,6 +378,16 @@ public function takeElementScreenshot($save_as = null)
         }
     }
 
+    public function getShadowRoot()
+    {
+        try {
+            return $this->element->getShadowRoot();
+        } catch (WebDriverException $exception) {
+            $this->dispatchOnException($exception);
+            throw $exception;
+        }
+    }
+
     /**
      * @param WebDriverException $exception
      */
diff --git a/lib/WebDriverElement.php b/lib/WebDriverElement.php
index 3409dde18..8ffa18383 100644
--- a/lib/WebDriverElement.php
+++ b/lib/WebDriverElement.php
@@ -2,6 +2,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Remote\ShadowRoot;
+
 /**
  * Interface for an HTML element in the WebDriver framework.
  */
@@ -141,4 +143,12 @@ public function getID();
      * @todo Add in next major release (BC)
      */
     //public function takeElementScreenshot($save_as = null);
+
+    /**
+     * Get representation of an element's shadow root for accessing the shadow DOM of a web component.
+     *
+     * @return ShadowRoot
+     * @todo Add in next major release (BC)
+     */
+    //public function getShadowRoot();
 }
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 8a723d8e7..82a5bde8d 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -3,18 +3,15 @@
 namespace Facebook\WebDriver;
 
 /**
- * The interface for WebDriver and WebDriverElement which is able to search for
- * WebDriverElement inside.
+ * The interface for WebDriver and WebDriverElement which is able to search for WebDriverElement inside.
  */
 interface WebDriverSearchContext
 {
     /**
-     * Find the first WebDriverElement within this element using the given
-     * mechanism.
+     * Find the first WebDriverElement within this element using the given mechanism.
      *
      * @param WebDriverBy $locator
-     * @return WebDriverElement NoSuchElementException is thrown in
-     *    HttpCommandExecutor if no element is found.
+     * @return WebDriverElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
     public function findElement(WebDriverBy $locator);
@@ -23,8 +20,7 @@ public function findElement(WebDriverBy $locator);
      * Find all WebDriverElements within this element using the given mechanism.
      *
      * @param WebDriverBy $locator
-     * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if
-     *    nothing matches
+     * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if nothing matches
      * @see WebDriverBy
      */
     public function findElements(WebDriverBy $locator);
diff --git a/phpstan.neon b/phpstan.neon
index d2b36c437..747193ddf 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -16,6 +16,8 @@ parameters:
           path: 'lib/Support/Events/EventFiringWebElement.php'
         - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::takeElementScreenshot\(\)#'
           path: 'lib/Support/Events/EventFiringWebElement.php'
+        - message: '#Call to an undefined method Facebook\\WebDriver\\WebDriverElement::getShadowRoot\(\)#'
+          path: 'lib/Support/Events/EventFiringWebElement.php'
         - '#Unsafe usage of new static\(\)#'
 
         # Parameter is intentionally not part of signature to not break BC
diff --git a/tests/functional/ShadowDomTest.php b/tests/functional/ShadowDomTest.php
new file mode 100644
index 000000000..ccd144bc9
--- /dev/null
+++ b/tests/functional/ShadowDomTest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+use Facebook\WebDriver\Exception\NoSuchShadowRootException;
+use Facebook\WebDriver\Remote\ShadowRoot;
+
+/**
+ * @group exclude-safari
+ *        Safaridriver does not support Shadow DOM endpoints
+ * @covers \Facebook\WebDriver\Remote\RemoteWebElement
+ * @covers \Facebook\WebDriver\Remote\ShadowRoot
+ */
+class ShadowDomTest extends WebDriverTestCase
+{
+    protected function setUp(): void
+    {
+        self::skipForJsonWireProtocol('Shadow DOM is only part of W3C WebDriver');
+
+        parent::setUp();
+    }
+
+    public function testShouldGetShadowRoot()
+    {
+        $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
+
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('custom-checkbox-element'));
+
+        $shadowRoot = $element->getShadowRoot();
+
+        $this->assertInstanceOf(ShadowRoot::class, $shadowRoot);
+    }
+
+    public function testShouldThrowExceptionWhenGettingShadowRootWithElementNotHavingShadowRoot()
+    {
+        $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
+
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('#no-shadow-root'));
+
+        $this->expectException(NoSuchShadowRootException::class);
+        $element->getShadowRoot();
+    }
+
+    /**
+     * @group exclude-firefox
+     *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
+     *        Finding elements in shadow DOM is not implemented in Geckodriver
+     */
+    public function testShouldFindElementUnderShadowRoot()
+    {
+        $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
+
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('custom-checkbox-element'));
+
+        $shadowRoot = $element->getShadowRoot();
+
+        $elementInShadow = $shadowRoot->findElement(WebDriverBy::cssSelector('input'));
+        $this->assertSame('checkbox', $elementInShadow->getAttribute('type'));
+
+        $elementsInShadow = $shadowRoot->findElements(WebDriverBy::cssSelector('div'));
+        $this->assertCount(2, $elementsInShadow);
+    }
+
+    /**
+     * @group exclude-firefox
+     *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
+     *        Finding elements in shadow DOM is not implemented in Geckodriver
+     */
+    public function testShouldReferenceTheSameShadowRootAsFromExecuteScript()
+    {
+        $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
+
+        $element = $this->driver->findElement(WebDriverBy::cssSelector('custom-checkbox-element'));
+
+        /** @var WebDriverElement $elementFromScript */
+        $elementFromScript = $this->driver->executeScript(
+            'return arguments[0].shadowRoot;',
+            [$element]
+        );
+
+        $shadowRoot = $element->getShadowRoot();
+
+        $this->assertSame($shadowRoot->getId(), reset($elementFromScript));
+    }
+}
diff --git a/tests/functional/web/index.html b/tests/functional/web/index.html
index ca989677a..6202e3e9b 100644
--- a/tests/functional/web/index.html
+++ b/tests/functional/web/index.html
@@ -36,6 +36,8 @@ <h1 id="welcome">Welcome to the php-webdriver testing page.</h1>
     <a href="http://github.com/events.html" id="a-drag">Events</a>
     |
     <a href="http://github.com/sortable.html" id="a-sortable">Sortable</a>
+    |
+    <a href="http://github.com/web-components.html" id="a-web-components">WebComponents</a>
 
     <p id="id_test">Test by ID</p>
     <p class="test_class">Test by Class</p>
diff --git a/tests/functional/web/web_components.html b/tests/functional/web/web_components.html
new file mode 100644
index 000000000..c76101356
--- /dev/null
+++ b/tests/functional/web/web_components.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>WebComponents and Shadow DOM tests</title>
+
+    <style>
+        custom-checkbox-element {
+            margin-top: 1ex;
+            padding: 1ex;
+            display: block;
+            background-color: #eeeeff;
+        }
+    </style>
+</head>
+<body>
+<h1>WebComponents and Shadow DOM tests</h1>
+
+<div><label>Input out of Shadow DOM: <input id="no-shadow-root"/></label></div>
+<div>
+    <custom-checkbox-element></custom-checkbox-element>
+</div>
+<script>
+  customElements.define('custom-checkbox-element',
+      class extends HTMLElement {
+        constructor() {
+          super();
+          this.attachShadow({mode: 'open'}).innerHTML = '<div><label>Checkbox in Shadow DOM: ' +
+              '<input type="checkbox"/></label>' +
+              '<div><p>Paragraph in Shadow DOM</p></div>' +
+              '</div>';
+        }
+      }
+  );
+</script>
+
+</body>
+</html>

From b9c084e83e0a3f67cab4f4ac72a6c47fc222fbe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 13 Sep 2022 17:05:21 +0200
Subject: [PATCH 705/784] Add element isDisplayed support even for browsers
 without native support (fixes #843)

---
 CHANGELOG.md                              |   1 +
 composer.json                             |   4 +-
 lib/Remote/RemoteWebDriver.php            |   8 +
 lib/Remote/RemoteWebElement.php           |   2 -
 lib/Support/IsElementDisplayedAtom.php    |  71 +++++++
 lib/scripts/isElementDisplayed.js         | 219 ++++++++++++++++++++++
 tests/functional/RemoteWebElementTest.php |   4 +-
 7 files changed, 303 insertions(+), 6 deletions(-)
 create mode 100644 lib/Support/IsElementDisplayedAtom.php
 create mode 100644 lib/scripts/isElementDisplayed.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f89893ed6..32b4c737f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Support for current Firefox XPI extension format. Extensions could now be loaded into `FirefoxProfile` using `addExtension()` method.
 - `setProfile()` method to `FirefoxOptions`, which is now a preferred way to set Firefox Profile.
+- Element `isDisplayed()` can now be used even for browsers not supporting native API endpoint (like Safari), thanks to javascript atom workaround.
 
 ### Changed
 - Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
diff --git a/composer.json b/composer.json
index 90f2d0f28..13b925349 100644
--- a/composer.json
+++ b/composer.json
@@ -75,12 +75,12 @@
     "analyze": [
       "vendor/bin/phpstan analyze -c phpstan.neon --ansi",
       "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run -vvv --ansi",
-      "vendor/bin/phpcs --standard=PSR2 ./lib/ ./tests/"
+      "vendor/bin/phpcs --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
     ],
     "fix": [
       "@composer normalize",
       "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff -vvv || exit 0",
-      "vendor/bin/phpcbf --standard=PSR2 ./lib/ ./tests/"
+      "vendor/bin/phpcbf --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
     ],
     "lint": [
       "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 409cfce2a..9c18cb886 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Exception\UnknownErrorException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
+use Facebook\WebDriver\Support\IsElementDisplayedAtom;
 use Facebook\WebDriver\Support\ScreenshotHelper;
 use Facebook\WebDriver\WebDriver;
 use Facebook\WebDriver\WebDriverBy;
@@ -574,6 +575,13 @@ public static function getAllSessions($selenium_server_url = 'http://localhost:4
 
     public function execute($command_name, $params = [])
     {
+        // As we so far only use atom for IS_ELEMENT_DISPLAYED, this condition is hardcoded here. In case more atoms
+        // are used, this should be rewritten and separated from this class (e.g. to some abstract matcher logic).
+        if ($command_name === DriverCommand::IS_ELEMENT_DISPLAYED
+            && IsElementDisplayedAtom::match($this->getCapabilities()->getBrowserName())) {
+            return (new IsElementDisplayedAtom($this))->execute($params);
+        }
+
         $command = new WebDriverCommand(
             $this->sessionID,
             $command_name,
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 2e5eae131..07c51e33f 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -336,8 +336,6 @@ public function getText()
      * Is this element displayed or not? This method avoids the problem of having
      * to parse an element's "style" attribute.
      *
-     * However, not all browsers implement this feature, because it is not part of W3C WebDriver.
-     * @see https://w3c.github.io/webdriver/#element-displayedness
      * @return bool
      */
     public function isDisplayed()
diff --git a/lib/Support/IsElementDisplayedAtom.php b/lib/Support/IsElementDisplayedAtom.php
new file mode 100644
index 000000000..b27e9cca7
--- /dev/null
+++ b/lib/Support/IsElementDisplayedAtom.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Facebook\WebDriver\Support;
+
+use Facebook\WebDriver\Remote\RemoteExecuteMethod;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\Remote\WebDriverBrowserType;
+
+/**
+ * Certain drivers have decided to not provide the endpoint which determines element displayedness, because
+ * the W3C WebDriver specification no longer dictates it.
+ *
+ * In those instances, we determine this using a script ("atom").
+ *
+ * @see https://w3c.github.io/webdriver/#element-displayedness
+ *
+ * Also note in case more than this one atom is used, this logic here should be refactored to some AbstractAtom.
+ */
+class IsElementDisplayedAtom
+{
+    /**
+     * List of browsers which are known to support /displayed endpoint on their own (so they don't need this atom).
+     *
+     * @var array
+     */
+    const BROWSERS_WITH_ENDPOINT_SUPPORT = [
+        WebDriverBrowserType::CHROME,
+        WebDriverBrowserType::FIREFOX,
+        WebDriverBrowserType::MICROSOFT_EDGE,
+    ];
+
+    /**
+     * @var RemoteWebDriver
+     */
+    private $driver;
+
+    public function __construct(RemoteWebDriver $driver)
+    {
+        $this->driver = $driver;
+    }
+
+    public static function match($browserName)
+    {
+        return !in_array($browserName, self::BROWSERS_WITH_ENDPOINT_SUPPORT, true);
+    }
+
+    public function execute($params)
+    {
+        $element = new RemoteWebElement(
+            new RemoteExecuteMethod($this->driver),
+            $params[':id'],
+            $this->driver->isW3cCompliant()
+        );
+
+        return $this->executeAtom('isElementDisplayed', $element);
+    }
+
+    protected function executeAtom($atomName, ...$params)
+    {
+        return $this->driver->executeScript(
+            sprintf('%s; return (%s).apply(null, arguments);', $this->loadAtomScript($atomName), $atomName),
+            $params
+        );
+    }
+
+    private function loadAtomScript($atomName)
+    {
+        return file_get_contents(__DIR__ . '/../scripts/' . $atomName . '.js');
+    }
+}
diff --git a/lib/scripts/isElementDisplayed.js b/lib/scripts/isElementDisplayed.js
new file mode 100644
index 000000000..f24bfa55e
--- /dev/null
+++ b/lib/scripts/isElementDisplayed.js
@@ -0,0 +1,219 @@
+/*
+ * Imported from WebdriverIO project.
+ * https://github.com/webdriverio/webdriverio/blob/main/packages/webdriverio/src/scripts/isElementDisplayed.ts
+ *
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * check if element is visible
+ * @param  {HTMLElement} elem  element to check
+ * @return {Boolean}           true if element is within viewport
+ */
+function isElementDisplayed(element) {
+    function nodeIsElement(node) {
+        if (!node) {
+            return false;
+        }
+
+        switch (node.nodeType) {
+            case Node.ELEMENT_NODE:
+            case Node.DOCUMENT_NODE:
+            case Node.DOCUMENT_FRAGMENT_NODE:
+                return true;
+            default:
+                return false;
+        }
+    }
+    function parentElementForElement(element) {
+        if (!element) {
+            return null;
+        }
+        return enclosingNodeOrSelfMatchingPredicate(element.parentNode, nodeIsElement);
+    }
+    function enclosingNodeOrSelfMatchingPredicate(targetNode, predicate) {
+        for (let node = targetNode; node && node !== targetNode.ownerDocument; node = node.parentNode)
+            if (predicate(node)) {
+                return node;
+            }
+        return null;
+    }
+    function enclosingElementOrSelfMatchingPredicate(targetElement, predicate) {
+        for (let element = targetElement; element && element !== targetElement.ownerDocument; element = parentElementForElement(element))
+            if (predicate(element)) {
+                return element;
+            }
+        return null;
+    }
+    function cascadedStylePropertyForElement(element, property) {
+        if (!element || !property) {
+            return null;
+        }
+        // if document-fragment, skip it and use element.host instead. This happens
+        // when the element is inside a shadow root.
+        // window.getComputedStyle errors on document-fragment.
+        if (element instanceof ShadowRoot) {
+            element = element.host;
+        }
+        let computedStyle = window.getComputedStyle(element);
+        let computedStyleProperty = computedStyle.getPropertyValue(property);
+        if (computedStyleProperty && computedStyleProperty !== 'inherit') {
+            return computedStyleProperty;
+        }
+        // Ideally getPropertyValue would return the 'used' or 'actual' value, but
+        // it doesn't for legacy reasons. So we need to do our own poor man's cascade.
+        // Fall back to the first non-'inherit' value found in an ancestor.
+        // In any case, getPropertyValue will not return 'initial'.
+        // FIXME: will this incorrectly inherit non-inheritable CSS properties?
+        // I think all important non-inheritable properties (width, height, etc.)
+        // for our purposes here are specially resolved, so this may not be an issue.
+        // Specification is here: https://drafts.csswg.org/cssom/#resolved-values
+        let parentElement = parentElementForElement(element);
+        return cascadedStylePropertyForElement(parentElement, property);
+    }
+    function elementSubtreeHasNonZeroDimensions(element) {
+        let boundingBox = element.getBoundingClientRect();
+        if (boundingBox.width > 0 && boundingBox.height > 0) {
+            return true;
+        }
+        // Paths can have a zero width or height. Treat them as shown if the stroke width is positive.
+        if (element.tagName.toUpperCase() === 'PATH' && boundingBox.width + boundingBox.height > 0) {
+            let strokeWidth = cascadedStylePropertyForElement(element, 'stroke-width');
+            return !!strokeWidth && (parseInt(strokeWidth, 10) > 0);
+        }
+        let cascadedOverflow = cascadedStylePropertyForElement(element, 'overflow');
+        if (cascadedOverflow === 'hidden') {
+            return false;
+        }
+        // If the container's overflow is not hidden and it has zero size, consider the
+        // container to have non-zero dimensions if a child node has non-zero dimensions.
+        return Array.from(element.childNodes).some((childNode) => {
+            if (childNode.nodeType === Node.TEXT_NODE) {
+                return true;
+            }
+            if (nodeIsElement(childNode)) {
+                return elementSubtreeHasNonZeroDimensions(childNode);
+            }
+            return false;
+        });
+    }
+    function elementOverflowsContainer(element) {
+        let cascadedOverflow = cascadedStylePropertyForElement(element, 'overflow');
+        if (cascadedOverflow !== 'hidden') {
+            return false;
+        }
+        // FIXME: this needs to take into account the scroll position of the element,
+        // the display modes of it and its ancestors, and the container it overflows.
+        // See Selenium's bot.dom.getOverflowState atom for an exhaustive list of edge cases.
+        return true;
+    }
+    function isElementSubtreeHiddenByOverflow(element) {
+        if (!element) {
+            return false;
+        }
+        if (!elementOverflowsContainer(element)) {
+            return false;
+        }
+        if (!element.childNodes.length) {
+            return false;
+        }
+        // This element's subtree is hidden by overflow if all child subtrees are as well.
+        return Array.from(element.childNodes).every((childNode) => {
+            // Returns true if the child node is overflowed or otherwise hidden.
+            // Base case: not an element, has zero size, scrolled out, or doesn't overflow container.
+            // Visibility of text nodes is controlled by parent
+            if (childNode.nodeType === Node.TEXT_NODE) {
+                return false;
+            }
+            if (!nodeIsElement(childNode)) {
+                return true;
+            }
+            if (!elementSubtreeHasNonZeroDimensions(childNode)) {
+                return true;
+            }
+            // Recurse.
+            return isElementSubtreeHiddenByOverflow(childNode);
+        });
+    }
+    // walk up the tree testing for a shadow root
+    function isElementInsideShadowRoot(element) {
+        if (!element) {
+            return false;
+        }
+        if (element.parentNode && element.parentNode.host) {
+            return true;
+        }
+        return isElementInsideShadowRoot(element.parentNode);
+    }
+    // This is a partial reimplementation of Selenium's "element is displayed" algorithm.
+    // When the W3C specification's algorithm stabilizes, we should implement that.
+    // If this command is misdirected to the wrong document (and is NOT inside a shadow root), treat it as not shown.
+    if (!isElementInsideShadowRoot(element) && !document.contains(element)) {
+        return false;
+    }
+    // Special cases for specific tag names.
+    switch (element.tagName.toUpperCase()) {
+        case 'BODY':
+            return true;
+        case 'SCRIPT':
+        case 'NOSCRIPT':
+            return false;
+        case 'OPTGROUP':
+        case 'OPTION': {
+            // Option/optgroup are considered shown if the containing <select> is shown.
+            let enclosingSelectElement = enclosingNodeOrSelfMatchingPredicate(element, (e) => e.tagName.toUpperCase() === 'SELECT');
+            return isElementDisplayed(enclosingSelectElement);
+        }
+        case 'INPUT':
+            // <input type="hidden"> is considered not shown.
+            if (element.type === 'hidden') {
+                return false;
+            }
+            break;
+        // case 'MAP':
+        // FIXME: Selenium has special handling for <map> elements. We don't do anything now.
+        default:
+            break;
+    }
+    if (cascadedStylePropertyForElement(element, 'visibility') !== 'visible') {
+        return false;
+    }
+    let hasAncestorWithZeroOpacity = !!enclosingElementOrSelfMatchingPredicate(element, (e) => {
+        return Number(cascadedStylePropertyForElement(e, 'opacity')) === 0;
+    });
+    let hasAncestorWithDisplayNone = !!enclosingElementOrSelfMatchingPredicate(element, (e) => {
+        return cascadedStylePropertyForElement(e, 'display') === 'none';
+    });
+    if (hasAncestorWithZeroOpacity || hasAncestorWithDisplayNone) {
+        return false;
+    }
+    if (!elementSubtreeHasNonZeroDimensions(element)) {
+        return false;
+    }
+    if (isElementSubtreeHiddenByOverflow(element)) {
+        return false;
+    }
+    return true;
+}
+
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 321a4aa98..b8e9f1cf8 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -291,8 +291,8 @@ public function testShouldSendKeysToFormElement()
 
     /**
      * @covers ::isDisplayed
-     * @group exclude-safari
-     *      Safari does not support /displayed endpoint.
+     * @covers \Facebook\WebDriver\Remote\RemoteWebDriver::execute
+     * @covers \Facebook\WebDriver\Support\IsElementDisplayedAtom
      */
     public function testShouldDetectElementDisplayedness()
     {

From 4b82945b4b36a1ef81c5c0379a220b77acee035d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 20 Sep 2022 12:10:06 +0200
Subject: [PATCH 706/784] Add coveralls coverage workaround

See https://github.com/lemurheavy/coveralls-public/issues/1653#issuecomment-1251587119
---
 .github/workflows/coveralls-workaround.yaml | 22 +++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/coveralls-workaround.yaml

diff --git a/.github/workflows/coveralls-workaround.yaml b/.github/workflows/coveralls-workaround.yaml
new file mode 100644
index 000000000..fc35817a2
--- /dev/null
+++ b/.github/workflows/coveralls-workaround.yaml
@@ -0,0 +1,22 @@
+name: Coveralls coverage
+# Must be run in separate workflow to have access to repository secrets even for PR from forks.
+# See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+
+permissions:
+  contents: read
+
+on:
+  workflow_run:
+    workflows: [ "Tests" ]
+    types:
+      - completed
+
+jobs:
+  coveralls:
+    name: Coveralls coverage workaround
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls coverage workaround
+        # see https://github.com/lemurheavy/coveralls-public/issues/1653#issuecomment-1251587119
+        run: |
+          curl --location --request GET 'https://coveralls.io/rerun_build?repo_token=${{%20secrets.COVERALLS_REPO_TOKEN%20}}&build_num=${{%20github.run_id%20}}'

From 66371abd2c1f282689d03e33202ecf86f52cf2dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 21 Sep 2022 18:39:03 +0200
Subject: [PATCH 707/784] Fix coveralls workaround

---
 .github/workflows/coveralls-workaround.yaml | 28 ++++++++++++++++++++-
 .github/workflows/tests.yaml                |  9 +++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/coveralls-workaround.yaml b/.github/workflows/coveralls-workaround.yaml
index fc35817a2..2e4fc227c 100644
--- a/.github/workflows/coveralls-workaround.yaml
+++ b/.github/workflows/coveralls-workaround.yaml
@@ -15,8 +15,34 @@ jobs:
   coveralls:
     name: Coveralls coverage workaround
     runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
     steps:
+      # see https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+      - name: 'Download artifact'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "data"
+            })[0];
+            var download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/data.zip', Buffer.from(download.data));
+      - run: unzip data.zip
       - name: Coveralls coverage workaround
         # see https://github.com/lemurheavy/coveralls-public/issues/1653#issuecomment-1251587119
         run: |
-          curl --location --request GET 'https://coveralls.io/rerun_build?repo_token=${{%20secrets.COVERALLS_REPO_TOKEN%20}}&build_num=${{%20github.run_id%20}}'
+          BUILD_NUM=$(cat run_id)
+          curl --location --request GET "https://coveralls.io/rerun_build?repo_token=${{%20secrets.COVERALLS_REPO_TOKEN%20}}&build_num=$BUILD_NUM"
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 2452c8619..8d0e76e90 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -205,3 +205,12 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
+      # Save run_id to be used by follow-up workflow
+      - name: Save run_id to file
+        run: |
+          mkdir -p ./data
+          echo ${{ github.run_id }} > ./data/run_id
+      - uses: actions/upload-artifact@v3
+        with:
+          name: data
+          path: data/

From aad77b446a302985693fb339d40185be07c8f42d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 3 Oct 2022 13:40:29 +0200
Subject: [PATCH 708/784] Release version 1.13.0

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b4c737f..28d50eb5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.13.0 - 2022-10-03
 ### Added
 - Support for current Firefox XPI extension format. Extensions could now be loaded into `FirefoxProfile` using `addExtension()` method.
 - `setProfile()` method to `FirefoxOptions`, which is now a preferred way to set Firefox Profile.
@@ -11,10 +13,10 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Handle errors when taking screenshots. `WebDriverException` is thrown if WebDriver returns empty or invalid screenshot data.
 - Deprecate `FirefoxDriver::PROFILE` constant. Instead, use `setProfile()` method of `FirefoxOptions` to set Firefox Profile.
 - Deprecate `getAllSessions()` method of `RemoteWebDriver` (which is not part of W3C WebDriver).
+- Increase default request timeout to 3 minutes (instead of 30 seconds).
 
 ### Fixed
 - Throw `UnknownErrorException` instead of fatal error if remote end returns invalid response for `findElement()`/`findElements()` commands.
-- Increase default request timeout to 3 minutes (instead of 30 seconds).
 
 ## 1.12.1 - 2022-05-03
 ### Fixed

From 514a821abe39191e96c5253a9823c80ca40755bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 7 Oct 2022 11:39:07 +0200
Subject: [PATCH 709/784] Replace issue template with issue form

---
 .github/ISSUE_TEMPLATE/bug_report.md          |  65 ---------
 .github/ISSUE_TEMPLATE/bug_report.yaml        | 124 ++++++++++++++++++
 .../{config.yml => config.yaml}               |   0
 3 files changed, 124 insertions(+), 65 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 rename .github/ISSUE_TEMPLATE/{config.yml => config.yaml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dcfc43785..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-name: 🐛 Bug report
-about: Create a bug report to help us improve php-webdriver
-title: ''
-labels: bug
-assignees: ''
----
-
-<!--
-For questions, ask in Discussions: https://github.com/php-webdriver/php-webdriver/discussions
-
-If reporting a bug, please FILL THE TEMPLATE COMPLETELY, otherwise the community and maintainers
-cannot provide a prompt feedback and help solving the issue.
--->
-
-### Bug description
-<!-- A clear description of what the bug is. -->
-
-### How could the issue be reproduced
-
-Steps to reproduce the behavior:
-1. 
-2. 
-3. ...
-
-<!-- Please fill everything relevant - the exact code you use, how you initialize the WebDriver, HTML snippet or URL of the page where you encounter the issue etc. -->
-
-```php
-// You can insert your PHP code here (or remove this block if it is not relevant for the issue).
-
-// For example you can provide how you create WebDrivere instance:
-$capabilities = DesiredCapabilities::chrome();
-$driver = RemoteWebDriver::create('http://localhost:4444/', $capabilities);
-
-// And the code you use to execute the php-webdriver commands, for example:
-$driver->get('http://site.localhost/foo.html');
-$button = $driver->findElement(WebDriverBy::cssSelector('#foo'));
-$button->click();
-```
-
-```html
-<!-- You can also provide HTML snippet of the relevant part of page -->
-<div>
-  <button id="foo">Foo</button>
-</div>
-```
-
-### Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-### Details
-<!-- Please fill relevant following items: -->
-
-* Php-webdriver version: <!-- You can run `composer show php-webdriver/webdriver` to find the version -->
-* PHP version:  <!-- You can run `php -v` to find the version -->
-* How do you start the browser driver or Selenium server:
-  <!-- For example Selenium server, chromedriver command, Laravel Dusk, Docker, SauceLabs etc. -->
-  <!-- If relevant, provide the complete command you use to start the browser driver or Selenium server -->
-* Selenium server version: <!-- Relevant only if you use Selenium server -->
-* Browser driver (chromedriver/geckodriver...) version: <!-- Run `chromedriver --version` or `geckodriver --version` -->
-* Browser used + version:
-* Operating system:
-
-### Additional context
-<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..bac315d1d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,124 @@
+name: 🐛 Bug report
+description: Create a bug report to help us improve php-webdriver
+labels: [ "bug" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you have a question, [ask in Discussions](https://github.com/php-webdriver/php-webdriver/discussions) instead of filling a bug.
+        
+        If you are reporting a bug, please **fill as much as possible information**, otherwise the community and maintainers cannot provide a prompt feedback and help solving the issue.
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug description
+      description: |
+        A clear description of what the bug is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: How could the issue be reproduced
+      description: |
+        Provide steps to reproduce the behavior. Please include everything relevant - the PHP code you use to initialize driver instance, the PHP code causing the error, HTML snippet or URL of the page where you encounter the issue etc.
+        This will be automatically formatted into code, so no need for backticks ```.
+      placeholder: |
+        // For example you can provide how you create WebDriver instance:
+        $capabilities = DesiredCapabilities::chrome();
+        $driver = RemoteWebDriver::create('http://localhost:4444/', $capabilities);
+        // And the code you use to execute the php-webdriver commands, for example:
+        $driver->get('http://site.localhost/foo.html');
+        $button = $driver->findElement(WebDriverBy::cssSelector('#foo'));
+        $button->click();
+        <!-- You can also provide HTML snippet of the relevant part of page -->
+        <div>
+          <button id="foo">Foo</button>
+        </div>
+
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: |
+        A clear and concise description of what you expected to happen.
+    validations:
+      required: false
+
+  - type: input
+    id: php-webdriver-version
+    attributes:
+      label: Php-webdriver version
+      description: You can run `composer show php-webdriver/webdriver` to find the version number
+      placeholder: |
+        For example: 1.13.0
+    validations:
+      required: true
+
+  - type: input
+    id: php-version
+    attributes:
+      label: PHP version
+      description: You can run `php -v` to find the version
+      placeholder: |
+        For example: 8.1.11
+    validations:
+      required: true
+
+  - type: input
+    id: how-start
+    attributes:
+      label: How do you start the browser driver or Selenium server
+      description: |
+        For example: Selenium server jar, Selenium in Docker, chromedriver command, Laravel Dusk, SauceLabs etc.
+        If relevant, provide the complete command you use to start the browser driver or Selenium server
+    validations:
+      required: true
+
+  - type: input
+    id: selenium-version
+    attributes:
+      label: Selenium server / Selenium Docker image version
+      description: Relevant only if you use Selenium server / Selenium in Docker
+    validations:
+      required: false
+
+  - type: input
+    id: browser-driver
+    attributes:
+      label: Browser driver (chromedriver/geckodriver...) version
+      description: You can run `chromedriver --version` or `geckodriver --version` to find the version
+      placeholder: |
+        For example: geckodriver 0.31.0
+    validations:
+      required: false
+
+  - type: input
+    id: browser
+    attributes:
+      label: Browser name and version
+      placeholder: |
+        For example: Firefox 105.0.2
+    validations:
+      required: false
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating system
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: |
+        Add any other context or you notes about the problem here.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yaml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yml
rename to .github/ISSUE_TEMPLATE/config.yaml

From dd865df75b42f3051ef2bbb3e5f946270e497194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Oct 2022 17:38:29 +0200
Subject: [PATCH 710/784] Replace yaml extension to yml, to fix github
 non-conforming with the standard

---
 .github/ISSUE_TEMPLATE/{bug_report.yaml => bug_report.yml} | 0
 .github/ISSUE_TEMPLATE/{config.yaml => config.yml}         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .github/ISSUE_TEMPLATE/{bug_report.yaml => bug_report.yml} (100%)
 rename .github/ISSUE_TEMPLATE/{config.yaml => config.yml} (100%)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.yaml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/config.yaml
rename to .github/ISSUE_TEMPLATE/config.yml

From 83cefc5511aafdee0c09fe9a4e1451618245d3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Oct 2022 17:29:21 +0200
Subject: [PATCH 711/784] Fix firefox extension test flakiness

---
 tests/functional/Firefox/FirefoxProfileTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 4e16dd096..59d0f6bfa 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -19,6 +19,7 @@
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\TestPage;
 use Facebook\WebDriver\WebDriverBy;
+use Facebook\WebDriver\WebDriverExpectedCondition;
 use Facebook\WebDriver\WebDriverTestCase;
 use PHPUnit\Framework\TestCase;
 
@@ -86,7 +87,11 @@ public function testShouldInstallExtension()
 
         $this->assertInstanceOf(RemoteWebDriver::class, $this->driver);
 
-        $element = $this->driver->findElement(WebDriverBy::id('webDriverExtensionTest'));
+        // it sometimes takes split of a second for the extension to render the element, so we must use wait
+        $element = $this->driver->wait(5, 1)->until(
+            WebDriverExpectedCondition::presenceOfElementLocated(WebDriverBy::id('webDriverExtensionTest'))
+        );
+
         $this->assertEquals('This element was added by browser extension', $element->getText());
     }
 

From 5848cdbef1694a005991c7c85d1787cbaf0f94f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2022 13:34:04 +0200
Subject: [PATCH 712/784] Do not fail in isDisplayed call when capabilities are
 missing in WebDriver (fixes #1022)

---
 CHANGELOG.md                   |  2 ++
 lib/Remote/RemoteWebDriver.php | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28d50eb5a..46eada656 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Fixed
+- Do not fail when using `isDisplayed()` and capabilities are missing in WebDriver instance. (Happens when driver instance was created using `RemoteWebDriver::createBySessionID()`.)
 
 ## 1.13.0 - 2022-10-03
 ### Added
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 9c18cb886..3caaa7fc8 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -24,7 +24,7 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
      */
     protected $executor;
     /**
-     * @var WebDriverCapabilities
+     * @var WebDriverCapabilities|null
      */
     protected $capabilities;
 
@@ -544,7 +544,7 @@ public function getSessionID()
     /**
      * Get capabilities of the RemoteWebDriver.
      *
-     * @return WebDriverCapabilities
+     * @return WebDriverCapabilities|null
      */
     public function getCapabilities()
     {
@@ -578,7 +578,13 @@ public function execute($command_name, $params = [])
         // As we so far only use atom for IS_ELEMENT_DISPLAYED, this condition is hardcoded here. In case more atoms
         // are used, this should be rewritten and separated from this class (e.g. to some abstract matcher logic).
         if ($command_name === DriverCommand::IS_ELEMENT_DISPLAYED
-            && IsElementDisplayedAtom::match($this->getCapabilities()->getBrowserName())) {
+            && (
+                // When capabilities are missing in php-webdriver 1.13.x, always fallback to use the atom
+                $this->getCapabilities() === null
+                // If capabilities are present, use the atom only if condition matches
+                || IsElementDisplayedAtom::match($this->getCapabilities()->getBrowserName())
+            )
+        ) {
             return (new IsElementDisplayedAtom($this))->execute($params);
         }
 

From 6dfe5f814b796c1b5748850aa19f781b9274c36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2022 13:49:44 +0200
Subject: [PATCH 713/784] Release version 1.13.1

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46eada656..e1d482657 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.13.1 - 2022-10-11
 ### Fixed
 - Do not fail when using `isDisplayed()` and capabilities are missing in WebDriver instance. (Happens when driver instance was created using `RemoteWebDriver::createBySessionID()`.)
 

From 9282b64decbbbf62948b0ff19aa9aa2a430f165d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Oct 2022 12:03:18 +0200
Subject: [PATCH 714/784] Require PHP ^7.3

---
 .github/workflows/tests.yaml |  4 ++--
 CHANGELOG.md                 |  3 +++
 composer.json                | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 8d0e76e90..4525576d8 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -46,10 +46,10 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['5.6', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php-version: ['7.3', '7.4', '8.0']
         dependencies: ['']
         include:
-          - { php-version: '5.6', dependencies: '--prefer-lowest' }
+          - { php-version: '7.3', dependencies: '--prefer-lowest' }
           - { php-version: '8.1', dependencies: '--ignore-platform-req=php' }
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28d50eb5a..828c90f90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Changed
+- Require PHP ^7.3.
+
 ## 1.13.0 - 2022-10-03
 ### Added
 - Support for current Firefox XPI extension format. Extensions could now be loaded into `FirefoxProfile` using `addExtension()` method.
diff --git a/composer.json b/composer.json
index 13b925349..23ce0f693 100644
--- a/composer.json
+++ b/composer.json
@@ -12,21 +12,21 @@
   ],
   "homepage": "https://github.com/php-webdriver/php-webdriver",
   "require": {
-    "php": "^5.6 || ~7.0 || ^8.0",
+    "php": "^7.3 || ^8.0",
     "ext-curl": "*",
     "ext-json": "*",
     "ext-zip": "*",
     "symfony/polyfill-mbstring": "^1.12",
-    "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0 || ^6.0"
+    "symfony/process": "^5.0 || ^6.0"
   },
   "require-dev": {
-    "ondram/ci-detector": "^2.1 || ^3.5 || ^4.0",
+    "ondram/ci-detector": "^4.0",
     "php-coveralls/php-coveralls": "^2.4",
-    "php-mock/php-mock-phpunit": "^1.1 || ^2.0",
+    "php-mock/php-mock-phpunit": "^2.0",
     "php-parallel-lint/php-parallel-lint": "^1.2",
-    "phpunit/phpunit": "^5.7 || ^7 || ^8 || ^9",
+    "phpunit/phpunit": "^9",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0 || ^6.0"
+    "symfony/var-dumper": "^5.0 || ^6.0"
   },
   "replace": {
     "facebook/webdriver": "*"

From f125fb24cf28b6021948505c590c6faa055dea8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Oct 2022 14:27:13 +0200
Subject: [PATCH 715/784] Remove workaround for PHP <7.2

---
 .github/workflows/tests.yaml     |  4 ----
 scripts/apply-phpunit-patches.sh | 20 --------------------
 2 files changed, 24 deletions(-)
 delete mode 100755 scripts/apply-phpunit-patches.sh

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 4525576d8..ea9ccc99b 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -66,10 +66,6 @@ jobs:
       - name: Install PHP dependencies
         run: composer update --no-interaction ${{ matrix.dependencies }}
 
-      - name: Apply PHPUnit patches
-        if: ${{ matrix.php-version < 7.2 }}
-        run: scripts/apply-phpunit-patches.sh
-
       - name: Run tests
         run: vendor/bin/phpunit --testsuite unit --colors=always --coverage-clover ./logs/clover.xml
 
diff --git a/scripts/apply-phpunit-patches.sh b/scripts/apply-phpunit-patches.sh
deleted file mode 100755
index 478e01c74..000000000
--- a/scripts/apply-phpunit-patches.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# All commands below must no fail
-set -e
-
-# Be in the root dir
-cd "$(dirname $0)/../"
-
-find tests/ -type f -print0 | xargs -0 sed -i 's/function setUpBeforeClass(): void/function setUpBeforeClass()/g';
-find tests/ -type f -print0 | xargs -0 sed -i 's/function setUp(): void/function setUp()/g';
-find tests/ -type f -print0 | xargs -0 sed -i 's/function tearDown(): void/function tearDown()/g';
-
-sed -i 's/endTest(\\PHPUnit\\Framework\\Test \$test, float \$time): void/endTest(\\PHPUnit_Framework_Test \$test, \$time)/g' tests/functional/ReportSauceLabsStatusListener.php;
-sed -i 's/: void/ /g' tests/functional/ReportSauceLabsStatusListener.php;
-# Drop the listener from the config file
-sed -i '/<listeners>/,+2d' phpunit.xml.dist;
-sed -i 's/function runBare(): void/function runBare()/g' tests/functional/WebDriverTestCase.php;
-
-# Return back to original dir
-cd - > /dev/null

From 939b77fd4b54424ec579be5944c1aa5b8c10d22e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Oct 2022 14:46:42 +0200
Subject: [PATCH 716/784] Update codestyle to use PHP 7.3 features

---
 .php-cs-fixer.dist.php                        |  21 +-
 lib/Chrome/ChromeDevToolsDriver.php           |   2 +-
 lib/Chrome/ChromeDriverService.php            |   6 +-
 lib/Chrome/ChromeOptions.php                  |   4 +-
 lib/Firefox/FirefoxDriver.php                 |   2 +-
 lib/Firefox/FirefoxDriverService.php          |   4 +-
 lib/Firefox/FirefoxOptions.php                |   8 +-
 lib/Firefox/FirefoxPreferences.php            |   8 +-
 .../Internal/WebDriverSingleKeyAction.php     |   2 +-
 lib/Net/URLChecker.php                        |   4 +-
 lib/Remote/CustomWebDriverCommand.php         |   4 +-
 lib/Remote/DesiredCapabilities.php            |   4 +-
 lib/Remote/DriverCommand.php                  | 236 +++++++++---------
 lib/Remote/HttpCommandExecutor.php            |   6 +-
 lib/Remote/JsonWireCompat.php                 |   2 +-
 lib/Remote/RemoteMouse.php                    |  10 +-
 lib/Remote/RemoteWebElement.php               |  14 +-
 lib/Remote/ShadowRoot.php                     |   2 +-
 lib/Remote/WebDriverBrowserType.php           |  40 +--
 lib/Remote/WebDriverCapabilityType.php        |  32 +--
 lib/Support/IsElementDisplayedAtom.php        |   2 +-
 lib/WebDriverExpectedCondition.php            |   8 +-
 lib/WebDriverKeys.php                         | 156 ++++++------
 lib/WebDriverPlatform.php                     |  16 +-
 lib/WebDriverTargetLocator.php                |   4 +-
 lib/WebDriverWait.php                         |   2 +-
 .../ReportSauceLabsStatusListener.php         |   2 +-
 tests/functional/TestPage.php                 |  28 +--
 tests/unit/Firefox/FirefoxOptionsTest.php     |   2 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php |   4 +-
 tests/unit/Support/ScreenshotHelperTest.php   |   2 +-
 31 files changed, 319 insertions(+), 318 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 5cf7d36f6..b677785f6 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -12,8 +12,9 @@
         'blank_line_before_statement' => ['statements' => ['return', 'try']],
         'braces' => ['allow_single_line_anonymous_class_with_empty_body' => true, 'allow_single_line_closure' => true],
         'cast_spaces' => true,
-        'class_attributes_separation' => ['elements' => ['method' => 'one']],
+        'class_attributes_separation' => ['elements' => ['method' => 'one', 'trait_import' => 'none']],
         'clean_namespace' => true,
+        'combine_nested_dirname' => true,
         'compact_nullable_typehint' => true,
         'concat_space' => ['spacing' => 'one'],
         'declare_equal_normalize' => true,
@@ -21,15 +22,18 @@
         'fopen_flags' => true,
         'full_opening_tag' => true,
         'function_typehint_space' => true,
+        'heredoc_indentation' => ['indentation' => 'same_as_start'],
         'implode_call' => true,
         'is_null' => true,
         'lambda_not_used_import' => true,
         'linebreak_after_opening_tag' => true,
+        'list_syntax' => true,
         'lowercase_cast' => true,
         'lowercase_static_reference' => true,
         'magic_constant_casing' => true,
         'magic_method_casing' => true,
         'mb_str_functions' => true,
+        'method_argument_space' => ['after_heredoc' => true],
         'native_function_casing' => true,
         'native_function_type_declaration_casing' => true,
         'new_with_braces' => true,
@@ -54,29 +58,30 @@
                 'switch',
                 'throw',
                 'use',
-                'use_trait',
             ],
         ],
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_singleline_whitespace_before_semicolons' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unused_imports' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'no_useless_sprintf' => true,
+        'no_whitespace_before_comma_in_array' => ['after_heredoc' => true],
         'no_whitespace_in_blank_line' => true,
+        'non_printable_character' => true,
         'object_operator_without_whitespace' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_construct' => true,
         'php_unit_dedicate_assert' => false,
-        'php_unit_expectation' => ['target' => '5.6'],
+        'php_unit_expectation' => ['target' => '8.4'],
         'php_unit_method_casing' => ['case' => 'camel_case'],
         'php_unit_mock_short_will_return' => true,
         'php_unit_mock' => true,
-        'php_unit_namespaced' => ['target' => '5.7'],
+        'php_unit_namespaced' => ['target' => '6.0'],
         'php_unit_no_expectation_annotation' => true,
         'php_unit_set_up_tear_down_visibility' => true,
         'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
@@ -94,6 +99,7 @@
         'phpdoc_types' => true,
         'phpdoc_var_annotation_correct_order' => true,
         'psr_autoloading' => true,
+        'random_api_migration' => true,
         'self_accessor' => true,
         'set_type_to_cast' => true,
         'short_scalar_cast' => true,
@@ -107,10 +113,11 @@
         'switch_continue_to_break' => true,
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
-        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+        'ternary_to_null_coalescing' => true,
+        'trailing_comma_in_multiline' => ['elements' => ['arrays'], 'after_heredoc' => true],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => ['elements' => ['method', 'property']],
+        'visibility_required' => ['elements' => ['method', 'property', 'const']],
         'whitespace_after_comma_in_array' => true,
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
     ])
diff --git a/lib/Chrome/ChromeDevToolsDriver.php b/lib/Chrome/ChromeDevToolsDriver.php
index ffbb91a18..2d95d274b 100644
--- a/lib/Chrome/ChromeDevToolsDriver.php
+++ b/lib/Chrome/ChromeDevToolsDriver.php
@@ -11,7 +11,7 @@
  */
 class ChromeDevToolsDriver
 {
-    const SEND_COMMAND = [
+    public const SEND_COMMAND = [
         'method' => 'POST',
         'url' => '/session/:sessionId/goog/cdp/execute',
     ];
diff --git a/lib/Chrome/ChromeDriverService.php b/lib/Chrome/ChromeDriverService.php
index a6d3eb834..902a48ded 100644
--- a/lib/Chrome/ChromeDriverService.php
+++ b/lib/Chrome/ChromeDriverService.php
@@ -10,14 +10,14 @@ class ChromeDriverService extends DriverService
      * The environment variable storing the path to the chrome driver executable.
      * @deprecated Use ChromeDriverService::CHROME_DRIVER_EXECUTABLE
      */
-    const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
+    public const CHROME_DRIVER_EXE_PROPERTY = 'webdriver.chrome.driver';
     /** @var string The environment variable storing the path to the chrome driver executable */
-    const CHROME_DRIVER_EXECUTABLE = 'WEBDRIVER_CHROME_DRIVER';
+    public const CHROME_DRIVER_EXECUTABLE = 'WEBDRIVER_CHROME_DRIVER';
     /**
      * @var string Default executable used when no other is provided
      * @internal
      */
-    const DEFAULT_EXECUTABLE = 'chromedriver';
+    public const DEFAULT_EXECUTABLE = 'chromedriver';
 
     /**
      * @return static
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 0e547b209..86e133397 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -17,11 +17,11 @@ class ChromeOptions implements JsonSerializable
      * The key of chromeOptions in desired capabilities (in legacy OSS JsonWire protocol)
      * @todo Replace value with 'goog:chromeOptions' after JsonWire protocol support is removed
      */
-    const CAPABILITY = 'chromeOptions';
+    public const CAPABILITY = 'chromeOptions';
     /**
      * The key of chromeOptions in desired capabilities (in W3C compatible protocol)
      */
-    const CAPABILITY_W3C = 'goog:chromeOptions';
+    public const CAPABILITY_W3C = 'goog:chromeOptions';
     /**
      * @var array
      */
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 70f6ff0d9..9d86a2be4 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -16,7 +16,7 @@ class FirefoxDriver extends LocalWebDriver
      * $capabilities = DesiredCapabilities::firefox();
      * $capabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
      */
-    const PROFILE = 'firefox_profile';
+    public const PROFILE = 'firefox_profile';
 
     /**
      * Creates a new FirefoxDriver using default configuration.
diff --git a/lib/Firefox/FirefoxDriverService.php b/lib/Firefox/FirefoxDriverService.php
index 525c5b5bc..83c6a28fb 100644
--- a/lib/Firefox/FirefoxDriverService.php
+++ b/lib/Firefox/FirefoxDriverService.php
@@ -9,12 +9,12 @@ class FirefoxDriverService extends DriverService
     /**
      * @var string Name of the environment variable storing the path to the driver binary
      */
-    const WEBDRIVER_FIREFOX_DRIVER = 'WEBDRIVER_FIREFOX_DRIVER';
+    public const WEBDRIVER_FIREFOX_DRIVER = 'WEBDRIVER_FIREFOX_DRIVER';
     /**
      * @var string Default executable used when no other is provided
      * @internal
      */
-    const DEFAULT_EXECUTABLE = 'geckodriver';
+    public const DEFAULT_EXECUTABLE = 'geckodriver';
 
     /**
      * @return static
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index 0a3a16744..1c08b28f5 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -12,13 +12,13 @@
 class FirefoxOptions implements \JsonSerializable
 {
     /** @var string The key of FirefoxOptions in desired capabilities */
-    const CAPABILITY = 'moz:firefoxOptions';
+    public const CAPABILITY = 'moz:firefoxOptions';
     /** @var string */
-    const OPTION_ARGS = 'args';
+    public const OPTION_ARGS = 'args';
     /** @var string */
-    const OPTION_PREFS = 'prefs';
+    public const OPTION_PREFS = 'prefs';
     /** @var string */
-    const OPTION_PROFILE = 'profile';
+    public const OPTION_PROFILE = 'profile';
 
     /** @var array */
     private $options = [];
diff --git a/lib/Firefox/FirefoxPreferences.php b/lib/Firefox/FirefoxPreferences.php
index 159a9c806..2a33fb003 100644
--- a/lib/Firefox/FirefoxPreferences.php
+++ b/lib/Firefox/FirefoxPreferences.php
@@ -11,13 +11,13 @@
 class FirefoxPreferences
 {
     /** @var string Port WebDriver uses to communicate with Firefox instance */
-    const WEBDRIVER_FIREFOX_PORT = 'webdriver_firefox_port';
+    public const WEBDRIVER_FIREFOX_PORT = 'webdriver_firefox_port';
     /** @var string Should the reader view (FF 38+) be enabled? */
-    const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
+    public const READER_PARSE_ON_LOAD_ENABLED = 'reader.parse-on-load.enabled';
     /** @var string Browser homepage */
-    const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
+    public const BROWSER_STARTUP_HOMEPAGE = 'browser.startup.homepage';
     /** @var string Should the Devtools JSON view be enabled? */
-    const DEVTOOLS_JSONVIEW = 'devtools.jsonview.enabled';
+    public const DEVTOOLS_JSONVIEW = 'devtools.jsonview.enabled';
 
     private function __construct()
     {
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 9b1a014d5..7adc2784d 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -10,7 +10,7 @@
 
 abstract class WebDriverSingleKeyAction extends WebDriverKeysRelatedAction implements WebDriverAction
 {
-    const MODIFIER_KEYS = [
+    public const MODIFIER_KEYS = [
         WebDriverKeys::SHIFT,
         WebDriverKeys::LEFT_SHIFT,
         WebDriverKeys::RIGHT_SHIFT,
diff --git a/lib/Net/URLChecker.php b/lib/Net/URLChecker.php
index 05e9cf1f6..5fe5d4abe 100644
--- a/lib/Net/URLChecker.php
+++ b/lib/Net/URLChecker.php
@@ -7,8 +7,8 @@
 
 class URLChecker
 {
-    const POLL_INTERVAL_MS = 500;
-    const CONNECT_TIMEOUT_MS = 500;
+    public const POLL_INTERVAL_MS = 500;
+    public const CONNECT_TIMEOUT_MS = 500;
 
     public function waitUntilAvailable($timeout_in_ms, $url)
     {
diff --git a/lib/Remote/CustomWebDriverCommand.php b/lib/Remote/CustomWebDriverCommand.php
index 157902199..94de4fd28 100644
--- a/lib/Remote/CustomWebDriverCommand.php
+++ b/lib/Remote/CustomWebDriverCommand.php
@@ -6,8 +6,8 @@
 
 class CustomWebDriverCommand extends WebDriverCommand
 {
-    const METHOD_GET = 'GET';
-    const METHOD_POST = 'POST';
+    public const METHOD_GET = 'GET';
+    public const METHOD_POST = 'POST';
 
     /** @var string */
     private $customUrl;
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index a7bde312e..4c854fac2 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -433,8 +433,6 @@ private function set($key, $value)
      */
     private function get($key, $default = null)
     {
-        return isset($this->capabilities[$key])
-            ? $this->capabilities[$key]
-            : $default;
+        return $this->capabilities[$key] ?? $default;
     }
 }
diff --git a/lib/Remote/DriverCommand.php b/lib/Remote/DriverCommand.php
index 3d35549bd..a3a230b7c 100644
--- a/lib/Remote/DriverCommand.php
+++ b/lib/Remote/DriverCommand.php
@@ -9,143 +9,143 @@
  */
 class DriverCommand
 {
-    const GET_ALL_SESSIONS = 'getAllSessions';
-    const GET_CAPABILITIES = 'getCapabilities';
-    const NEW_SESSION = 'newSession';
-    const STATUS = 'status';
-    const CLOSE = 'close';
-    const QUIT = 'quit';
-    const GET = 'get';
-    const GO_BACK = 'goBack';
-    const GO_FORWARD = 'goForward';
-    const REFRESH = 'refresh';
-    const ADD_COOKIE = 'addCookie';
-    const GET_ALL_COOKIES = 'getCookies';
-    const DELETE_COOKIE = 'deleteCookie';
-    const DELETE_ALL_COOKIES = 'deleteAllCookies';
-    const FIND_ELEMENT = 'findElement';
-    const FIND_ELEMENTS = 'findElements';
-    const FIND_CHILD_ELEMENT = 'findChildElement';
-    const FIND_CHILD_ELEMENTS = 'findChildElements';
-    const CLEAR_ELEMENT = 'clearElement';
-    const CLICK_ELEMENT = 'clickElement';
-    const SEND_KEYS_TO_ELEMENT = 'sendKeysToElement';
-    const SEND_KEYS_TO_ACTIVE_ELEMENT = 'sendKeysToActiveElement';
-    const SUBMIT_ELEMENT = 'submitElement';
-    const UPLOAD_FILE = 'uploadFile';
-    const GET_CURRENT_WINDOW_HANDLE = 'getCurrentWindowHandle';
-    const GET_WINDOW_HANDLES = 'getWindowHandles';
-    const GET_CURRENT_CONTEXT_HANDLE = 'getCurrentContextHandle';
-    const GET_CONTEXT_HANDLES = 'getContextHandles';
+    public const GET_ALL_SESSIONS = 'getAllSessions';
+    public const GET_CAPABILITIES = 'getCapabilities';
+    public const NEW_SESSION = 'newSession';
+    public const STATUS = 'status';
+    public const CLOSE = 'close';
+    public const QUIT = 'quit';
+    public const GET = 'get';
+    public const GO_BACK = 'goBack';
+    public const GO_FORWARD = 'goForward';
+    public const REFRESH = 'refresh';
+    public const ADD_COOKIE = 'addCookie';
+    public const GET_ALL_COOKIES = 'getCookies';
+    public const DELETE_COOKIE = 'deleteCookie';
+    public const DELETE_ALL_COOKIES = 'deleteAllCookies';
+    public const FIND_ELEMENT = 'findElement';
+    public const FIND_ELEMENTS = 'findElements';
+    public const FIND_CHILD_ELEMENT = 'findChildElement';
+    public const FIND_CHILD_ELEMENTS = 'findChildElements';
+    public const CLEAR_ELEMENT = 'clearElement';
+    public const CLICK_ELEMENT = 'clickElement';
+    public const SEND_KEYS_TO_ELEMENT = 'sendKeysToElement';
+    public const SEND_KEYS_TO_ACTIVE_ELEMENT = 'sendKeysToActiveElement';
+    public const SUBMIT_ELEMENT = 'submitElement';
+    public const UPLOAD_FILE = 'uploadFile';
+    public const GET_CURRENT_WINDOW_HANDLE = 'getCurrentWindowHandle';
+    public const GET_WINDOW_HANDLES = 'getWindowHandles';
+    public const GET_CURRENT_CONTEXT_HANDLE = 'getCurrentContextHandle';
+    public const GET_CONTEXT_HANDLES = 'getContextHandles';
     // Switching between to window/frame/iframe
-    const SWITCH_TO_WINDOW = 'switchToWindow';
-    const SWITCH_TO_CONTEXT = 'switchToContext';
-    const SWITCH_TO_FRAME = 'switchToFrame';
-    const SWITCH_TO_PARENT_FRAME = 'switchToParentFrame';
-    const GET_ACTIVE_ELEMENT = 'getActiveElement';
+    public const SWITCH_TO_WINDOW = 'switchToWindow';
+    public const SWITCH_TO_CONTEXT = 'switchToContext';
+    public const SWITCH_TO_FRAME = 'switchToFrame';
+    public const SWITCH_TO_PARENT_FRAME = 'switchToParentFrame';
+    public const GET_ACTIVE_ELEMENT = 'getActiveElement';
     // Information of the page
-    const GET_CURRENT_URL = 'getCurrentUrl';
-    const GET_PAGE_SOURCE = 'getPageSource';
-    const GET_TITLE = 'getTitle';
+    public const GET_CURRENT_URL = 'getCurrentUrl';
+    public const GET_PAGE_SOURCE = 'getPageSource';
+    public const GET_TITLE = 'getTitle';
     // Javascript API
-    const EXECUTE_SCRIPT = 'executeScript';
-    const EXECUTE_ASYNC_SCRIPT = 'executeAsyncScript';
+    public const EXECUTE_SCRIPT = 'executeScript';
+    public const EXECUTE_ASYNC_SCRIPT = 'executeAsyncScript';
     // API getting information from an element.
-    const GET_ELEMENT_TEXT = 'getElementText';
-    const GET_ELEMENT_TAG_NAME = 'getElementTagName';
-    const IS_ELEMENT_SELECTED = 'isElementSelected';
-    const IS_ELEMENT_ENABLED = 'isElementEnabled';
-    const IS_ELEMENT_DISPLAYED = 'isElementDisplayed';
-    const GET_ELEMENT_LOCATION = 'getElementLocation';
-    const GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW = 'getElementLocationOnceScrolledIntoView';
-    const GET_ELEMENT_SIZE = 'getElementSize';
-    const GET_ELEMENT_ATTRIBUTE = 'getElementAttribute';
-    const GET_ELEMENT_VALUE_OF_CSS_PROPERTY = 'getElementValueOfCssProperty';
-    const ELEMENT_EQUALS = 'elementEquals';
-    const SCREENSHOT = 'screenshot';
+    public const GET_ELEMENT_TEXT = 'getElementText';
+    public const GET_ELEMENT_TAG_NAME = 'getElementTagName';
+    public const IS_ELEMENT_SELECTED = 'isElementSelected';
+    public const IS_ELEMENT_ENABLED = 'isElementEnabled';
+    public const IS_ELEMENT_DISPLAYED = 'isElementDisplayed';
+    public const GET_ELEMENT_LOCATION = 'getElementLocation';
+    public const GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW = 'getElementLocationOnceScrolledIntoView';
+    public const GET_ELEMENT_SIZE = 'getElementSize';
+    public const GET_ELEMENT_ATTRIBUTE = 'getElementAttribute';
+    public const GET_ELEMENT_VALUE_OF_CSS_PROPERTY = 'getElementValueOfCssProperty';
+    public const ELEMENT_EQUALS = 'elementEquals';
+    public const SCREENSHOT = 'screenshot';
     // Alert API
-    const ACCEPT_ALERT = 'acceptAlert';
-    const DISMISS_ALERT = 'dismissAlert';
-    const GET_ALERT_TEXT = 'getAlertText';
-    const SET_ALERT_VALUE = 'setAlertValue';
+    public const ACCEPT_ALERT = 'acceptAlert';
+    public const DISMISS_ALERT = 'dismissAlert';
+    public const GET_ALERT_TEXT = 'getAlertText';
+    public const SET_ALERT_VALUE = 'setAlertValue';
     // Timeout API
-    const SET_TIMEOUT = 'setTimeout';
-    const IMPLICITLY_WAIT = 'implicitlyWait';
-    const SET_SCRIPT_TIMEOUT = 'setScriptTimeout';
+    public const SET_TIMEOUT = 'setTimeout';
+    public const IMPLICITLY_WAIT = 'implicitlyWait';
+    public const SET_SCRIPT_TIMEOUT = 'setScriptTimeout';
     /** @deprecated */
-    const EXECUTE_SQL = 'executeSQL';
-    const GET_LOCATION = 'getLocation';
-    const SET_LOCATION = 'setLocation';
-    const GET_APP_CACHE = 'getAppCache';
-    const GET_APP_CACHE_STATUS = 'getStatus';
-    const CLEAR_APP_CACHE = 'clearAppCache';
-    const IS_BROWSER_ONLINE = 'isBrowserOnline';
-    const SET_BROWSER_ONLINE = 'setBrowserOnline';
+    public const EXECUTE_SQL = 'executeSQL';
+    public const GET_LOCATION = 'getLocation';
+    public const SET_LOCATION = 'setLocation';
+    public const GET_APP_CACHE = 'getAppCache';
+    public const GET_APP_CACHE_STATUS = 'getStatus';
+    public const CLEAR_APP_CACHE = 'clearAppCache';
+    public const IS_BROWSER_ONLINE = 'isBrowserOnline';
+    public const SET_BROWSER_ONLINE = 'setBrowserOnline';
     // Local storage
-    const GET_LOCAL_STORAGE_ITEM = 'getLocalStorageItem';
-    const GET_LOCAL_STORAGE_KEYS = 'getLocalStorageKeys';
-    const SET_LOCAL_STORAGE_ITEM = 'setLocalStorageItem';
-    const REMOVE_LOCAL_STORAGE_ITEM = 'removeLocalStorageItem';
-    const CLEAR_LOCAL_STORAGE = 'clearLocalStorage';
-    const GET_LOCAL_STORAGE_SIZE = 'getLocalStorageSize';
+    public const GET_LOCAL_STORAGE_ITEM = 'getLocalStorageItem';
+    public const GET_LOCAL_STORAGE_KEYS = 'getLocalStorageKeys';
+    public const SET_LOCAL_STORAGE_ITEM = 'setLocalStorageItem';
+    public const REMOVE_LOCAL_STORAGE_ITEM = 'removeLocalStorageItem';
+    public const CLEAR_LOCAL_STORAGE = 'clearLocalStorage';
+    public const GET_LOCAL_STORAGE_SIZE = 'getLocalStorageSize';
     // Session storage
-    const GET_SESSION_STORAGE_ITEM = 'getSessionStorageItem';
-    const GET_SESSION_STORAGE_KEYS = 'getSessionStorageKey';
-    const SET_SESSION_STORAGE_ITEM = 'setSessionStorageItem';
-    const REMOVE_SESSION_STORAGE_ITEM = 'removeSessionStorageItem';
-    const CLEAR_SESSION_STORAGE = 'clearSessionStorage';
-    const GET_SESSION_STORAGE_SIZE = 'getSessionStorageSize';
+    public const GET_SESSION_STORAGE_ITEM = 'getSessionStorageItem';
+    public const GET_SESSION_STORAGE_KEYS = 'getSessionStorageKey';
+    public const SET_SESSION_STORAGE_ITEM = 'setSessionStorageItem';
+    public const REMOVE_SESSION_STORAGE_ITEM = 'removeSessionStorageItem';
+    public const CLEAR_SESSION_STORAGE = 'clearSessionStorage';
+    public const GET_SESSION_STORAGE_SIZE = 'getSessionStorageSize';
     // Screen orientation
-    const SET_SCREEN_ORIENTATION = 'setScreenOrientation';
-    const GET_SCREEN_ORIENTATION = 'getScreenOrientation';
+    public const SET_SCREEN_ORIENTATION = 'setScreenOrientation';
+    public const GET_SCREEN_ORIENTATION = 'getScreenOrientation';
     // These belong to the Advanced user interactions - an element is optional for these commands.
-    const CLICK = 'mouseClick';
-    const DOUBLE_CLICK = 'mouseDoubleClick';
-    const MOUSE_DOWN = 'mouseButtonDown';
-    const MOUSE_UP = 'mouseButtonUp';
-    const MOVE_TO = 'mouseMoveTo';
+    public const CLICK = 'mouseClick';
+    public const DOUBLE_CLICK = 'mouseDoubleClick';
+    public const MOUSE_DOWN = 'mouseButtonDown';
+    public const MOUSE_UP = 'mouseButtonUp';
+    public const MOVE_TO = 'mouseMoveTo';
     // Those allow interactions with the Input Methods installed on the system.
-    const IME_GET_AVAILABLE_ENGINES = 'imeGetAvailableEngines';
-    const IME_GET_ACTIVE_ENGINE = 'imeGetActiveEngine';
-    const IME_IS_ACTIVATED = 'imeIsActivated';
-    const IME_DEACTIVATE = 'imeDeactivate';
-    const IME_ACTIVATE_ENGINE = 'imeActivateEngine';
+    public const IME_GET_AVAILABLE_ENGINES = 'imeGetAvailableEngines';
+    public const IME_GET_ACTIVE_ENGINE = 'imeGetActiveEngine';
+    public const IME_IS_ACTIVATED = 'imeIsActivated';
+    public const IME_DEACTIVATE = 'imeDeactivate';
+    public const IME_ACTIVATE_ENGINE = 'imeActivateEngine';
     // These belong to the Advanced Touch API
-    const TOUCH_SINGLE_TAP = 'touchSingleTap';
-    const TOUCH_DOWN = 'touchDown';
-    const TOUCH_UP = 'touchUp';
-    const TOUCH_MOVE = 'touchMove';
-    const TOUCH_SCROLL = 'touchScroll';
-    const TOUCH_DOUBLE_TAP = 'touchDoubleTap';
-    const TOUCH_LONG_PRESS = 'touchLongPress';
-    const TOUCH_FLICK = 'touchFlick';
+    public const TOUCH_SINGLE_TAP = 'touchSingleTap';
+    public const TOUCH_DOWN = 'touchDown';
+    public const TOUCH_UP = 'touchUp';
+    public const TOUCH_MOVE = 'touchMove';
+    public const TOUCH_SCROLL = 'touchScroll';
+    public const TOUCH_DOUBLE_TAP = 'touchDoubleTap';
+    public const TOUCH_LONG_PRESS = 'touchLongPress';
+    public const TOUCH_FLICK = 'touchFlick';
     // Window API (beta)
-    const SET_WINDOW_SIZE = 'setWindowSize';
-    const SET_WINDOW_POSITION = 'setWindowPosition';
-    const GET_WINDOW_SIZE = 'getWindowSize';
-    const GET_WINDOW_POSITION = 'getWindowPosition';
-    const MAXIMIZE_WINDOW = 'maximizeWindow';
-    const FULLSCREEN_WINDOW = 'fullscreenWindow';
+    public const SET_WINDOW_SIZE = 'setWindowSize';
+    public const SET_WINDOW_POSITION = 'setWindowPosition';
+    public const GET_WINDOW_SIZE = 'getWindowSize';
+    public const GET_WINDOW_POSITION = 'getWindowPosition';
+    public const MAXIMIZE_WINDOW = 'maximizeWindow';
+    public const FULLSCREEN_WINDOW = 'fullscreenWindow';
     // Logging API
-    const GET_AVAILABLE_LOG_TYPES = 'getAvailableLogTypes';
-    const GET_LOG = 'getLog';
-    const GET_SESSION_LOGS = 'getSessionLogs';
+    public const GET_AVAILABLE_LOG_TYPES = 'getAvailableLogTypes';
+    public const GET_LOG = 'getLog';
+    public const GET_SESSION_LOGS = 'getSessionLogs';
     // Mobile API
-    const GET_NETWORK_CONNECTION = 'getNetworkConnection';
-    const SET_NETWORK_CONNECTION = 'setNetworkConnection';
+    public const GET_NETWORK_CONNECTION = 'getNetworkConnection';
+    public const SET_NETWORK_CONNECTION = 'setNetworkConnection';
     // Custom command
-    const CUSTOM_COMMAND = 'customCommand';
+    public const CUSTOM_COMMAND = 'customCommand';
 
     // W3C specific
-    const ACTIONS = 'actions';
-    const GET_ELEMENT_PROPERTY = 'getElementProperty';
-    const GET_NAMED_COOKIE = 'getNamedCookie';
-    const NEW_WINDOW = 'newWindow';
-    const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
-    const MINIMIZE_WINDOW = 'minimizeWindow';
-    const GET_ELEMENT_SHADOW_ROOT = 'getElementShadowRoot';
-    const FIND_ELEMENT_FROM_SHADOW_ROOT = 'findElementFromShadowRoot';
-    const FIND_ELEMENTS_FROM_SHADOW_ROOT = 'findElementsFromShadowRoot';
+    public const ACTIONS = 'actions';
+    public const GET_ELEMENT_PROPERTY = 'getElementProperty';
+    public const GET_NAMED_COOKIE = 'getNamedCookie';
+    public const NEW_WINDOW = 'newWindow';
+    public const TAKE_ELEMENT_SCREENSHOT = 'takeElementScreenshot';
+    public const MINIMIZE_WINDOW = 'minimizeWindow';
+    public const GET_ELEMENT_SHADOW_ROOT = 'getElementShadowRoot';
+    public const FIND_ELEMENT_FROM_SHADOW_ROOT = 'findElementFromShadowRoot';
+    public const FIND_ELEMENTS_FROM_SHADOW_ROOT = 'findElementsFromShadowRoot';
 
     private function __construct()
     {
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 94e2cb5d5..6dbfd0c0e 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -13,7 +13,7 @@
  */
 class HttpCommandExecutor implements WebDriverCommandExecutor
 {
-    const DEFAULT_HTTP_HEADERS = [
+    public const DEFAULT_HTTP_HEADERS = [
         'Content-Type: application/json;charset=UTF-8',
         'Accept: application/json',
     ];
@@ -282,7 +282,7 @@ public function execute(WebDriverCommand $command)
         $url = $http_options['url'];
 
         $sessionID = $command->getSessionID();
-        $url = str_replace(':sessionId', $sessionID === null ? '' : $sessionID, $url);
+        $url = str_replace(':sessionId', $sessionID ?? '', $url);
         $params = $command->getParameters();
         foreach ($params as $name => $value) {
             if ($name[0] === ':') {
@@ -385,7 +385,7 @@ public function execute(WebDriverCommand $command)
             WebDriverException::throwException($value['error'], $message, $results);
         }
 
-        $status = isset($results['status']) ? $results['status'] : 0;
+        $status = $results['status'] ?? 0;
         if ($status !== 0) {
             // Legacy JsonWire
             WebDriverException::throwException($status, $message, $results);
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index 65a6956ba..952cb1906 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -16,7 +16,7 @@ abstract class JsonWireCompat
      *
      * @see https://w3c.github.io/webdriver/webdriver-spec.html#elements
      */
-    const WEB_DRIVER_ELEMENT_IDENTIFIER = 'element-6066-11e4-a52e-4f735466cecf';
+    public const WEB_DRIVER_ELEMENT_IDENTIFIER = 'element-6066-11e4-a52e-4f735466cecf';
 
     public static function getElement(array $rawElement)
     {
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index d2429967e..14ad4eaf5 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -11,11 +11,11 @@
 class RemoteMouse implements WebDriverMouse
 {
     /** @internal */
-    const BUTTON_LEFT = 0;
+    public const BUTTON_LEFT = 0;
     /** @internal */
-    const BUTTON_MIDDLE = 1;
+    public const BUTTON_MIDDLE = 1;
     /** @internal */
-    const BUTTON_RIGHT = 2;
+    public const BUTTON_RIGHT = 2;
 
     /**
      * @var RemoteExecuteMethod
@@ -274,8 +274,8 @@ private function createMoveAction(
         $move_action = [
             'type' => 'pointerMove',
             'duration' => 100, // to simulate human delay
-            'x' => $x_offset === null ? 0 : $x_offset,
-            'y' => $y_offset === null ? 0 : $y_offset,
+            'x' => $x_offset ?? 0,
+            'y' => $y_offset ?? 0,
         ];
 
         if ($where !== null) {
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 07c51e33f..89b38752a 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -241,11 +241,11 @@ public function getLocationOnScreenOnceScrolledIntoView()
     {
         if ($this->isW3cCompliant) {
             $script = <<<JS
-var e = arguments[0];
-e.scrollIntoView({ behavior: 'instant', block: 'end', inline: 'nearest' }); 
-var rect = e.getBoundingClientRect(); 
-return {'x': rect.left, 'y': rect.top};
-JS;
+                var e = arguments[0];
+                e.scrollIntoView({ behavior: 'instant', block: 'end', inline: 'nearest' });
+                var rect = e.getBoundingClientRect();
+                return {'x': rect.left, 'y': rect.top};
+            JS;
 
             $result = $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
                 'script' => $script,
@@ -462,7 +462,7 @@ public function submit()
         if ($this->isW3cCompliant) {
             // Submit method cannot be called directly in case an input of this form is named "submit".
             // We use this polyfill to trigger 'submit' event using form.dispatchEvent().
-            $submitPolyfill = $script = <<<HTXT
+            $submitPolyfill = <<<HTXT
                 var form = arguments[0];
                 while (form.nodeName !== "FORM" && form.parentNode) { // find the parent form of this element
                     form = form.parentNode;
@@ -474,7 +474,7 @@ public function submit()
                 if (form.dispatchEvent(event)) {
                     HTMLFormElement.prototype.submit.call(form);
                 }
-HTXT;
+            HTXT;
             $this->executor->execute(DriverCommand::EXECUTE_SCRIPT, [
                 'script' => $submitPolyfill,
                 'args' => [[JsonWireCompat::WEB_DRIVER_ELEMENT_IDENTIFIER => $this->id]],
diff --git a/lib/Remote/ShadowRoot.php b/lib/Remote/ShadowRoot.php
index 1ec13a217..63ac2f8e4 100644
--- a/lib/Remote/ShadowRoot.php
+++ b/lib/Remote/ShadowRoot.php
@@ -14,7 +14,7 @@ class ShadowRoot implements WebDriverSearchContext
      *
      * @see https://w3c.github.io/webdriver/#shadow-root
      */
-    const SHADOW_ROOT_IDENTIFIER = 'shadow-6066-11e4-a52e-4f735466cecf';
+    public const SHADOW_ROOT_IDENTIFIER = 'shadow-6066-11e4-a52e-4f735466cecf';
 
     /**
      * @var RemoteExecuteMethod
diff --git a/lib/Remote/WebDriverBrowserType.php b/lib/Remote/WebDriverBrowserType.php
index 77badd6cc..9e3f4e0ff 100644
--- a/lib/Remote/WebDriverBrowserType.php
+++ b/lib/Remote/WebDriverBrowserType.php
@@ -9,30 +9,30 @@
  */
 class WebDriverBrowserType
 {
-    const FIREFOX = 'firefox';
-    const FIREFOX_PROXY = 'firefoxproxy';
-    const FIREFOX_CHROME = 'firefoxchrome';
-    const GOOGLECHROME = 'googlechrome';
-    const SAFARI = 'safari';
-    const SAFARI_PROXY = 'safariproxy';
-    const OPERA = 'opera';
-    const MICROSOFT_EDGE = 'MicrosoftEdge';
-    const IEXPLORE = 'iexplore';
-    const IEXPLORE_PROXY = 'iexploreproxy';
-    const CHROME = 'chrome';
-    const KONQUEROR = 'konqueror';
-    const MOCK = 'mock';
-    const IE_HTA = 'iehta';
-    const ANDROID = 'android';
-    const HTMLUNIT = 'htmlunit';
-    const IE = 'internet explorer';
-    const IPHONE = 'iphone';
-    const IPAD = 'iPad';
+    public const FIREFOX = 'firefox';
+    public const FIREFOX_PROXY = 'firefoxproxy';
+    public const FIREFOX_CHROME = 'firefoxchrome';
+    public const GOOGLECHROME = 'googlechrome';
+    public const SAFARI = 'safari';
+    public const SAFARI_PROXY = 'safariproxy';
+    public const OPERA = 'opera';
+    public const MICROSOFT_EDGE = 'MicrosoftEdge';
+    public const IEXPLORE = 'iexplore';
+    public const IEXPLORE_PROXY = 'iexploreproxy';
+    public const CHROME = 'chrome';
+    public const KONQUEROR = 'konqueror';
+    public const MOCK = 'mock';
+    public const IE_HTA = 'iehta';
+    public const ANDROID = 'android';
+    public const HTMLUNIT = 'htmlunit';
+    public const IE = 'internet explorer';
+    public const IPHONE = 'iphone';
+    public const IPAD = 'iPad';
     /**
      * @deprecated PhantomJS is no longer developed and its support will be removed in next major version.
      * Use headless Chrome or Firefox instead.
      */
-    const PHANTOMJS = 'phantomjs';
+    public const PHANTOMJS = 'phantomjs';
 
     private function __construct()
     {
diff --git a/lib/Remote/WebDriverCapabilityType.php b/lib/Remote/WebDriverCapabilityType.php
index 45833339a..ee2538061 100644
--- a/lib/Remote/WebDriverCapabilityType.php
+++ b/lib/Remote/WebDriverCapabilityType.php
@@ -9,22 +9,22 @@
  */
 class WebDriverCapabilityType
 {
-    const BROWSER_NAME = 'browserName';
-    const VERSION = 'version';
-    const PLATFORM = 'platform';
-    const JAVASCRIPT_ENABLED = 'javascriptEnabled';
-    const TAKES_SCREENSHOT = 'takesScreenshot';
-    const HANDLES_ALERTS = 'handlesAlerts';
-    const DATABASE_ENABLED = 'databaseEnabled';
-    const LOCATION_CONTEXT_ENABLED = 'locationContextEnabled';
-    const APPLICATION_CACHE_ENABLED = 'applicationCacheEnabled';
-    const BROWSER_CONNECTION_ENABLED = 'browserConnectionEnabled';
-    const CSS_SELECTORS_ENABLED = 'cssSelectorsEnabled';
-    const WEB_STORAGE_ENABLED = 'webStorageEnabled';
-    const ROTATABLE = 'rotatable';
-    const ACCEPT_SSL_CERTS = 'acceptSslCerts';
-    const NATIVE_EVENTS = 'nativeEvents';
-    const PROXY = 'proxy';
+    public const BROWSER_NAME = 'browserName';
+    public const VERSION = 'version';
+    public const PLATFORM = 'platform';
+    public const JAVASCRIPT_ENABLED = 'javascriptEnabled';
+    public const TAKES_SCREENSHOT = 'takesScreenshot';
+    public const HANDLES_ALERTS = 'handlesAlerts';
+    public const DATABASE_ENABLED = 'databaseEnabled';
+    public const LOCATION_CONTEXT_ENABLED = 'locationContextEnabled';
+    public const APPLICATION_CACHE_ENABLED = 'applicationCacheEnabled';
+    public const BROWSER_CONNECTION_ENABLED = 'browserConnectionEnabled';
+    public const CSS_SELECTORS_ENABLED = 'cssSelectorsEnabled';
+    public const WEB_STORAGE_ENABLED = 'webStorageEnabled';
+    public const ROTATABLE = 'rotatable';
+    public const ACCEPT_SSL_CERTS = 'acceptSslCerts';
+    public const NATIVE_EVENTS = 'nativeEvents';
+    public const PROXY = 'proxy';
 
     private function __construct()
     {
diff --git a/lib/Support/IsElementDisplayedAtom.php b/lib/Support/IsElementDisplayedAtom.php
index b27e9cca7..d95e4f01f 100644
--- a/lib/Support/IsElementDisplayedAtom.php
+++ b/lib/Support/IsElementDisplayedAtom.php
@@ -24,7 +24,7 @@ class IsElementDisplayedAtom
      *
      * @var array
      */
-    const BROWSERS_WITH_ENDPOINT_SUPPORT = [
+    public const BROWSERS_WITH_ENDPOINT_SUPPORT = [
         WebDriverBrowserType::CHROME,
         WebDriverBrowserType::FIREFOX,
         WebDriverBrowserType::MICROSOFT_EDGE,
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 26914a161..5794d2580 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -375,9 +375,7 @@ public static function invisibilityOfElementLocated(WebDriverBy $by)
             function (WebDriver $driver) use ($by) {
                 try {
                     return !$driver->findElement($by)->isDisplayed();
-                } catch (NoSuchElementException $e) {
-                    return true;
-                } catch (StaleElementReferenceException $e) {
+                } catch (NoSuchElementException|StaleElementReferenceException $e) {
                     return true;
                 }
             }
@@ -397,9 +395,7 @@ public static function invisibilityOfElementWithText(WebDriverBy $by, $text)
             function (WebDriver $driver) use ($by, $text) {
                 try {
                     return !($driver->findElement($by)->getText() === $text);
-                } catch (NoSuchElementException $e) {
-                    return true;
-                } catch (StaleElementReferenceException $e) {
+                } catch (NoSuchElementException|StaleElementReferenceException $e) {
                     return true;
                 }
             }
diff --git a/lib/WebDriverKeys.php b/lib/WebDriverKeys.php
index 5bba2eff0..40f3ffbf5 100644
--- a/lib/WebDriverKeys.php
+++ b/lib/WebDriverKeys.php
@@ -9,85 +9,85 @@
  */
 class WebDriverKeys
 {
-    const NULL = "\xEE\x80\x80";
-    const CANCEL = "\xEE\x80\x81";
-    const HELP = "\xEE\x80\x82";
-    const BACKSPACE = "\xEE\x80\x83";
-    const TAB = "\xEE\x80\x84";
-    const CLEAR = "\xEE\x80\x85";
-    const RETURN_KEY = "\xEE\x80\x86";
-    const ENTER = "\xEE\x80\x87";
-    const SHIFT = "\xEE\x80\x88";
-    const CONTROL = "\xEE\x80\x89";
-    const ALT = "\xEE\x80\x8A";
-    const PAUSE = "\xEE\x80\x8B";
-    const ESCAPE = "\xEE\x80\x8C";
-    const SPACE = "\xEE\x80\x8D";
-    const PAGE_UP = "\xEE\x80\x8E";
-    const PAGE_DOWN = "\xEE\x80\x8F";
-    const END = "\xEE\x80\x90";
-    const HOME = "\xEE\x80\x91";
-    const ARROW_LEFT = "\xEE\x80\x92";
-    const ARROW_UP = "\xEE\x80\x93";
-    const ARROW_RIGHT = "\xEE\x80\x94";
-    const ARROW_DOWN = "\xEE\x80\x95";
-    const INSERT = "\xEE\x80\x96";
-    const DELETE = "\xEE\x80\x97";
-    const SEMICOLON = "\xEE\x80\x98";
-    const EQUALS = "\xEE\x80\x99";
-    const NUMPAD0 = "\xEE\x80\x9A";
-    const NUMPAD1 = "\xEE\x80\x9B";
-    const NUMPAD2 = "\xEE\x80\x9C";
-    const NUMPAD3 = "\xEE\x80\x9D";
-    const NUMPAD4 = "\xEE\x80\x9E";
-    const NUMPAD5 = "\xEE\x80\x9F";
-    const NUMPAD6 = "\xEE\x80\xA0";
-    const NUMPAD7 = "\xEE\x80\xA1";
-    const NUMPAD8 = "\xEE\x80\xA2";
-    const NUMPAD9 = "\xEE\x80\xA3";
-    const MULTIPLY = "\xEE\x80\xA4";
-    const ADD = "\xEE\x80\xA5";
-    const SEPARATOR = "\xEE\x80\xA6";
-    const SUBTRACT = "\xEE\x80\xA7";
-    const DECIMAL = "\xEE\x80\xA8";
-    const DIVIDE = "\xEE\x80\xA9";
-    const F1 = "\xEE\x80\xB1";
-    const F2 = "\xEE\x80\xB2";
-    const F3 = "\xEE\x80\xB3";
-    const F4 = "\xEE\x80\xB4";
-    const F5 = "\xEE\x80\xB5";
-    const F6 = "\xEE\x80\xB6";
-    const F7 = "\xEE\x80\xB7";
-    const F8 = "\xEE\x80\xB8";
-    const F9 = "\xEE\x80\xB9";
-    const F10 = "\xEE\x80\xBA";
-    const F11 = "\xEE\x80\xBB";
-    const F12 = "\xEE\x80\xBC";
-    const META = "\xEE\x80\xBD";
-    const ZENKAKU_HANKAKU = "\xEE\x80\xC0";
-    const RIGHT_SHIFT = "\xEE\x81\x90";
-    const RIGHT_CONTROL = "\xEE\x81\x91";
-    const RIGHT_ALT = "\xEE\x81\x92";
-    const RIGHT_META = "\xEE\x81\x93";
-    const NUMPAD_PAGE_UP = "\xEE\x81\x94";
-    const NUMPAD_PAGE_DOWN = "\xEE\x81\x95";
-    const NUMPAD_END = "\xEE\x81\x96";
-    const NUMPAD_HOME = "\xEE\x81\x97";
-    const NUMPAD_ARROW_LEFT = "\xEE\x81\x98";
-    const NUMPAD_ARROW_UP = "\xEE\x81\x99";
-    const NUMPAD_ARROW_RIGHT = "\xEE\x81\x9A";
-    const NUMPAD_ARROW_DOWN = "\xEE\x81\x9B";
-    const NUMPAD_ARROW_INSERT = "\xEE\x81\x9C";
-    const NUMPAD_ARROW_DELETE = "\xEE\x81\x9D";
+    public const NULL = "\xEE\x80\x80";
+    public const CANCEL = "\xEE\x80\x81";
+    public const HELP = "\xEE\x80\x82";
+    public const BACKSPACE = "\xEE\x80\x83";
+    public const TAB = "\xEE\x80\x84";
+    public const CLEAR = "\xEE\x80\x85";
+    public const RETURN_KEY = "\xEE\x80\x86";
+    public const ENTER = "\xEE\x80\x87";
+    public const SHIFT = "\xEE\x80\x88";
+    public const CONTROL = "\xEE\x80\x89";
+    public const ALT = "\xEE\x80\x8A";
+    public const PAUSE = "\xEE\x80\x8B";
+    public const ESCAPE = "\xEE\x80\x8C";
+    public const SPACE = "\xEE\x80\x8D";
+    public const PAGE_UP = "\xEE\x80\x8E";
+    public const PAGE_DOWN = "\xEE\x80\x8F";
+    public const END = "\xEE\x80\x90";
+    public const HOME = "\xEE\x80\x91";
+    public const ARROW_LEFT = "\xEE\x80\x92";
+    public const ARROW_UP = "\xEE\x80\x93";
+    public const ARROW_RIGHT = "\xEE\x80\x94";
+    public const ARROW_DOWN = "\xEE\x80\x95";
+    public const INSERT = "\xEE\x80\x96";
+    public const DELETE = "\xEE\x80\x97";
+    public const SEMICOLON = "\xEE\x80\x98";
+    public const EQUALS = "\xEE\x80\x99";
+    public const NUMPAD0 = "\xEE\x80\x9A";
+    public const NUMPAD1 = "\xEE\x80\x9B";
+    public const NUMPAD2 = "\xEE\x80\x9C";
+    public const NUMPAD3 = "\xEE\x80\x9D";
+    public const NUMPAD4 = "\xEE\x80\x9E";
+    public const NUMPAD5 = "\xEE\x80\x9F";
+    public const NUMPAD6 = "\xEE\x80\xA0";
+    public const NUMPAD7 = "\xEE\x80\xA1";
+    public const NUMPAD8 = "\xEE\x80\xA2";
+    public const NUMPAD9 = "\xEE\x80\xA3";
+    public const MULTIPLY = "\xEE\x80\xA4";
+    public const ADD = "\xEE\x80\xA5";
+    public const SEPARATOR = "\xEE\x80\xA6";
+    public const SUBTRACT = "\xEE\x80\xA7";
+    public const DECIMAL = "\xEE\x80\xA8";
+    public const DIVIDE = "\xEE\x80\xA9";
+    public const F1 = "\xEE\x80\xB1";
+    public const F2 = "\xEE\x80\xB2";
+    public const F3 = "\xEE\x80\xB3";
+    public const F4 = "\xEE\x80\xB4";
+    public const F5 = "\xEE\x80\xB5";
+    public const F6 = "\xEE\x80\xB6";
+    public const F7 = "\xEE\x80\xB7";
+    public const F8 = "\xEE\x80\xB8";
+    public const F9 = "\xEE\x80\xB9";
+    public const F10 = "\xEE\x80\xBA";
+    public const F11 = "\xEE\x80\xBB";
+    public const F12 = "\xEE\x80\xBC";
+    public const META = "\xEE\x80\xBD";
+    public const ZENKAKU_HANKAKU = "\xEE\x80\xC0";
+    public const RIGHT_SHIFT = "\xEE\x81\x90";
+    public const RIGHT_CONTROL = "\xEE\x81\x91";
+    public const RIGHT_ALT = "\xEE\x81\x92";
+    public const RIGHT_META = "\xEE\x81\x93";
+    public const NUMPAD_PAGE_UP = "\xEE\x81\x94";
+    public const NUMPAD_PAGE_DOWN = "\xEE\x81\x95";
+    public const NUMPAD_END = "\xEE\x81\x96";
+    public const NUMPAD_HOME = "\xEE\x81\x97";
+    public const NUMPAD_ARROW_LEFT = "\xEE\x81\x98";
+    public const NUMPAD_ARROW_UP = "\xEE\x81\x99";
+    public const NUMPAD_ARROW_RIGHT = "\xEE\x81\x9A";
+    public const NUMPAD_ARROW_DOWN = "\xEE\x81\x9B";
+    public const NUMPAD_ARROW_INSERT = "\xEE\x81\x9C";
+    public const NUMPAD_ARROW_DELETE = "\xEE\x81\x9D";
     // Aliases
-    const LEFT_SHIFT = self::SHIFT;
-    const LEFT_CONTROL = self::CONTROL;
-    const LEFT_ALT = self::ALT;
-    const LEFT = self::ARROW_LEFT;
-    const UP = self::ARROW_UP;
-    const RIGHT = self::ARROW_RIGHT;
-    const DOWN = self::ARROW_DOWN;
-    const COMMAND = self::META;
+    public const LEFT_SHIFT = self::SHIFT;
+    public const LEFT_CONTROL = self::CONTROL;
+    public const LEFT_ALT = self::ALT;
+    public const LEFT = self::ARROW_LEFT;
+    public const UP = self::ARROW_UP;
+    public const RIGHT = self::ARROW_RIGHT;
+    public const DOWN = self::ARROW_DOWN;
+    public const COMMAND = self::META;
 
     /**
      * Encode input of `sendKeys()` to appropriate format according to protocol.
diff --git a/lib/WebDriverPlatform.php b/lib/WebDriverPlatform.php
index d7194e05e..a589f3013 100644
--- a/lib/WebDriverPlatform.php
+++ b/lib/WebDriverPlatform.php
@@ -9,15 +9,15 @@
  */
 class WebDriverPlatform
 {
-    const ANDROID = 'ANDROID';
+    public const ANDROID = 'ANDROID';
     /** @deprecated ANY has no meaning in W3C WebDriver, see https://github.com/php-webdriver/php-webdriver/pull/731 */
-    const ANY = 'ANY';
-    const LINUX = 'LINUX';
-    const MAC = 'MAC';
-    const UNIX = 'UNIX';
-    const VISTA = 'VISTA';
-    const WINDOWS = 'WINDOWS';
-    const XP = 'XP';
+    public const ANY = 'ANY';
+    public const LINUX = 'LINUX';
+    public const MAC = 'MAC';
+    public const UNIX = 'UNIX';
+    public const VISTA = 'VISTA';
+    public const WINDOWS = 'WINDOWS';
+    public const XP = 'XP';
 
     private function __construct()
     {
diff --git a/lib/WebDriverTargetLocator.php b/lib/WebDriverTargetLocator.php
index 08096bcab..8787f66c5 100644
--- a/lib/WebDriverTargetLocator.php
+++ b/lib/WebDriverTargetLocator.php
@@ -8,9 +8,9 @@
 interface WebDriverTargetLocator
 {
     /** @var string */
-    const WINDOW_TYPE_WINDOW = 'window';
+    public const WINDOW_TYPE_WINDOW = 'window';
     /** @var string */
-    const WINDOW_TYPE_TAB = 'tab';
+    public const WINDOW_TYPE_TAB = 'tab';
 
     /**
      * Set the current browsing context to the current top-level browsing context.
diff --git a/lib/WebDriverWait.php b/lib/WebDriverWait.php
index 5b2009b3c..d2176b92a 100644
--- a/lib/WebDriverWait.php
+++ b/lib/WebDriverWait.php
@@ -28,7 +28,7 @@ class WebDriverWait
     public function __construct(WebDriver $driver, $timeout_in_second = null, $interval_in_millisecond = null)
     {
         $this->driver = $driver;
-        $this->timeout = isset($timeout_in_second) ? $timeout_in_second : 30;
+        $this->timeout = $timeout_in_second ?? 30;
         $this->interval = $interval_in_millisecond ?: 250;
     }
 
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index 7c3bed873..ac71c6035 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -103,7 +103,7 @@ private function submitToSauceLabs($url, array $data)
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($curl, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
         curl_setopt($curl, CURLOPT_USERPWD, getenv('SAUCE_USERNAME') . ':' . getenv('SAUCE_ACCESS_KEY'));
-        curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data));
+        curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($data, JSON_THROW_ON_ERROR));
         // Disable sending 'Expect: 100-Continue' header, as it is causing issues with eg. squid proxy
         curl_setopt($curl, CURLOPT_HTTPHEADER, ['Expect:']);
 
diff --git a/tests/functional/TestPage.php b/tests/functional/TestPage.php
index 08cb86bec..bf039c2e2 100644
--- a/tests/functional/TestPage.php
+++ b/tests/functional/TestPage.php
@@ -4,20 +4,20 @@
 
 class TestPage
 {
-    const ALERT = 'alert.html';
-    const DELAYED_ELEMENT = 'delayed_element.html';
-    const ESCAPE_CSS = 'escape_css.html';
-    const EVENTS = 'events.html';
-    const FORM = 'form.html';
-    const FORM_CHECKBOX_RADIO = 'form_checkbox_radio.html';
-    const GECKO_653 = 'gecko653.html';
-    const INDEX = 'index.html';
-    const OPEN_NEW_WINDOW = 'open_new_window.html';
-    const PAGE_WITH_FRAME = 'page_with_frame.html';
-    const SLOW_LOADING = 'slow_loading.html';
-    const SORTABLE = 'sortable.html';
-    const UPLOAD = 'upload.html';
-    const WEB_COMPONENTS = 'web_components.html';
+    public const ALERT = 'alert.html';
+    public const DELAYED_ELEMENT = 'delayed_element.html';
+    public const ESCAPE_CSS = 'escape_css.html';
+    public const EVENTS = 'events.html';
+    public const FORM = 'form.html';
+    public const FORM_CHECKBOX_RADIO = 'form_checkbox_radio.html';
+    public const GECKO_653 = 'gecko653.html';
+    public const INDEX = 'index.html';
+    public const OPEN_NEW_WINDOW = 'open_new_window.html';
+    public const PAGE_WITH_FRAME = 'page_with_frame.html';
+    public const SLOW_LOADING = 'slow_loading.html';
+    public const SORTABLE = 'sortable.html';
+    public const UPLOAD = 'upload.html';
+    public const WEB_COMPONENTS = 'web_components.html';
 
     private function __construct()
     {
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
index 332f55de9..2e937c6e4 100644
--- a/tests/unit/Firefox/FirefoxOptionsTest.php
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -7,7 +7,7 @@
 class FirefoxOptionsTest extends TestCase
 {
     /** @var array<string,bool> */
-    const EXPECTED_DEFAULT_PREFS = [
+    public const EXPECTED_DEFAULT_PREFS = [
         FirefoxPreferences::READER_PARSE_ON_LOAD_ENABLED => false,
         FirefoxPreferences::DEVTOOLS_JSONVIEW => false,
     ];
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 0d96831aa..17d7c3e55 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -183,8 +183,8 @@ public function testShouldConvertCapabilitiesToW3cCompatible(
         array $expectedW3cCapabilities
     ) {
         $this->assertJsonStringEqualsJsonString(
-            json_encode($expectedW3cCapabilities),
-            json_encode($inputJsonWireCapabilities->toW3cCompatibleArray())
+            json_encode($expectedW3cCapabilities, JSON_THROW_ON_ERROR),
+            json_encode($inputJsonWireCapabilities->toW3cCompatibleArray(), JSON_THROW_ON_ERROR)
         );
     }
 
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index edc3f661f..d73df3613 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -9,7 +9,7 @@
 
 class ScreenshotHelperTest extends TestCase
 {
-    const BLACK_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
+    public const BLACK_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
 
     public function testShouldSavePageScreenshotToSubdirectoryIfNotExists()
     {

From a332fd1cee0275115519a4160a7c29f8b5d185e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 4 Oct 2022 16:42:01 +0200
Subject: [PATCH 717/784] Use PHPUnit 9 features and new configuration format

---
 .php-cs-fixer.dist.php                        |  3 +-
 composer.json                                 |  2 +-
 phpunit.xml.dist                              | 24 ++++-------
 .../functional/RemoteWebDriverCreateTest.php  |  2 +-
 .../RemoteWebDriverFindElementTest.php        |  4 +-
 tests/functional/RemoteWebDriverTest.php      | 10 ++---
 tests/functional/RemoteWebElementTest.php     |  4 +-
 tests/unit/Remote/HttpCommandExecutorTest.php | 41 ++++++++++---------
 tests/unit/Support/ScreenshotHelperTest.php   |  7 ++--
 9 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index b677785f6..2454b085f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -76,7 +76,8 @@
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_construct' => true,
-        'php_unit_dedicate_assert' => false,
+        'php_unit_dedicate_assert' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
         'php_unit_expectation' => ['target' => '8.4'],
         'php_unit_method_casing' => ['case' => 'camel_case'],
         'php_unit_mock_short_will_return' => true,
diff --git a/composer.json b/composer.json
index 23ce0f693..a50de49d6 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "php-coveralls/php-coveralls": "^2.4",
     "php-mock/php-mock-phpunit": "^2.0",
     "php-parallel-lint/php-parallel-lint": "^1.2",
-    "phpunit/phpunit": "^9",
+    "phpunit/phpunit": "^9.3",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/var-dumper": "^5.0 || ^6.0"
   },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2e81aef6d..c58c72eaa 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-        backupGlobals="false"
-        colors="true"
-        bootstrap="tests/bootstrap.php"
-        >
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
+         bootstrap="tests/bootstrap.php"
+>
     <testsuites>
         <testsuite name="unit">
             <directory>tests/unit</directory>
@@ -18,14 +13,13 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">./lib</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="Facebook\WebDriver\ReportSauceLabsStatusListener"/>
     </listeners>
-
 </phpunit>
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 3de4b2c93..37426cad3 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -30,7 +30,7 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $this->assertInstanceOf(HttpCommandExecutor::class, $this->driver->getCommandExecutor());
         $this->assertNotEmpty($this->driver->getCommandExecutor()->getAddressOfRemoteServer());
 
-        $this->assertTrue(is_string($this->driver->getSessionID()));
+        $this->assertIsString($this->driver->getSessionID());
         $this->assertNotEmpty($this->driver->getSessionID());
 
         $returnedCapabilities = $this->driver->getCapabilities();
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 5887b4fba..80adf1be1 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -34,7 +34,7 @@ public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('not_existing'));
 
-        $this->assertTrue(is_array($elements));
+        $this->assertIsArray($elements);
         $this->assertCount(0, $elements);
     }
 
@@ -44,7 +44,7 @@ public function testShouldFindMultipleElements()
 
         $elements = $this->driver->findElements(WebDriverBy::cssSelector('ul > li'));
 
-        $this->assertTrue(is_array($elements));
+        $this->assertIsArray($elements);
         $this->assertCount(5, $elements);
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $elements);
     }
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 81dbbd953..262423d2b 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -62,7 +62,7 @@ public function testShouldGetSessionId()
 
         $sessionId = $this->driver->getSessionID();
 
-        $this->assertTrue(is_string($sessionId));
+        $this->assertIsString($sessionId);
         $this->assertNotEmpty($sessionId);
     }
 
@@ -76,7 +76,7 @@ public function testShouldGetAllSessions()
 
         $sessions = RemoteWebDriver::getAllSessions($this->serverUrl, 30000);
 
-        $this->assertTrue(is_array($sessions));
+        $this->assertIsArray($sessions);
         $this->assertCount(1, $sessions);
 
         $this->assertArrayHasKey('capabilities', $sessions[0]);
@@ -123,7 +123,7 @@ public function testShouldGetWindowHandles()
         $windowHandle = $this->driver->getWindowHandle();
         $windowHandles = $this->driver->getWindowHandles();
 
-        $this->assertTrue(is_string($windowHandle));
+        $this->assertIsString($windowHandle);
         $this->assertNotEmpty($windowHandle);
         $this->assertSame([$windowHandle], $windowHandles);
 
@@ -318,8 +318,8 @@ public function testShouldGetRemoteEndStatus()
     {
         $status = $this->driver->getStatus();
 
-        $this->assertTrue(is_bool($status->isReady()));
-        $this->assertTrue(is_array($status->getMeta()));
+        $this->assertIsBool($status->isReady());
+        $this->assertIsArray($status->getMeta());
 
         if (getenv('BROWSER_NAME') !== 'safari') {
             $this->assertNotEmpty($status->getMessage());
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index b8e9f1cf8..acd8b4a91 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -453,7 +453,7 @@ public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
 
         $childElements = $element->findElements(WebDriverBy::cssSelector('not_existing'));
 
-        $this->assertTrue(is_array($childElements));
+        $this->assertIsArray($childElements);
         $this->assertCount(0, $childElements);
     }
 
@@ -465,7 +465,7 @@ public function testShouldFindMultipleChildElements()
         $allElements = $this->driver->findElements(WebDriverBy::cssSelector('li'));
         $childElements = $element->findElements(WebDriverBy::cssSelector('li'));
 
-        $this->assertTrue(is_array($childElements));
+        $this->assertIsArray($childElements);
         $this->assertCount(5, $allElements); // there should be 5 <li> elements on page
         $this->assertCount(3, $childElements); // but we should find only subelements of one <ul>
         $this->assertContainsOnlyInstancesOf(RemoteWebElement::class, $childElements);
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 30e117536..70ebe8013 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -29,31 +29,32 @@ public function testShouldSendRequestToAssembledUrl(
         $shouldResetExpectHeader,
         $expectedUrl,
         $expectedPostData
-    ) {
-        $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
-        $curlSetoptMock->expects($this->at(0))
-            ->with($this->anything(), CURLOPT_URL, $expectedUrl);
+    ): void {
+        $expectedCurlSetOptCalls = [
+            [$this->anything(), CURLOPT_URL, $expectedUrl],
+            [$this->anything()],
+        ];
 
         if ($shouldResetExpectHeader) {
-            $curlSetoptMock->expects($this->at(2))
-                ->with(
-                    $this->anything(),
-                    CURLOPT_HTTPHEADER,
-                    ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json', 'Expect:']
-                );
-            $curlSetoptMock->expects($this->at(3))
-                ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+            $expectedCurlSetOptCalls[] = [
+                $this->anything(),
+                CURLOPT_HTTPHEADER,
+                ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json', 'Expect:'],
+            ];
         } else {
-            $curlSetoptMock->expects($this->at(2))
-                ->with(
-                    $this->anything(),
-                    CURLOPT_HTTPHEADER,
-                    ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json']
-                );
-            $curlSetoptMock->expects($this->at(3))
-                ->with($this->anything(), CURLOPT_POSTFIELDS, $expectedPostData);
+            $expectedCurlSetOptCalls[] = [
+                $this->anything(),
+                CURLOPT_HTTPHEADER,
+                ['Content-Type: application/json;charset=UTF-8', 'Accept: application/json'],
+            ];
         }
 
+        $expectedCurlSetOptCalls[] = [$this->anything(), CURLOPT_POSTFIELDS, $expectedPostData];
+
+        $curlSetoptMock = $this->getFunctionMock(__NAMESPACE__, 'curl_setopt');
+        $curlSetoptMock->expects($this->exactly(4))
+            ->withConsecutive(...$expectedCurlSetOptCalls);
+
         $curlExecMock = $this->getFunctionMock(__NAMESPACE__, 'curl_exec');
         $curlExecMock->expects($this->once())
             ->willReturn('{}');
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index d73df3613..6d77b7cad 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -9,13 +9,14 @@
 
 class ScreenshotHelperTest extends TestCase
 {
-    public const BLACK_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
+    public const BLACK_PIXEL =
+        'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
 
     public function testShouldSavePageScreenshotToSubdirectoryIfNotExists()
     {
         $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
         $directoryPath = dirname($fullFilePath);
-        $this->assertDirectoryNotExists($directoryPath);
+        $this->assertDirectoryDoesNotExist($directoryPath);
 
         $executorMock = $this->createMock(RemoteExecuteMethod::class);
         $executorMock->expects($this->once())
@@ -53,7 +54,7 @@ public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists()
     {
         $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
         $directoryPath = dirname($fullFilePath);
-        $this->assertDirectoryNotExists($directoryPath);
+        $this->assertDirectoryDoesNotExist($directoryPath);
         $elementId = 'foo-id';
 
         $executorMock = $this->createMock(RemoteExecuteMethod::class);

From f14a0956afb755ddf64778bdde15f5b0d09a7e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 6 Oct 2022 15:10:37 +0200
Subject: [PATCH 718/784] Make code analyze tools natively integrated, remove
 preinstall composer script

---
 .github/CONTRIBUTING.md      |  2 --
 .github/workflows/tests.yaml |  2 +-
 composer.json                | 14 ++++++--------
 tools/phpstan/composer.json  |  5 +++++
 4 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 tools/phpstan/composer.json

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c10d85094..535d9ad55 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -27,8 +27,6 @@ Here is the [official documentation](https://www.selenium.dev/documentation/en/)
 To make sure your code comply with [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style, tests passes and to execute other automated checks, run locally:
 
 ```sh
-composer preinstall # Run this only on the first run - this will install some additional dependencies
-
 composer all
 ```
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index ea9ccc99b..f302d168f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ jobs:
           extensions: mbstring, intl, zip
 
       - name: Install PHP dependencies
-        run: composer preinstall
+        run: composer update --no-interaction
 
       - name: Lint
         run: composer lint
diff --git a/composer.json b/composer.json
index a50de49d6..873db09d6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
     "symfony/process": "^5.0 || ^6.0"
   },
   "require-dev": {
+    "ergebnis/composer-normalize": "^2.20.0",
     "ondram/ci-detector": "^4.0",
     "php-coveralls/php-coveralls": "^2.4",
     "php-mock/php-mock-phpunit": "^2.0",
@@ -62,10 +63,12 @@
   },
   "scripts": {
     "post-install-cmd": [
-      "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction"
+      "composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
+      "composer install --working-dir=tools/phpstan --no-progress --no-interaction"
     ],
     "post-update-cmd": [
-      "php -r 'if (PHP_VERSION_ID > 70103) { exit(1); }' || composer update --working-dir=tools/php-cs-fixer --no-progress --no-interaction"
+      "composer update --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
+      "composer update --working-dir=tools/phpstan --no-progress --no-interaction"
     ],
     "all": [
       "@lint",
@@ -73,7 +76,7 @@
       "@test"
     ],
     "analyze": [
-      "vendor/bin/phpstan analyze -c phpstan.neon --ansi",
+      "tools/phpstan/vendor/bin/phpstan analyze -c phpstan.neon --ansi",
       "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run -vvv --ansi",
       "vendor/bin/phpcs --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
     ],
@@ -87,11 +90,6 @@
       "@composer validate",
       "@composer normalize --dry-run"
     ],
-    "preinstall": [
-      "@composer update --no-progress --no-interaction",
-      "@composer require --dev phpstan/phpstan",
-      "@composer require --dev ergebnis/composer-normalize"
-    ],
     "test": [
       "vendor/bin/phpunit --colors=always"
     ]
diff --git a/tools/phpstan/composer.json b/tools/phpstan/composer.json
new file mode 100644
index 000000000..0ac8efe45
--- /dev/null
+++ b/tools/phpstan/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpstan/phpstan": "^1.8"
+    }
+}

From d9e38af7411c14b5125b265e5a29c062c5d866c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2022 13:58:10 +0200
Subject: [PATCH 719/784] Encapsulate php and composer calls in composer.json
 for better portability

---
 composer.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 873db09d6..d4b5b8a91 100644
--- a/composer.json
+++ b/composer.json
@@ -63,12 +63,12 @@
   },
   "scripts": {
     "post-install-cmd": [
-      "composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
-      "composer install --working-dir=tools/phpstan --no-progress --no-interaction"
+      "@composer install --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
+      "@composer install --working-dir=tools/phpstan --no-progress --no-interaction"
     ],
     "post-update-cmd": [
-      "composer update --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
-      "composer update --working-dir=tools/phpstan --no-progress --no-interaction"
+      "@composer update --working-dir=tools/php-cs-fixer --no-progress --no-interaction",
+      "@composer update --working-dir=tools/phpstan --no-progress --no-interaction"
     ],
     "all": [
       "@lint",
@@ -76,22 +76,22 @@
       "@test"
     ],
     "analyze": [
-      "tools/phpstan/vendor/bin/phpstan analyze -c phpstan.neon --ansi",
-      "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run -vvv --ansi",
-      "vendor/bin/phpcs --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
+      "@php tools/phpstan/vendor/bin/phpstan analyze -c phpstan.neon --ansi",
+      "@php tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run -vvv --ansi",
+      "@php vendor/bin/phpcs --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
     ],
     "fix": [
       "@composer normalize",
-      "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff -vvv || exit 0",
-      "vendor/bin/phpcbf --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
+      "@php tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff -vvv || exit 0",
+      "@php vendor/bin/phpcbf --standard=PSR2 --ignore=*.js ./lib/ ./tests/"
     ],
     "lint": [
-      "vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
+      "@php vendor/bin/parallel-lint -j 10 ./lib ./tests example.php",
       "@composer validate",
       "@composer normalize --dry-run"
     ],
     "test": [
-      "vendor/bin/phpunit --colors=always"
+      "@php vendor/bin/phpunit --colors=always"
     ]
   }
 }

From 160c23a5bb02f309d061aecdfadcf67e01cbff44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Wed, 12 Oct 2022 14:20:29 +0200
Subject: [PATCH 720/784] Update sauce connect action

---
 .github/workflows/sauce-labs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index c966cbacc..41ebc4d1c 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -46,7 +46,7 @@ jobs:
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
       - name: Start Sauce Connect
-        uses: saucelabs/sauce-connect-action@v1
+        uses: saucelabs/sauce-connect-action@v2
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

From 494fb99648dcb8fc7abf512c673eb746145c4e81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2022 16:41:10 +0200
Subject: [PATCH 721/784] Add common interface for all exceptions thrown from
 php-webdriver

---
 CHANGELOG.md                                     |  2 ++
 lib/Exception/PhpWebDriverExceptionInterface.php | 10 ++++++++++
 lib/Exception/WebDriverException.php             |  5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 lib/Exception/PhpWebDriverExceptionInterface.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 828c90f90..44bf6c987 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Added
+- `PhpWebDriverExceptionInterface` as a common interface to identify all exceptions thrown in php-webdriver
 
 ### Changed
 - Require PHP ^7.3.
diff --git a/lib/Exception/PhpWebDriverExceptionInterface.php b/lib/Exception/PhpWebDriverExceptionInterface.php
new file mode 100644
index 000000000..04408a63b
--- /dev/null
+++ b/lib/Exception/PhpWebDriverExceptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Facebook\WebDriver\Exception;
+
+/**
+ * Common interface to identify all exceptions thrown in php-webdriver (both those of WebDriver protocol and internal).
+ */
+interface PhpWebDriverExceptionInterface
+{
+}
diff --git a/lib/Exception/WebDriverException.php b/lib/Exception/WebDriverException.php
index d80689426..3438617f2 100644
--- a/lib/Exception/WebDriverException.php
+++ b/lib/Exception/WebDriverException.php
@@ -5,9 +5,12 @@
 use Exception;
 
 /**
+ * Ancestor for all exceptions defined in W3C WebDriver standard.
+ * (And also for deprecated JsonWire protocol exceptions.)
+ *
  * @see https://w3c.github.io/webdriver/#errors
  */
-class WebDriverException extends Exception
+class WebDriverException extends Exception implements PhpWebDriverExceptionInterface
 {
     private $results;
 

From 6a8998c3b5c1fd9f2b17cf445e5b4a6c592aeb5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 11 Oct 2022 17:55:34 +0200
Subject: [PATCH 722/784] Refactor internal exceptions

---
 .php-cs-fixer.dist.php                        |  1 -
 CHANGELOG.md                                  |  3 ++
 lib/AbstractWebDriverCheckboxOrRadio.php      |  4 +-
 lib/Cookie.php                                | 14 +++----
 lib/Exception/DriverServerDiedException.php   | 15 --------
 .../Internal/DriverServerDiedException.php    | 16 ++++++++
 lib/Exception/Internal/IOException.php        | 16 ++++++++
 lib/Exception/Internal/LogicException.php     | 29 ++++++++++++++
 lib/Exception/Internal/RuntimeException.php   | 32 ++++++++++++++++
 .../Internal/UnexpectedResponseException.php  | 29 ++++++++++++++
 .../Internal/WebDriverCurlException.php       | 22 +++++++++++
 lib/Exception/WebDriverCurlException.php      |  7 ----
 lib/Firefox/FirefoxOptions.php                |  7 ++--
 lib/Firefox/FirefoxProfile.php                | 36 +++++++++++-------
 .../Internal/WebDriverSingleKeyAction.php     |  3 +-
 lib/Local/LocalWebDriver.php                  | 11 +++---
 lib/Remote/CustomWebDriverCommand.php         |  9 +++--
 lib/Remote/DesiredCapabilities.php            |  6 +--
 lib/Remote/HttpCommandExecutor.php            | 38 ++++---------------
 lib/Remote/RemoteTargetLocator.php            | 10 ++---
 lib/Remote/RemoteWebDriver.php                |  6 +--
 lib/Remote/RemoteWebElement.php               | 12 +++---
 lib/Remote/Service/DriverCommandExecutor.php  |  2 +-
 lib/Remote/Service/DriverService.php          | 23 ++++-------
 lib/Support/ScreenshotHelper.php              | 10 +++--
 lib/WebDriverCheckboxes.php                   |  4 +-
 lib/WebDriverExpectedCondition.php            |  3 +-
 lib/WebDriverOptions.php                      |  4 +-
 lib/WebDriverRadios.php                       |  4 +-
 lib/WebDriverWindow.php                       |  5 +--
 tests/functional/RemoteTargetLocatorTest.php  |  3 +-
 tests/unit/CookieTest.php                     |  6 +--
 .../DriverServerDiedExceptionTest.php         |  4 +-
 .../Exception/Internal/IOExceptionTest.php    | 15 ++++++++
 .../Exception/Internal/LogicExceptionTest.php | 26 +++++++++++++
 .../Internal/RuntimeExceptionTest.php         | 34 +++++++++++++++++
 .../UnexpectedResponseExceptionTest.php       | 30 +++++++++++++++
 .../Internal/WebDriverCurlExceptionTest.php   | 34 +++++++++++++++++
 tests/unit/Firefox/FirefoxOptionsTest.php     |  5 ++-
 .../Internal/WebDriverSingleKeyActionTest.php |  3 +-
 .../Remote/CustomWebDriverCommandTest.php     |  6 +--
 tests/unit/Remote/RemoteWebDriverTest.php     |  7 +++-
 tests/unit/Support/ScreenshotHelperTest.php   |  4 +-
 tests/unit/WebDriverOptionsTest.php           |  3 +-
 44 files changed, 409 insertions(+), 152 deletions(-)
 delete mode 100644 lib/Exception/DriverServerDiedException.php
 create mode 100644 lib/Exception/Internal/DriverServerDiedException.php
 create mode 100644 lib/Exception/Internal/IOException.php
 create mode 100644 lib/Exception/Internal/LogicException.php
 create mode 100644 lib/Exception/Internal/RuntimeException.php
 create mode 100644 lib/Exception/Internal/UnexpectedResponseException.php
 create mode 100644 lib/Exception/Internal/WebDriverCurlException.php
 delete mode 100644 lib/Exception/WebDriverCurlException.php
 rename tests/unit/Exception/{ => Internal}/DriverServerDiedExceptionTest.php (70%)
 create mode 100644 tests/unit/Exception/Internal/IOExceptionTest.php
 create mode 100644 tests/unit/Exception/Internal/LogicExceptionTest.php
 create mode 100644 tests/unit/Exception/Internal/RuntimeExceptionTest.php
 create mode 100644 tests/unit/Exception/Internal/UnexpectedResponseExceptionTest.php
 create mode 100644 tests/unit/Exception/Internal/WebDriverCurlExceptionTest.php

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 2454b085f..23496f768 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -26,7 +26,6 @@
         'implode_call' => true,
         'is_null' => true,
         'lambda_not_used_import' => true,
-        'linebreak_after_opening_tag' => true,
         'list_syntax' => true,
         'lowercase_cast' => true,
         'lowercase_static_reference' => true,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44bf6c987..e466ab9c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Require PHP ^7.3.
+- Throw `UnexpectedResponseException` instead of `UnknownErrorException` in `findElement()` and `findElements()` methods.
+- Throw custom php-webdriver exceptions instead of native PHP SPL exceptions.
+- Do not mix internal non-W3C WebDriver exceptions, separate them into own namespace.
 
 ## 1.13.0 - 2022-10-03
 ### Added
diff --git a/lib/AbstractWebDriverCheckboxOrRadio.php b/lib/AbstractWebDriverCheckboxOrRadio.php
index 450bc387e..00aee242a 100644
--- a/lib/AbstractWebDriverCheckboxOrRadio.php
+++ b/lib/AbstractWebDriverCheckboxOrRadio.php
@@ -2,9 +2,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\InvalidElementStateException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\UnexpectedTagNameException;
-use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Support\XPathEscaper;
 
 /**
@@ -30,7 +30,7 @@ public function __construct(WebDriverElement $element)
 
         $this->name = $element->getAttribute('name');
         if ($this->name === null) {
-            throw new WebDriverException('The input does not have a "name" attribute.');
+            throw new InvalidElementStateException('The input does not have a "name" attribute.');
         }
 
         $this->element = $element;
diff --git a/lib/Cookie.php b/lib/Cookie.php
index 77b04687c..85a93df79 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver;
 
-use InvalidArgumentException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
 
 /**
  * Set values of an cookie.
@@ -36,10 +36,10 @@ public function __construct($name, $value)
     public static function createFromArray(array $cookieArray)
     {
         if (!isset($cookieArray['name'])) {
-            throw new InvalidArgumentException('Cookie name should be set');
+            throw LogicException::forError('Cookie name should be set');
         }
         if (!isset($cookieArray['value'])) {
-            throw new InvalidArgumentException('Cookie value should be set');
+            throw LogicException::forError('Cookie value should be set');
         }
         $cookie = new self($cookieArray['name'], $cookieArray['value']);
 
@@ -107,7 +107,7 @@ public function getPath()
     public function setDomain($domain)
     {
         if (mb_strpos($domain, ':') !== false) {
-            throw new InvalidArgumentException(sprintf('Cookie domain "%s" should not contain a port', $domain));
+            throw LogicException::forError(sprintf('Cookie domain "%s" should not contain a port', $domain));
         }
 
         $this->offsetSet('domain', $domain);
@@ -258,11 +258,11 @@ public function offsetUnset($offset)
     protected function validateCookieName($name)
     {
         if ($name === null || $name === '') {
-            throw new InvalidArgumentException('Cookie name should be non-empty');
+            throw LogicException::forError('Cookie name should be non-empty');
         }
 
         if (mb_strpos($name, ';') !== false) {
-            throw new InvalidArgumentException('Cookie name should not contain a ";"');
+            throw LogicException::forError('Cookie name should not contain a ";"');
         }
     }
 
@@ -272,7 +272,7 @@ protected function validateCookieName($name)
     protected function validateCookieValue($value)
     {
         if ($value === null) {
-            throw new InvalidArgumentException('Cookie value is required when setting a cookie');
+            throw LogicException::forError('Cookie value is required when setting a cookie');
         }
     }
 }
diff --git a/lib/Exception/DriverServerDiedException.php b/lib/Exception/DriverServerDiedException.php
deleted file mode 100644
index c3eff3b9e..000000000
--- a/lib/Exception/DriverServerDiedException.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Facebook\WebDriver\Exception;
-
-/**
- * The driver server process is unexpectedly no longer available.
- */
-class DriverServerDiedException extends WebDriverException
-{
-    public function __construct(\Exception $previous = null)
-    {
-        parent::__construct('The driver server has died.');
-        \Exception::__construct($this->getMessage(), $this->getCode(), $previous);
-    }
-}
diff --git a/lib/Exception/Internal/DriverServerDiedException.php b/lib/Exception/Internal/DriverServerDiedException.php
new file mode 100644
index 000000000..43c848551
--- /dev/null
+++ b/lib/Exception/Internal/DriverServerDiedException.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
+
+/**
+ * The driver server process is unexpectedly no longer available.
+ */
+class DriverServerDiedException extends \RuntimeException implements PhpWebDriverExceptionInterface
+{
+    public function __construct(\Exception $previous = null)
+    {
+        parent::__construct('The driver server has died.', 0, $previous);
+    }
+}
diff --git a/lib/Exception/Internal/IOException.php b/lib/Exception/Internal/IOException.php
new file mode 100644
index 000000000..908b3c901
--- /dev/null
+++ b/lib/Exception/Internal/IOException.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
+
+/**
+ * Exception class thrown when a filesystem related operation failure happens.
+ */
+class IOException extends \LogicException implements PhpWebDriverExceptionInterface
+{
+    public static function forFileError(string $message, string $path): self
+    {
+        return new self(sprintf($message . ' ("%s")', $path));
+    }
+}
diff --git a/lib/Exception/Internal/LogicException.php b/lib/Exception/Internal/LogicException.php
new file mode 100644
index 000000000..e9f55f0fd
--- /dev/null
+++ b/lib/Exception/Internal/LogicException.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
+
+/**
+ * Exception thrown when error in program logic occurs. This includes invalid domain data and unexpected data states.
+ */
+class LogicException extends \LogicException implements PhpWebDriverExceptionInterface
+{
+    public static function forError(string $message): self
+    {
+        return new self($message);
+    }
+
+    public static function forInvalidHttpMethod(string $url, string $httpMethod, array $params): self
+    {
+        return new self(
+            sprintf(
+                'The http method called for "%s" is "%s", but it has to be POST' .
+                ' if you want to pass the JSON params %s',
+                $url,
+                $httpMethod,
+                json_encode($params)
+            )
+        );
+    }
+}
diff --git a/lib/Exception/Internal/RuntimeException.php b/lib/Exception/Internal/RuntimeException.php
new file mode 100644
index 000000000..604b369f5
--- /dev/null
+++ b/lib/Exception/Internal/RuntimeException.php
@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
+use Symfony\Component\Process\Process;
+
+/**
+ * Exception thrown if an error which can only be found on runtime occurs.
+ */
+class RuntimeException extends \RuntimeException implements PhpWebDriverExceptionInterface
+{
+    public static function forError(string $message): self
+    {
+        return new self($message);
+    }
+
+    /**
+     * @param Process $process
+     * @return RuntimeException
+     */
+    public static function forDriverError(Process $process): self
+    {
+        return new self(
+            sprintf(
+                'Error starting driver executable "%s": %s',
+                $process->getCommandLine(),
+                $process->getErrorOutput()
+            )
+        );
+    }
+}
diff --git a/lib/Exception/Internal/UnexpectedResponseException.php b/lib/Exception/Internal/UnexpectedResponseException.php
new file mode 100644
index 000000000..dddde41bf
--- /dev/null
+++ b/lib/Exception/Internal/UnexpectedResponseException.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
+
+/**
+ * Exception thrown on invalid or unexpected server response.
+ */
+class UnexpectedResponseException extends \RuntimeException implements PhpWebDriverExceptionInterface
+{
+    public static function forError(string $message): self
+    {
+        return new self($message);
+    }
+
+    public static function forJsonDecodingError(int $jsonLastError, string $rawResults): self
+    {
+        return new self(
+            sprintf(
+                "JSON decoding of remote response failed.\n" .
+                "Error code: %d\n" .
+                "The response: '%s'\n",
+                $jsonLastError,
+                $rawResults
+            )
+        );
+    }
+}
diff --git a/lib/Exception/Internal/WebDriverCurlException.php b/lib/Exception/Internal/WebDriverCurlException.php
new file mode 100644
index 000000000..ac81f97e2
--- /dev/null
+++ b/lib/Exception/Internal/WebDriverCurlException.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+/**
+ * @deprecated To be replaced with UnexpectedResponseException in 2.0
+ */
+class WebDriverCurlException extends UnexpectedResponseException
+{
+    public static function forCurlError(string $httpMethod, string $url, string $curlError, ?array $params): self
+    {
+        $message = sprintf('Curl error thrown for http %s to %s', $httpMethod, $url);
+
+        if (!empty($params)) {
+            $message .= sprintf(' with params: %s', json_encode($params, JSON_UNESCAPED_SLASHES));
+        }
+
+        $message .= "\n\n" . $curlError;
+
+        return new self($message);
+    }
+}
diff --git a/lib/Exception/WebDriverCurlException.php b/lib/Exception/WebDriverCurlException.php
deleted file mode 100644
index c5f95476d..000000000
--- a/lib/Exception/WebDriverCurlException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Facebook\WebDriver\Exception;
-
-class WebDriverCurlException extends WebDriverException
-{
-}
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index 1c08b28f5..8d9d94f88 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Firefox;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use ReturnTypeWillChange;
 
 /**
@@ -49,13 +50,13 @@ public function __construct()
     public function setOption($name, $value)
     {
         if ($name === self::OPTION_PREFS) {
-            throw new \InvalidArgumentException('Use setPreference() method to set Firefox preferences');
+            throw LogicException::forError('Use setPreference() method to set Firefox preferences');
         }
         if ($name === self::OPTION_ARGS) {
-            throw new \InvalidArgumentException('Use addArguments() method to add Firefox arguments');
+            throw LogicException::forError('Use addArguments() method to add Firefox arguments');
         }
         if ($name === self::OPTION_PROFILE) {
-            throw new \InvalidArgumentException('Use setProfile() method to set Firefox profile');
+            throw LogicException::forError('Use setProfile() method to set Firefox profile');
         }
 
         $this->options[$name] = $value;
diff --git a/lib/Firefox/FirefoxProfile.php b/lib/Firefox/FirefoxProfile.php
index 6e06db6be..95e8004a8 100644
--- a/lib/Firefox/FirefoxProfile.php
+++ b/lib/Firefox/FirefoxProfile.php
@@ -2,7 +2,9 @@
 
 namespace Facebook\WebDriver\Firefox;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Exception\Internal\IOException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
+use Facebook\WebDriver\Exception\Internal\RuntimeException;
 use FilesystemIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -71,7 +73,7 @@ public function setRdfFile($rdf_file)
     /**
      * @param string $key
      * @param string|bool|int $value
-     * @throws WebDriverException
+     * @throws LogicException
      * @return FirefoxProfile
      */
     public function setPreference($key, $value)
@@ -85,7 +87,7 @@ public function setPreference($key, $value)
                 if (is_bool($value)) {
                     $value = $value ? 'true' : 'false';
                 } else {
-                    throw new WebDriverException(
+                    throw LogicException::forError(
                         'The value of the preference should be either a string, int or bool.'
                     );
                 }
@@ -185,8 +187,7 @@ public function encode()
     /**
      * @param string $extension The path to the extension.
      * @param string $profileDir The path to the profile directory.
-     * @throws \Exception
-     * @throws WebDriverException
+     * @throws IOException
      */
     private function installExtension($extension, $profileDir)
     {
@@ -195,18 +196,24 @@ private function installExtension($extension, $profileDir)
         // install extension to profile directory
         $extensionDir = $profileDir . '/extensions/';
         if (!is_dir($extensionDir) && !mkdir($extensionDir, 0777, true) && !is_dir($extensionDir)) {
-            throw new WebDriverException('Cannot install Firefox extension - cannot create directory');
+            throw IOException::forFileError(
+                'Cannot install Firefox extension - cannot create directory',
+                $extensionDir
+            );
         }
 
         if (!copy($extension, $extensionDir . $extensionCommonName . '.xpi')) {
-            throw new WebDriverException('Cannot install Firefox extension - cannot copy file');
+            throw IOException::forFileError(
+                'Cannot install Firefox extension - cannot copy file',
+                $extension
+            );
         }
     }
 
     /**
      * @param string $prefix Prefix of the temp directory.
      *
-     * @throws WebDriverException
+     * @throws IOException
      * @return string The path to the temp directory created.
      */
     private function createTempDirectory($prefix = '')
@@ -216,7 +223,10 @@ private function createTempDirectory($prefix = '')
             unlink($temp_dir);
             mkdir($temp_dir);
             if (!is_dir($temp_dir)) {
-                throw new WebDriverException('Cannot create firefox profile.');
+                throw IOException::forFileError(
+                    'Cannot install Firefox extension - cannot create directory',
+                    $temp_dir
+                );
             }
         }
 
@@ -246,7 +256,7 @@ private function deleteDirectory($directory)
      * @param string $xpi The path to the .xpi extension.
      * @param string $target_dir The path to the unzip directory.
      *
-     * @throws \Exception
+     * @throws IOException
      * @return FirefoxProfile
      */
     private function extractTo($xpi, $target_dir)
@@ -257,10 +267,10 @@ private function extractTo($xpi, $target_dir)
                 $zip->extractTo($target_dir);
                 $zip->close();
             } else {
-                throw new \Exception("Failed to open the firefox extension. '$xpi'");
+                throw IOException::forFileError('Failed to open the firefox extension.', $xpi);
             }
         } else {
-            throw new \Exception("Firefox extension doesn't exist. '$xpi'");
+            throw IOException::forFileError('Firefox extension doesn\'t exist.', $xpi);
         }
 
         return $this;
@@ -287,7 +297,7 @@ private function parseExtensionName($extensionPath)
             strpos($mozillaRsaHex, $objectIdentifierHexMarker, $firstMarkerPosInHex + 2); // phpcs:ignore
 
         if ($secondMarkerPosInHexString === false) {
-            throw new WebDriverException('Cannot install extension. Cannot fetch extension commonName');
+            throw RuntimeException::forError('Cannot install extension. Cannot fetch extension commonName');
         }
 
         // phpcs:ignore
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 7adc2784d..0cc4d193a 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverAction;
 use Facebook\WebDriver\WebDriverKeyboard;
@@ -41,7 +42,7 @@ public function __construct(
         parent::__construct($keyboard, $mouse, $location_provider);
 
         if (!in_array($key, self::MODIFIER_KEYS, true)) {
-            throw new \InvalidArgumentException(
+            throw LogicException::forError(
                 sprintf(
                     'keyDown / keyUp actions can only be used for modifier keys, but "%s" was given',
                     $key
diff --git a/lib/Local/LocalWebDriver.php b/lib/Local/LocalWebDriver.php
index d695ff016..1c396c5c7 100644
--- a/lib/Local/LocalWebDriver.php
+++ b/lib/Local/LocalWebDriver.php
@@ -2,11 +2,12 @@
 
 namespace Facebook\WebDriver\Local;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 
 /**
+ * @codeCoverageIgnore
  * @todo Break inheritance from RemoteWebDriver in next major version. (Composition over inheritance!)
  */
 abstract class LocalWebDriver extends RemoteWebDriver
@@ -19,7 +20,7 @@ abstract class LocalWebDriver extends RemoteWebDriver
      * @param null $http_proxy
      * @param null $http_proxy_port
      * @param DesiredCapabilities|null $required_capabilities
-     * @throws WebDriverException
+     * @throws LogicException
      * @return RemoteWebDriver
      * @todo Remove in next major version (should not be inherited)
      */
@@ -32,7 +33,7 @@ public static function create(
         $http_proxy_port = null,
         DesiredCapabilities $required_capabilities = null
     ) {
-        throw new WebDriverException('Use start() method to start local WebDriver.');
+        throw LogicException::forError('Use start() method to start local WebDriver.');
     }
 
     /**
@@ -40,7 +41,7 @@ public static function create(
      * @param string $selenium_server_url
      * @param null $connection_timeout_in_ms
      * @param null $request_timeout_in_ms
-     * @throws WebDriverException
+     * @throws LogicException
      * @return RemoteWebDriver
      * @todo Remove in next major version (should not be inherited)
      */
@@ -50,6 +51,6 @@ public static function createBySessionID(
         $connection_timeout_in_ms = null,
         $request_timeout_in_ms = null
     ) {
-        throw new WebDriverException('Use start() method to start local WebDriver.');
+        throw LogicException::forError('Use start() method to start local WebDriver.');
     }
 }
diff --git a/lib/Remote/CustomWebDriverCommand.php b/lib/Remote/CustomWebDriverCommand.php
index 94de4fd28..54e2afdee 100644
--- a/lib/Remote/CustomWebDriverCommand.php
+++ b/lib/Remote/CustomWebDriverCommand.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Exception\WebDriverException;
 
 class CustomWebDriverCommand extends WebDriverCommand
@@ -34,7 +35,7 @@ public function __construct($session_id, $url, $method, array $parameters)
     public function getCustomUrl()
     {
         if ($this->customUrl === null) {
-            throw new WebDriverException('URL of custom command is not set');
+            throw LogicException::forError('URL of custom command is not set');
         }
 
         return $this->customUrl;
@@ -47,7 +48,7 @@ public function getCustomUrl()
     public function getCustomMethod()
     {
         if ($this->customMethod === null) {
-            throw new WebDriverException('Method of custom command is not set');
+            throw LogicException::forError('Method of custom command is not set');
         }
 
         return $this->customMethod;
@@ -62,7 +63,7 @@ protected function setCustomRequestParameters($custom_url, $custom_method)
     {
         $allowedMethods = [static::METHOD_GET, static::METHOD_POST];
         if (!in_array($custom_method, $allowedMethods, true)) {
-            throw new WebDriverException(
+            throw LogicException::forError(
                 sprintf(
                     'Invalid custom method "%s", must be one of [%s]',
                     $custom_method,
@@ -73,7 +74,7 @@ protected function setCustomRequestParameters($custom_url, $custom_method)
         $this->customMethod = $custom_method;
 
         if (mb_strpos($custom_url, '/') !== 0) {
-            throw new WebDriverException(
+            throw LogicException::forError(
                 sprintf('URL of custom command has to start with / but is "%s"', $custom_url)
             );
         }
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index 4c854fac2..c016a7f4f 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -2,8 +2,8 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Exception;
 use Facebook\WebDriver\Chrome\ChromeOptions;
+use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Firefox\FirefoxDriver;
 use Facebook\WebDriver\Firefox\FirefoxOptions;
 use Facebook\WebDriver\Firefox\FirefoxProfile;
@@ -152,7 +152,7 @@ public function isJavascriptEnabled()
      * This is a htmlUnit-only option.
      *
      * @param bool $enabled
-     * @throws Exception
+     * @throws UnsupportedOperationException
      * @return DesiredCapabilities
      * @see https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#read-write-capabilities
      */
@@ -160,7 +160,7 @@ public function setJavascriptEnabled($enabled)
     {
         $browser = $this->getBrowserName();
         if ($browser && $browser !== WebDriverBrowserType::HTMLUNIT) {
-            throw new Exception(
+            throw new UnsupportedOperationException(
                 'isJavascriptEnabled() is a htmlunit-only option. ' .
                 'See https://github.com/SeleniumHQ/selenium/wiki/DesiredCapabilities#read-write-capabilities.'
             );
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 6dbfd0c0e..d4602ac26 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -2,11 +2,11 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use BadMethodCallException;
-use Facebook\WebDriver\Exception\WebDriverCurlException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
+use Facebook\WebDriver\Exception\Internal\WebDriverCurlException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\WebDriverCommandExecutor;
-use InvalidArgumentException;
 
 /**
  * Command executor talking to the standalone server via HTTP.
@@ -272,7 +272,6 @@ public function setRequestTimeout($timeout_in_ms)
     /**
      * @param WebDriverCommand $command
      *
-     * @throws WebDriverException
      * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command)
@@ -292,13 +291,7 @@ public function execute(WebDriverCommand $command)
         }
 
         if (is_array($params) && !empty($params) && $http_method !== 'POST') {
-            throw new BadMethodCallException(sprintf(
-                'The http method called for %s is %s but it has to be POST' .
-                ' if you want to pass the JSON params %s',
-                $url,
-                $http_method,
-                json_encode($params)
-            ));
+            throw LogicException::forInvalidHttpMethod($url, $http_method, $params);
         }
 
         curl_setopt($this->curl, CURLOPT_URL, $this->url . $url);
@@ -334,30 +327,13 @@ public function execute(WebDriverCommand $command)
         $raw_results = trim(curl_exec($this->curl));
 
         if ($error = curl_error($this->curl)) {
-            $msg = sprintf(
-                'Curl error thrown for http %s to %s',
-                $http_method,
-                $url
-            );
-            if (is_array($params) && !empty($params)) {
-                $msg .= sprintf(' with params: %s', json_encode($params, JSON_UNESCAPED_SLASHES));
-            }
-
-            throw new WebDriverCurlException($msg . "\n\n" . $error);
+            throw WebDriverCurlException::forCurlError($http_method, $url, $error, is_array($params) ? $params : null);
         }
 
         $results = json_decode($raw_results, true);
 
         if ($results === null && json_last_error() !== JSON_ERROR_NONE) {
-            throw new WebDriverException(
-                sprintf(
-                    "JSON decoding of remote response failed.\n" .
-                    "Error code: %d\n" .
-                    "The response: '%s'\n",
-                    json_last_error(),
-                    $raw_results
-                )
-            );
+            throw UnexpectedResponseException::forJsonDecodingError(json_last_error(), $raw_results);
         }
 
         $value = null;
@@ -414,7 +390,7 @@ protected function getCommandHttpOptions(WebDriverCommand $command)
         $commandName = $command->getName();
         if (!isset(self::$commands[$commandName])) {
             if ($this->isW3cCompliant && !isset(self::$w3cCompliantCommands[$commandName])) {
-                throw new InvalidArgumentException($command->getName() . ' is not a valid command.');
+                throw LogicException::forError($command->getName() . ' is not a valid command.');
             }
         }
 
diff --git a/lib/Remote/RemoteTargetLocator.php b/lib/Remote/RemoteTargetLocator.php
index 5b9881371..979b9c4f6 100644
--- a/lib/Remote/RemoteTargetLocator.php
+++ b/lib/Remote/RemoteTargetLocator.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\UnsupportedOperationException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\WebDriverAlert;
 use Facebook\WebDriver\WebDriverElement;
 use Facebook\WebDriver\WebDriverTargetLocator;
@@ -53,7 +53,7 @@ public function frame($frame)
             } elseif (is_int($frame)) {
                 $id = $frame;
             } else {
-                throw new \InvalidArgumentException(
+                throw LogicException::forError(
                     'In W3C compliance mode frame must be either instance of WebDriverElement, integer or null'
                 );
             }
@@ -111,17 +111,17 @@ public function window($handle)
      * @param string $windowType The type of a new browser window that should be created. One of [tab, window].
      * The created window is not guaranteed to be of the requested type; if the driver does not support the requested
      * type, a new browser window will be created of whatever type the driver does support.
-     * @throws UnsupportedOperationException
+     * @throws LogicException
      * @return RemoteWebDriver This driver focused on the given window
      */
     public function newWindow($windowType = self::WINDOW_TYPE_TAB)
     {
         if ($windowType !== self::WINDOW_TYPE_TAB && $windowType !== self::WINDOW_TYPE_WINDOW) {
-            throw new \InvalidArgumentException('Window type must by either "tab" or "window"');
+            throw LogicException::forError('Window type must by either "tab" or "window"');
         }
 
         if (!$this->isW3cCompliant) {
-            throw new UnsupportedOperationException('New window is only supported in W3C mode');
+            throw LogicException::forError('New window is only supported in W3C mode');
         }
 
         $response = $this->executor->execute(DriverCommand::NEW_WINDOW, ['type' => $windowType]);
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 9c18cb886..5db0af1c2 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\UnknownErrorException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\JavaScriptExecutor;
 use Facebook\WebDriver\Support\IsElementDisplayedAtom;
@@ -212,7 +212,7 @@ public function findElement(WebDriverBy $by)
         );
 
         if ($raw_element === null) {
-            throw new UnknownErrorException('Unexpected server response to findElement command');
+            throw UnexpectedResponseException::forError('Unexpected server response to findElement command');
         }
 
         return $this->newElement(JsonWireCompat::getElement($raw_element));
@@ -233,7 +233,7 @@ public function findElements(WebDriverBy $by)
         );
 
         if ($raw_elements === null) {
-            throw new UnknownErrorException('Unexpected server response to findElements command');
+            throw UnexpectedResponseException::forError('Unexpected server response to findElements command');
         }
 
         $elements = [];
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 89b38752a..bf8ceeff0 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -3,8 +3,10 @@
 namespace Facebook\WebDriver\Remote;
 
 use Facebook\WebDriver\Exception\ElementNotInteractableException;
+use Facebook\WebDriver\Exception\Internal\IOException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
+use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
-use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\Support\ScreenshotHelper;
@@ -408,7 +410,7 @@ public function sendKeys($value)
                     // This is so far non-W3C compliant method, so it may fail - if so, we just ignore the exception.
                     // @see https://github.com/w3c/webdriver/issues/1355
                     $fileName = $this->upload($local_file);
-                } catch (WebDriverException $e) {
+                } catch (PhpWebDriverExceptionInterface $e) {
                     $fileName = $local_file;
                 }
 
@@ -602,13 +604,13 @@ protected function newElement($id)
      *
      * @param string $local_file
      *
-     * @throws WebDriverException
+     * @throws LogicException
      * @return string The remote path of the file.
      */
     protected function upload($local_file)
     {
         if (!is_file($local_file)) {
-            throw new WebDriverException('You may only upload files: ' . $local_file);
+            throw LogicException::forError('You may only upload files: ' . $local_file);
         }
 
         $temp_zip_path = $this->createTemporaryZipArchive($local_file);
@@ -635,7 +637,7 @@ protected function createTemporaryZipArchive($fileToZip)
 
         $zip = new ZipArchive();
         if (($errorCode = $zip->open($tempZipPath, ZipArchive::CREATE)) !== true) {
-            throw new WebDriverException(sprintf('Error creating zip archive: %s', $errorCode));
+            throw IOException::forFileError(sprintf('Error creating zip archive: %s', $errorCode), $tempZipPath);
         }
 
         $info = pathinfo($fileToZip);
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index d16ec943d..3aadfea58 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Remote\Service;
 
-use Facebook\WebDriver\Exception\DriverServerDiedException;
+use Facebook\WebDriver\Exception\Internal\DriverServerDiedException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index 237ca46b9..bb863bc82 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -2,7 +2,8 @@
 
 namespace Facebook\WebDriver\Remote\Service;
 
-use Exception;
+use Facebook\WebDriver\Exception\Internal\IOException;
+use Facebook\WebDriver\Exception\Internal\RuntimeException;
 use Facebook\WebDriver\Net\URLChecker;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\ProcessBuilder;
@@ -123,7 +124,7 @@ protected static function checkExecutable($executable)
 
     /**
      * @param string $executable
-     * @throws Exception
+     * @throws IOException
      */
     protected function setExecutable($executable)
     {
@@ -133,12 +134,10 @@ protected function setExecutable($executable)
             return;
         }
 
-        throw new Exception(
-            sprintf(
-                '"%s" is not executable. Make sure the path is correct or use environment variable to specify'
-                 . ' location of the executable.',
-                $executable
-            )
+        throw IOException::forFileError(
+            'File is not executable. Make sure the path is correct or use environment variable to specify'
+            . ' location of the executable.',
+            $executable
         );
     }
 
@@ -150,13 +149,7 @@ protected function checkWasStarted($process)
         usleep(10000); // wait 10ms, otherwise the asynchronous process failure may not yet be propagated
 
         if (!$process->isRunning()) {
-            throw new Exception(
-                sprintf(
-                    'Error starting driver executable "%s": %s',
-                    $process->getCommandLine(),
-                    $process->getErrorOutput()
-                )
-            );
+            throw RuntimeException::forDriverError($process);
         }
     }
 
diff --git a/lib/Support/ScreenshotHelper.php b/lib/Support/ScreenshotHelper.php
index 5fe18efd1..956f56147 100644
--- a/lib/Support/ScreenshotHelper.php
+++ b/lib/Support/ScreenshotHelper.php
@@ -2,6 +2,8 @@
 
 namespace Facebook\WebDriver\Support;
 
+use Facebook\WebDriver\Exception\Internal\IOException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Exception\WebDriverException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\RemoteExecuteMethod;
@@ -43,13 +45,15 @@ private function takeScreenshot(array $commandToExecute, $saveAs = null)
         $response = $this->executor->execute(...$commandToExecute);
 
         if (!is_string($response)) {
-            throw new WebDriverException('Error taking screenshot, no data received from the remote end');
+            throw UnexpectedResponseException::forError(
+                'Error taking screenshot, no data received from the remote end'
+            );
         }
 
         $screenshot = base64_decode($response, true);
 
         if ($screenshot === false) {
-            throw new WebDriverException('Error decoding screenshot data');
+            throw UnexpectedResponseException::forError('Error decoding screenshot data');
         }
 
         if ($saveAs !== null) {
@@ -70,7 +74,7 @@ private function createDirectoryIfNotExists($directoryPath)
     {
         if (!file_exists($directoryPath)) {
             if (!mkdir($directoryPath, 0777, true) && !is_dir($directoryPath)) {
-                throw new WebDriverException(sprintf('Directory "%s" was not created', $directoryPath));
+                throw IOException::forFileError('Directory cannot be not created', $directoryPath);
             }
         }
     }
diff --git a/lib/WebDriverCheckboxes.php b/lib/WebDriverCheckboxes.php
index 5467589c8..abc8cc46c 100644
--- a/lib/WebDriverCheckboxes.php
+++ b/lib/WebDriverCheckboxes.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Exception\InvalidElementStateException;
 
 /**
  * Provides helper methods for checkboxes.
@@ -15,7 +15,7 @@ public function __construct(WebDriverElement $element)
 
         $this->type = $element->getAttribute('type');
         if ($this->type !== 'checkbox') {
-            throw new WebDriverException('The input must be of type "checkbox".');
+            throw new InvalidElementStateException('The input must be of type "checkbox".');
         }
     }
 
diff --git a/lib/WebDriverExpectedCondition.php b/lib/WebDriverExpectedCondition.php
index 5794d2580..188f3c4d8 100644
--- a/lib/WebDriverExpectedCondition.php
+++ b/lib/WebDriverExpectedCondition.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Exception\NoSuchAlertException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\NoSuchFrameException;
@@ -522,7 +523,7 @@ function (WebDriver $driver) use ($element_or_by, $selected) {
             );
         }
 
-        throw new \InvalidArgumentException('Instance of either WebDriverElement or WebDriverBy must be given');
+        throw LogicException::forError('Instance of either WebDriverElement or WebDriverBy must be given');
     }
 
     /**
diff --git a/lib/WebDriverOptions.php b/lib/WebDriverOptions.php
index 84f2270eb..c84757fe8 100644
--- a/lib/WebDriverOptions.php
+++ b/lib/WebDriverOptions.php
@@ -2,10 +2,10 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Exception\NoSuchCookieException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
-use InvalidArgumentException;
 
 /**
  * Managing stuff you would do in a browser.
@@ -40,7 +40,7 @@ public function addCookie($cookie)
             $cookie = Cookie::createFromArray($cookie);
         }
         if (!$cookie instanceof Cookie) {
-            throw new InvalidArgumentException('Cookie must be set from instance of Cookie class or from array.');
+            throw LogicException::forError('Cookie must be set from instance of Cookie class or from array.');
         }
 
         $this->executor->execute(
diff --git a/lib/WebDriverRadios.php b/lib/WebDriverRadios.php
index e1687983e..aeaaaecac 100644
--- a/lib/WebDriverRadios.php
+++ b/lib/WebDriverRadios.php
@@ -2,8 +2,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\InvalidElementStateException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
-use Facebook\WebDriver\Exception\WebDriverException;
 
 /**
  * Provides helper methods for radio buttons.
@@ -16,7 +16,7 @@ public function __construct(WebDriverElement $element)
 
         $this->type = $element->getAttribute('type');
         if ($this->type !== 'radio') {
-            throw new WebDriverException('The input must be of type "radio".');
+            throw new InvalidElementStateException('The input must be of type "radio".');
         }
     }
 
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 57754eb76..9d2a6e752 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -3,6 +3,7 @@
 namespace Facebook\WebDriver;
 
 use Facebook\WebDriver\Exception\IndexOutOfBoundsException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
@@ -176,9 +177,7 @@ public function setScreenOrientation($orientation)
     {
         $orientation = mb_strtoupper($orientation);
         if (!in_array($orientation, ['PORTRAIT', 'LANDSCAPE'], true)) {
-            throw new IndexOutOfBoundsException(
-                'Orientation must be either PORTRAIT, or LANDSCAPE'
-            );
+            throw LogicException::forError('Orientation must be either PORTRAIT, or LANDSCAPE');
         }
 
         $this->executor->execute(
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index f3a098be4..4f62f6d7b 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Remote\RemoteWebElement;
 
 /**
@@ -158,7 +159,7 @@ public function testShouldNotAcceptStringAsFrameIdInW3cMode()
 
         $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
             'In W3C compliance mode frame must be either instance of WebDriverElement, integer or null'
         );
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index d58419a9a..5b99088ce 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -2,11 +2,9 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers \Facebook\WebDriver\Cookie
- */
 class CookieTest extends TestCase
 {
     public function testShouldSetAllProperties()
@@ -168,7 +166,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
     public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage)
     {
         if ($expectedMessage) {
-            $this->expectException(\InvalidArgumentException::class);
+            $this->expectException(LogicException::class);
             $this->expectExceptionMessage($expectedMessage);
         }
 
diff --git a/tests/unit/Exception/DriverServerDiedExceptionTest.php b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
similarity index 70%
rename from tests/unit/Exception/DriverServerDiedExceptionTest.php
rename to tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
index 3c98e6e00..7ada0a6de 100644
--- a/tests/unit/Exception/DriverServerDiedExceptionTest.php
+++ b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Facebook\WebDriver\Exception;
+namespace Facebook\WebDriver\Exception\Internal;
 
 use PHPUnit\Framework\TestCase;
 
@@ -8,7 +8,7 @@ class DriverServerDiedExceptionTest extends TestCase
 {
     public function testShouldCreateWithPreviousException()
     {
-        $dummyPreviousException = new WebDriverCurlException('CURL error');
+        $dummyPreviousException = UnexpectedResponseException::forError('CURL error');
 
         $exception = new DriverServerDiedException($dummyPreviousException);
 
diff --git a/tests/unit/Exception/Internal/IOExceptionTest.php b/tests/unit/Exception/Internal/IOExceptionTest.php
new file mode 100644
index 000000000..240991963
--- /dev/null
+++ b/tests/unit/Exception/Internal/IOExceptionTest.php
@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use PHPUnit\Framework\TestCase;
+
+class IOExceptionTest extends TestCase
+{
+    public function testShouldCreateExceptionForFileError(): void
+    {
+        $exception = IOException::forFileError('Error message', '/file/path.txt');
+
+        $this->assertSame('Error message ("/file/path.txt")', $exception->getMessage());
+    }
+}
diff --git a/tests/unit/Exception/Internal/LogicExceptionTest.php b/tests/unit/Exception/Internal/LogicExceptionTest.php
new file mode 100644
index 000000000..ba09d58d8
--- /dev/null
+++ b/tests/unit/Exception/Internal/LogicExceptionTest.php
@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use PHPUnit\Framework\TestCase;
+
+class LogicExceptionTest extends TestCase
+{
+    public function testShouldCreateExceptionForError(): void
+    {
+        $exception = LogicException::forError('Error message');
+
+        $this->assertSame('Error message', $exception->getMessage());
+    }
+
+    public function testShouldCreateExceptionForInvalidHttpMethod(): void
+    {
+        $exception = LogicException::forInvalidHttpMethod('http://foo.bar/', 'FOO', ['key' => 'val']);
+
+        $this->assertSame(
+            'The http method called for "http://foo.bar/" is "FOO", but it has to be POST if you want to pass'
+            . ' the JSON params {"key":"val"}',
+            $exception->getMessage()
+        );
+    }
+}
diff --git a/tests/unit/Exception/Internal/RuntimeExceptionTest.php b/tests/unit/Exception/Internal/RuntimeExceptionTest.php
new file mode 100644
index 000000000..97adf87b3
--- /dev/null
+++ b/tests/unit/Exception/Internal/RuntimeExceptionTest.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Process\Process;
+
+class RuntimeExceptionTest extends TestCase
+{
+    public function testShouldCreateExceptionForError(): void
+    {
+        $exception = RuntimeException::forError('Error message');
+
+        $this->assertSame('Error message', $exception->getMessage());
+    }
+
+    public function testShouldCreateExceptionForDriverError(): void
+    {
+        $processMock = $this->createConfiguredMock(
+            Process::class,
+            [
+                'getCommandLine' => '/bin/true --force',
+                'getErrorOutput' => 'may the force be with you',
+            ]
+        );
+
+        $exception = RuntimeException::forDriverError($processMock);
+
+        $this->assertSame(
+            'Error starting driver executable "/bin/true --force": may the force be with you',
+            $exception->getMessage()
+        );
+    }
+}
diff --git a/tests/unit/Exception/Internal/UnexpectedResponseExceptionTest.php b/tests/unit/Exception/Internal/UnexpectedResponseExceptionTest.php
new file mode 100644
index 000000000..80f4b4a0d
--- /dev/null
+++ b/tests/unit/Exception/Internal/UnexpectedResponseExceptionTest.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use PHPUnit\Framework\TestCase;
+
+class UnexpectedResponseExceptionTest extends TestCase
+{
+    public function testShouldCreateExceptionForError(): void
+    {
+        $exception = UnexpectedResponseException::forError('Error message');
+
+        $this->assertSame('Error message', $exception->getMessage());
+    }
+
+    public function testShouldCreateExceptionForJsonDecodingError(): void
+    {
+        $exception = UnexpectedResponseException::forJsonDecodingError(JSON_ERROR_SYNTAX, 'foo');
+
+        $this->assertSame(
+            <<<EOF
+            JSON decoding of remote response failed.
+            Error code: 4
+            The response: 'foo'
+
+            EOF,
+            $exception->getMessage()
+        );
+    }
+}
diff --git a/tests/unit/Exception/Internal/WebDriverCurlExceptionTest.php b/tests/unit/Exception/Internal/WebDriverCurlExceptionTest.php
new file mode 100644
index 000000000..acc94cb88
--- /dev/null
+++ b/tests/unit/Exception/Internal/WebDriverCurlExceptionTest.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Exception\Internal;
+
+use PHPUnit\Framework\TestCase;
+
+class WebDriverCurlExceptionTest extends TestCase
+{
+    /**
+     * @dataProvider provideParams
+     */
+    public function testShouldCreateExceptionForCurlError(?array $params, string $exceptionMessageExtra): void
+    {
+        $exception = WebDriverCurlException::forCurlError('GET', 'http://foo.bar/', 'curl error', $params);
+
+        $this->assertSame(
+            <<<EOF
+            Curl error thrown for http GET to http://foo.bar$exceptionMessageExtra
+            
+            curl error
+            EOF,
+            $exception->getMessage()
+        );
+    }
+
+    public function provideParams(): array
+    {
+        return [
+            'null params' => [null, ''],
+            'empty params' => [[], ''],
+            'array of params' => [['bar' => 'foo', 'baz' => 'bat'], ' with params: {"bar":"foo","baz":"bat"}'],
+        ];
+    }
+}
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
index 2e937c6e4..83e71e53f 100644
--- a/tests/unit/Firefox/FirefoxOptionsTest.php
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Firefox;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use PHPUnit\Framework\TestCase;
 
 class FirefoxOptionsTest extends TestCase
@@ -104,7 +105,7 @@ public function testShouldNotAllowToSetArgumentsOptionDirectly()
     {
         $options = new FirefoxOptions();
 
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Use addArguments() method to add Firefox arguments');
         $options->setOption('args', []);
     }
@@ -113,7 +114,7 @@ public function testShouldNotAllowToSetPreferencesOptionDirectly()
     {
         $options = new FirefoxOptions();
 
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Use setPreference() method to set Firefox preferences');
         $options->setOption('prefs', []);
     }
diff --git a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
index ddded93bb..fbd85a0ba 100644
--- a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Internal\WebDriverLocatable;
 use Facebook\WebDriver\WebDriverKeyboard;
 use Facebook\WebDriver\WebDriverMouse;
@@ -14,7 +15,7 @@ class WebDriverSingleKeyActionTest extends TestCase
 {
     public function testShouldThrowExceptionWhenNotUsedForModifier()
     {
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
             'keyDown / keyUp actions can only be used for modifier keys, but "foo" was given'
         );
diff --git a/tests/unit/Remote/CustomWebDriverCommandTest.php b/tests/unit/Remote/CustomWebDriverCommandTest.php
index b56bc4aea..8de7320f2 100644
--- a/tests/unit/Remote/CustomWebDriverCommandTest.php
+++ b/tests/unit/Remote/CustomWebDriverCommandTest.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use PHPUnit\Framework\TestCase;
 
 class CustomWebDriverCommandTest extends TestCase
@@ -22,7 +22,7 @@ public function testShouldSetOptionsUsingConstructor()
 
     public function testCustomCommandInvalidUrlExceptionInit()
     {
-        $this->expectException(WebDriverException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('URL of custom command has to start with / but is "url-without-leading-slash"');
 
         new CustomWebDriverCommand('session-id-123', 'url-without-leading-slash', 'POST', []);
@@ -30,7 +30,7 @@ public function testCustomCommandInvalidUrlExceptionInit()
 
     public function testCustomCommandInvalidMethodExceptionInit()
     {
-        $this->expectException(WebDriverException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Invalid custom method "invalid-method", must be one of [GET, POST]');
 
         new CustomWebDriverCommand('session-id-123', '/some-url', 'invalid-method', []);
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 198fd3997..4db77d687 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
-use Facebook\WebDriver\Exception\UnknownErrorException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Interactions\WebDriverActions;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverNavigation;
@@ -106,6 +106,9 @@ public function testShouldCreateWebDriverWaitInstance()
     }
 
     /**
+     * @covers ::findElement
+     * @covers ::findElements
+     * @covers \Facebook\WebDriver\Exception\Internal\UnexpectedResponseException
      * @param string $method
      * @param string $expectedExceptionMessage
      * @dataProvider provideMethods
@@ -120,7 +123,7 @@ public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($meth
 
         $this->driver->setCommandExecutor($executorMock);
 
-        $this->expectException(UnknownErrorException::class);
+        $this->expectException(UnexpectedResponseException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
         call_user_func([$this->driver, $method], $this->createMock(WebDriverBy::class));
     }
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index 6d77b7cad..4b843414a 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -2,7 +2,7 @@
 
 namespace Facebook\WebDriver\Support;
 
-use Facebook\WebDriver\Exception\WebDriverException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\RemoteExecuteMethod;
 use PHPUnit\Framework\TestCase;
@@ -89,7 +89,7 @@ public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expected
 
         $helper = new ScreenshotHelper($executorMock);
 
-        $this->expectException(WebDriverException::class);
+        $this->expectException(UnexpectedResponseException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
         $helper->takePageScreenshot();
     }
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 7b4b8f45e..12e645b4e 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\LogicException;
 use Facebook\WebDriver\Remote\DriverCommand;
 use Facebook\WebDriver\Remote\ExecuteMethod;
 use PHPUnit\Framework\TestCase;
@@ -76,7 +77,7 @@ public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
 
         $options = new WebDriverOptions($this->executor);
 
-        $this->expectException(\InvalidArgumentException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Cookie must be set from instance of Cookie class or from array.');
         $options->addCookie($notCookie);
     }

From a521f856b93a8eb4e173417590b0da1560ff3d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 10 Oct 2022 15:29:04 +0200
Subject: [PATCH 723/784] Capabilities must be provided when resuing session,
 do not allow them to be null

Null capabilities causes issues and inconsistencies in various places.
---
 lib/Remote/RemoteWebDriver.php            | 20 +++++++++++++-------
 phpstan.neon                              |  2 ++
 tests/unit/Remote/RemoteWebDriverTest.php |  9 ++++++++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 5db0af1c2..f5908faf9 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -56,22 +56,19 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
     /**
      * @param HttpCommandExecutor $commandExecutor
      * @param string $sessionId
-     * @param WebDriverCapabilities|null $capabilities
+     * @param WebDriverCapabilities $capabilities
      * @param bool $isW3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
      */
     protected function __construct(
         HttpCommandExecutor $commandExecutor,
         $sessionId,
-        WebDriverCapabilities $capabilities = null,
+        WebDriverCapabilities $capabilities,
         $isW3cCompliant = false
     ) {
         $this->executor = $commandExecutor;
         $this->sessionID = $sessionId;
         $this->isW3cCompliant = $isW3cCompliant;
-
-        if ($capabilities !== null) {
-            $this->capabilities = $capabilities;
-        }
+        $this->capabilities = $capabilities;
     }
 
     /**
@@ -147,6 +144,8 @@ public static function create(
      * @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
      * @param bool $isW3cCompliant True to use W3C WebDriver (default), false to use the legacy JsonWire protocol
+     * @param WebDriverCapabilities|null $existingCapabilities Provide capabilities of the existing previously created
+     *  session. If not provided, we will attempt to read them, but this will only work when using Selenium Grid.
      * @return static
      */
     public static function createBySessionID(
@@ -157,6 +156,7 @@ public static function createBySessionID(
     ) {
         // BC layer to not break the method signature
         $isW3cCompliant = func_num_args() > 4 ? func_get_arg(4) : true;
+        $existingCapabilities = func_num_args() > 5 ? func_get_arg(5) : null;
 
         $executor = new HttpCommandExecutor($selenium_server_url, null, null);
         if ($connection_timeout_in_ms !== null) {
@@ -170,7 +170,13 @@ public static function createBySessionID(
             $executor->disableW3cCompliance();
         }
 
-        return new static($executor, $session_id, null, $isW3cCompliant);
+        if ($existingCapabilities === null) {
+            throw new UnknownErrorException(
+                'Existing capabilities must be provided when reusing previous session.'
+            );
+        }
+
+        return new static($executor, $session_id, $existingCapabilities, $isW3cCompliant);
     }
 
     /**
diff --git a/phpstan.neon b/phpstan.neon
index 747193ddf..b4c1e307d 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -23,5 +23,7 @@ parameters:
         # Parameter is intentionally not part of signature to not break BC
         - message: '#PHPDoc tag \@param references unknown parameter: \$isW3cCompliant#'
           path: 'lib/Remote/RemoteWebDriver.php'
+        - message: '#PHPDoc tag \@param references unknown parameter: \$existingCapabilities#'
+          path: 'lib/Remote/RemoteWebDriver.php'
 
     inferPrivatePropertyTypeFromConstructor: true
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 4db77d687..48feec3fa 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -22,7 +22,14 @@ class RemoteWebDriverTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->driver = RemoteWebDriver::createBySessionID('session-id', 'http://foo.bar:4444/');
+        $this->driver = RemoteWebDriver::createBySessionID(
+            'session-id',
+            'http://foo.bar:4444/',
+            null,
+            null,
+            true,
+            new DesiredCapabilities([])
+        );
     }
 
     /**

From f998f324b33942a92a477cf2a097a7c3d5c56bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 17 Oct 2022 18:45:02 +0200
Subject: [PATCH 724/784] Read capabilities of the reused session from the
 Selenium Grid

---
 .github/workflows/tests.yaml                  |  1 +
 CHANGELOG.md                                  |  3 +-
 .../Internal/UnexpectedResponseException.php  | 12 +++++
 lib/Remote/RemoteWebDriver.php                | 37 ++++++++++++--
 .../functional/RemoteWebDriverCreateTest.php  | 51 ++++++++++++++++++-
 tests/functional/WebDriverTestCase.php        |  5 ++
 tests/unit/Remote/RemoteWebDriverTest.php     |  3 +-
 7 files changed, 103 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index f302d168f..1f0216d14 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -162,6 +162,7 @@ jobs:
           CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chrome_driver/chromedriver' || '' }}"
           GECKODRIVER_PATH: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '/usr/local/share/gecko_driver/geckodriver' || '' }}"
           DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
+          SELENIUM_SERVER: "${{ matrix.selenium-server && '1' || '0' }}"
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
           if [ "$BROWSER_NAME" = "firefox" ]; then EXCLUDE_GROUP+="exclude-firefox,"; fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e466ab9c4..159676e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,10 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Require PHP ^7.3.
+- Capabilities must be either explicitly provided or retrievable from Selenium Grid when resuing session with `createBySessionID()`.
 - Throw `UnexpectedResponseException` instead of `UnknownErrorException` in `findElement()` and `findElements()` methods.
 - Throw custom php-webdriver exceptions instead of native PHP SPL exceptions.
-- Do not mix internal non-W3C WebDriver exceptions, separate them into own namespace.
+- Do not mix internal non-W3C WebDriver exceptions, separate them into own namespaces.
 
 ## 1.13.0 - 2022-10-03
 ### Added
diff --git a/lib/Exception/Internal/UnexpectedResponseException.php b/lib/Exception/Internal/UnexpectedResponseException.php
index dddde41bf..13597c8f7 100644
--- a/lib/Exception/Internal/UnexpectedResponseException.php
+++ b/lib/Exception/Internal/UnexpectedResponseException.php
@@ -26,4 +26,16 @@ public static function forJsonDecodingError(int $jsonLastError, string $rawResul
             )
         );
     }
+
+    public static function forCapabilitiesRetrievalError(\Exception $previousException): self
+    {
+        return new self(
+            sprintf(
+                'Existing Capabilities were not provided, and they also cannot be read from Selenium Grid'
+                . ' (error: "%s"). You are probably not using Selenium Grid, so to reuse the previous session,'
+                . ' Capabilities must be explicitly provided to createBySessionID() method.',
+                $previousException->getMessage()
+            )
+        );
+    }
 }
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index f5908faf9..b7aac41fd 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -136,8 +136,14 @@ public static function create(
     /**
      * [Experimental] Construct the RemoteWebDriver by an existing session.
      *
-     * This constructor can boost the performance a lot by reusing the same browser for the whole test suite.
-     * You cannot pass the desired capabilities because the session was created before.
+     * This constructor can boost the performance by reusing the same browser for the whole test suite. On the other
+     * hand, because the browser is not pristine, this may lead to flaky and dependent tests. So carefully
+     * consider the tradeoffs.
+     *
+     * To create the instance, we need to know Capabilities of the previously created session. You can either
+     * pass them in $existingCapabilities parameter, or we will attempt to receive them from the Selenium Grid server.
+     * However, if Capabilities were not provided and the attempt to get them was not successful,
+     * exception will be thrown.
      *
      * @param string $session_id The existing session id
      * @param string $selenium_server_url The url of the remote Selenium WebDriver server
@@ -170,10 +176,9 @@ public static function createBySessionID(
             $executor->disableW3cCompliance();
         }
 
+        // if  capabilities were not provided, attempt to read them from the Selenium Grid API
         if ($existingCapabilities === null) {
-            throw new UnknownErrorException(
-                'Existing capabilities must be provided when reusing previous session.'
-            );
+            $existingCapabilities = self::readExistingCapabilitiesFromSeleniumGrid($session_id, $executor);
         }
 
         return new static($executor, $session_id, $existingCapabilities, $isW3cCompliant);
@@ -733,4 +738,26 @@ protected static function castToDesiredCapabilitiesObject($desired_capabilities
 
         return $desired_capabilities;
     }
+
+    protected static function readExistingCapabilitiesFromSeleniumGrid(
+        string $session_id,
+        HttpCommandExecutor $executor
+    ): DesiredCapabilities {
+        $getCapabilitiesCommand = new CustomWebDriverCommand($session_id, '/se/grid/session/:sessionId', 'GET', []);
+
+        try {
+            $capabilitiesResponse = $executor->execute($getCapabilitiesCommand);
+
+            $existingCapabilities = DesiredCapabilities::createFromW3cCapabilities(
+                $capabilitiesResponse->getValue()['capabilities']
+            );
+            if ($existingCapabilities === null) {
+                throw UnexpectedResponseException::forError('Empty capabilities received');
+            }
+        } catch (\Exception $e) {
+            throw UnexpectedResponseException::forCapabilitiesRetrievalError($e);
+        }
+
+        return $existingCapabilities;
+    }
 }
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index 37426cad3..b37af2d38 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -2,12 +2,14 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\HttpCommandExecutor;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\WebDriverBrowserType;
 
 /**
+ * @covers \Facebook\WebDriver\Exception\Internal\UnexpectedResponseException
  * @covers \Facebook\WebDriver\Remote\HttpCommandExecutor
  * @covers \Facebook\WebDriver\Remote\RemoteWebDriver
  */
@@ -111,12 +113,41 @@ public function testShouldCreateInstanceFromExistingSessionId()
         $originalDriver->get($this->getTestPageUrl(TestPage::INDEX));
         $this->compatAssertStringContainsString('/index.html', $originalDriver->getCurrentURL());
 
-        // Store session ID
+        // Store session attributes
         $sessionId = $originalDriver->getSessionID();
         $isW3cCompliant = $originalDriver->isW3cCompliant();
+        $originalCapabilities = $originalDriver->getCapabilities();
+
+        $capabilitiesForSessionReuse = $originalCapabilities;
+        if ($this->isSeleniumServerUsed()) {
+            // do not provide capabilities when selenium server is used, to test they are read from selenium server
+            $capabilitiesForSessionReuse = null;
+        }
 
         // Create new RemoteWebDriver instance based on the session ID
-        $this->driver = RemoteWebDriver::createBySessionID($sessionId, $this->serverUrl, null, null, $isW3cCompliant);
+        $this->driver = RemoteWebDriver::createBySessionID(
+            $sessionId,
+            $this->serverUrl,
+            null,
+            null,
+            $isW3cCompliant,
+            $capabilitiesForSessionReuse
+        );
+
+        // Capabilities should be retrieved and be set to the driver instance
+        $returnedCapabilities = $this->driver->getCapabilities();
+        $this->assertInstanceOf(WebDriverCapabilities::class, $returnedCapabilities);
+
+        $expectedBrowserName = $this->desiredCapabilities->getBrowserName();
+
+        if ($this->isSauceLabsBuild() && $expectedBrowserName === 'MicrosoftEdge') {
+            $expectedBrowserName = 'msedge'; // SauceLabs for some reason reports MicrosoftEdge as msedge
+        }
+        $this->assertEqualsIgnoringCase(
+            $expectedBrowserName,
+            $returnedCapabilities->getBrowserName()
+        );
+        $this->assertEqualsCanonicalizing($originalCapabilities, $this->driver->getCapabilities());
 
         // Check we reused the previous instance (window) and it has the same URL
         $this->compatAssertStringContainsString('/index.html', $this->driver->getCurrentURL());
@@ -125,6 +156,22 @@ public function testShouldCreateInstanceFromExistingSessionId()
         $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
     }
 
+    public function testShouldRequireCapabilitiesToBeSetToReuseExistingSession()
+    {
+        $this->expectException(UnexpectedResponseException::class);
+        $this->expectExceptionMessage(
+            'Existing Capabilities were not provided, and they also cannot be read from Selenium Grid'
+        );
+
+        // Do not provide capabilities, they also cannot be retrieved from the Selenium Grid
+        RemoteWebDriver::createBySessionID(
+            'sessionId',
+            'http://localhost:332/', // nothing should be running there
+            null,
+            null
+        );
+    }
+
     protected function createWebDriver()
     {
     }
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index dbd6606ac..685615970 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -110,6 +110,11 @@ public static function isW3cProtocolBuild()
         return getenv('DISABLE_W3C_PROTOCOL') !== '1';
     }
 
+    public static function isSeleniumServerUsed(): bool
+    {
+        return getenv('SELENIUM_SERVER') === '1';
+    }
+
     public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
     {
         if (static::isW3cProtocolBuild()) {
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 48feec3fa..76d6d1428 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -11,7 +11,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Unit part of RemoteWebDriver tests. Ie. tests for behavior which do not interact with the real remote server.
+ * Unit part of RemoteWebDriver tests. I.e. tests for behavior which do not interact with the real remote server.
  *
  * @coversDefaultClass \Facebook\WebDriver\Remote\RemoteWebDriver
  */
@@ -22,6 +22,7 @@ class RemoteWebDriverTest extends TestCase
 
     protected function setUp(): void
     {
+        // `createBySessionID()` is used because it is the simplest way to instantiate real RemoteWebDriver
         $this->driver = RemoteWebDriver::createBySessionID(
             'session-id',
             'http://foo.bar:4444/',

From 1015581a7b770b0a3f4a165f559eaaec211e088a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 15 Nov 2022 12:28:33 +0100
Subject: [PATCH 725/784] Remove no longer needed compatibility layer with old
 PHPUnit

---
 tests/functional/RemoteTargetLocatorTest.php  | 32 +++++++++----------
 .../functional/RemoteWebDriverCreateTest.php  |  4 +--
 tests/functional/RemoteWebDriverTest.php      |  4 +--
 tests/functional/WebDriverTestCase.php        | 16 ----------
 4 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 4f62f6d7b..2ef90803c 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -24,7 +24,7 @@ public function testShouldSwitchToWindow()
         );
 
         // At first the window should not be switched
-        $this->compatAssertStringContainsString('open_new_window.html', $this->driver->getCurrentURL());
+        $this->assertStringContainsString('open_new_window.html', $this->driver->getCurrentURL());
         $this->assertSame($originalWindowHandle, $this->driver->getWindowHandle());
 
         /**
@@ -44,7 +44,7 @@ public function testShouldSwitchToWindow()
         });
 
         // After switchTo() is called, the active window should be changed
-        $this->compatAssertStringContainsString('index.html', $this->driver->getCurrentURL());
+        $this->assertStringContainsString('index.html', $this->driver->getCurrentURL());
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
 
@@ -70,25 +70,25 @@ public function testShouldSwitchToFrameByItsId()
 
         $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
+        $this->assertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(null);
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(1);
-        $this->compatAssertStringContainsString($secondChildFrame, $this->driver->getPageSource());
+        $this->assertStringContainsString($secondChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(null);
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
+        $this->assertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->defaultContent();
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
     public function testShouldSwitchToParentFrame()
@@ -98,13 +98,13 @@ public function testShouldSwitchToParentFrame()
 
         $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
 
         $this->driver->switchTo()->frame(0);
-        $this->compatAssertStringContainsString($firstChildFrame, $this->driver->getPageSource());
+        $this->assertStringContainsString($firstChildFrame, $this->driver->getPageSource());
 
         $this->driver->switchTo()->parent();
-        $this->compatAssertStringContainsString($parentPage, $this->driver->getPageSource());
+        $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
     public function testShouldSwitchToFrameByElement()
@@ -114,7 +114,7 @@ public function testShouldSwitchToFrameByElement()
         $element = $this->driver->findElement(WebDriverBy::id('iframe_content'));
         $this->driver->switchTo()->frame($element);
 
-        $this->compatAssertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
+        $this->assertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
     }
 
     /**
@@ -129,8 +129,8 @@ public function testShouldCreateNewWindow()
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $this->assertEquals($this->getTestPageUrl(TestPage::INDEX), $this->driver->getCurrentUrl());
         $source = $this->driver->getPageSource();
-        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
-        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
+        $this->assertStringContainsString('<h1 id="welcome">', $source);
+        $this->assertStringContainsString('Welcome to the php-webdriver testing page.', $source);
         $windowHandles = $this->driver->getWindowHandles();
         $this->assertCount(1, $windowHandles);
 
@@ -178,6 +178,6 @@ public function testShouldAcceptStringAsFrameIdInJsonWireMode()
 
         $this->driver->switchTo()->frame('iframe_content');
 
-        $this->compatAssertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
+        $this->assertStringContainsString('This is the content of the iFrame', $this->driver->getPageSource());
     }
 }
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index b37af2d38..dcb883846 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -111,7 +111,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
             $this->requestTimeout
         );
         $originalDriver->get($this->getTestPageUrl(TestPage::INDEX));
-        $this->compatAssertStringContainsString('/index.html', $originalDriver->getCurrentURL());
+        $this->assertStringContainsString('/index.html', $originalDriver->getCurrentURL());
 
         // Store session attributes
         $sessionId = $originalDriver->getSessionID();
@@ -150,7 +150,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
         $this->assertEqualsCanonicalizing($originalCapabilities, $this->driver->getCapabilities());
 
         // Check we reused the previous instance (window) and it has the same URL
-        $this->compatAssertStringContainsString('/index.html', $this->driver->getCurrentURL());
+        $this->assertStringContainsString('/index.html', $this->driver->getCurrentURL());
 
         // Do some interaction with the new driver
         $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 262423d2b..07da0a0ae 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -42,8 +42,8 @@ public function testShouldGetPageSource()
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $source = $this->driver->getPageSource();
-        $this->compatAssertStringContainsString('<h1 id="welcome">', $source);
-        $this->compatAssertStringContainsString('Welcome to the php-webdriver testing page.', $source);
+        $this->assertStringContainsString('<h1 id="welcome">', $source);
+        $this->assertStringContainsString('Welcome to the php-webdriver testing page.', $source);
     }
 
     /**
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 685615970..5db9e7894 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -240,22 +240,6 @@ protected function setUpSauceLabs()
         }
     }
 
-    /**
-     * Uses assertStringContainsString when it is available or uses assertContains for old phpunit versions
-     * @param string $needle
-     * @param string $haystack
-     * @param string $message
-     */
-    protected function compatAssertStringContainsString($needle, $haystack, $message = '')
-    {
-        if (method_exists($this, 'assertStringContainsString')) {
-            parent::assertStringContainsString($needle, $haystack, $message);
-
-            return;
-        }
-        parent::assertContains($needle, $haystack, $message);
-    }
-
     protected function createWebDriver()
     {
         $this->driver = RemoteWebDriver::create(

From 1321cc40c2dc4f15208eecc9b321913c24f12c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 3 Jan 2023 11:18:15 +0100
Subject: [PATCH 726/784] Use new shields.io badges URL

See https://github.com/badges/shields/issues/8671
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2f2432095..f3e8d3801 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # php-webdriver – Selenium WebDriver bindings for PHP
 
 [![Latest stable version](https://img.shields.io/packagist/v/php-webdriver/webdriver.svg?style=flat-square&label=Packagist)](https://packagist.org/packages/php-webdriver/webdriver)
-[![GitHub Actions build status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Tests?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
-[![SauceLabs test status](https://img.shields.io/github/workflow/status/php-webdriver/php-webdriver/Sauce%20Labs?style=flat-square&label=SauceLabs)](https://saucelabs.com/u/php-webdriver)
+[![GitHub Actions build status](https://img.shields.io/github/actions/workflow/status/php-webdriver/php-webdriver/tests.yaml?style=flat-square&label=GitHub%20Actions)](https://github.com/php-webdriver/php-webdriver/actions)
+[![SauceLabs test status](https://img.shields.io/github/actions/workflow/status/php-webdriver/php-webdriver/sauce-labs.yaml?style=flat-square&label=SauceLabs)](https://saucelabs.com/u/php-webdriver)
 [![Total downloads](https://img.shields.io/packagist/dd/php-webdriver/webdriver.svg?style=flat-square&label=Downloads)](https://packagist.org/packages/php-webdriver/webdriver)
 
 ## Description

From f335837f50b838d865557c31b5ee0a5844757cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 3 Jan 2023 13:00:49 +0100
Subject: [PATCH 727/784] Declare job step timout for fast fail when cannot
 start browser driver

---
 .github/workflows/tests.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 1f0216d14..101364c8c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -149,6 +149,7 @@ jobs:
           php -S 127.0.0.1:8000 -t tests/functional/web/ &> ./logs/php-server.log &
 
       - name: Wait for browser & PHP to start
+        timeout-minutes: 1
         run: |
           while ! nc -z localhost 4444 </dev/null; do echo Waiting for remote driver to start...; sleep 1; done
           while ! nc -z localhost 8000 </dev/null; do echo Waiting for PHP server to start...; sleep 1; done

From 4ae78891abc2194f032b5b25bfdfe3a6e27bab8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 30 Jan 2023 15:22:41 +0100
Subject: [PATCH 728/784] Test: Declare return types in test methods

---
 .php-cs-fixer.dist.php                        |  2 +
 .../Chrome/ChromeDevToolsDriverTest.php       |  4 +-
 .../Chrome/ChromeDriverServiceTest.php        |  8 +-
 tests/functional/Chrome/ChromeDriverTest.php  |  8 +-
 tests/functional/FileUploadTest.php           |  4 +-
 .../Firefox/FirefoxDriverServiceTest.php      |  6 +-
 .../functional/Firefox/FirefoxDriverTest.php  |  6 +-
 .../functional/Firefox/FirefoxProfileTest.php | 10 +--
 tests/functional/RemoteKeyboardTest.php       |  2 +-
 tests/functional/RemoteTargetLocatorTest.php  | 16 ++--
 .../functional/RemoteWebDriverCreateTest.php  | 14 ++--
 .../RemoteWebDriverFindElementTest.php        | 10 +--
 tests/functional/RemoteWebDriverTest.php      | 28 +++----
 tests/functional/RemoteWebElementTest.php     | 50 ++++++------
 .../ReportSauceLabsStatusListener.php         |  4 +-
 tests/functional/RetrieveEventsTrait.php      |  4 +-
 tests/functional/ShadowDomTest.php            |  8 +-
 tests/functional/WebDriverActionsTest.php     | 20 ++---
 tests/functional/WebDriverAlertTest.php       |  8 +-
 tests/functional/WebDriverByTest.php          |  4 +-
 tests/functional/WebDriverCheckboxesTest.php  | 36 ++++-----
 tests/functional/WebDriverNavigationTest.php  |  6 +-
 .../WebDriverOptionsCookiesTest.php           |  2 +-
 tests/functional/WebDriverRadiosTest.php      | 36 ++++-----
 tests/functional/WebDriverSelectTest.php      | 64 +++++++--------
 tests/functional/WebDriverTestCase.php        | 16 ++--
 tests/functional/WebDriverTimeoutsTest.php    |  6 +-
 tests/functional/WebDriverWindowTest.php      | 14 ++--
 tests/unit/CookieTest.php                     | 16 ++--
 .../DriverServerDiedExceptionTest.php         |  2 +-
 .../unit/Exception/WebDriverExceptionTest.php | 78 +++++++++----------
 tests/unit/Firefox/FirefoxOptionsTest.php     | 16 ++--
 .../WebDriverButtonReleaseActionTest.php      |  2 +-
 .../Internal/WebDriverClickActionTest.php     |  2 +-
 .../WebDriverClickAndHoldActionTest.php       |  2 +-
 .../WebDriverContextClickActionTest.php       |  2 +-
 .../Internal/WebDriverCoordinatesTest.php     |  2 +-
 .../WebDriverDoubleClickActionTest.php        |  2 +-
 .../Internal/WebDriverKeyDownActionTest.php   |  2 +-
 .../Internal/WebDriverKeyUpActionTest.php     |  2 +-
 .../Internal/WebDriverMouseMoveActionTest.php |  2 +-
 .../WebDriverMouseToOffsetActionTest.php      |  2 +-
 .../Internal/WebDriverSendKeysActionTest.php  |  2 +-
 .../Internal/WebDriverSingleKeyActionTest.php |  2 +-
 .../Remote/CustomWebDriverCommandTest.php     |  6 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php | 26 +++----
 tests/unit/Remote/HttpCommandExecutorTest.php |  2 +-
 tests/unit/Remote/LocalFileDetectorTest.php   |  4 +-
 tests/unit/Remote/RemoteWebDriverTest.php     | 20 ++---
 tests/unit/Remote/RemoteWebElementTest.php    |  2 +-
 tests/unit/Remote/WebDriverCommandTest.php    |  4 +-
 tests/unit/Support/ScreenshotHelperTest.php   | 10 +--
 tests/unit/Support/XPathEscaperTest.php       |  4 +-
 tests/unit/WebDriverExpectedConditionTest.php | 42 +++++-----
 tests/unit/WebDriverKeysTest.php              |  4 +-
 tests/unit/WebDriverOptionsTest.php           | 16 ++--
 56 files changed, 337 insertions(+), 335 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 23496f768..6c0bacf2f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -98,6 +98,7 @@
         'phpdoc_trim' => true,
         'phpdoc_types' => true,
         'phpdoc_var_annotation_correct_order' => true,
+        //'pow_to_exponentiation' => true,
         'psr_autoloading' => true,
         'random_api_migration' => true,
         'self_accessor' => true,
@@ -118,6 +119,7 @@
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => ['elements' => ['method', 'property', 'const']],
+        //'void_return' => true,
         'whitespace_after_comma_in_array' => true,
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
     ])
diff --git a/tests/functional/Chrome/ChromeDevToolsDriverTest.php b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
index b927c73d6..28e01965c 100644
--- a/tests/functional/Chrome/ChromeDevToolsDriverTest.php
+++ b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
         }
     }
 
-    public function testShouldExecuteDevToolsCommandWithoutParameters()
+    public function testShouldExecuteDevToolsCommandWithoutParameters(): void
     {
         $devTools = new ChromeDevToolsDriver($this->driver);
 
@@ -31,7 +31,7 @@ public function testShouldExecuteDevToolsCommandWithoutParameters()
         $this->assertSame([], $result);
     }
 
-    public function testShouldExecuteDevToolsCommandWithParameters()
+    public function testShouldExecuteDevToolsCommandWithParameters(): void
     {
         $devTools = new ChromeDevToolsDriver($this->driver);
 
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index d83ca6af4..33526c451 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -30,7 +30,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
+    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor(): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
@@ -50,7 +50,7 @@ public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
         $this->assertInstanceOf(ChromeDriverService::class, $this->driverService->stop());
     }
 
-    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
+    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor(): void
     {
         $this->driverService = new ChromeDriverService(getenv('CHROMEDRIVER_PATH'), 9515, ['--port=9515']);
 
@@ -63,7 +63,7 @@ public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
         $this->assertFalse($this->driverService->isRunning());
     }
 
-    public function testShouldThrowExceptionIfExecutableIsNotExecutable()
+    public function testShouldThrowExceptionIfExecutableIsNotExecutable(): void
     {
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . __FILE__);
 
@@ -72,7 +72,7 @@ public function testShouldThrowExceptionIfExecutableIsNotExecutable()
         ChromeDriverService::createDefaultService();
     }
 
-    public function testShouldUseDefaultExecutableIfNoneProvided()
+    public function testShouldUseDefaultExecutableIfNoneProvided(): void
     {
         // Put path where ChromeDriver binary is actually located to system PATH, to make sure we can locate it
         putenv('PATH=' . getenv('PATH') . ':' . dirname(getenv('CHROMEDRIVER_PATH')));
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 695fa57e3..7fac8c1b4 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -37,7 +37,7 @@ protected function tearDown(): void
      * @dataProvider provideDialect
      * @param bool $isW3cDialect
      */
-    public function testShouldStartChromeDriver($isW3cDialect)
+    public function testShouldStartChromeDriver($isW3cDialect): void
     {
         $this->startChromeDriver($isW3cDialect);
         $this->assertInstanceOf(ChromeDriver::class, $this->driver);
@@ -55,7 +55,7 @@ public function testShouldStartChromeDriver($isW3cDialect)
     /**
      * @return array[]
      */
-    public function provideDialect()
+    public function provideDialect(): array
     {
         return [
             'w3c' => [true],
@@ -63,7 +63,7 @@ public function provideDialect()
         ];
     }
 
-    public function testShouldInstantiateDevTools()
+    public function testShouldInstantiateDevTools(): void
     {
         $this->startChromeDriver();
 
@@ -81,7 +81,7 @@ public function testShouldInstantiateDevTools()
         $this->assertSame(['result' => ['type' => 'string', 'value' => 'http://localhost:8000/']], $cdpResult);
     }
 
-    private function startChromeDriver($w3cDialect = true)
+    private function startChromeDriver($w3cDialect = true): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(ChromeDriverService::CHROME_DRIVER_EXECUTABLE . '=' . getenv('CHROMEDRIVER_PATH'));
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 4ca5e1e60..c1d60603c 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -16,7 +16,7 @@ class FileUploadTest extends WebDriverTestCase
      * @group exclude-saucelabs
      * W3C protocol does not support remote file upload: https://github.com/w3c/webdriver/issues/1355
      */
-    public function testShouldUploadAFile()
+    public function testShouldUploadAFile(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::UPLOAD));
 
@@ -43,7 +43,7 @@ public function testShouldUploadAFile()
         $this->assertSame('10', $uploadedFileSize);
     }
 
-    private function getTestFilePath()
+    private function getTestFilePath(): string
     {
         return __DIR__ . '/Fixtures/FileUploadTestFile.txt';
     }
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
index 190286847..d9e60a26e 100644
--- a/tests/functional/Firefox/FirefoxDriverServiceTest.php
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -32,7 +32,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
+    public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor(): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
@@ -52,7 +52,7 @@ public function testShouldStartAndStopServiceCreatedUsingShortcutConstructor()
         $this->assertInstanceOf(FirefoxDriverService::class, $this->driverService->stop());
     }
 
-    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
+    public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor(): void
     {
         $this->driverService = new FirefoxDriverService(getenv('GECKODRIVER_PATH'), 9515, ['-p=9515']);
 
@@ -65,7 +65,7 @@ public function testShouldStartAndStopServiceCreatedUsingDefaultConstructor()
         $this->assertFalse($this->driverService->isRunning());
     }
 
-    public function testShouldUseDefaultExecutableIfNoneProvided()
+    public function testShouldUseDefaultExecutableIfNoneProvided(): void
     {
         // Put path where geckodriver binary is actually located to system PATH, to make sure we can locate it
         putenv('PATH=' . getenv('PATH') . ':' . dirname(getenv('GECKODRIVER_PATH')));
diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
index 7c7b91370..42ee45f69 100644
--- a/tests/functional/Firefox/FirefoxDriverTest.php
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -37,7 +37,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testShouldStartFirefoxDriver()
+    public function testShouldStartFirefoxDriver(): void
     {
         $this->startFirefoxDriver();
         $this->assertInstanceOf(FirefoxDriver::class, $this->driver);
@@ -53,7 +53,7 @@ public function testShouldStartFirefoxDriver()
         $this->assertSame('http://localhost:8000/', $this->driver->getCurrentURL());
     }
 
-    public function testShouldSetPreferenceWithFirefoxOptions()
+    public function testShouldSetPreferenceWithFirefoxOptions(): void
     {
         $firefoxOptions = new FirefoxOptions();
         $firefoxOptions->setPreference('javascript.enabled', false);
@@ -69,7 +69,7 @@ public function testShouldSetPreferenceWithFirefoxOptions()
         );
     }
 
-    private function startFirefoxDriver(FirefoxOptions $firefoxOptions = null)
+    private function startFirefoxDriver(FirefoxOptions $firefoxOptions = null): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 59d0f6bfa..982ebfbcc 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -64,7 +64,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testShouldStartDriverWithEmptyProfile()
+    public function testShouldStartDriverWithEmptyProfile(): void
     {
         $firefoxProfile = new FirefoxProfile();
         $this->startFirefoxDriverWithProfile($firefoxProfile);
@@ -77,7 +77,7 @@ public function testShouldStartDriverWithEmptyProfile()
         );
     }
 
-    public function testShouldInstallExtension()
+    public function testShouldInstallExtension(): void
     {
         $firefoxProfile = new FirefoxProfile();
         $firefoxProfile->addExtension($this->firefoxTestExtensionFilename);
@@ -95,7 +95,7 @@ public function testShouldInstallExtension()
         $this->assertEquals('This element was added by browser extension', $element->getText());
     }
 
-    public function testShouldUseProfilePreferences()
+    public function testShouldUseProfilePreferences(): void
     {
         $firefoxProfile = new FirefoxProfile();
 
@@ -115,7 +115,7 @@ public function testShouldUseProfilePreferences()
         );
     }
 
-    protected function getTestPageUrl($path)
+    protected function getTestPageUrl($path): string
     {
         $host = 'http://localhost:8000/';
         if ($alternateHost = getenv('FIXTURES_HOST')) {
@@ -125,7 +125,7 @@ protected function getTestPageUrl($path)
         return $host . '/' . $path;
     }
 
-    private function startFirefoxDriverWithProfile(FirefoxProfile $firefoxProfile)
+    private function startFirefoxDriverWithProfile(FirefoxProfile $firefoxProfile): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index dfab3a687..09a6430f1 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -19,7 +19,7 @@ class RemoteKeyboardTest extends WebDriverTestCase
      * @group exclude-safari
      * https://feedbackassistant.apple.com/feedback/9051272
      */
-    public function testShouldPressSendAndReleaseKeys()
+    public function testShouldPressSendAndReleaseKeys(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 2ef90803c..8aa965181 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -10,7 +10,7 @@
  */
 class RemoteTargetLocatorTest extends WebDriverTestCase
 {
-    public function testShouldSwitchToWindow()
+    public function testShouldSwitchToWindow(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
         $originalWindowHandle = $this->driver->getWindowHandle();
@@ -48,7 +48,7 @@ public function testShouldSwitchToWindow()
         $this->assertNotSame($originalWindowHandle, $this->driver->getWindowHandle());
     }
 
-    public function testActiveElement()
+    public function testActiveElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -62,7 +62,7 @@ public function testActiveElement()
         $this->assertSame('test_name', $activeElement->getAttribute('name'));
     }
 
-    public function testShouldSwitchToFrameByItsId()
+    public function testShouldSwitchToFrameByItsId(): void
     {
         $parentPage = 'This is the host page which contains an iFrame';
         $firstChildFrame = 'This is the content of the iFrame';
@@ -91,7 +91,7 @@ public function testShouldSwitchToFrameByItsId()
         $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
-    public function testShouldSwitchToParentFrame()
+    public function testShouldSwitchToParentFrame(): void
     {
         $parentPage = 'This is the host page which contains an iFrame';
         $firstChildFrame = 'This is the content of the iFrame';
@@ -107,7 +107,7 @@ public function testShouldSwitchToParentFrame()
         $this->assertStringContainsString($parentPage, $this->driver->getPageSource());
     }
 
-    public function testShouldSwitchToFrameByElement()
+    public function testShouldSwitchToFrameByElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::PAGE_WITH_FRAME));
 
@@ -120,7 +120,7 @@ public function testShouldSwitchToFrameByElement()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldCreateNewWindow()
+    public function testShouldCreateNewWindow(): void
     {
         self::skipForJsonWireProtocol('Create new window is not supported in JsonWire protocol');
 
@@ -153,7 +153,7 @@ public function testShouldCreateNewWindow()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldNotAcceptStringAsFrameIdInW3cMode()
+    public function testShouldNotAcceptStringAsFrameIdInW3cMode(): void
     {
         self::skipForJsonWireProtocol();
 
@@ -170,7 +170,7 @@ public function testShouldNotAcceptStringAsFrameIdInW3cMode()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldAcceptStringAsFrameIdInJsonWireMode()
+    public function testShouldAcceptStringAsFrameIdInJsonWireMode(): void
     {
         self::skipForW3cProtocol();
 
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index dcb883846..d55e1f681 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -15,7 +15,7 @@
  */
 class RemoteWebDriverCreateTest extends WebDriverTestCase
 {
-    public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
+    public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver(): void
     {
         $this->driver = RemoteWebDriver::create(
             $this->serverUrl,
@@ -51,7 +51,7 @@ public function testShouldStartBrowserAndCreateInstanceOfRemoteWebDriver()
         $this->assertNotEmpty($returnedCapabilities->getVersion());
     }
 
-    public function testShouldAcceptCapabilitiesAsAnArray()
+    public function testShouldAcceptCapabilitiesAsAnArray(): void
     {
         // Method has a side-effect of converting whole content of desiredCapabilities to an array
         $this->desiredCapabilities->toArray();
@@ -66,7 +66,7 @@ public function testShouldAcceptCapabilitiesAsAnArray()
         $this->assertNotNull($this->driver->getCapabilities());
     }
 
-    public function testShouldCreateWebDriverWithRequiredCapabilities()
+    public function testShouldCreateWebDriverWithRequiredCapabilities(): void
     {
         $requiredCapabilities = new DesiredCapabilities();
 
@@ -89,7 +89,7 @@ public function testShouldCreateWebDriverWithRequiredCapabilities()
      * However the the browser driver must be able to create non-headless instance (eg. inside xvfb).
      * @group exclude-saucelabs
      */
-    public function testShouldCreateWebDriverWithoutCapabilities()
+    public function testShouldCreateWebDriverWithoutCapabilities(): void
     {
         if (getenv('GECKODRIVER') !== '1' && empty(getenv('CHROMEDRIVER_PATH'))) {
             $this->markTestSkipped('This test makes sense only when run directly via specific browser driver');
@@ -101,7 +101,7 @@ public function testShouldCreateWebDriverWithoutCapabilities()
         $this->assertNotEmpty($this->driver->getSessionID());
     }
 
-    public function testShouldCreateInstanceFromExistingSessionId()
+    public function testShouldCreateInstanceFromExistingSessionId(): void
     {
         // Create driver instance and load page "index.html"
         $originalDriver = RemoteWebDriver::create(
@@ -156,7 +156,7 @@ public function testShouldCreateInstanceFromExistingSessionId()
         $this->assertNotEmpty($this->driver->findElement(WebDriverBy::id('id_test'))->getText());
     }
 
-    public function testShouldRequireCapabilitiesToBeSetToReuseExistingSession()
+    public function testShouldRequireCapabilitiesToBeSetToReuseExistingSession(): void
     {
         $this->expectException(UnexpectedResponseException::class);
         $this->expectExceptionMessage(
@@ -172,7 +172,7 @@ public function testShouldRequireCapabilitiesToBeSetToReuseExistingSession()
         );
     }
 
-    protected function createWebDriver()
+    protected function createWebDriver(): void
     {
     }
 }
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 80adf1be1..699442d7c 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -11,7 +11,7 @@
  */
 class RemoteWebDriverFindElementTest extends WebDriverTestCase
 {
-    public function testShouldThrowExceptionIfElementCannotBeFound()
+    public function testShouldThrowExceptionIfElementCannotBeFound(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -19,7 +19,7 @@ public function testShouldThrowExceptionIfElementCannotBeFound()
         $this->driver->findElement(WebDriverBy::id('not_existing'));
     }
 
-    public function testShouldFindElementIfExistsOnAPage()
+    public function testShouldFindElementIfExistsOnAPage(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -28,7 +28,7 @@ public function testShouldFindElementIfExistsOnAPage()
         $this->assertInstanceOf(RemoteWebElement::class, $element);
     }
 
-    public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
+    public function testShouldReturnEmptyArrayIfElementsCannotBeFound(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -38,7 +38,7 @@ public function testShouldReturnEmptyArrayIfElementsCannotBeFound()
         $this->assertCount(0, $elements);
     }
 
-    public function testShouldFindMultipleElements()
+    public function testShouldFindMultipleElements(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -52,7 +52,7 @@ public function testShouldFindMultipleElements()
     /**
      * @group exclude-saucelabs
      */
-    public function testEscapeCssSelector()
+    public function testEscapeCssSelector(): void
     {
         self::skipForJsonWireProtocol(
             'CSS selectors containing special characters are not supported by the legacy protocol'
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 07da0a0ae..213dce0c5 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -13,7 +13,7 @@ class RemoteWebDriverTest extends WebDriverTestCase
     /**
      * @covers ::getTitle
      */
-    public function testShouldGetPageTitle()
+    public function testShouldGetPageTitle(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -27,7 +27,7 @@ public function testShouldGetPageTitle()
      * @covers ::get
      * @covers ::getCurrentURL
      */
-    public function testShouldGetCurrentUrl()
+    public function testShouldGetCurrentUrl(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -37,7 +37,7 @@ public function testShouldGetCurrentUrl()
     /**
      * @covers ::getPageSource
      */
-    public function testShouldGetPageSource()
+    public function testShouldGetPageSource(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -50,7 +50,7 @@ public function testShouldGetPageSource()
      * @covers ::getSessionID
      * @covers ::isW3cCompliant
      */
-    public function testShouldGetSessionId()
+    public function testShouldGetSessionId(): void
     {
         // This tests is intentionally included in another test, to not slow down build.
         // @TODO Remove following in 2.0
@@ -70,7 +70,7 @@ public function testShouldGetSessionId()
      * @group exclude-saucelabs
      * @covers ::getAllSessions
      */
-    public function testShouldGetAllSessions()
+    public function testShouldGetAllSessions(): void
     {
         self::skipForW3cProtocol();
 
@@ -89,7 +89,7 @@ public function testShouldGetAllSessions()
      * @covers ::getCommandExecutor
      * @covers ::quit
      */
-    public function testShouldQuitAndUnsetExecutor()
+    public function testShouldQuitAndUnsetExecutor(): void
     {
         self::skipForW3cProtocol();
 
@@ -116,7 +116,7 @@ public function testShouldQuitAndUnsetExecutor()
      * @covers ::getWindowHandle
      * @covers ::getWindowHandles
      */
-    public function testShouldGetWindowHandles()
+    public function testShouldGetWindowHandles(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
 
@@ -140,7 +140,7 @@ public function testShouldGetWindowHandles()
     /**
      * @covers ::close
      */
-    public function testShouldCloseWindow()
+    public function testShouldCloseWindow(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::OPEN_NEW_WINDOW));
         $this->driver->findElement(WebDriverBy::cssSelector('a'))->click();
@@ -158,7 +158,7 @@ public function testShouldCloseWindow()
      * @covers ::executeScript
      * @group exclude-saucelabs
      */
-    public function testShouldExecuteScriptAndDoNotBlockExecution()
+    public function testShouldExecuteScriptAndDoNotBlockExecution(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -188,7 +188,7 @@ function(){document.getElementById("id_test").innerHTML = "Text changed by scrip
      * @covers ::executeAsyncScript
      * @covers \Facebook\WebDriver\WebDriverTimeouts::setScriptTimeout
      */
-    public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished()
+    public function testShouldExecuteAsyncScriptAndWaitUntilItIsFinished(): void
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
 
@@ -228,7 +228,7 @@ function(){
      * @covers ::prepareScriptArguments
      * @group exclude-saucelabs
      */
-    public function testShouldExecuteScriptWithParamsAndReturnValue()
+    public function testShouldExecuteScriptWithParamsAndReturnValue(): void
     {
         $this->driver->manage()->timeouts()->setScriptTimeout(1);
 
@@ -252,7 +252,7 @@ public function testShouldExecuteScriptWithParamsAndReturnValue()
      * @covers ::takeScreenshot
      * @covers \Facebook\WebDriver\Support\ScreenshotHelper
      */
-    public function testShouldTakeScreenshot()
+    public function testShouldTakeScreenshot(): void
     {
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
@@ -274,7 +274,7 @@ public function testShouldTakeScreenshot()
      * @group exclude-safari
      *        Safari is returning different color profile and it does not have way to configure "force-color-profile"
      */
-    public function testShouldSaveScreenshotToFile()
+    public function testShouldSaveScreenshotToFile(): void
     {
         if (!extension_loaded('gd')) {
             $this->markTestSkipped('GD extension must be enabled');
@@ -314,7 +314,7 @@ public function testShouldSaveScreenshotToFile()
      * @group exclude-saucelabs
      * Status endpoint is not supported on Sauce Labs
      */
-    public function testShouldGetRemoteEndStatus()
+    public function testShouldGetRemoteEndStatus(): void
     {
         $status = $this->driver->getStatus();
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index acd8b4a91..0baff69f1 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -19,7 +19,7 @@ class RemoteWebElementTest extends WebDriverTestCase
      * @group exclude-safari
      *      Safari does not normalize white-spaces
      */
-    public function testShouldGetText()
+    public function testShouldGetText(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $elementWithSimpleText = $this->driver->findElement(WebDriverBy::id('text-simple'));
@@ -33,7 +33,7 @@ public function testShouldGetText()
     /**
      * @covers ::getAttribute
      */
-    public function testShouldGetAttributeValue()
+    public function testShouldGetAttributeValue(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -48,7 +48,7 @@ public function testShouldGetAttributeValue()
     /**
      * @covers ::getDomProperty
      */
-    public function testShouldGetDomPropertyValue()
+    public function testShouldGetDomPropertyValue(): void
     {
         self::skipForJsonWireProtocol();
 
@@ -70,7 +70,7 @@ public function testShouldGetDomPropertyValue()
     /**
      * @covers ::getLocation
      */
-    public function testShouldGetLocation()
+    public function testShouldGetLocation(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -85,7 +85,7 @@ public function testShouldGetLocation()
     /**
      * @covers ::getLocationOnScreenOnceScrolledIntoView
      */
-    public function testShouldGetLocationOnScreenOnceScrolledIntoView()
+    public function testShouldGetLocationOnScreenOnceScrolledIntoView(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -110,7 +110,7 @@ public function testShouldGetLocationOnScreenOnceScrolledIntoView()
     /**
      * @covers ::getSize
      */
-    public function testShouldGetSize()
+    public function testShouldGetSize(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -125,7 +125,7 @@ public function testShouldGetSize()
     /**
      * @covers ::getCSSValue
      */
-    public function testShouldGetCssValue()
+    public function testShouldGetCssValue(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -145,7 +145,7 @@ public function testShouldGetCssValue()
     /**
      * @covers ::getTagName
      */
-    public function testShouldGetTagName()
+    public function testShouldGetTagName(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -157,7 +157,7 @@ public function testShouldGetTagName()
     /**
      * @covers ::click
      */
-    public function testShouldClick()
+    public function testShouldClick(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
@@ -180,7 +180,7 @@ public function testShouldClick()
      * @group exclude-chrome
      * @group exclude-edge
      */
-    public function testGeckoDriverShouldClickOnBlockLevelElement()
+    public function testGeckoDriverShouldClickOnBlockLevelElement(): void
     {
         self::skipForUnmatchedBrowsers(['firefox']);
 
@@ -209,7 +209,7 @@ public function testGeckoDriverShouldClickOnBlockLevelElement()
      * @group exclude-chrome
      * @group exclude-edge
      */
-    public function testGeckoDriverShouldClickNotInteractable()
+    public function testGeckoDriverShouldClickNotInteractable(): void
     {
         self::skipForUnmatchedBrowsers(['firefox']);
 
@@ -237,7 +237,7 @@ public function testGeckoDriverShouldClickNotInteractable()
     /**
      * @covers ::clear
      */
-    public function testShouldClearFormElementText()
+    public function testShouldClearFormElementText(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -256,7 +256,7 @@ public function testShouldClearFormElementText()
     /**
      * @covers ::sendKeys
      */
-    public function testShouldSendKeysToFormElement()
+    public function testShouldSendKeysToFormElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -294,7 +294,7 @@ public function testShouldSendKeysToFormElement()
      * @covers \Facebook\WebDriver\Remote\RemoteWebDriver::execute
      * @covers \Facebook\WebDriver\Support\IsElementDisplayedAtom
      */
-    public function testShouldDetectElementDisplayedness()
+    public function testShouldDetectElementDisplayedness(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -310,7 +310,7 @@ public function testShouldDetectElementDisplayedness()
     /**
      * @covers ::isEnabled
      */
-    public function testShouldDetectEnabledInputs()
+    public function testShouldDetectEnabledInputs(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -324,7 +324,7 @@ public function testShouldDetectEnabledInputs()
     /**
      * @covers ::isSelected
      */
-    public function testShouldSelectedInputsOrOptions()
+    public function testShouldSelectedInputsOrOptions(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -352,7 +352,7 @@ public function testShouldSelectedInputsOrOptions()
      * @covers ::submit
      * @group exclude-edge
      */
-    public function testShouldSubmitFormBySubmitEventOnForm()
+    public function testShouldSubmitFormBySubmitEventOnForm(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -370,7 +370,7 @@ public function testShouldSubmitFormBySubmitEventOnForm()
     /**
      * @covers ::submit
      */
-    public function testShouldSubmitFormBySubmitEventOnFormInputElement()
+    public function testShouldSubmitFormBySubmitEventOnFormInputElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -388,7 +388,7 @@ public function testShouldSubmitFormBySubmitEventOnFormInputElement()
     /**
      * @covers ::click
      */
-    public function testShouldSubmitFormByClickOnSubmitInput()
+    public function testShouldSubmitFormByClickOnSubmitInput(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
 
@@ -406,7 +406,7 @@ public function testShouldSubmitFormByClickOnSubmitInput()
     /**
      * @covers ::equals
      */
-    public function testShouldCompareEqualsElement()
+    public function testShouldCompareEqualsElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
@@ -425,7 +425,7 @@ public function testShouldCompareEqualsElement()
     /**
      * @covers ::findElement
      */
-    public function testShouldThrowExceptionIfChildElementCannotBeFound()
+    public function testShouldThrowExceptionIfChildElementCannotBeFound(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
@@ -434,7 +434,7 @@ public function testShouldThrowExceptionIfChildElementCannotBeFound()
         $element->findElement(WebDriverBy::id('not_existing'));
     }
 
-    public function testShouldFindChildElementIfExistsOnAPage()
+    public function testShouldFindChildElementIfExistsOnAPage(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
@@ -446,7 +446,7 @@ public function testShouldFindChildElementIfExistsOnAPage()
         $this->assertSame('First', $childElement->getText());
     }
 
-    public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
+    public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
@@ -457,7 +457,7 @@ public function testShouldReturnEmptyArrayIfChildElementsCannotBeFound()
         $this->assertCount(0, $childElements);
     }
 
-    public function testShouldFindMultipleChildElements()
+    public function testShouldFindMultipleChildElements(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $element = $this->driver->findElement(WebDriverBy::cssSelector('ul.list'));
@@ -476,7 +476,7 @@ public function testShouldFindMultipleChildElements()
      * @covers \Facebook\WebDriver\Support\ScreenshotHelper
      * @group exclude-saucelabs
      */
-    public function testShouldTakeAndSaveElementScreenshot()
+    public function testShouldTakeAndSaveElementScreenshot(): void
     {
         self::skipForJsonWireProtocol('Take element screenshot is only part of W3C protocol');
 
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index ac71c6035..96db8f27b 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -82,7 +82,7 @@ public function startTest(\PHPUnit\Framework\Test $test): void
      * @param int $testStatus
      * @return bool
      */
-    private function testWasSkippedOrIncomplete($testStatus)
+    private function testWasSkippedOrIncomplete($testStatus): bool
     {
         if ($testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED
             || $testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_INCOMPLETE) {
@@ -96,7 +96,7 @@ private function testWasSkippedOrIncomplete($testStatus)
      * @param string $url
      * @param array $data
      */
-    private function submitToSauceLabs($url, array $data)
+    private function submitToSauceLabs($url, array $data): void
     {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
index 32653e05a..8188070e0 100644
--- a/tests/functional/RetrieveEventsTrait.php
+++ b/tests/functional/RetrieveEventsTrait.php
@@ -12,7 +12,7 @@ trait RetrieveEventsTrait
     /**
      * @return array
      */
-    private function retrieveLoggedKeyboardEvents()
+    private function retrieveLoggedKeyboardEvents(): array
     {
         return $this->retrieveLoggerEvents(WebDriverBy::id('keyboardEventsLog'));
     }
@@ -20,7 +20,7 @@ private function retrieveLoggedKeyboardEvents()
     /**
      * @return array
      */
-    private function retrieveLoggedMouseEvents()
+    private function retrieveLoggedMouseEvents(): array
     {
         return $this->retrieveLoggerEvents(WebDriverBy::id('mouseEventsLog'));
     }
diff --git a/tests/functional/ShadowDomTest.php b/tests/functional/ShadowDomTest.php
index ccd144bc9..ed442874e 100644
--- a/tests/functional/ShadowDomTest.php
+++ b/tests/functional/ShadowDomTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    public function testShouldGetShadowRoot()
+    public function testShouldGetShadowRoot(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
 
@@ -31,7 +31,7 @@ public function testShouldGetShadowRoot()
         $this->assertInstanceOf(ShadowRoot::class, $shadowRoot);
     }
 
-    public function testShouldThrowExceptionWhenGettingShadowRootWithElementNotHavingShadowRoot()
+    public function testShouldThrowExceptionWhenGettingShadowRootWithElementNotHavingShadowRoot(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
 
@@ -46,7 +46,7 @@ public function testShouldThrowExceptionWhenGettingShadowRootWithElementNotHavin
      *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
      *        Finding elements in shadow DOM is not implemented in Geckodriver
      */
-    public function testShouldFindElementUnderShadowRoot()
+    public function testShouldFindElementUnderShadowRoot(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
 
@@ -66,7 +66,7 @@ public function testShouldFindElementUnderShadowRoot()
      *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
      *        Finding elements in shadow DOM is not implemented in Geckodriver
      */
-    public function testShouldReferenceTheSameShadowRootAsFromExecuteScript()
+    public function testShouldReferenceTheSameShadowRootAsFromExecuteScript(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 7b71d2a17..95d359cd5 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -25,7 +25,7 @@ class WebDriverActionsTest extends WebDriverTestCase
 {
     use RetrieveEventsTrait;
 
-    public function testShouldClickOnElement()
+    public function testShouldClickOnElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
@@ -47,7 +47,7 @@ public function testShouldClickOnElement()
         $this->assertSame($logs, $loggedEvents);
     }
 
-    public function testShouldClickAndHoldOnElementAndRelease()
+    public function testShouldClickAndHoldOnElementAndRelease(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
@@ -72,7 +72,7 @@ public function testShouldClickAndHoldOnElementAndRelease()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldContextClickOnElement()
+    public function testShouldContextClickOnElement(): void
     {
         if ($this->desiredCapabilities->getBrowserName() === WebDriverBrowserType::MICROSOFT_EDGE) {
             $this->markTestSkipped('Getting stuck in EdgeDriver');
@@ -97,7 +97,7 @@ public function testShouldContextClickOnElement()
      * @group exclude-safari
      *        https://github.com/webdriverio/webdriverio/issues/231
      */
-    public function testShouldDoubleClickOnElement()
+    public function testShouldDoubleClickOnElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
@@ -113,7 +113,7 @@ public function testShouldDoubleClickOnElement()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldSendKeysUpAndDown()
+    public function testShouldSendKeysUpAndDown(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::EVENTS));
 
@@ -142,7 +142,7 @@ public function testShouldSendKeysUpAndDown()
      * @group exclude-safari
      *        https://developer.apple.com/forums/thread/662677
      */
-    public function testShouldMoveToElement()
+    public function testShouldMoveToElement(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
@@ -165,7 +165,7 @@ public function testShouldMoveToElement()
      * @group exclude-safari
      *        https://developer.apple.com/forums/thread/662677
      */
-    public function testShouldMoveByOffset()
+    public function testShouldMoveByOffset(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
@@ -188,7 +188,7 @@ public function testShouldMoveByOffset()
      *        https://developer.apple.com/forums/thread/662677
      * @group exclude-saucelabs
      */
-    public function testShouldDragAndDrop()
+    public function testShouldDragAndDrop(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
@@ -221,7 +221,7 @@ public function testShouldDragAndDrop()
      *        https://developer.apple.com/forums/thread/662677
      *        it does not work even with Python Selenium, looks like Safaridriver does not implements Interaction API
      */
-    public function testShouldDragAndDropBy()
+    public function testShouldDragAndDropBy(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::SORTABLE));
 
@@ -253,7 +253,7 @@ public function testShouldDragAndDropBy()
     /**
      * @return array
      */
-    private function retrieveListContent()
+    private function retrieveListContent(): array
     {
         return [
             $this->retrieveLoggerEvents(WebDriverBy::cssSelector('#sortable1')),
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 622dd10dd..34c4255b5 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -18,7 +18,7 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::ALERT));
     }
 
-    public function testShouldAcceptAlert()
+    public function testShouldAcceptAlert(): void
     {
         // Open alert (it is delayed for 1 second, to make sure following wait for alertIsPresent works properly)
         $this->driver->findElement(WebDriverBy::id('open-alert-delayed'))->click();
@@ -39,7 +39,7 @@ public function testShouldAcceptAlert()
         $this->driver->switchTo()->alert()->accept();
     }
 
-    public function testShouldAcceptAndDismissConfirmation()
+    public function testShouldAcceptAndDismissConfirmation(): void
     {
         // Open confirmation
         $this->driver->findElement(WebDriverBy::id('open-confirm'))->click();
@@ -61,7 +61,7 @@ public function testShouldAcceptAndDismissConfirmation()
         $this->assertSame('dismissed', $this->getResultText());
     }
 
-    public function testShouldSubmitPromptText()
+    public function testShouldSubmitPromptText(): void
     {
         // Open confirmation
         $this->driver->findElement(WebDriverBy::id('open-prompt'))->click();
@@ -77,7 +77,7 @@ public function testShouldSubmitPromptText()
         $this->assertSame('Text entered to prompt', $this->getResultText());
     }
 
-    private function getResultText()
+    private function getResultText(): string
     {
         return $this->driver
             ->findElement(WebDriverBy::id('result'))
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 27ee04755..87ad8a417 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -22,7 +22,7 @@ public function testShouldFindTextElementByLocator(
         $webDriverByLocatorValue,
         $expectedText = null,
         $expectedAttributeValue = null
-    ) {
+    ): void {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
         $by = call_user_func([WebDriverBy::class, $webDriverByLocatorMethod], $webDriverByLocatorValue);
@@ -42,7 +42,7 @@ public function testShouldFindTextElementByLocator(
     /**
      * @return array[]
      */
-    public function provideTextElements()
+    public function provideTextElements(): array
     {
         return [
             'id' => ['id', 'id_test', 'Test by ID'],
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 4d7f82b52..e22c54002 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -18,7 +18,7 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::FORM_CHECKBOX_RADIO));
     }
 
-    public function testIsMultiple()
+    public function testIsMultiple(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -27,7 +27,7 @@ public function testIsMultiple()
         $this->assertTrue($checkboxes->isMultiple());
     }
 
-    public function testGetOptions()
+    public function testGetOptions(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//form[2]//input[@type="checkbox"]'))
@@ -36,7 +36,7 @@ public function testGetOptions()
         $this->assertNotEmpty($checkboxes->getOptions());
     }
 
-    public function testGetFirstSelectedOption()
+    public function testGetFirstSelectedOption(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -47,7 +47,7 @@ public function testGetFirstSelectedOption()
         $this->assertSame('j2a', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@id="j5b"]'))
@@ -56,7 +56,7 @@ public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociate
         $this->assertEquals('j5b', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@id="j5d"]'))
@@ -65,7 +65,7 @@ public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociate
         $this->assertEquals('j5c', $checkboxes->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testSelectByValue()
+    public function testSelectByValue(): void
     {
         $selectedOptions = ['j2b', 'j2c'];
 
@@ -83,7 +83,7 @@ public function testSelectByValue()
         $this->assertSame($selectedOptions, $selectedValues);
     }
 
-    public function testSelectByValueInvalid()
+    public function testSelectByValueInvalid(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -94,7 +94,7 @@ public function testSelectByValueInvalid()
         $checkboxes->selectByValue('notexist');
     }
 
-    public function testSelectByIndex()
+    public function testSelectByIndex(): void
     {
         $selectedOptions = [1 => 'j2b', 2 => 'j2c'];
 
@@ -112,7 +112,7 @@ public function testSelectByIndex()
         $this->assertSame(array_values($selectedOptions), $selectedValues);
     }
 
-    public function testSelectByIndexInvalid()
+    public function testSelectByIndexInvalid(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -129,7 +129,7 @@ public function testSelectByIndexInvalid()
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisibleText($text, $value)
+    public function testSelectByVisibleText($text, $value): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -143,7 +143,7 @@ public function testSelectByVisibleText($text, $value)
     /**
      * @return array[]
      */
-    public function provideSelectByVisibleTextData()
+    public function provideSelectByVisibleTextData(): array
     {
         return [
             ['J 2 B', 'j2b'],
@@ -157,7 +157,7 @@ public function provideSelectByVisibleTextData()
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisiblePartialText($text, $value)
+    public function testSelectByVisiblePartialText($text, $value): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -171,7 +171,7 @@ public function testSelectByVisiblePartialText($text, $value)
     /**
      * @return array[]
      */
-    public function provideSelectByVisiblePartialTextData()
+    public function provideSelectByVisiblePartialTextData(): array
     {
         return [
             ['2 B', 'j2b'],
@@ -179,7 +179,7 @@ public function provideSelectByVisiblePartialTextData()
         ];
     }
 
-    public function testDeselectAll()
+    public function testDeselectAll(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -191,7 +191,7 @@ public function testDeselectAll()
         $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
-    public function testDeselectByIndex()
+    public function testDeselectByIndex(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -203,7 +203,7 @@ public function testDeselectByIndex()
         $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
-    public function testDeselectByValue()
+    public function testDeselectByValue(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -215,7 +215,7 @@ public function testDeselectByValue()
         $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
-    public function testDeselectByVisibleText()
+    public function testDeselectByVisibleText(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -227,7 +227,7 @@ public function testDeselectByVisibleText()
         $this->assertEmpty($checkboxes->getAllSelectedOptions());
     }
 
-    public function testDeselectByVisiblePartialText()
+    public function testDeselectByVisiblePartialText(): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index f3fea87e8..1a36244bd 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -11,7 +11,7 @@ class WebDriverNavigationTest extends WebDriverTestCase
      * @covers ::__construct
      * @covers ::to
      */
-    public function testShouldNavigateToUrl()
+    public function testShouldNavigateToUrl(): void
     {
         $this->driver->navigate()->to($this->getTestPageUrl(TestPage::INDEX));
 
@@ -22,7 +22,7 @@ public function testShouldNavigateToUrl()
      * @covers ::back
      * @covers ::forward
      */
-    public function testShouldNavigateBackAndForward()
+    public function testShouldNavigateBackAndForward(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
         $linkElement = $this->driver->findElement(WebDriverBy::id('a-form'));
@@ -51,7 +51,7 @@ public function testShouldNavigateBackAndForward()
     /**
      * @covers ::refresh
      */
-    public function testShouldRefreshPage()
+    public function testShouldRefreshPage(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index 31b915fd9..ec83e65ab 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -16,7 +16,7 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
     }
 
-    public function testShouldSetGetAndDeleteCookies()
+    public function testShouldSetGetAndDeleteCookies(): void
     {
         $cookie1 = new Cookie('cookie1', 'cookie1Value');
         $cookie2 = new Cookie('cookie2', 'cookie2Value');
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index d2c28d085..ffc25c67a 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -19,14 +19,14 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::FORM_CHECKBOX_RADIO));
     }
 
-    public function testIsMultiple()
+    public function testIsMultiple(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
         $this->assertFalse($radios->isMultiple());
     }
 
-    public function testGetOptions()
+    public function testGetOptions(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $values = [];
@@ -37,7 +37,7 @@ public function testGetOptions()
         $this->assertSame(['j3a', 'j3b', 'j3c'], $values);
     }
 
-    public function testGetFirstSelectedOption()
+    public function testGetFirstSelectedOption(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -46,14 +46,14 @@ public function testGetFirstSelectedOption()
         $this->assertSame('j3a', $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentForm(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@id="j4b"]')));
 
         $this->assertEquals('j4b', $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId()
+    public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociatedWithCurrentFormWithoutId(): void
     {
         $radios = new WebDriverRadios(
             $this->driver->findElement(WebDriverBy::xpath('//input[@id="j4c"]'))
@@ -62,7 +62,7 @@ public function testShouldGetFirstSelectedOptionConsideringOnlyElementsAssociate
         $this->assertEquals('j4c', $radios->getFirstSelectedOption()->getAttribute('value'));
     }
 
-    public function testSelectByValue()
+    public function testSelectByValue(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByValue('j3b');
@@ -73,7 +73,7 @@ public function testSelectByValue()
         $this->assertSame('j3b', $selectedOptions[0]->getAttribute('value'));
     }
 
-    public function testSelectByValueInvalid()
+    public function testSelectByValueInvalid(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -82,7 +82,7 @@ public function testSelectByValueInvalid()
         $radios->selectByValue('notexist');
     }
 
-    public function testSelectByIndex()
+    public function testSelectByIndex(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByIndex(1);
@@ -92,7 +92,7 @@ public function testSelectByIndex()
         $this->assertSame('j3b', $allSelectedOptions[0]->getAttribute('value'));
     }
 
-    public function testSelectByIndexInvalid()
+    public function testSelectByIndexInvalid(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -107,7 +107,7 @@ public function testSelectByIndexInvalid()
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisibleText($text, $value)
+    public function testSelectByVisibleText($text, $value): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByVisibleText($text);
@@ -117,7 +117,7 @@ public function testSelectByVisibleText($text, $value)
     /**
      * @return array[]
      */
-    public function provideSelectByVisibleTextData()
+    public function provideSelectByVisibleTextData(): array
     {
         return [
             ['J 3 B', 'j3b'],
@@ -131,7 +131,7 @@ public function provideSelectByVisibleTextData()
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisiblePartialText($text, $value)
+    public function testSelectByVisiblePartialText($text, $value): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByVisiblePartialText($text);
@@ -141,7 +141,7 @@ public function testSelectByVisiblePartialText($text, $value)
     /**
      * @return array[]
      */
-    public function provideSelectByVisiblePartialTextData()
+    public function provideSelectByVisiblePartialTextData(): array
     {
         return [
             ['3 B', 'j3b'],
@@ -149,7 +149,7 @@ public function provideSelectByVisiblePartialTextData()
         ];
     }
 
-    public function testDeselectAllRadio()
+    public function testDeselectAllRadio(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -158,7 +158,7 @@ public function testDeselectAllRadio()
         $radios->deselectAll();
     }
 
-    public function testDeselectByIndexRadio()
+    public function testDeselectByIndexRadio(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -167,7 +167,7 @@ public function testDeselectByIndexRadio()
         $radios->deselectByIndex(0);
     }
 
-    public function testDeselectByValueRadio()
+    public function testDeselectByValueRadio(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -176,7 +176,7 @@ public function testDeselectByValueRadio()
         $radios->deselectByValue('val');
     }
 
-    public function testDeselectByVisibleTextRadio()
+    public function testDeselectByVisibleTextRadio(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
@@ -185,7 +185,7 @@ public function testDeselectByVisibleTextRadio()
         $radios->deselectByVisibleText('AB');
     }
 
-    public function testDeselectByVisiblePartialTextRadio()
+    public function testDeselectByVisiblePartialTextRadio(): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
 
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 01c075188..b688a10cb 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
     }
 
-    public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple()
+    public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple(): void
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
         $originalMultipleElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
@@ -35,7 +35,7 @@ public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultip
         $this->assertTrue($selectMultiple->isMultiple());
     }
 
-    public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
+    public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement(): void
     {
         $notSelectElement = $this->driver->findElement(WebDriverBy::cssSelector('textarea'));
 
@@ -48,7 +48,7 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
      * @dataProvider provideSelectSelector
      * @param string $selector
      */
-    public function testShouldGetOptionsOfSelect($selector)
+    public function testShouldGetOptionsOfSelect($selector): void
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector($selector));
         $select = new WebDriverSelect($originalElement);
@@ -62,7 +62,7 @@ public function testShouldGetOptionsOfSelect($selector)
     /**
      * @return array[]
      */
-    public function provideSelectSelector()
+    public function provideSelectSelector(): array
     {
         return [
             'simple <select>' => ['#select'],
@@ -70,7 +70,7 @@ public function provideSelectSelector()
         ];
     }
 
-    public function testShouldDefaultSelectedOptionOfSimpleSelect()
+    public function testShouldDefaultSelectedOptionOfSimpleSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -85,7 +85,7 @@ public function testShouldDefaultSelectedOptionOfSimpleSelect()
         $this->assertSame('First', $firstSelectedOption->getText());
     }
 
-    public function testShouldReturnEmptyArrayIfNoOptionsOfMultipleSelectSelected()
+    public function testShouldReturnEmptyArrayIfNoOptionsOfMultipleSelectSelected(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
 
@@ -94,7 +94,7 @@ public function testShouldReturnEmptyArrayIfNoOptionsOfMultipleSelectSelected()
         $this->assertSame([], $selectedOptions);
     }
 
-    public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultipleSelect()
+    public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultipleSelect(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
 
@@ -103,7 +103,7 @@ public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultiple
         $select->getFirstSelectedOption();
     }
 
-    public function testShouldSelectOptionOfSimpleSelectByIndex()
+    public function testShouldSelectOptionOfSimpleSelectByIndex(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
         $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
@@ -120,7 +120,7 @@ public function testShouldSelectOptionOfSimpleSelectByIndex()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldSelectOptionOfMultipleSelectByIndex()
+    public function testShouldSelectOptionOfMultipleSelectByIndex(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $this->assertSame([], $select->getAllSelectedOptions());
@@ -138,7 +138,7 @@ public function testShouldSelectOptionOfMultipleSelectByIndex()
         $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect()
+    public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -147,7 +147,7 @@ public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect()
         $select->selectByIndex(1337);
     }
 
-    public function testShouldSelectOptionOfSimpleSelectByValue()
+    public function testShouldSelectOptionOfSimpleSelectByValue(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
         $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
@@ -164,7 +164,7 @@ public function testShouldSelectOptionOfSimpleSelectByValue()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldSelectOptionOfMultipleSelectByValue()
+    public function testShouldSelectOptionOfMultipleSelectByValue(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $this->assertSame([], $select->getAllSelectedOptions());
@@ -182,7 +182,7 @@ public function testShouldSelectOptionOfMultipleSelectByValue()
         $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect()
+    public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -191,7 +191,7 @@ public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect()
         $select->selectByValue(1337);
     }
 
-    public function testShouldSelectOptionOfSimpleSelectByVisibleText()
+    public function testShouldSelectOptionOfSimpleSelectByVisibleText(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
         $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
@@ -208,7 +208,7 @@ public function testShouldSelectOptionOfSimpleSelectByVisibleText()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldSelectOptionOfMultipleSelectByVisibleText()
+    public function testShouldSelectOptionOfMultipleSelectByVisibleText(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $this->assertSame([], $select->getAllSelectedOptions());
@@ -226,7 +226,7 @@ public function testShouldSelectOptionOfMultipleSelectByVisibleText()
         $this->assertContainsOptionsWithValues(['second', 'fourth', 'fifth'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect()
+    public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -235,7 +235,7 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect()
         $select->selectByVisibleText('second'); // the option is "This is second option"
     }
 
-    public function testShouldSelectOptionOfSimpleSelectByVisiblePartialText()
+    public function testShouldSelectOptionOfSimpleSelectByVisiblePartialText(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
         $this->assertSame('first', $select->getFirstSelectedOption()->getAttribute('value'));
@@ -252,7 +252,7 @@ public function testShouldSelectOptionOfSimpleSelectByVisiblePartialText()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldSelectOptionOfMultipleSelectByVisiblePartialText()
+    public function testShouldSelectOptionOfMultipleSelectByVisiblePartialText(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $this->assertSame([], $select->getAllSelectedOptions());
@@ -273,7 +273,7 @@ public function testShouldSelectOptionOfMultipleSelectByVisiblePartialText()
         );
     }
 
-    public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSelect()
+    public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -282,7 +282,7 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSel
         $select->selectByVisiblePartialText('Not existing option');
     }
 
-    public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
+    public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -295,7 +295,7 @@ public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldDeselectAllOptionsOnMultipleSelect()
+    public function testShouldDeselectAllOptionsOnMultipleSelect(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
 
@@ -313,7 +313,7 @@ public function testShouldDeselectAllOptionsOnMultipleSelect()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldDeselectOptionOnMultipleSelectByIndex()
+    public function testShouldDeselectOptionOnMultipleSelectByIndex(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // index 3
@@ -326,7 +326,7 @@ public function testShouldDeselectOptionOnMultipleSelectByIndex()
         $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -339,7 +339,7 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldDeselectOptionOnMultipleSelectByValue()
+    public function testShouldDeselectOptionOnMultipleSelectByValue(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('third');
@@ -352,7 +352,7 @@ public function testShouldDeselectOptionOnMultipleSelectByValue()
         $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -365,7 +365,7 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldDeselectOptionOnMultipleSelectByVisibleText()
+    public function testShouldDeselectOptionOnMultipleSelectByVisibleText(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'
@@ -380,7 +380,7 @@ public function testShouldDeselectOptionOnMultipleSelectByVisibleText()
         $this->assertContainsOptionsWithValues(['second'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -393,7 +393,7 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
      * @group exclude-edge
      * https://connect.microsoft.com/IE/feedback/details/2020772/-microsoft-edge-webdriver-cannot-select-multiple-on-select-html-tag
      */
-    public function testShouldDeselectOptionOnMultipleSelectByVisiblePartialText()
+    public function testShouldDeselectOptionOnMultipleSelectByVisiblePartialText(): void
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
         $select->selectByValue('fourth'); // text 'Fourth  with   spaces   inside'
@@ -414,7 +414,7 @@ public function testShouldDeselectOptionOnMultipleSelectByVisiblePartialText()
         $this->assertContainsOptionsWithValues(['first'], $select->getAllSelectedOptions());
     }
 
-    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartialText()
+    public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartialText(): void
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
@@ -426,7 +426,7 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartia
     /**
      * @return WebDriverSelect
      */
-    protected function getWebDriverSelectForSimpleSelect()
+    protected function getWebDriverSelectForSimpleSelect(): WebDriverSelect
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
 
@@ -436,7 +436,7 @@ protected function getWebDriverSelectForSimpleSelect()
     /**
      * @return WebDriverSelect
      */
-    protected function getWebDriverSelectForMultipleSelect()
+    protected function getWebDriverSelectForMultipleSelect(): WebDriverSelect
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
 
@@ -447,7 +447,7 @@ protected function getWebDriverSelectForMultipleSelect()
      * @param string[] $expectedValues
      * @param array $options
      */
-    private function assertContainsOptionsWithValues(array $expectedValues, array $options)
+    private function assertContainsOptionsWithValues(array $expectedValues, array $options): void
     {
         $expectedCount = count($expectedValues);
         $this->assertContainsOnlyInstancesOf(WebDriverElement::class, $options);
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5db9e7894..4319e158a 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -97,7 +97,7 @@ protected function tearDown(): void
     /**
      * @return bool
      */
-    public static function isSauceLabsBuild()
+    public static function isSauceLabsBuild(): bool
     {
         return getenv('SAUCELABS') ? true : false;
     }
@@ -105,7 +105,7 @@ public static function isSauceLabsBuild()
     /**
      * @return bool
      */
-    public static function isW3cProtocolBuild()
+    public static function isW3cProtocolBuild(): bool
     {
         return getenv('DISABLE_W3C_PROTOCOL') !== '1';
     }
@@ -115,14 +115,14 @@ public static function isSeleniumServerUsed(): bool
         return getenv('SELENIUM_SERVER') === '1';
     }
 
-    public static function skipForW3cProtocol($message = 'Not supported by W3C specification')
+    public static function skipForW3cProtocol($message = 'Not supported by W3C specification'): void
     {
         if (static::isW3cProtocolBuild()) {
             static::markTestSkipped($message);
         }
     }
 
-    public static function skipForJsonWireProtocol($message = 'Not supported by JsonWire protocol')
+    public static function skipForJsonWireProtocol($message = 'Not supported by JsonWire protocol'): void
     {
         if (!static::isW3cProtocolBuild()) {
             static::markTestSkipped($message);
@@ -135,7 +135,7 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
      * @param string[] $browsers List of browsers for this test
      * @param string|null $message
      */
-    public static function skipForUnmatchedBrowsers($browsers = [], $message = null)
+    public static function skipForUnmatchedBrowsers($browsers = [], $message = null): void
     {
         $browserName = (string) getenv('BROWSER_NAME');
         if (!in_array($browserName, $browsers, true)) {
@@ -178,7 +178,7 @@ public function runBare(): void
      * @param string $path
      * @return string
      */
-    protected function getTestPageUrl($path)
+    protected function getTestPageUrl($path): string
     {
         $host = 'http://localhost:8000/';
         if ($alternateHost = getenv('FIXTURES_HOST')) {
@@ -188,7 +188,7 @@ protected function getTestPageUrl($path)
         return $host . '/' . $path;
     }
 
-    protected function setUpSauceLabs()
+    protected function setUpSauceLabs(): void
     {
         $this->serverUrl = sprintf(
             'http://%s:%s@ondemand.saucelabs.com/wd/hub',
@@ -240,7 +240,7 @@ protected function setUpSauceLabs()
         }
     }
 
-    protected function createWebDriver()
+    protected function createWebDriver(): void
     {
         $this->driver = RemoteWebDriver::create(
             $this->serverUrl,
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 66f61f51a..950cc5cd3 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -15,7 +15,7 @@ class WebDriverTimeoutsTest extends WebDriverTestCase
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldFailGettingDelayedElementWithoutWait()
+    public function testShouldFailGettingDelayedElementWithoutWait(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::DELAYED_ELEMENT));
 
@@ -27,7 +27,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
      * @covers ::__construct
      * @covers ::implicitlyWait
      */
-    public function testShouldGetDelayedElementWithImplicitWait()
+    public function testShouldGetDelayedElementWithImplicitWait(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::DELAYED_ELEMENT));
 
@@ -42,7 +42,7 @@ public function testShouldGetDelayedElementWithImplicitWait()
      * @covers ::__construct
      * @covers ::pageLoadTimeout
      */
-    public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout()
+    public function testShouldFailIfPageIsLoadingLongerThanPageLoadTimeout(): void
     {
         $this->driver->manage()->timeouts()->pageLoadTimeout(1);
 
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 3cd91e587..10ce1eb44 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -10,7 +10,7 @@ class WebDriverWindowTest extends WebDriverTestCase
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldGetPosition()
+    public function testShouldGetPosition(): void
     {
         $position = $this->driver->manage()
             ->window()
@@ -20,7 +20,7 @@ public function testShouldGetPosition()
         $this->assertGreaterThanOrEqual(0, $position->getY());
     }
 
-    public function testShouldGetSize()
+    public function testShouldGetSize(): void
     {
         $size = $this->driver->manage()
             ->window()
@@ -30,7 +30,7 @@ public function testShouldGetSize()
         $this->assertGreaterThan(0, $size->getHeight());
     }
 
-    public function testShouldMaximizeWindow()
+    public function testShouldMaximizeWindow(): void
     {
         $sizeBefore = $this->driver->manage()
             ->window()
@@ -52,7 +52,7 @@ public function testShouldMaximizeWindow()
      * @group exclude-edge
      * @group exclude-saucelabs
      */
-    public function testShouldFullscreenWindow()
+    public function testShouldFullscreenWindow(): void
     {
         self::skipForJsonWireProtocol('"fullscreen" window is not supported in JsonWire protocol');
 
@@ -79,7 +79,7 @@ public function testShouldFullscreenWindow()
      * @group exclude-safari
      * @group exclude-saucelabs
      */
-    public function testShouldMinimizeWindow()
+    public function testShouldMinimizeWindow(): void
     {
         self::skipForJsonWireProtocol('"minimize" window is not supported in JsonWire protocol');
 
@@ -95,7 +95,7 @@ public function testShouldMinimizeWindow()
     /**
      * @group exclude-saucelabs
      */
-    public function testShouldSetSize()
+    public function testShouldSetSize(): void
     {
         $sizeBefore = $this->driver->manage()
             ->window()
@@ -118,7 +118,7 @@ public function testShouldSetSize()
     /**
      * @todo Skip when running headless mode
      */
-    public function testShouldSetWindowPosition()
+    public function testShouldSetWindowPosition(): void
     {
         $this->driver->manage()
             ->window()
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 5b99088ce..0efc3ee0a 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -7,7 +7,7 @@
 
 class CookieTest extends TestCase
 {
-    public function testShouldSetAllProperties()
+    public function testShouldSetAllProperties(): Cookie
     {
         $cookie = new Cookie('cookieName', 'someValue');
         $cookie->setPath('/bar');
@@ -33,7 +33,7 @@ public function testShouldSetAllProperties()
      * @depends testShouldSetAllProperties
      * @param Cookie $cookie
      */
-    public function testShouldBeConvertibleToArray(Cookie $cookie)
+    public function testShouldBeConvertibleToArray(Cookie $cookie): void
     {
         $this->assertSame(
             [
@@ -59,7 +59,7 @@ public function testShouldBeConvertibleToArray(Cookie $cookie)
      * https://github.com/SeleniumHQ/selenium/wiki/JsonWireProtocol
      * https://w3c.github.io/webdriver/#add-cookie
      */
-    public function testShouldNotContainNullValues()
+    public function testShouldNotContainNullValues(): void
     {
         $cookie = new Cookie('cookieName', 'someValue');
 
@@ -77,7 +77,7 @@ public function testShouldNotContainNullValues()
      * @depends testShouldSetAllProperties
      * @param Cookie $cookie
      */
-    public function testShouldProvideArrayAccessToProperties(Cookie $cookie)
+    public function testShouldProvideArrayAccessToProperties(Cookie $cookie): void
     {
         $this->assertSame('cookieName', $cookie['name']);
         $this->assertSame('someValue', $cookie['value']);
@@ -94,7 +94,7 @@ public function testShouldProvideArrayAccessToProperties(Cookie $cookie)
         $this->assertArrayNotHasKey('domain', $cookie);
     }
 
-    public function testShouldBeCreatableFromAnArrayWithBasicValues()
+    public function testShouldBeCreatableFromAnArrayWithBasicValues(): void
     {
         $sourceArray = [
             'name' => 'cookieName',
@@ -131,7 +131,7 @@ public function testShouldBeCreatableFromAnArrayWithBasicValues()
         $this->assertNull($cookie->getSameSite());
     }
 
-    public function testShouldBeCreatableFromAnArrayWithAllValues()
+    public function testShouldBeCreatableFromAnArrayWithAllValues(): void
     {
         $sourceArray = [
             'name' => 'cookieName',
@@ -163,7 +163,7 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
      * @param string $domain
      * @param string $expectedMessage
      */
-    public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage)
+    public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage): void
     {
         if ($expectedMessage) {
             $this->expectException(LogicException::class);
@@ -181,7 +181,7 @@ public function testShouldValidateCookieOnConstruction($name, $value, $domain, $
     /**
      * @return array[]
      */
-    public function provideInvalidCookie()
+    public function provideInvalidCookie(): array
     {
         return [
             // $name, $value, $domain, $expectedMessage
diff --git a/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
index 7ada0a6de..ba97b2bfa 100644
--- a/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
+++ b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
@@ -6,7 +6,7 @@
 
 class DriverServerDiedExceptionTest extends TestCase
 {
-    public function testShouldCreateWithPreviousException()
+    public function testShouldCreateWithPreviousException(): void
     {
         $dummyPreviousException = UnexpectedResponseException::forError('CURL error');
 
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index 5013265f1..d5ec3d040 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -6,7 +6,7 @@
 
 class WebDriverExceptionTest extends TestCase
 {
-    public function testShouldStoreResultsOnInstantiation()
+    public function testShouldStoreResultsOnInstantiation(): void
     {
         $exception = new WebDriverException('exception message', ['foo', 'bar']);
 
@@ -21,7 +21,7 @@ public function testShouldStoreResultsOnInstantiation()
      * @param int $errorCode
      * @param string $expectedExceptionType
      */
-    public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCode, $expectedExceptionType)
+    public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCode, $expectedExceptionType): void
     {
         try {
             WebDriverException::throwException($errorCode, 'exception message', ['results']);
@@ -36,7 +36,43 @@ public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCo
     /**
      * @return array[]
      */
-    public function provideJsonWireStatusCode()
+    public function provideW3CWebDriverErrorCode(): array
+    {
+        return [
+                ['element click intercepted', ElementClickInterceptedException::class],
+                ['element not interactable', ElementNotInteractableException::class],
+                ['element not interactable', ElementNotInteractableException::class],
+                ['insecure certificate', InsecureCertificateException::class],
+                ['invalid argument', InvalidArgumentException::class],
+                ['invalid cookie domain', InvalidCookieDomainException::class],
+                ['invalid element state', InvalidElementStateException::class],
+                ['invalid selector', InvalidSelectorException::class],
+                ['invalid session id', InvalidSessionIdException::class],
+                ['javascript error', JavascriptErrorException::class],
+                ['move target out of bounds', MoveTargetOutOfBoundsException::class],
+                ['no such alert', NoSuchAlertException::class],
+                ['no such cookie', NoSuchCookieException::class],
+                ['no such element', NoSuchElementException::class],
+                ['no such frame', NoSuchFrameException::class],
+                ['no such window', NoSuchWindowException::class],
+                ['script timeout', ScriptTimeoutException::class],
+                ['session not created', SessionNotCreatedException::class],
+                ['stale element reference', StaleElementReferenceException::class],
+                ['timeout', TimeoutException::class],
+                ['unable to set cookie', UnableToSetCookieException::class],
+                ['unable to capture screen', UnableToCaptureScreenException::class],
+                ['unexpected alert open', UnexpectedAlertOpenException::class],
+                ['unknown command', UnknownCommandException::class],
+                ['unknown error', UnknownErrorException::class],
+                ['unknown method', UnknownMethodException::class],
+                ['unsupported operation', UnsupportedOperationException::class],
+        ];
+    }
+
+    /**
+     * @return array[]
+     */
+    public function provideJsonWireStatusCode(): array
     {
         return [
             [1337, UnrecognizedExceptionException::class],
@@ -76,40 +112,4 @@ public function provideJsonWireStatusCode()
             [34, MoveTargetOutOfBoundsException::class],
         ];
     }
-
-    /**
-     * @return array[]
-     */
-    public function provideW3CWebDriverErrorCode()
-    {
-        return [
-                ['element click intercepted', ElementClickInterceptedException::class],
-                ['element not interactable', ElementNotInteractableException::class],
-                ['element not interactable', ElementNotInteractableException::class],
-                ['insecure certificate', InsecureCertificateException::class],
-                ['invalid argument', InvalidArgumentException::class],
-                ['invalid cookie domain', InvalidCookieDomainException::class],
-                ['invalid element state', InvalidElementStateException::class],
-                ['invalid selector', InvalidSelectorException::class],
-                ['invalid session id', InvalidSessionIdException::class],
-                ['javascript error', JavascriptErrorException::class],
-                ['move target out of bounds', MoveTargetOutOfBoundsException::class],
-                ['no such alert', NoSuchAlertException::class],
-                ['no such cookie', NoSuchCookieException::class],
-                ['no such element', NoSuchElementException::class],
-                ['no such frame', NoSuchFrameException::class],
-                ['no such window', NoSuchWindowException::class],
-                ['script timeout', ScriptTimeoutException::class],
-                ['session not created', SessionNotCreatedException::class],
-                ['stale element reference', StaleElementReferenceException::class],
-                ['timeout', TimeoutException::class],
-                ['unable to set cookie', UnableToSetCookieException::class],
-                ['unable to capture screen', UnableToCaptureScreenException::class],
-                ['unexpected alert open', UnexpectedAlertOpenException::class],
-                ['unknown command', UnknownCommandException::class],
-                ['unknown error', UnknownErrorException::class],
-                ['unknown method', UnknownMethodException::class],
-                ['unsupported operation', UnsupportedOperationException::class],
-        ];
-    }
 }
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
index 83e71e53f..a9880ff6e 100644
--- a/tests/unit/Firefox/FirefoxOptionsTest.php
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -13,7 +13,7 @@ class FirefoxOptionsTest extends TestCase
         FirefoxPreferences::DEVTOOLS_JSONVIEW => false,
     ];
 
-    public function testShouldBeConstructedWithDefaultOptions()
+    public function testShouldBeConstructedWithDefaultOptions(): void
     {
         $options = new FirefoxOptions();
 
@@ -25,7 +25,7 @@ public function testShouldBeConstructedWithDefaultOptions()
         );
     }
 
-    public function testShouldAddCustomOptions()
+    public function testShouldAddCustomOptions(): void
     {
         $options = new FirefoxOptions();
 
@@ -40,7 +40,7 @@ public function testShouldAddCustomOptions()
         );
     }
 
-    public function testShouldOverwriteDefaultOptionsWhenSpecified()
+    public function testShouldOverwriteDefaultOptionsWhenSpecified(): void
     {
         $options = new FirefoxOptions();
 
@@ -57,7 +57,7 @@ public function testShouldOverwriteDefaultOptionsWhenSpecified()
         );
     }
 
-    public function testShouldSetCustomPreference()
+    public function testShouldSetCustomPreference(): void
     {
         $options = new FirefoxOptions();
 
@@ -75,7 +75,7 @@ public function testShouldSetCustomPreference()
         );
     }
 
-    public function testShouldAddArguments()
+    public function testShouldAddArguments(): void
     {
         $options = new FirefoxOptions();
 
@@ -90,7 +90,7 @@ public function testShouldAddArguments()
         );
     }
 
-    public function testShouldJsonSerializeToArrayObject()
+    public function testShouldJsonSerializeToArrayObject(): void
     {
         $options = new FirefoxOptions();
         $options->setOption('binary', '/usr/local/firefox/bin/firefox');
@@ -101,7 +101,7 @@ public function testShouldJsonSerializeToArrayObject()
         $this->assertSame('/usr/local/firefox/bin/firefox', $jsonSerialized['binary']);
     }
 
-    public function testShouldNotAllowToSetArgumentsOptionDirectly()
+    public function testShouldNotAllowToSetArgumentsOptionDirectly(): void
     {
         $options = new FirefoxOptions();
 
@@ -110,7 +110,7 @@ public function testShouldNotAllowToSetArgumentsOptionDirectly()
         $options->setOption('args', []);
     }
 
-    public function testShouldNotAllowToSetPreferencesOptionDirectly()
+    public function testShouldNotAllowToSetPreferencesOptionDirectly(): void
     {
         $options = new FirefoxOptions();
 
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index 22aed07ef..a8b409a6b 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformSendsMouseUpCommand()
+    public function testPerformSendsMouseUpCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 7ec720f5d..9f1e48f65 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformSendsClickCommand()
+    public function testPerformSendsClickCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index 749215583..a62820d30 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformSendsMouseDownCommand()
+    public function testPerformSendsMouseDownCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index 5bc3282e7..e2f75cbed 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformSendsContextClickCommand()
+    public function testPerformSendsContextClickCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index b14ad2654..4e62e8c63 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -7,7 +7,7 @@
 
 class WebDriverCoordinatesTest extends TestCase
 {
-    public function testConstruct()
+    public function testConstruct(): void
     {
         $in_view_port = function () {
             return new WebDriverPoint(0, 0);
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 72122e30e..4447ec003 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformSendsDoubleClickCommand()
+    public function testPerformSendsDoubleClickCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index edf522b25..2146e2fa7 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    public function testPerformFocusesOnElementAndSendPressKeyCommand(): void
     {
         $coords = $this->createMock(WebDriverCoordinates::class);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 275a4b968..67fdf2bd3 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    public function testPerformFocusesOnElementAndSendPressKeyCommand(): void
     {
         $coords = $this->createMock(WebDriverCoordinates::class);
         $this->webDriverMouse->expects($this->once())->method('click')->with($coords);
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 47c8aa191..5803c9c10 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    public function testPerformFocusesOnElementAndSendPressKeyCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index af2c9be09..995c2219f 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    public function testPerformFocusesOnElementAndSendPressKeyCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index d38816479..a4db9c98d 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
         );
     }
 
-    public function testPerformFocusesOnElementAndSendPressKeyCommand()
+    public function testPerformFocusesOnElementAndSendPressKeyCommand(): void
     {
         $coords = $this->getMockBuilder(WebDriverCoordinates::class)
             ->disableOriginalConstructor()->getMock();
diff --git a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
index fbd85a0ba..cca19d3f9 100644
--- a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
@@ -13,7 +13,7 @@
  */
 class WebDriverSingleKeyActionTest extends TestCase
 {
-    public function testShouldThrowExceptionWhenNotUsedForModifier()
+    public function testShouldThrowExceptionWhenNotUsedForModifier(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(
diff --git a/tests/unit/Remote/CustomWebDriverCommandTest.php b/tests/unit/Remote/CustomWebDriverCommandTest.php
index 8de7320f2..f199f13f4 100644
--- a/tests/unit/Remote/CustomWebDriverCommandTest.php
+++ b/tests/unit/Remote/CustomWebDriverCommandTest.php
@@ -7,7 +7,7 @@
 
 class CustomWebDriverCommandTest extends TestCase
 {
-    public function testShouldSetOptionsUsingConstructor()
+    public function testShouldSetOptionsUsingConstructor(): void
     {
         $command = new CustomWebDriverCommand(
             'session-id-123',
@@ -20,7 +20,7 @@ public function testShouldSetOptionsUsingConstructor()
         $this->assertSame('POST', $command->getCustomMethod());
     }
 
-    public function testCustomCommandInvalidUrlExceptionInit()
+    public function testCustomCommandInvalidUrlExceptionInit(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('URL of custom command has to start with / but is "url-without-leading-slash"');
@@ -28,7 +28,7 @@ public function testCustomCommandInvalidUrlExceptionInit()
         new CustomWebDriverCommand('session-id-123', 'url-without-leading-slash', 'POST', []);
     }
 
-    public function testCustomCommandInvalidMethodExceptionInit()
+    public function testCustomCommandInvalidMethodExceptionInit(): void
     {
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage('Invalid custom method "invalid-method", must be one of [GET, POST]');
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 17d7c3e55..f8c15556e 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -12,7 +12,7 @@
 
 class DesiredCapabilitiesTest extends TestCase
 {
-    public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
+    public function testShouldInstantiateWithCapabilitiesGivenInConstructor(): void
     {
         $capabilities = new DesiredCapabilities(
             ['fooKey' => 'fooVal', WebDriverCapabilityType::PLATFORM => WebDriverPlatform::ANY]
@@ -27,7 +27,7 @@ public function testShouldInstantiateWithCapabilitiesGivenInConstructor()
         );
     }
 
-    public function testShouldInstantiateEmptyInstance()
+    public function testShouldInstantiateEmptyInstance(): void
     {
         $capabilities = new DesiredCapabilities();
 
@@ -35,7 +35,7 @@ public function testShouldInstantiateEmptyInstance()
         $this->assertSame([], $capabilities->toArray());
     }
 
-    public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
+    public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters(): void
     {
         $capabilities = new DesiredCapabilities();
         // generic capability setter
@@ -51,7 +51,7 @@ public function testShouldProvideAccessToCapabilitiesUsingSettersAndGetters()
         $this->assertSame(333, $capabilities->getVersion());
     }
 
-    public function testShouldAccessCapabilitiesIsser()
+    public function testShouldAccessCapabilitiesIsser(): void
     {
         $capabilities = new DesiredCapabilities();
 
@@ -66,7 +66,7 @@ public function testShouldAccessCapabilitiesIsser()
         $this->assertFalse($capabilities->is('customNull'));
     }
 
-    public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
+    public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('isJavascriptEnabled() is a htmlunit-only option');
@@ -76,7 +76,7 @@ public function testShouldNotAllowToDisableJavascriptForNonHtmlUnitBrowser()
         $capabilities->setJavascriptEnabled(false);
     }
 
-    public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser()
+    public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser(): void
     {
         $capabilities = new DesiredCapabilities();
         $capabilities->setBrowserName(WebDriverBrowserType::HTMLUNIT);
@@ -95,7 +95,7 @@ public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
         $setupMethod,
         $expectedBrowser,
         $expectedPlatform
-    ) {
+    ): void {
         /** @var DesiredCapabilities $capabilities */
         $capabilities = call_user_func([DesiredCapabilities::class, $setupMethod]);
 
@@ -106,7 +106,7 @@ public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
     /**
      * @return array[]
      */
-    public function provideBrowserCapabilities()
+    public function provideBrowserCapabilities(): array
     {
         return [
             ['android', WebDriverBrowserType::ANDROID, WebDriverPlatform::ANDROID],
@@ -124,7 +124,7 @@ public function provideBrowserCapabilities()
         ];
     }
 
-    public function testShouldSetupFirefoxWithDefaultOptions()
+    public function testShouldSetupFirefoxWithDefaultOptions(): void
     {
         $capabilitiesArray = DesiredCapabilities::firefox()->toArray();
 
@@ -137,7 +137,7 @@ public function testShouldSetupFirefoxWithDefaultOptions()
         );
     }
 
-    public function testShouldSetupFirefoxWithCustomOptions()
+    public function testShouldSetupFirefoxWithCustomOptions(): void
     {
         $firefoxOptions = new FirefoxOptions();
         $firefoxOptions->addArguments(['-headless']);
@@ -159,7 +159,7 @@ public function testShouldSetupFirefoxWithCustomOptions()
         );
     }
 
-    public function testShouldNotOverwriteDefaultFirefoxOptionsWhenAddingFirefoxOptionAsArray()
+    public function testShouldNotOverwriteDefaultFirefoxOptionsWhenAddingFirefoxOptionAsArray(): void
     {
         $capabilities = DesiredCapabilities::firefox();
         $capabilities->setCapability('moz:firefoxOptions', ['args' => ['-headless']]);
@@ -181,7 +181,7 @@ public function testShouldNotOverwriteDefaultFirefoxOptionsWhenAddingFirefoxOpti
     public function testShouldConvertCapabilitiesToW3cCompatible(
         DesiredCapabilities $inputJsonWireCapabilities,
         array $expectedW3cCapabilities
-    ) {
+    ): void {
         $this->assertJsonStringEqualsJsonString(
             json_encode($expectedW3cCapabilities, JSON_THROW_ON_ERROR),
             json_encode($inputJsonWireCapabilities->toW3cCompatibleArray(), JSON_THROW_ON_ERROR)
@@ -191,7 +191,7 @@ public function testShouldConvertCapabilitiesToW3cCompatible(
     /**
      * @return array[]
      */
-    public function provideW3cCapabilities()
+    public function provideW3cCapabilities(): array
     {
         $chromeOptions = new ChromeOptions();
         $chromeOptions->addArguments(['--headless']);
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 70ebe8013..c4c8f632e 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -65,7 +65,7 @@ public function testShouldSendRequestToAssembledUrl(
     /**
      * @return array[]
      */
-    public function provideCommand()
+    public function provideCommand(): array
     {
         return [
             'POST command having :id placeholder in url' => [
diff --git a/tests/unit/Remote/LocalFileDetectorTest.php b/tests/unit/Remote/LocalFileDetectorTest.php
index b58413d8b..bb1e3636f 100644
--- a/tests/unit/Remote/LocalFileDetectorTest.php
+++ b/tests/unit/Remote/LocalFileDetectorTest.php
@@ -6,7 +6,7 @@
 
 class LocalFileDetectorTest extends TestCase
 {
-    public function testShouldDetectLocalFile()
+    public function testShouldDetectLocalFile(): void
     {
         $detector = new LocalFileDetector();
 
@@ -15,7 +15,7 @@ public function testShouldDetectLocalFile()
         $this->assertSame(__FILE__, $file);
     }
 
-    public function testShouldReturnNullIfFileNotDetected()
+    public function testShouldReturnNullIfFileNotDetected(): void
     {
         $detector = new LocalFileDetector();
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 76d6d1428..0f729d965 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
     /**
      * @covers ::manage
      */
-    public function testShouldCreateWebDriverOptionsInstance()
+    public function testShouldCreateWebDriverOptionsInstance(): void
     {
         $wait = $this->driver->manage();
 
@@ -46,7 +46,7 @@ public function testShouldCreateWebDriverOptionsInstance()
     /**
      * @covers ::navigate
      */
-    public function testShouldCreateWebDriverNavigationInstance()
+    public function testShouldCreateWebDriverNavigationInstance(): void
     {
         $wait = $this->driver->navigate();
 
@@ -56,7 +56,7 @@ public function testShouldCreateWebDriverNavigationInstance()
     /**
      * @covers ::switchTo
      */
-    public function testShouldCreateRemoteTargetLocatorInstance()
+    public function testShouldCreateRemoteTargetLocatorInstance(): void
     {
         $wait = $this->driver->switchTo();
 
@@ -66,7 +66,7 @@ public function testShouldCreateRemoteTargetLocatorInstance()
     /**
      * @covers ::getMouse
      */
-    public function testShouldCreateRemoteMouseInstance()
+    public function testShouldCreateRemoteMouseInstance(): void
     {
         $wait = $this->driver->getMouse();
 
@@ -76,7 +76,7 @@ public function testShouldCreateRemoteMouseInstance()
     /**
      * @covers ::getKeyboard
      */
-    public function testShouldCreateRemoteKeyboardInstance()
+    public function testShouldCreateRemoteKeyboardInstance(): void
     {
         $wait = $this->driver->getKeyboard();
 
@@ -86,7 +86,7 @@ public function testShouldCreateRemoteKeyboardInstance()
     /**
      * @covers ::getTouch
      */
-    public function testShouldCreateRemoteTouchScreenInstance()
+    public function testShouldCreateRemoteTouchScreenInstance(): void
     {
         $wait = $this->driver->getTouch();
 
@@ -96,7 +96,7 @@ public function testShouldCreateRemoteTouchScreenInstance()
     /**
      * @covers ::action
      */
-    public function testShouldCreateWebDriverActionsInstance()
+    public function testShouldCreateWebDriverActionsInstance(): void
     {
         $wait = $this->driver->action();
 
@@ -106,7 +106,7 @@ public function testShouldCreateWebDriverActionsInstance()
     /**
      * @covers ::wait
      */
-    public function testShouldCreateWebDriverWaitInstance()
+    public function testShouldCreateWebDriverWaitInstance(): void
     {
         $wait = $this->driver->wait(15, 1337);
 
@@ -121,7 +121,7 @@ public function testShouldCreateWebDriverWaitInstance()
      * @param string $expectedExceptionMessage
      * @dataProvider provideMethods
      */
-    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($method, $expectedExceptionMessage)
+    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($method, $expectedExceptionMessage): void
     {
         $executorMock = $this->createMock(HttpCommandExecutor::class);
         $executorMock->expects($this->once())
@@ -136,7 +136,7 @@ public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($meth
         call_user_func([$this->driver, $method], $this->createMock(WebDriverBy::class));
     }
 
-    public function provideMethods()
+    public function provideMethods(): array
     {
         return [
             ['findElement', 'Unexpected server response to findElement command'],
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
index 7ca0eddb6..8da35a64c 100644
--- a/tests/unit/Remote/RemoteWebElementTest.php
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -15,7 +15,7 @@ class RemoteWebElementTest extends TestCase
      * @covers ::__construct
      * @covers ::getId
      */
-    public function testShouldConstructNewInstance()
+    public function testShouldConstructNewInstance(): void
     {
         $executeMethod = $this->createMock(RemoteExecuteMethod::class);
         $element = new RemoteWebElement($executeMethod, 333);
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 8ba7abf33..7df4b9026 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -6,7 +6,7 @@
 
 class WebDriverCommandTest extends TestCase
 {
-    public function testShouldSetOptionsUsingConstructor()
+    public function testShouldSetOptionsUsingConstructor(): void
     {
         $command = new WebDriverCommand('session-id-123', 'bar-baz-name', ['foo' => 'bar']);
 
@@ -15,7 +15,7 @@ public function testShouldSetOptionsUsingConstructor()
         $this->assertSame(['foo' => 'bar'], $command->getParameters());
     }
 
-    public function testShouldCreateNewSessionCommand()
+    public function testShouldCreateNewSessionCommand(): void
     {
         $command = WebDriverCommand::newSession(['bar' => 'baz']);
 
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index 4b843414a..136c58d21 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -12,7 +12,7 @@ class ScreenshotHelperTest extends TestCase
     public const BLACK_PIXEL =
         'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=';
 
-    public function testShouldSavePageScreenshotToSubdirectoryIfNotExists()
+    public function testShouldSavePageScreenshotToSubdirectoryIfNotExists(): void
     {
         $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
         $directoryPath = dirname($fullFilePath);
@@ -36,7 +36,7 @@ public function testShouldSavePageScreenshotToSubdirectoryIfNotExists()
         rmdir($directoryPath);
     }
 
-    public function testShouldOnlyReturnBase64IfDirectoryNotProvided()
+    public function testShouldOnlyReturnBase64IfDirectoryNotProvided(): void
     {
         $executorMock = $this->createMock(RemoteExecuteMethod::class);
         $executorMock->expects($this->once())
@@ -50,7 +50,7 @@ public function testShouldOnlyReturnBase64IfDirectoryNotProvided()
         $this->assertSame(base64_decode(self::BLACK_PIXEL, true), $output);
     }
 
-    public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists()
+    public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists(): void
     {
         $fullFilePath = sys_get_temp_dir() . '/' . uniqid('php-webdriver-', true) . '/screenshot.png';
         $directoryPath = dirname($fullFilePath);
@@ -79,7 +79,7 @@ public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists()
      * @param mixed $data
      * @param string $expectedExceptionMessage
      */
-    public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expectedExceptionMessage)
+    public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expectedExceptionMessage): void
     {
         $executorMock = $this->createMock(RemoteExecuteMethod::class);
         $executorMock->expects($this->once())
@@ -94,7 +94,7 @@ public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expected
         $helper->takePageScreenshot();
     }
 
-    public function provideInvalidData()
+    public function provideInvalidData(): array
     {
         return [
             'empty response' => [null, 'Error taking screenshot, no data received from the remote end'],
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index e5a373f98..36a62a3ac 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -11,7 +11,7 @@ class XPathEscaperTest extends TestCase
      * @param string $input
      * @param string $expectedOutput
      */
-    public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input, $expectedOutput)
+    public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input, $expectedOutput): void
     {
         $output = XPathEscaper::escapeQuotes($input);
 
@@ -21,7 +21,7 @@ public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input,
     /**
      * @return array[]
      */
-    public function provideXpath()
+    public function provideXpath(): array
     {
         return [
             'empty string encapsulate in single quotes' => ['', "''"],
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index d401a8886..501240ece 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         $this->wait = new WebDriverWait($this->driverMock, 1, 1);
     }
 
-    public function testShouldDetectTitleIsCondition()
+    public function testShouldDetectTitleIsCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getTitle')
@@ -38,7 +38,7 @@ public function testShouldDetectTitleIsCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectTitleContainsCondition()
+    public function testShouldDetectTitleContainsCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getTitle')
@@ -51,7 +51,7 @@ public function testShouldDetectTitleContainsCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectTitleMatchesCondition()
+    public function testShouldDetectTitleMatchesCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getTitle')
@@ -64,7 +64,7 @@ public function testShouldDetectTitleMatchesCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectUrlIsCondition()
+    public function testShouldDetectUrlIsCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getCurrentURL')
@@ -77,7 +77,7 @@ public function testShouldDetectUrlIsCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectUrlContainsCondition()
+    public function testShouldDetectUrlContainsCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getCurrentURL')
@@ -90,7 +90,7 @@ public function testShouldDetectUrlContainsCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectUrlMatchesCondition()
+    public function testShouldDetectUrlMatchesCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getCurrentURL')
@@ -103,7 +103,7 @@ public function testShouldDetectUrlMatchesCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectPresenceOfElementLocatedCondition()
+    public function testShouldDetectPresenceOfElementLocatedCondition(): void
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
 
@@ -120,7 +120,7 @@ public function testShouldDetectPresenceOfElementLocatedCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
-    public function testShouldDetectNotPresenceOfElementLocatedCondition()
+    public function testShouldDetectNotPresenceOfElementLocatedCondition(): void
     {
         $element = new RemoteWebElement(new RemoteExecuteMethod($this->driverMock), 'id');
 
@@ -140,7 +140,7 @@ public function testShouldDetectNotPresenceOfElementLocatedCondition()
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
+    public function testShouldDetectPresenceOfAllElementsLocatedByCondition(): void
     {
         $element = $this->createMock(RemoteWebElement::class);
 
@@ -157,7 +157,7 @@ public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
         $this->assertSame([$element], $this->wait->until($condition));
     }
 
-    public function testShouldDetectVisibilityOfElementLocatedCondition()
+    public function testShouldDetectVisibilityOfElementLocatedCondition(): void
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -181,7 +181,7 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
-    public function testShouldDetectVisibilityOfAnyElementLocated()
+    public function testShouldDetectVisibilityOfAnyElementLocated(): void
     {
         $elementList = [
             $this->createMock(RemoteWebElement::class),
@@ -211,7 +211,7 @@ public function testShouldDetectVisibilityOfAnyElementLocated()
         $this->assertSame([$elementList[1], $elementList[2]], $this->wait->until($condition));
     }
 
-    public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException()
+    public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException(): void
     {
         $element = $this->createMock(RemoteWebElement::class);
 
@@ -232,7 +232,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchEle
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElementReferenceException()
+    public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElementReferenceException(): void
     {
         $element = $this->createMock(RemoteWebElement::class);
 
@@ -253,7 +253,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElem
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElementBecamesInvisible()
+    public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElementBecamesInvisible(): void
     {
         $element = $this->createMock(RemoteWebElement::class);
 
@@ -274,7 +274,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElement
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectVisibilityOfCondition()
+    public function testShouldDetectVisibilityOfCondition(): void
     {
         $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->exactly(2))
@@ -289,7 +289,7 @@ public function testShouldDetectVisibilityOfCondition()
         $this->assertSame($element, $this->wait->until($condition));
     }
 
-    public function testShouldDetectElementTextContainsCondition()
+    public function testShouldDetectElementTextContainsCondition(): void
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -313,7 +313,7 @@ public function testShouldDetectElementTextContainsCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectElementTextIsCondition()
+    public function testShouldDetectElementTextIsCondition(): void
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -340,7 +340,7 @@ public function testShouldDetectElementTextIsCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectElementTextMatchesCondition()
+    public function testShouldDetectElementTextMatchesCondition(): void
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -368,7 +368,7 @@ public function testShouldDetectElementTextMatchesCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectElementValueContainsCondition()
+    public function testShouldDetectElementValueContainsCondition(): void
     {
         // Set-up the consecutive calls to apply() as follows:
         // Call #1: throws NoSuchElementException
@@ -397,7 +397,7 @@ public function testShouldDetectElementValueContainsCondition()
         $this->assertTrue($this->wait->until($condition));
     }
 
-    public function testShouldDetectNumberOfWindowsToBeCondition()
+    public function testShouldDetectNumberOfWindowsToBeCondition(): void
     {
         $this->driverMock->expects($this->any())
             ->method('getWindowHandles')
@@ -414,7 +414,7 @@ public function testShouldDetectNumberOfWindowsToBeCondition()
      * @param RemoteWebElement $element
      * @param int $expectedNumberOfFindElementCalls
      */
-    private function setupDriverToReturnElementAfterAnException($element, $expectedNumberOfFindElementCalls)
+    private function setupDriverToReturnElementAfterAnException($element, $expectedNumberOfFindElementCalls): void
     {
         $consecutiveReturn = [
             $this->throwException(new NoSuchElementException('')),
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index 757b7ff99..044a61cee 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -15,7 +15,7 @@ class WebDriverKeysTest extends TestCase
      * @param array $expectedOssOutput
      * @param string $expectedW3cOutput
      */
-    public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOutput, $expectedW3cOutput)
+    public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOutput, $expectedW3cOutput): void
     {
         $this->assertSame($expectedOssOutput, WebDriverKeys::encode($keys));
         $this->assertSame($expectedW3cOutput, WebDriverKeys::encode($keys, true));
@@ -24,7 +24,7 @@ public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOu
     /**
      * @return array[]
      */
-    public function provideKeys()
+    public function provideKeys(): array
     {
         return [
             'empty string' => ['', [''], ''],
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 12e645b4e..31d2bfef0 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
             ->getMock();
     }
 
-    public function testShouldAddCookieFromArray()
+    public function testShouldAddCookieFromArray(): void
     {
         $cookieInArray = [
             'name' => 'cookieName',
@@ -43,7 +43,7 @@ public function testShouldAddCookieFromArray()
         $options->addCookie($cookieInArray);
     }
 
-    public function testShouldAddCookieFromCookieObject()
+    public function testShouldAddCookieFromCookieObject(): void
     {
         $cookieObject = new Cookie('cookieName', 'someValue');
         $cookieObject->setPath('/bar');
@@ -71,7 +71,7 @@ public function testShouldAddCookieFromCookieObject()
         $options->addCookie($cookieObject);
     }
 
-    public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
+    public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie(): void
     {
         $notCookie = new \stdClass();
 
@@ -82,7 +82,7 @@ public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
         $options->addCookie($notCookie);
     }
 
-    public function testShouldGetAllCookies()
+    public function testShouldGetAllCookies(): void
     {
         $this->executor->expects($this->once())
             ->method('execute')
@@ -118,7 +118,7 @@ public function testShouldGetAllCookies()
         $this->assertSame('secondCookie', $cookies[1]->getName());
     }
 
-    public function testShouldGetCookieByName()
+    public function testShouldGetCookieByName(): void
     {
         $this->executor->expects($this->once())
             ->method('execute')
@@ -157,7 +157,7 @@ public function testShouldGetCookieByName()
         $this->assertTrue($cookie->isSecure());
     }
 
-    public function testShouldReturnNullIfCookieWithNameNotFound()
+    public function testShouldReturnNullIfCookieWithNameNotFound(): void
     {
         $this->executor->expects($this->once())
             ->method('execute')
@@ -180,7 +180,7 @@ public function testShouldReturnNullIfCookieWithNameNotFound()
         $this->assertNull($options->getCookieNamed('notExistingCookie'));
     }
 
-    public function testShouldReturnTimeoutsInstance()
+    public function testShouldReturnTimeoutsInstance(): void
     {
         $options = new WebDriverOptions($this->executor);
 
@@ -188,7 +188,7 @@ public function testShouldReturnTimeoutsInstance()
         $this->assertInstanceOf(WebDriverTimeouts::class, $timeouts);
     }
 
-    public function testShouldReturnWindowInstance()
+    public function testShouldReturnWindowInstance(): void
     {
         $options = new WebDriverOptions($this->executor);
 

From 3d3745b3349455d895ae198b41e794f997a2004d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 30 Jan 2023 15:33:36 +0100
Subject: [PATCH 729/784] Test: Add typehints where applicable

---
 .php-cs-fixer.dist.php                             |  2 ++
 tests/functional/Chrome/ChromeDriverTest.php       |  2 +-
 tests/functional/ReportSauceLabsStatusListener.php |  4 ++--
 tests/functional/WebDriverByTest.php               |  8 ++++----
 tests/functional/WebDriverCheckboxesTest.php       |  4 ++--
 tests/functional/WebDriverRadiosTest.php           |  4 ++--
 tests/functional/WebDriverSelectTest.php           |  2 +-
 tests/functional/WebDriverTestCase.php             |  4 ++--
 tests/unit/CookieTest.php                          | 12 ++++++------
 tests/unit/Exception/WebDriverExceptionTest.php    |  9 +++++----
 tests/unit/Remote/DesiredCapabilitiesTest.php      |  6 +++---
 tests/unit/Remote/HttpCommandExecutorTest.php      |  6 +++---
 tests/unit/Remote/RemoteWebDriverTest.php          |  6 ++++--
 tests/unit/Support/ScreenshotHelperTest.php        |  2 +-
 tests/unit/Support/XPathEscaperTest.php            |  2 +-
 tests/unit/WebDriverExpectedConditionTest.php      |  6 ++++--
 tests/unit/WebDriverKeysTest.php                   |  7 +++++--
 17 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 6c0bacf2f..60d702ef0 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -96,6 +96,8 @@
         'phpdoc_scalar' => true,
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_trim' => true,
+        //'phpdoc_to_param_type' => true,
+        //'phpdoc_to_return_type' => true,
         'phpdoc_types' => true,
         'phpdoc_var_annotation_correct_order' => true,
         //'pow_to_exponentiation' => true,
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 7fac8c1b4..25efa9a82 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -37,7 +37,7 @@ protected function tearDown(): void
      * @dataProvider provideDialect
      * @param bool $isW3cDialect
      */
-    public function testShouldStartChromeDriver($isW3cDialect): void
+    public function testShouldStartChromeDriver(bool $isW3cDialect): void
     {
         $this->startChromeDriver($isW3cDialect);
         $this->assertInstanceOf(ChromeDriver::class, $this->driver);
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index 96db8f27b..73d69f7a9 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -82,7 +82,7 @@ public function startTest(\PHPUnit\Framework\Test $test): void
      * @param int $testStatus
      * @return bool
      */
-    private function testWasSkippedOrIncomplete($testStatus): bool
+    private function testWasSkippedOrIncomplete(int $testStatus): bool
     {
         if ($testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED
             || $testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_INCOMPLETE) {
@@ -96,7 +96,7 @@ private function testWasSkippedOrIncomplete($testStatus): bool
      * @param string $url
      * @param array $data
      */
-    private function submitToSauceLabs($url, array $data): void
+    private function submitToSauceLabs(string $url, array $data): void
     {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'PUT');
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index 87ad8a417..e064924dd 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -18,10 +18,10 @@ class WebDriverByTest extends WebDriverTestCase
      * @param string $expectedAttributeValue
      */
     public function testShouldFindTextElementByLocator(
-        $webDriverByLocatorMethod,
-        $webDriverByLocatorValue,
-        $expectedText = null,
-        $expectedAttributeValue = null
+        string $webDriverByLocatorMethod,
+        string $webDriverByLocatorValue,
+        string $expectedText = null,
+        string $expectedAttributeValue = null
     ): void {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index e22c54002..87ab12460 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -129,7 +129,7 @@ public function testSelectByIndexInvalid(): void
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisibleText($text, $value): void
+    public function testSelectByVisibleText(string $text, string $value): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
@@ -157,7 +157,7 @@ public function provideSelectByVisibleTextData(): array
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisiblePartialText($text, $value): void
+    public function testSelectByVisiblePartialText(string $text, string $value): void
     {
         $checkboxes = new WebDriverCheckboxes(
             $this->driver->findElement(WebDriverBy::xpath('//input[@type="checkbox"]'))
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index ffc25c67a..9f8584489 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -107,7 +107,7 @@ public function testSelectByIndexInvalid(): void
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisibleText($text, $value): void
+    public function testSelectByVisibleText(string $text, string $value): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByVisibleText($text);
@@ -131,7 +131,7 @@ public function provideSelectByVisibleTextData(): array
      * @param string $text
      * @param string $value
      */
-    public function testSelectByVisiblePartialText($text, $value): void
+    public function testSelectByVisiblePartialText(string $text, string $value): void
     {
         $radios = new WebDriverRadios($this->driver->findElement(WebDriverBy::xpath('//input[@type="radio"]')));
         $radios->selectByVisiblePartialText($text);
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index b688a10cb..a4f56c8ea 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -48,7 +48,7 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement(): vo
      * @dataProvider provideSelectSelector
      * @param string $selector
      */
-    public function testShouldGetOptionsOfSelect($selector): void
+    public function testShouldGetOptionsOfSelect(string $selector): void
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector($selector));
         $select = new WebDriverSelect($originalElement);
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 4319e158a..dccc8a3e1 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -135,7 +135,7 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
      * @param string[] $browsers List of browsers for this test
      * @param string|null $message
      */
-    public static function skipForUnmatchedBrowsers($browsers = [], $message = null): void
+    public static function skipForUnmatchedBrowsers(array $browsers = [], ?string $message = null): void
     {
         $browserName = (string) getenv('BROWSER_NAME');
         if (!in_array($browserName, $browsers, true)) {
@@ -178,7 +178,7 @@ public function runBare(): void
      * @param string $path
      * @return string
      */
-    protected function getTestPageUrl($path): string
+    protected function getTestPageUrl(string $path): string
     {
         $host = 'http://localhost:8000/';
         if ($alternateHost = getenv('FIXTURES_HOST')) {
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 0efc3ee0a..17d7c61b6 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -158,13 +158,13 @@ public function testShouldBeCreatableFromAnArrayWithAllValues(): void
 
     /**
      * @dataProvider provideInvalidCookie
-     * @param string $name
-     * @param string $value
-     * @param string $domain
-     * @param string $expectedMessage
      */
-    public function testShouldValidateCookieOnConstruction($name, $value, $domain, $expectedMessage): void
-    {
+    public function testShouldValidateCookieOnConstruction(
+        ?string $name,
+        ?string $value,
+        ?string $domain,
+        ?string $expectedMessage
+    ): void {
         if ($expectedMessage) {
             $this->expectException(LogicException::class);
             $this->expectExceptionMessage($expectedMessage);
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index d5ec3d040..ba0d6049d 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -18,11 +18,12 @@ public function testShouldStoreResultsOnInstantiation(): void
     /**
      * @dataProvider provideJsonWireStatusCode
      * @dataProvider provideW3CWebDriverErrorCode
-     * @param int $errorCode
-     * @param string $expectedExceptionType
+     * @param int|string $errorCode
      */
-    public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode($errorCode, $expectedExceptionType): void
-    {
+    public function testShouldThrowProperExceptionBasedOnWebDriverErrorCode(
+        $errorCode,
+        string $expectedExceptionType
+    ): void {
         try {
             WebDriverException::throwException($errorCode, 'exception message', ['results']);
         } catch (WebDriverException $e) {
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index f8c15556e..621346296 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -92,9 +92,9 @@ public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser(): void
      * @param string $expectedPlatform
      */
     public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
-        $setupMethod,
-        $expectedBrowser,
-        $expectedPlatform
+        string $setupMethod,
+        string $expectedBrowser,
+        string $expectedPlatform
     ): void {
         /** @var DesiredCapabilities $capabilities */
         $capabilities = call_user_func([DesiredCapabilities::class, $setupMethod]);
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index c4c8f632e..7a23265b6 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -26,9 +26,9 @@ protected function setUp(): void
      */
     public function testShouldSendRequestToAssembledUrl(
         WebDriverCommand $command,
-        $shouldResetExpectHeader,
-        $expectedUrl,
-        $expectedPostData
+        bool $shouldResetExpectHeader,
+        string $expectedUrl,
+        ?string $expectedPostData
     ): void {
         $expectedCurlSetOptCalls = [
             [$this->anything(), CURLOPT_URL, $expectedUrl],
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 0f729d965..478d1078a 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -121,8 +121,10 @@ public function testShouldCreateWebDriverWaitInstance(): void
      * @param string $expectedExceptionMessage
      * @dataProvider provideMethods
      */
-    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd($method, $expectedExceptionMessage): void
-    {
+    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd(
+        string $method,
+        string $expectedExceptionMessage
+    ): void {
         $executorMock = $this->createMock(HttpCommandExecutor::class);
         $executorMock->expects($this->once())
             ->method('execute')
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index 136c58d21..407593c46 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -79,7 +79,7 @@ public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists(): void
      * @param mixed $data
      * @param string $expectedExceptionMessage
      */
-    public function testShouldThrowExceptionWhenInvalidDataReceived($data, $expectedExceptionMessage): void
+    public function testShouldThrowExceptionWhenInvalidDataReceived($data, string $expectedExceptionMessage): void
     {
         $executorMock = $this->createMock(RemoteExecuteMethod::class);
         $executorMock->expects($this->once())
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index 36a62a3ac..d872d374a 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -11,7 +11,7 @@ class XPathEscaperTest extends TestCase
      * @param string $input
      * @param string $expectedOutput
      */
-    public function testShouldInstantiateWithCapabilitiesGivenInConstructor($input, $expectedOutput): void
+    public function testShouldInstantiateWithCapabilitiesGivenInConstructor(string $input, string $expectedOutput): void
     {
         $output = XPathEscaper::escapeQuotes($input);
 
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 501240ece..0d55f3bcd 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -414,8 +414,10 @@ public function testShouldDetectNumberOfWindowsToBeCondition(): void
      * @param RemoteWebElement $element
      * @param int $expectedNumberOfFindElementCalls
      */
-    private function setupDriverToReturnElementAfterAnException($element, $expectedNumberOfFindElementCalls): void
-    {
+    private function setupDriverToReturnElementAfterAnException(
+        RemoteWebElement $element,
+        int $expectedNumberOfFindElementCalls
+    ): void {
         $consecutiveReturn = [
             $this->throwException(new NoSuchElementException('')),
         ];
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index 044a61cee..d482b4ce2 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -15,8 +15,11 @@ class WebDriverKeysTest extends TestCase
      * @param array $expectedOssOutput
      * @param string $expectedW3cOutput
      */
-    public function testShouldEncodeKeysToFormatOfEachProtocol($keys, $expectedOssOutput, $expectedW3cOutput): void
-    {
+    public function testShouldEncodeKeysToFormatOfEachProtocol(
+        $keys,
+        array $expectedOssOutput,
+        string $expectedW3cOutput
+    ): void {
         $this->assertSame($expectedOssOutput, WebDriverKeys::encode($keys));
         $this->assertSame($expectedW3cOutput, WebDriverKeys::encode($keys, true));
     }

From 7970c0c6caa86b082f46498b4004cd598e80d776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 30 Jan 2023 15:37:05 +0100
Subject: [PATCH 730/784] Test: Remove superfluous typehints

---
 .php-cs-fixer.dist.php                             |  5 +++++
 tests/functional/Chrome/ChromeDriverTest.php       |  1 -
 tests/functional/ReportSauceLabsStatusListener.php |  8 --------
 tests/functional/RetrieveEventsTrait.php           |  6 ------
 tests/functional/WebDriverActionsTest.php          |  3 ---
 tests/functional/WebDriverByTest.php               |  4 ----
 tests/functional/WebDriverCheckboxesTest.php       |  6 ------
 tests/functional/WebDriverRadiosTest.php           |  6 ------
 tests/functional/WebDriverSelectTest.php           |  8 --------
 tests/functional/WebDriverTestCase.php             | 10 ----------
 tests/unit/CookieTest.php                          |  2 --
 tests/unit/Remote/DesiredCapabilitiesTest.php      |  5 -----
 tests/unit/Remote/HttpCommandExecutorTest.php      |  4 ----
 tests/unit/Remote/RemoteWebDriverTest.php          |  2 --
 tests/unit/Support/ScreenshotHelperTest.php        |  1 -
 tests/unit/Support/XPathEscaperTest.php            |  2 --
 tests/unit/WebDriverExpectedConditionTest.php      |  4 ----
 tests/unit/WebDriverKeysTest.php                   |  2 --
 18 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 60d702ef0..fff63ebfd 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -62,6 +62,11 @@
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_singleline_whitespace_before_semicolons' => true,
+        //'no_superfluous_phpdoc_tags' => [
+        //    'allow_mixed' => true,
+        //    'remove_inheritdoc' => true,
+        //    'allow_unused_params' => false,
+        //],
         'no_trailing_comma_in_singleline' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unused_imports' => true,
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 25efa9a82..b3e8bea8b 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -35,7 +35,6 @@ protected function tearDown(): void
 
     /**
      * @dataProvider provideDialect
-     * @param bool $isW3cDialect
      */
     public function testShouldStartChromeDriver(bool $isW3cDialect): void
     {
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index 73d69f7a9..98becc436 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -78,10 +78,6 @@ public function startTest(\PHPUnit\Framework\Test $test): void
     {
     }
 
-    /**
-     * @param int $testStatus
-     * @return bool
-     */
     private function testWasSkippedOrIncomplete(int $testStatus): bool
     {
         if ($testStatus === \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED
@@ -92,10 +88,6 @@ private function testWasSkippedOrIncomplete(int $testStatus): bool
         return false;
     }
 
-    /**
-     * @param string $url
-     * @param array $data
-     */
     private function submitToSauceLabs(string $url, array $data): void
     {
         $curl = curl_init($url);
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
index 8188070e0..68bb3dc8b 100644
--- a/tests/functional/RetrieveEventsTrait.php
+++ b/tests/functional/RetrieveEventsTrait.php
@@ -9,17 +9,11 @@ trait RetrieveEventsTrait
     /** @var RemoteWebDriver $driver */
     public $driver;
 
-    /**
-     * @return array
-     */
     private function retrieveLoggedKeyboardEvents(): array
     {
         return $this->retrieveLoggerEvents(WebDriverBy::id('keyboardEventsLog'));
     }
 
-    /**
-     * @return array
-     */
     private function retrieveLoggedMouseEvents(): array
     {
         return $this->retrieveLoggerEvents(WebDriverBy::id('mouseEventsLog'));
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index 95d359cd5..aa07f721c 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -250,9 +250,6 @@ public function testShouldDragAndDropBy(): void
         );
     }
 
-    /**
-     * @return array
-     */
     private function retrieveListContent(): array
     {
         return [
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index e064924dd..c50a1c36e 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -12,10 +12,6 @@ class WebDriverByTest extends WebDriverTestCase
 {
     /**
      * @dataProvider provideTextElements
-     * @param string $webDriverByLocatorMethod
-     * @param string $webDriverByLocatorValue
-     * @param string $expectedText
-     * @param string $expectedAttributeValue
      */
     public function testShouldFindTextElementByLocator(
         string $webDriverByLocatorMethod,
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index 87ab12460..df4b4238b 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -125,9 +125,6 @@ public function testSelectByIndexInvalid(): void
 
     /**
      * @dataProvider provideSelectByVisibleTextData
-     *
-     * @param string $text
-     * @param string $value
      */
     public function testSelectByVisibleText(string $text, string $value): void
     {
@@ -153,9 +150,6 @@ public function provideSelectByVisibleTextData(): array
 
     /**
      * @dataProvider provideSelectByVisiblePartialTextData
-     *
-     * @param string $text
-     * @param string $value
      */
     public function testSelectByVisiblePartialText(string $text, string $value): void
     {
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 9f8584489..0370e8174 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -103,9 +103,6 @@ public function testSelectByIndexInvalid(): void
 
     /**
      * @dataProvider provideSelectByVisibleTextData
-     *
-     * @param string $text
-     * @param string $value
      */
     public function testSelectByVisibleText(string $text, string $value): void
     {
@@ -127,9 +124,6 @@ public function provideSelectByVisibleTextData(): array
 
     /**
      * @dataProvider provideSelectByVisiblePartialTextData
-     *
-     * @param string $text
-     * @param string $value
      */
     public function testSelectByVisiblePartialText(string $text, string $value): void
     {
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index a4f56c8ea..7c8e64bb5 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -46,7 +46,6 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement(): vo
 
     /**
      * @dataProvider provideSelectSelector
-     * @param string $selector
      */
     public function testShouldGetOptionsOfSelect(string $selector): void
     {
@@ -423,9 +422,6 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartia
         $select->deselectByVisiblePartialText('First');
     }
 
-    /**
-     * @return WebDriverSelect
-     */
     protected function getWebDriverSelectForSimpleSelect(): WebDriverSelect
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
@@ -433,9 +429,6 @@ protected function getWebDriverSelectForSimpleSelect(): WebDriverSelect
         return new WebDriverSelect($originalElement);
     }
 
-    /**
-     * @return WebDriverSelect
-     */
     protected function getWebDriverSelectForMultipleSelect(): WebDriverSelect
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
@@ -445,7 +438,6 @@ protected function getWebDriverSelectForMultipleSelect(): WebDriverSelect
 
     /**
      * @param string[] $expectedValues
-     * @param array $options
      */
     private function assertContainsOptionsWithValues(array $expectedValues, array $options): void
     {
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index dccc8a3e1..16ab4decd 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -94,17 +94,11 @@ protected function tearDown(): void
         }
     }
 
-    /**
-     * @return bool
-     */
     public static function isSauceLabsBuild(): bool
     {
         return getenv('SAUCELABS') ? true : false;
     }
 
-    /**
-     * @return bool
-     */
     public static function isW3cProtocolBuild(): bool
     {
         return getenv('DISABLE_W3C_PROTOCOL') !== '1';
@@ -133,7 +127,6 @@ public static function skipForJsonWireProtocol($message = 'Not supported by Json
      * Mark a test as skipped if the current browser is not in the list of browsers.
      *
      * @param string[] $browsers List of browsers for this test
-     * @param string|null $message
      */
     public static function skipForUnmatchedBrowsers(array $browsers = [], ?string $message = null): void
     {
@@ -174,9 +167,6 @@ public function runBare(): void
 
     /**
      * Get the URL of given test HTML on running webserver.
-     *
-     * @param string $path
-     * @return string
      */
     protected function getTestPageUrl(string $path): string
     {
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 17d7c61b6..02de76772 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -31,7 +31,6 @@ public function testShouldSetAllProperties(): Cookie
 
     /**
      * @depends testShouldSetAllProperties
-     * @param Cookie $cookie
      */
     public function testShouldBeConvertibleToArray(Cookie $cookie): void
     {
@@ -75,7 +74,6 @@ public function testShouldNotContainNullValues(): void
 
     /**
      * @depends testShouldSetAllProperties
-     * @param Cookie $cookie
      */
     public function testShouldProvideArrayAccessToProperties(Cookie $cookie): void
     {
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 621346296..357b326dd 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -87,9 +87,6 @@ public function testShouldAllowToDisableJavascriptForHtmlUnitBrowser(): void
 
     /**
      * @dataProvider provideBrowserCapabilities
-     * @param string $setupMethod
-     * @param string $expectedBrowser
-     * @param string $expectedPlatform
      */
     public function testShouldProvideShortcutSetupForCapabilitiesOfEachBrowser(
         string $setupMethod,
@@ -175,8 +172,6 @@ public function testShouldNotOverwriteDefaultFirefoxOptionsWhenAddingFirefoxOpti
 
     /**
      * @dataProvider provideW3cCapabilities
-     * @param DesiredCapabilities $inputJsonWireCapabilities
-     * @param array $expectedW3cCapabilities
      */
     public function testShouldConvertCapabilitiesToW3cCompatible(
         DesiredCapabilities $inputJsonWireCapabilities,
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index 7a23265b6..b2576eada 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -19,10 +19,6 @@ protected function setUp(): void
 
     /**
      * @dataProvider provideCommand
-     * @param WebDriverCommand $command
-     * @param bool $shouldResetExpectHeader
-     * @param string $expectedUrl
-     * @param string|null $expectedPostData
      */
     public function testShouldSendRequestToAssembledUrl(
         WebDriverCommand $command,
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 478d1078a..9df4127c5 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -117,8 +117,6 @@ public function testShouldCreateWebDriverWaitInstance(): void
      * @covers ::findElement
      * @covers ::findElements
      * @covers \Facebook\WebDriver\Exception\Internal\UnexpectedResponseException
-     * @param string $method
-     * @param string $expectedExceptionMessage
      * @dataProvider provideMethods
      */
     public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd(
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index 407593c46..7266c86b6 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -77,7 +77,6 @@ public function testShouldSaveElementScreenshotToSubdirectoryIfNotExists(): void
     /**
      * @dataProvider provideInvalidData
      * @param mixed $data
-     * @param string $expectedExceptionMessage
      */
     public function testShouldThrowExceptionWhenInvalidDataReceived($data, string $expectedExceptionMessage): void
     {
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index d872d374a..5313bc408 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -8,8 +8,6 @@ class XPathEscaperTest extends TestCase
 {
     /**
      * @dataProvider provideXpath
-     * @param string $input
-     * @param string $expectedOutput
      */
     public function testShouldInstantiateWithCapabilitiesGivenInConstructor(string $input, string $expectedOutput): void
     {
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 0d55f3bcd..9e95df346 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -410,10 +410,6 @@ public function testShouldDetectNumberOfWindowsToBeCondition(): void
         $this->assertTrue(call_user_func($condition->getApply(), $this->driverMock));
     }
 
-    /**
-     * @param RemoteWebElement $element
-     * @param int $expectedNumberOfFindElementCalls
-     */
     private function setupDriverToReturnElementAfterAnException(
         RemoteWebElement $element,
         int $expectedNumberOfFindElementCalls
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index d482b4ce2..f3c59042c 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -12,8 +12,6 @@ class WebDriverKeysTest extends TestCase
     /**
      * @dataProvider provideKeys
      * @param mixed $keys
-     * @param array $expectedOssOutput
-     * @param string $expectedW3cOutput
      */
     public function testShouldEncodeKeysToFormatOfEachProtocol(
         $keys,

From bc653c9e00ae9a340f8d48e8f6cacfd90f1efb13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 31 Jan 2023 11:39:17 +0100
Subject: [PATCH 731/784] Codestyle: Remove superfluous phpdocs, which adds no
 extra information over used typehints

---
 .php-cs-fixer.dist.php                        | 10 ++---
 lib/Chrome/ChromeOptions.php                  |  2 -
 lib/Exception/Internal/RuntimeException.php   |  4 --
 lib/Firefox/FirefoxOptions.php                |  1 -
 .../Internal/WebDriverCoordinates.php         |  2 -
 .../Internal/WebDriverKeysRelatedAction.php   |  5 ---
 .../Internal/WebDriverMouseAction.php         |  4 --
 .../Internal/WebDriverMoveToOffsetAction.php  |  2 -
 .../Internal/WebDriverSendKeysAction.php      |  3 --
 .../Touch/WebDriverDownAction.php             |  1 -
 .../Touch/WebDriverFlickAction.php            |  1 -
 .../Touch/WebDriverFlickFromElementAction.php |  2 -
 .../Touch/WebDriverMoveAction.php             |  1 -
 .../Touch/WebDriverScrollAction.php           |  1 -
 .../WebDriverScrollFromElementAction.php      |  2 -
 .../Touch/WebDriverTouchAction.php            |  4 --
 .../Touch/WebDriverTouchScreen.php            |  5 ---
 lib/Interactions/WebDriverActions.php         | 15 -------
 lib/Interactions/WebDriverCompositeAction.php |  1 -
 lib/Interactions/WebDriverTouchActions.php    |  5 ---
 lib/Local/LocalWebDriver.php                  |  1 -
 lib/Remote/CustomWebDriverCommand.php         |  1 -
 lib/Remote/ExecuteMethod.php                  |  1 -
 lib/Remote/HttpCommandExecutor.php            |  2 -
 lib/Remote/JsonWireCompat.php                 |  1 -
 lib/Remote/RemoteExecuteMethod.php            |  4 --
 lib/Remote/RemoteMouse.php                    | 16 -------
 lib/Remote/RemoteStatus.php                   |  1 -
 lib/Remote/RemoteTouchScreen.php              | 11 -----
 lib/Remote/RemoteWebDriver.php                |  7 +---
 lib/Remote/RemoteWebElement.php               |  5 ---
 lib/Remote/Service/DriverCommandExecutor.php  |  2 -
 lib/Remote/ShadowRoot.php                     |  4 --
 lib/Support/Events/EventFiringWebDriver.php   | 12 ------
 .../Events/EventFiringWebDriverNavigation.php |  7 ----
 lib/Support/Events/EventFiringWebElement.php  | 11 -----
 lib/WebDriverCommandExecutor.php              |  2 -
 lib/WebDriverDispatcher.php                   |  3 --
 lib/WebDriverEventListener.php                | 42 -------------------
 lib/WebDriverMouse.php                        |  6 ---
 lib/WebDriverSearchContext.php                |  2 -
 lib/WebDriverSelect.php                       |  2 -
 lib/WebDriverUpAction.php                     |  1 -
 lib/WebDriverWindow.php                       |  2 -
 44 files changed, 6 insertions(+), 211 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index fff63ebfd..fe4763287 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -62,11 +62,11 @@
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_singleline_whitespace_before_semicolons' => true,
-        //'no_superfluous_phpdoc_tags' => [
-        //    'allow_mixed' => true,
-        //    'remove_inheritdoc' => true,
-        //    'allow_unused_params' => false,
-        //],
+        'no_superfluous_phpdoc_tags' => [
+            'allow_mixed' => true,
+            'remove_inheritdoc' => true,
+            'allow_unused_params' => true, // Used in RemoteWebDriver::createBySessionID to maintain BC
+        ],
         'no_trailing_comma_in_singleline' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unused_imports' => true,
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 86e133397..1b094a048 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -65,7 +65,6 @@ public function setBinary($path)
     }
 
     /**
-     * @param array $arguments
      * @return ChromeOptions
      */
     public function addArguments(array $arguments)
@@ -79,7 +78,6 @@ public function addArguments(array $arguments)
      * Add a Chrome extension to install on browser startup. Each path should be
      * a packed Chrome extension.
      *
-     * @param array $paths
      * @return ChromeOptions
      */
     public function addExtensions(array $paths)
diff --git a/lib/Exception/Internal/RuntimeException.php b/lib/Exception/Internal/RuntimeException.php
index 604b369f5..cc3a971fb 100644
--- a/lib/Exception/Internal/RuntimeException.php
+++ b/lib/Exception/Internal/RuntimeException.php
@@ -15,10 +15,6 @@ public static function forError(string $message): self
         return new self($message);
     }
 
-    /**
-     * @param Process $process
-     * @return RuntimeException
-     */
     public static function forDriverError(Process $process): self
     {
         return new self(
diff --git a/lib/Firefox/FirefoxOptions.php b/lib/Firefox/FirefoxOptions.php
index 8d9d94f88..84cf94cef 100644
--- a/lib/Firefox/FirefoxOptions.php
+++ b/lib/Firefox/FirefoxOptions.php
@@ -97,7 +97,6 @@ public function setPreference($name, $value)
 
     /**
      * @see https://github.com/php-webdriver/php-webdriver/wiki/Firefox#firefox-profile
-     * @param FirefoxProfile $profile
      * @return self
      */
     public function setProfile(FirefoxProfile $profile)
diff --git a/lib/Interactions/Internal/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
index 387bdbea6..91ad29f7c 100644
--- a/lib/Interactions/Internal/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -29,8 +29,6 @@ class WebDriverCoordinates
 
     /**
      * @param null $on_screen
-     * @param callable $in_view_port
-     * @param callable $on_page
      * @param string $auxiliary
      */
     public function __construct($on_screen, callable $in_view_port, callable $on_page, $auxiliary)
diff --git a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index 69f4aa179..a5d231f74 100644
--- a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -24,11 +24,6 @@ abstract class WebDriverKeysRelatedAction
      */
     protected $locationProvider;
 
-    /**
-     * @param WebDriverKeyboard $keyboard
-     * @param WebDriverMouse $mouse
-     * @param WebDriverLocatable $location_provider
-     */
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
diff --git a/lib/Interactions/Internal/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
index 5cb0cfd10..1333def5d 100644
--- a/lib/Interactions/Internal/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -19,10 +19,6 @@ class WebDriverMouseAction
      */
     protected $locationProvider;
 
-    /**
-     * @param WebDriverMouse $mouse
-     * @param WebDriverLocatable|null $location_provider
-     */
     public function __construct(WebDriverMouse $mouse, WebDriverLocatable $location_provider = null)
     {
         $this->mouse = $mouse;
diff --git a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index 98fd824d7..4cfc74aef 100644
--- a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -18,8 +18,6 @@ class WebDriverMoveToOffsetAction extends WebDriverMouseAction implements WebDri
     private $yOffset;
 
     /**
-     * @param WebDriverMouse $mouse
-     * @param WebDriverLocatable|null $location_provider
      * @param int|null $x_offset
      * @param int|null $y_offset
      */
diff --git a/lib/Interactions/Internal/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
index 4e65cc27c..f8af6a98b 100644
--- a/lib/Interactions/Internal/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -15,9 +15,6 @@ class WebDriverSendKeysAction extends WebDriverKeysRelatedAction implements WebD
     private $keys = '';
 
     /**
-     * @param WebDriverKeyboard $keyboard
-     * @param WebDriverMouse $mouse
-     * @param WebDriverLocatable $location_provider
      * @param string $keys
      */
     public function __construct(
diff --git a/lib/Interactions/Touch/WebDriverDownAction.php b/lib/Interactions/Touch/WebDriverDownAction.php
index 2e0f1e5d1..225726fcf 100644
--- a/lib/Interactions/Touch/WebDriverDownAction.php
+++ b/lib/Interactions/Touch/WebDriverDownAction.php
@@ -16,7 +16,6 @@ class WebDriverDownAction extends WebDriverTouchAction implements WebDriverActio
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
      * @param int $x
      * @param int $y
      */
diff --git a/lib/Interactions/Touch/WebDriverFlickAction.php b/lib/Interactions/Touch/WebDriverFlickAction.php
index 5430852ac..acdb7fc3e 100644
--- a/lib/Interactions/Touch/WebDriverFlickAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickAction.php
@@ -16,7 +16,6 @@ class WebDriverFlickAction extends WebDriverTouchAction implements WebDriverActi
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
      * @param int $x
      * @param int $y
      */
diff --git a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
index 799febe10..28d359718 100644
--- a/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverFlickFromElementAction.php
@@ -21,8 +21,6 @@ class WebDriverFlickFromElementAction extends WebDriverTouchAction implements We
     private $speed;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
-     * @param WebDriverElement $element
      * @param int $x
      * @param int $y
      * @param int $speed
diff --git a/lib/Interactions/Touch/WebDriverMoveAction.php b/lib/Interactions/Touch/WebDriverMoveAction.php
index 8cdf5eb99..d0a5f85f9 100644
--- a/lib/Interactions/Touch/WebDriverMoveAction.php
+++ b/lib/Interactions/Touch/WebDriverMoveAction.php
@@ -10,7 +10,6 @@ class WebDriverMoveAction extends WebDriverTouchAction implements WebDriverActio
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
      * @param int $x
      * @param int $y
      */
diff --git a/lib/Interactions/Touch/WebDriverScrollAction.php b/lib/Interactions/Touch/WebDriverScrollAction.php
index 0fd40c5b4..952d57e34 100644
--- a/lib/Interactions/Touch/WebDriverScrollAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollAction.php
@@ -10,7 +10,6 @@ class WebDriverScrollAction extends WebDriverTouchAction implements WebDriverAct
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
      * @param int $x
      * @param int $y
      */
diff --git a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
index ba68bc62c..217564dc7 100644
--- a/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
+++ b/lib/Interactions/Touch/WebDriverScrollFromElementAction.php
@@ -11,8 +11,6 @@ class WebDriverScrollFromElementAction extends WebDriverTouchAction implements W
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
-     * @param WebDriverElement $element
      * @param int $x
      * @param int $y
      */
diff --git a/lib/Interactions/Touch/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
index 3919170a9..b79e20db7 100644
--- a/lib/Interactions/Touch/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -19,10 +19,6 @@ abstract class WebDriverTouchAction
      */
     protected $locationProvider;
 
-    /**
-     * @param WebDriverTouchScreen $touch_screen
-     * @param WebDriverLocatable $location_provider
-     */
     public function __construct(
         WebDriverTouchScreen $touch_screen,
         WebDriverLocatable $location_provider = null
diff --git a/lib/Interactions/Touch/WebDriverTouchScreen.php b/lib/Interactions/Touch/WebDriverTouchScreen.php
index 21696fc90..ff9f9c4d1 100644
--- a/lib/Interactions/Touch/WebDriverTouchScreen.php
+++ b/lib/Interactions/Touch/WebDriverTouchScreen.php
@@ -12,7 +12,6 @@ interface WebDriverTouchScreen
     /**
      * Single tap on the touch enabled device.
      *
-     * @param WebDriverElement $element
      * @return $this
      */
     public function tap(WebDriverElement $element);
@@ -20,7 +19,6 @@ public function tap(WebDriverElement $element);
     /**
      * Double tap on the touch screen using finger motion events.
      *
-     * @param WebDriverElement $element
      * @return $this
      */
     public function doubleTap(WebDriverElement $element);
@@ -48,7 +46,6 @@ public function flick($xspeed, $yspeed);
      * Flick on the touch screen using finger motion events.
      * This flickcommand starts at a particular screen location.
      *
-     * @param WebDriverElement $element
      * @param int $xoffset
      * @param int $yoffset
      * @param int $speed
@@ -64,7 +61,6 @@ public function flickFromElement(
     /**
      * Long press on the touch screen using finger motion events.
      *
-     * @param WebDriverElement $element
      * @return $this
      */
     public function longPress(WebDriverElement $element);
@@ -92,7 +88,6 @@ public function scroll($xoffset, $yoffset);
      * Scroll on the touch screen using finger based motion events. Use this
      * command to start scrolling at a particular screen location.
      *
-     * @param WebDriverElement $element
      * @param int $xoffset
      * @param int $yoffset
      * @return $this
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index b5172e2e7..015f4b897 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -25,9 +25,6 @@ class WebDriverActions
     protected $mouse;
     protected $action;
 
-    /**
-     * @param WebDriverHasInputDevices $driver
-     */
     public function __construct(WebDriverHasInputDevices $driver)
     {
         $this->driver = $driver;
@@ -48,7 +45,6 @@ public function perform()
      * Mouse click.
      * If $element is provided, move to the middle of the element first.
      *
-     * @param WebDriverElement $element
      * @return WebDriverActions
      */
     public function click(WebDriverElement $element = null)
@@ -64,7 +60,6 @@ public function click(WebDriverElement $element = null)
      * Mouse click and hold.
      * If $element is provided, move to the middle of the element first.
      *
-     * @param WebDriverElement $element
      * @return WebDriverActions
      */
     public function clickAndHold(WebDriverElement $element = null)
@@ -80,7 +75,6 @@ public function clickAndHold(WebDriverElement $element = null)
      * Context-click (right click).
      * If $element is provided, move to the middle of the element first.
      *
-     * @param WebDriverElement $element
      * @return WebDriverActions
      */
     public function contextClick(WebDriverElement $element = null)
@@ -96,7 +90,6 @@ public function contextClick(WebDriverElement $element = null)
      * Double click.
      * If $element is provided, move to the middle of the element first.
      *
-     * @param WebDriverElement $element
      * @return WebDriverActions
      */
     public function doubleClick(WebDriverElement $element = null)
@@ -111,8 +104,6 @@ public function doubleClick(WebDriverElement $element = null)
     /**
      * Drag and drop from $source to $target.
      *
-     * @param WebDriverElement $source
-     * @param WebDriverElement $target
      * @return WebDriverActions
      */
     public function dragAndDrop(WebDriverElement $source, WebDriverElement $target)
@@ -133,7 +124,6 @@ public function dragAndDrop(WebDriverElement $source, WebDriverElement $target)
     /**
      * Drag $source and drop by offset ($x_offset, $y_offset).
      *
-     * @param WebDriverElement $source
      * @param int $x_offset
      * @param int $y_offset
      * @return WebDriverActions
@@ -174,7 +164,6 @@ public function moveByOffset($x_offset, $y_offset)
      * Extra shift, calculated from the top-left corner of the element, can be set by passing $x_offset and $y_offset
      * parameters.
      *
-     * @param WebDriverElement $element
      * @param int $x_offset
      * @param int $y_offset
      * @return WebDriverActions
@@ -195,7 +184,6 @@ public function moveToElement(WebDriverElement $element, $x_offset = null, $y_of
      * Release the mouse button.
      * If $element is provided, move to the middle of the element first.
      *
-     * @param WebDriverElement $element
      * @return WebDriverActions
      */
     public function release(WebDriverElement $element = null)
@@ -212,7 +200,6 @@ public function release(WebDriverElement $element = null)
      * If $element is provided, focus on that element first.
      *
      * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-     * @param WebDriverElement $element
      * @param string $key
      * @return WebDriverActions
      */
@@ -230,7 +217,6 @@ public function keyDown(WebDriverElement $element = null, $key = null)
      * If $element is provided, focus on that element first.
      *
      * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-     * @param WebDriverElement $element
      * @param string $key
      * @return WebDriverActions
      */
@@ -248,7 +234,6 @@ public function keyUp(WebDriverElement $element = null, $key = null)
      * If $element is provided, focus on that element first (using single mouse click).
      *
      * @see WebDriverKeys for special keys like CONTROL, ALT, etc.
-     * @param WebDriverElement $element
      * @param string $keys
      * @return WebDriverActions
      */
diff --git a/lib/Interactions/WebDriverCompositeAction.php b/lib/Interactions/WebDriverCompositeAction.php
index 168bf5ff5..955d61986 100644
--- a/lib/Interactions/WebDriverCompositeAction.php
+++ b/lib/Interactions/WebDriverCompositeAction.php
@@ -17,7 +17,6 @@ class WebDriverCompositeAction implements WebDriverAction
     /**
      * Add an WebDriverAction to the sequence.
      *
-     * @param WebDriverAction $action
      * @return WebDriverCompositeAction The current instance.
      */
     public function addAction(WebDriverAction $action)
diff --git a/lib/Interactions/WebDriverTouchActions.php b/lib/Interactions/WebDriverTouchActions.php
index da0e47815..fd3298410 100644
--- a/lib/Interactions/WebDriverTouchActions.php
+++ b/lib/Interactions/WebDriverTouchActions.php
@@ -33,7 +33,6 @@ public function __construct(WebDriver $driver)
     }
 
     /**
-     * @param WebDriverElement $element
      * @return WebDriverTouchActions
      */
     public function tap(WebDriverElement $element)
@@ -102,7 +101,6 @@ public function scroll($x, $y)
     }
 
     /**
-     * @param WebDriverElement $element
      * @param int $x
      * @param int $y
      * @return WebDriverTouchActions
@@ -117,7 +115,6 @@ public function scrollFromElement(WebDriverElement $element, $x, $y)
     }
 
     /**
-     * @param WebDriverElement $element
      * @return WebDriverTouchActions
      */
     public function doubleTap(WebDriverElement $element)
@@ -130,7 +127,6 @@ public function doubleTap(WebDriverElement $element)
     }
 
     /**
-     * @param WebDriverElement $element
      * @return WebDriverTouchActions
      */
     public function longPress(WebDriverElement $element)
@@ -157,7 +153,6 @@ public function flick($x, $y)
     }
 
     /**
-     * @param WebDriverElement $element
      * @param int $x
      * @param int $y
      * @param int $speed
diff --git a/lib/Local/LocalWebDriver.php b/lib/Local/LocalWebDriver.php
index 1c396c5c7..c0ab32a42 100644
--- a/lib/Local/LocalWebDriver.php
+++ b/lib/Local/LocalWebDriver.php
@@ -19,7 +19,6 @@ abstract class LocalWebDriver extends RemoteWebDriver
      * @param null $request_timeout_in_ms
      * @param null $http_proxy
      * @param null $http_proxy_port
-     * @param DesiredCapabilities|null $required_capabilities
      * @throws LogicException
      * @return RemoteWebDriver
      * @todo Remove in next major version (should not be inherited)
diff --git a/lib/Remote/CustomWebDriverCommand.php b/lib/Remote/CustomWebDriverCommand.php
index 54e2afdee..cef2c95b2 100644
--- a/lib/Remote/CustomWebDriverCommand.php
+++ b/lib/Remote/CustomWebDriverCommand.php
@@ -19,7 +19,6 @@ class CustomWebDriverCommand extends WebDriverCommand
      * @param string $session_id
      * @param string $url
      * @param string $method
-     * @param array $parameters
      */
     public function __construct($session_id, $url, $method, array $parameters)
     {
diff --git a/lib/Remote/ExecuteMethod.php b/lib/Remote/ExecuteMethod.php
index 3f1636e5b..ba659e6d2 100644
--- a/lib/Remote/ExecuteMethod.php
+++ b/lib/Remote/ExecuteMethod.php
@@ -6,7 +6,6 @@ interface ExecuteMethod
 {
     /**
      * @param string $command_name
-     * @param array $parameters
      * @return WebDriverResponse
      */
     public function execute($command_name, array $parameters = []);
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index d4602ac26..37987f088 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -270,8 +270,6 @@ public function setRequestTimeout($timeout_in_ms)
     }
 
     /**
-     * @param WebDriverCommand $command
-     *
      * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command)
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index 952cb1906..4ba791e92 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -30,7 +30,6 @@ public static function getElement(array $rawElement)
     }
 
     /**
-     * @param WebDriverBy $by
      * @param bool $isW3cCompliant
      *
      * @return array
diff --git a/lib/Remote/RemoteExecuteMethod.php b/lib/Remote/RemoteExecuteMethod.php
index 6cc0c26a7..265abcc1e 100644
--- a/lib/Remote/RemoteExecuteMethod.php
+++ b/lib/Remote/RemoteExecuteMethod.php
@@ -9,9 +9,6 @@ class RemoteExecuteMethod implements ExecuteMethod
      */
     private $driver;
 
-    /**
-     * @param RemoteWebDriver $driver
-     */
     public function __construct(RemoteWebDriver $driver)
     {
         $this->driver = $driver;
@@ -19,7 +16,6 @@ public function __construct(RemoteWebDriver $driver)
 
     /**
      * @param string $command_name
-     * @param array $parameters
      * @return mixed
      */
     public function execute($command_name, array $parameters = [])
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 14ad4eaf5..2df87e44a 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -27,7 +27,6 @@ class RemoteMouse implements WebDriverMouse
     private $isW3cCompliant;
 
     /**
-     * @param RemoteExecuteMethod $executor
      * @param bool $isW3cCompliant
      */
     public function __construct(RemoteExecuteMethod $executor, $isW3cCompliant = false)
@@ -37,8 +36,6 @@ public function __construct(RemoteExecuteMethod $executor, $isW3cCompliant = fal
     }
 
     /**
-     * @param null|WebDriverCoordinates $where
-     *
      * @return RemoteMouse
      */
     public function click(WebDriverCoordinates $where = null)
@@ -68,8 +65,6 @@ public function click(WebDriverCoordinates $where = null)
     }
 
     /**
-     * @param WebDriverCoordinates $where
-     *
      * @return RemoteMouse
      */
     public function contextClick(WebDriverCoordinates $where = null)
@@ -108,8 +103,6 @@ public function contextClick(WebDriverCoordinates $where = null)
     }
 
     /**
-     * @param WebDriverCoordinates $where
-     *
      * @return RemoteMouse
      */
     public function doubleClick(WebDriverCoordinates $where = null)
@@ -138,8 +131,6 @@ public function doubleClick(WebDriverCoordinates $where = null)
     }
 
     /**
-     * @param WebDriverCoordinates $where
-     *
      * @return RemoteMouse
      */
     public function mouseDown(WebDriverCoordinates $where = null)
@@ -172,7 +163,6 @@ public function mouseDown(WebDriverCoordinates $where = null)
     }
 
     /**
-     * @param WebDriverCoordinates $where
      * @param int|null $x_offset
      * @param int|null $y_offset
      *
@@ -215,8 +205,6 @@ public function mouseMove(
     }
 
     /**
-     * @param WebDriverCoordinates $where
-     *
      * @return RemoteMouse
      */
     public function mouseUp(WebDriverCoordinates $where = null)
@@ -249,9 +237,6 @@ public function mouseUp(WebDriverCoordinates $where = null)
         return $this;
     }
 
-    /**
-     * @param WebDriverCoordinates $where
-     */
     protected function moveIfNeeded(WebDriverCoordinates $where = null)
     {
         if ($where) {
@@ -260,7 +245,6 @@ protected function moveIfNeeded(WebDriverCoordinates $where = null)
     }
 
     /**
-     * @param WebDriverCoordinates $where
      * @param int|null $x_offset
      * @param int|null $y_offset
      *
diff --git a/lib/Remote/RemoteStatus.php b/lib/Remote/RemoteStatus.php
index 3d123bd45..73ebeba21 100644
--- a/lib/Remote/RemoteStatus.php
+++ b/lib/Remote/RemoteStatus.php
@@ -29,7 +29,6 @@ protected function __construct($isReady, $message, array $meta = [])
     }
 
     /**
-     * @param array $responseBody
      * @return RemoteStatus
      */
     public static function createFromResponse(array $responseBody)
diff --git a/lib/Remote/RemoteTouchScreen.php b/lib/Remote/RemoteTouchScreen.php
index 889c12e6c..951c8619a 100644
--- a/lib/Remote/RemoteTouchScreen.php
+++ b/lib/Remote/RemoteTouchScreen.php
@@ -15,17 +15,12 @@ class RemoteTouchScreen implements WebDriverTouchScreen
      */
     private $executor;
 
-    /**
-     * @param RemoteExecuteMethod $executor
-     */
     public function __construct(RemoteExecuteMethod $executor)
     {
         $this->executor = $executor;
     }
 
     /**
-     * @param WebDriverElement $element
-     *
      * @return RemoteTouchScreen The instance.
      */
     public function tap(WebDriverElement $element)
@@ -39,8 +34,6 @@ public function tap(WebDriverElement $element)
     }
 
     /**
-     * @param WebDriverElement $element
-     *
      * @return RemoteTouchScreen The instance.
      */
     public function doubleTap(WebDriverElement $element)
@@ -86,7 +79,6 @@ public function flick($xspeed, $yspeed)
     }
 
     /**
-     * @param WebDriverElement $element
      * @param int $xoffset
      * @param int $yoffset
      * @param int $speed
@@ -106,8 +98,6 @@ public function flickFromElement(WebDriverElement $element, $xoffset, $yoffset,
     }
 
     /**
-     * @param WebDriverElement $element
-     *
      * @return RemoteTouchScreen The instance.
      */
     public function longPress(WebDriverElement $element)
@@ -153,7 +143,6 @@ public function scroll($xoffset, $yoffset)
     }
 
     /**
-     * @param WebDriverElement $element
      * @param int $xoffset
      * @param int $yoffset
      *
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index a4270f63a..e53abd38c 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -54,9 +54,7 @@ class RemoteWebDriver implements WebDriver, JavaScriptExecutor, WebDriverHasInpu
     protected $isW3cCompliant;
 
     /**
-     * @param HttpCommandExecutor $commandExecutor
      * @param string $sessionId
-     * @param WebDriverCapabilities $capabilities
      * @param bool $isW3cCompliant false to use the legacy JsonWire protocol, true for the W3C WebDriver spec
      */
     protected function __construct(
@@ -176,7 +174,7 @@ public static function createBySessionID(
             $executor->disableW3cCompliance();
         }
 
-        // if  capabilities were not provided, attempt to read them from the Selenium Grid API
+        // if capabilities were not provided, attempt to read them from the Selenium Grid API
         if ($existingCapabilities === null) {
             $existingCapabilities = self::readExistingCapabilitiesFromSeleniumGrid($session_id, $executor);
         }
@@ -211,7 +209,6 @@ public function newWindow()
     /**
      * Find the first WebDriverElement using the given mechanism.
      *
-     * @param WebDriverBy $by
      * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
@@ -232,7 +229,6 @@ public function findElement(WebDriverBy $by)
     /**
      * Find all WebDriverElements within the current page using the given mechanism.
      *
-     * @param WebDriverBy $by
      * @return RemoteWebElement[] A list of all WebDriverElements, or an empty array if nothing matches
      * @see WebDriverBy
      */
@@ -678,7 +674,6 @@ protected static function createFromResponse(WebDriverResponse $response, HttpCo
     /**
      * Prepare arguments for JavaScript injection
      *
-     * @param array $arguments
      * @return array
      */
     protected function prepareScriptArguments(array $arguments)
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index bf8ceeff0..fa09ddc64 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -40,7 +40,6 @@ class RemoteWebElement implements WebDriverElement, WebDriverLocatable
     protected $isW3cCompliant;
 
     /**
-     * @param RemoteExecuteMethod $executor
      * @param string $id
      * @param bool $isW3cCompliant
      */
@@ -96,7 +95,6 @@ public function click()
      * search the entire document from the root, not just the children (relative context) of this current node.
      * Use ".//" to limit your search to the children of this element.
      *
-     * @param WebDriverBy $by
      * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
@@ -120,7 +118,6 @@ public function findElement(WebDriverBy $by)
      * search the entire document from the root, not just the children (relative context) of this current node.
      * Use ".//" to limit your search to the children of this element.
      *
-     * @param WebDriverBy $by
      * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
      *    array if nothing matches
      * @see WebDriverBy
@@ -441,7 +438,6 @@ public function sendKeys($value)
      *
      *   eg. `$element->setFileDetector(new LocalFileDetector);`
      *
-     * @param FileDetector $detector
      * @return RemoteWebElement
      * @see FileDetector
      * @see LocalFileDetector
@@ -517,7 +513,6 @@ public function takeElementScreenshot($save_as = null)
     /**
      * Test if two elements IDs refer to the same DOM element.
      *
-     * @param WebDriverElement $other
      * @return bool
      */
     public function equals(WebDriverElement $other)
diff --git a/lib/Remote/Service/DriverCommandExecutor.php b/lib/Remote/Service/DriverCommandExecutor.php
index 3aadfea58..5e3ef8399 100644
--- a/lib/Remote/Service/DriverCommandExecutor.php
+++ b/lib/Remote/Service/DriverCommandExecutor.php
@@ -26,8 +26,6 @@ public function __construct(DriverService $service)
     }
 
     /**
-     * @param WebDriverCommand $command
-     *
      * @throws \Exception
      * @throws WebDriverException
      * @return WebDriverResponse
diff --git a/lib/Remote/ShadowRoot.php b/lib/Remote/ShadowRoot.php
index 63ac2f8e4..1baed693a 100644
--- a/lib/Remote/ShadowRoot.php
+++ b/lib/Remote/ShadowRoot.php
@@ -33,8 +33,6 @@ public function __construct(RemoteExecuteMethod $executor, $id)
     }
 
     /**
-     * @param RemoteExecuteMethod $executor
-     * @param array $response
      * @return self
      */
     public static function createFromResponse(RemoteExecuteMethod $executor, array $response)
@@ -47,7 +45,6 @@ public static function createFromResponse(RemoteExecuteMethod $executor, array $
     }
 
     /**
-     * @param WebDriverBy $locator
      * @return RemoteWebElement
      */
     public function findElement(WebDriverBy $locator)
@@ -64,7 +61,6 @@ public function findElement(WebDriverBy $locator)
     }
 
     /**
-     * @param WebDriverBy $locator
      * @return WebDriverElement[]
      */
     public function findElements(WebDriverBy $locator)
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index a4a74e346..2d4d68dd5 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -26,10 +26,6 @@ class EventFiringWebDriver implements WebDriver, JavaScriptExecutor
      */
     protected $dispatcher;
 
-    /**
-     * @param WebDriver $driver
-     * @param WebDriverDispatcher $dispatcher
-     */
     public function __construct(WebDriver $driver, WebDriverDispatcher $dispatcher = null)
     {
         $this->dispatcher = $dispatcher ?: new WebDriverDispatcher();
@@ -76,7 +72,6 @@ public function get($url)
     }
 
     /**
-     * @param WebDriverBy $by
      * @throws WebDriverException
      * @return array
      */
@@ -100,7 +95,6 @@ public function findElements(WebDriverBy $by)
     }
 
     /**
-     * @param WebDriverBy $by
      * @throws WebDriverException
      * @return EventFiringWebElement
      */
@@ -122,7 +116,6 @@ public function findElement(WebDriverBy $by)
 
     /**
      * @param string $script
-     * @param array $arguments
      * @throws WebDriverException
      * @return mixed
      */
@@ -150,7 +143,6 @@ public function executeScript($script, array $arguments = [])
 
     /**
      * @param string $script
-     * @param array $arguments
      * @throws WebDriverException
      * @return mixed
      */
@@ -375,7 +367,6 @@ public function execute($name, $params)
     }
 
     /**
-     * @param WebDriverElement $element
      * @return EventFiringWebElement
      */
     protected function newElement(WebDriverElement $element)
@@ -396,9 +387,6 @@ protected function dispatch($method, ...$arguments)
         $this->dispatcher->dispatch($method, $arguments);
     }
 
-    /**
-     * @param WebDriverException $exception
-     */
     protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception, $this);
diff --git a/lib/Support/Events/EventFiringWebDriverNavigation.php b/lib/Support/Events/EventFiringWebDriverNavigation.php
index 5070076d8..27ea34205 100644
--- a/lib/Support/Events/EventFiringWebDriverNavigation.php
+++ b/lib/Support/Events/EventFiringWebDriverNavigation.php
@@ -17,10 +17,6 @@ class EventFiringWebDriverNavigation implements WebDriverNavigationInterface
      */
     protected $dispatcher;
 
-    /**
-     * @param WebDriverNavigationInterface $navigator
-     * @param WebDriverDispatcher $dispatcher
-     */
     public function __construct(WebDriverNavigationInterface $navigator, WebDriverDispatcher $dispatcher)
     {
         $this->navigator = $navigator;
@@ -132,9 +128,6 @@ protected function dispatch($method, ...$arguments)
         $this->dispatcher->dispatch($method, $arguments);
     }
 
-    /**
-     * @param WebDriverException $exception
-     */
     protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch('onException', $exception);
diff --git a/lib/Support/Events/EventFiringWebElement.php b/lib/Support/Events/EventFiringWebElement.php
index fa18b1a93..6caa08684 100644
--- a/lib/Support/Events/EventFiringWebElement.php
+++ b/lib/Support/Events/EventFiringWebElement.php
@@ -22,10 +22,6 @@ class EventFiringWebElement implements WebDriverElement, WebDriverLocatable
      */
     protected $dispatcher;
 
-    /**
-     * @param WebDriverElement $element
-     * @param WebDriverDispatcher $dispatcher
-     */
     public function __construct(WebDriverElement $element, WebDriverDispatcher $dispatcher)
     {
         $this->element = $element;
@@ -88,7 +84,6 @@ public function click()
     }
 
     /**
-     * @param WebDriverBy $by
      * @throws WebDriverException
      * @return EventFiringWebElement
      */
@@ -119,7 +114,6 @@ public function findElement(WebDriverBy $by)
     }
 
     /**
-     * @param WebDriverBy $by
      * @throws WebDriverException
      * @return array
      */
@@ -355,7 +349,6 @@ public function getID()
     /**
      * Test if two element IDs refer to the same DOM element.
      *
-     * @param WebDriverElement $other
      * @return bool
      */
     public function equals(WebDriverElement $other)
@@ -388,9 +381,6 @@ public function getShadowRoot()
         }
     }
 
-    /**
-     * @param WebDriverException $exception
-     */
     protected function dispatchOnException(WebDriverException $exception)
     {
         $this->dispatch(
@@ -414,7 +404,6 @@ protected function dispatch($method, ...$arguments)
     }
 
     /**
-     * @param WebDriverElement $element
      * @return static
      */
     protected function newElement(WebDriverElement $element)
diff --git a/lib/WebDriverCommandExecutor.php b/lib/WebDriverCommandExecutor.php
index 4031c235d..7f6bb3ece 100644
--- a/lib/WebDriverCommandExecutor.php
+++ b/lib/WebDriverCommandExecutor.php
@@ -11,8 +11,6 @@
 interface WebDriverCommandExecutor
 {
     /**
-     * @param WebDriverCommand $command
-     *
      * @return WebDriverResponse
      */
     public function execute(WebDriverCommand $command);
diff --git a/lib/WebDriverDispatcher.php b/lib/WebDriverDispatcher.php
index 851214719..fe1ecb0f4 100644
--- a/lib/WebDriverDispatcher.php
+++ b/lib/WebDriverDispatcher.php
@@ -19,7 +19,6 @@ class WebDriverDispatcher
      * this is needed so that EventFiringWebElement can pass the driver to the
      * exception handling
      *
-     * @param EventFiringWebDriver $driver
      * @return $this
      */
     public function setDefaultDriver(EventFiringWebDriver $driver)
@@ -38,7 +37,6 @@ public function getDefaultDriver()
     }
 
     /**
-     * @param WebDriverEventListener $listener
      * @return $this
      */
     public function register(WebDriverEventListener $listener)
@@ -49,7 +47,6 @@ public function register(WebDriverEventListener $listener)
     }
 
     /**
-     * @param WebDriverEventListener $listener
      * @return $this
      */
     public function unregister(WebDriverEventListener $listener)
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index 673d85bee..f4f03de23 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -10,85 +10,43 @@ interface WebDriverEventListener
 {
     /**
      * @param string $url
-     * @param EventFiringWebDriver $driver
      */
     public function beforeNavigateTo($url, EventFiringWebDriver $driver);
 
     /**
      * @param string $url
-     * @param EventFiringWebDriver $driver
      */
     public function afterNavigateTo($url, EventFiringWebDriver $driver);
 
-    /**
-     * @param EventFiringWebDriver $driver
-     */
     public function beforeNavigateBack(EventFiringWebDriver $driver);
 
-    /**
-     * @param EventFiringWebDriver $driver
-     */
     public function afterNavigateBack(EventFiringWebDriver $driver);
 
-    /**
-     * @param EventFiringWebDriver $driver
-     */
     public function beforeNavigateForward(EventFiringWebDriver $driver);
 
-    /**
-     * @param EventFiringWebDriver $driver
-     */
     public function afterNavigateForward(EventFiringWebDriver $driver);
 
-    /**
-     * @param WebDriverBy $by
-     * @param EventFiringWebElement|null $element
-     * @param EventFiringWebDriver $driver
-     */
     public function beforeFindBy(WebDriverBy $by, $element, EventFiringWebDriver $driver);
 
-    /**
-     * @param WebDriverBy $by
-     * @param EventFiringWebElement|null $element
-     * @param EventFiringWebDriver $driver
-     */
     public function afterFindBy(WebDriverBy $by, $element, EventFiringWebDriver $driver);
 
     /**
      * @param string $script
-     * @param EventFiringWebDriver $driver
      */
     public function beforeScript($script, EventFiringWebDriver $driver);
 
     /**
      * @param string $script
-     * @param EventFiringWebDriver $driver
      */
     public function afterScript($script, EventFiringWebDriver $driver);
 
-    /**
-     * @param EventFiringWebElement $element
-     */
     public function beforeClickOn(EventFiringWebElement $element);
 
-    /**
-     * @param EventFiringWebElement $element
-     */
     public function afterClickOn(EventFiringWebElement $element);
 
-    /**
-     * @param EventFiringWebElement $element
-     */
     public function beforeChangeValueOf(EventFiringWebElement $element);
 
-    /**
-     * @param EventFiringWebElement $element
-     */
     public function afterChangeValueOf(EventFiringWebElement $element);
 
-    /**
-     * @param WebDriverException $exception
-     * @param EventFiringWebDriver $driver
-     */
     public function onException(WebDriverException $exception, EventFiringWebDriver $driver = null);
 }
diff --git a/lib/WebDriverMouse.php b/lib/WebDriverMouse.php
index 5178a314b..7c9362329 100644
--- a/lib/WebDriverMouse.php
+++ b/lib/WebDriverMouse.php
@@ -10,31 +10,26 @@
 interface WebDriverMouse
 {
     /**
-     * @param WebDriverCoordinates $where
      * @return WebDriverMouse
      */
     public function click(WebDriverCoordinates $where);
 
     /**
-     * @param WebDriverCoordinates $where
      * @return WebDriverMouse
      */
     public function contextClick(WebDriverCoordinates $where);
 
     /**
-     * @param WebDriverCoordinates $where
      * @return WebDriverMouse
      */
     public function doubleClick(WebDriverCoordinates $where);
 
     /**
-     * @param WebDriverCoordinates $where
      * @return WebDriverMouse
      */
     public function mouseDown(WebDriverCoordinates $where);
 
     /**
-     * @param WebDriverCoordinates $where
      * @param int $x_offset
      * @param int $y_offset
      * @return WebDriverMouse
@@ -46,7 +41,6 @@ public function mouseMove(
     );
 
     /**
-     * @param WebDriverCoordinates $where
      * @return WebDriverMouse
      */
     public function mouseUp(WebDriverCoordinates $where);
diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 82a5bde8d..09430e674 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -10,7 +10,6 @@ interface WebDriverSearchContext
     /**
      * Find the first WebDriverElement within this element using the given mechanism.
      *
-     * @param WebDriverBy $locator
      * @return WebDriverElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
@@ -19,7 +18,6 @@ public function findElement(WebDriverBy $locator);
     /**
      * Find all WebDriverElements within this element using the given mechanism.
      *
-     * @param WebDriverBy $locator
      * @return WebDriverElement[] A list of all WebDriverElements, or an empty array if nothing matches
      * @see WebDriverBy
      */
diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 53d894b96..3e6e73524 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -223,7 +223,6 @@ public function deselectByVisiblePartialText($text)
 
     /**
      * Mark option selected
-     * @param WebDriverElement $option
      */
     protected function selectOption(WebDriverElement $option)
     {
@@ -234,7 +233,6 @@ protected function selectOption(WebDriverElement $option)
 
     /**
      * Mark option not selected
-     * @param WebDriverElement $option
      */
     protected function deselectOption(WebDriverElement $option)
     {
diff --git a/lib/WebDriverUpAction.php b/lib/WebDriverUpAction.php
index 62d275dea..3b045df4b 100644
--- a/lib/WebDriverUpAction.php
+++ b/lib/WebDriverUpAction.php
@@ -11,7 +11,6 @@ class WebDriverUpAction extends WebDriverTouchAction implements WebDriverAction
     private $y;
 
     /**
-     * @param WebDriverTouchScreen $touch_screen
      * @param int $x
      * @param int $y
      */
diff --git a/lib/WebDriverWindow.php b/lib/WebDriverWindow.php
index 9d2a6e752..2a69fe240 100644
--- a/lib/WebDriverWindow.php
+++ b/lib/WebDriverWindow.php
@@ -121,7 +121,6 @@ public function fullscreen()
      * Set the size of the current window. This will change the outer window
      * dimension, not just the view port.
      *
-     * @param WebDriverDimension $size
      * @return WebDriverWindow The instance.
      */
     public function setSize(WebDriverDimension $size)
@@ -140,7 +139,6 @@ public function setSize(WebDriverDimension $size)
      * Set the position of the current window. This is relative to the upper left
      * corner of the screen.
      *
-     * @param WebDriverPoint $position
      * @return WebDriverWindow The instance.
      */
     public function setPosition(WebDriverPoint $position)

From 3ea4f924afb43056bf9c630509e657d951608563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 9 Feb 2023 13:12:19 +0100
Subject: [PATCH 732/784] Release version 1.14.0

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf6b7aece..777d8a961 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+
+## 1.14.0 - 2023-02-09
 ### Added
 - `PhpWebDriverExceptionInterface` as a common interface to identify all exceptions thrown in php-webdriver
 

From 56712cad43ea34b503940478b6fb00b4a035a673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 9 Feb 2023 13:07:36 +0100
Subject: [PATCH 733/784] Test: Use strict types in tests

---
 .php-cs-fixer.dist.php                            |  9 +++++----
 tests/bootstrap.php                               |  2 +-
 .../Chrome/ChromeDevToolsDriverTest.php           |  2 +-
 .../functional/Chrome/ChromeDriverServiceTest.php |  2 +-
 tests/functional/Chrome/ChromeDriverTest.php      |  2 +-
 tests/functional/FileUploadTest.php               |  2 +-
 .../Firefox/FirefoxDriverServiceTest.php          |  2 +-
 tests/functional/Firefox/FirefoxDriverTest.php    |  2 +-
 tests/functional/Firefox/FirefoxProfileTest.php   | 15 +--------------
 tests/functional/RemoteKeyboardTest.php           |  2 +-
 tests/functional/RemoteTargetLocatorTest.php      |  2 +-
 tests/functional/RemoteWebDriverCreateTest.php    |  2 +-
 .../functional/RemoteWebDriverFindElementTest.php |  2 +-
 tests/functional/RemoteWebDriverTest.php          |  2 +-
 tests/functional/RemoteWebElementTest.php         |  2 +-
 .../functional/ReportSauceLabsStatusListener.php  |  2 +-
 tests/functional/RetrieveEventsTrait.php          |  2 +-
 tests/functional/ShadowDomTest.php                |  2 +-
 tests/functional/TestPage.php                     |  2 +-
 tests/functional/WebDriverActionsTest.php         |  2 +-
 tests/functional/WebDriverAlertTest.php           |  2 +-
 tests/functional/WebDriverByTest.php              |  2 +-
 tests/functional/WebDriverCheckboxesTest.php      |  2 +-
 tests/functional/WebDriverNavigationTest.php      |  2 +-
 tests/functional/WebDriverOptionsCookiesTest.php  |  2 +-
 tests/functional/WebDriverRadiosTest.php          |  2 +-
 tests/functional/WebDriverSelectTest.php          |  2 +-
 tests/functional/WebDriverTestCase.php            |  4 ++--
 tests/functional/WebDriverTimeoutsTest.php        |  2 +-
 tests/functional/WebDriverWindowTest.php          |  2 +-
 tests/functional/web/slow_pixel.png.php           |  2 +-
 tests/functional/web/submit.php                   |  2 +-
 tests/functional/web/upload.php                   |  2 +-
 tests/unit/CookieTest.php                         |  2 +-
 .../Internal/DriverServerDiedExceptionTest.php    |  2 +-
 tests/unit/Exception/WebDriverExceptionTest.php   |  2 +-
 tests/unit/Firefox/FirefoxOptionsTest.php         |  2 +-
 .../Internal/WebDriverButtonReleaseActionTest.php |  2 +-
 .../Internal/WebDriverClickActionTest.php         |  2 +-
 .../Internal/WebDriverClickAndHoldActionTest.php  |  2 +-
 .../Internal/WebDriverContextClickActionTest.php  |  2 +-
 .../Internal/WebDriverCoordinatesTest.php         |  2 +-
 .../Internal/WebDriverDoubleClickActionTest.php   |  2 +-
 .../Internal/WebDriverKeyDownActionTest.php       |  2 +-
 .../Internal/WebDriverKeyUpActionTest.php         |  2 +-
 .../Internal/WebDriverMouseMoveActionTest.php     |  2 +-
 .../Internal/WebDriverMouseToOffsetActionTest.php |  2 +-
 .../Internal/WebDriverSendKeysActionTest.php      |  2 +-
 .../Internal/WebDriverSingleKeyActionTest.php     |  2 +-
 tests/unit/Remote/CustomWebDriverCommandTest.php  |  2 +-
 tests/unit/Remote/DesiredCapabilitiesTest.php     |  2 +-
 tests/unit/Remote/HttpCommandExecutorTest.php     |  2 +-
 tests/unit/Remote/LocalFileDetectorTest.php       |  2 +-
 tests/unit/Remote/RemoteWebDriverTest.php         |  2 +-
 tests/unit/Remote/RemoteWebElementTest.php        |  2 +-
 tests/unit/Remote/WebDriverCommandTest.php        |  2 +-
 tests/unit/Support/ScreenshotHelperTest.php       |  2 +-
 tests/unit/Support/XPathEscaperTest.php           |  2 +-
 tests/unit/WebDriverExpectedConditionTest.php     |  2 +-
 tests/unit/WebDriverKeysTest.php                  |  2 +-
 tests/unit/WebDriverOptionsTest.php               |  2 +-
 61 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index fe4763287..440b532b8 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -18,6 +18,7 @@
         'compact_nullable_typehint' => true,
         'concat_space' => ['spacing' => 'one'],
         'declare_equal_normalize' => true,
+        //'declare_strict_types' => true, // TODO: used only in tests, use in lib in next major version
         'fopen_flag_order' => true,
         'fopen_flags' => true,
         'full_opening_tag' => true,
@@ -101,11 +102,11 @@
         'phpdoc_scalar' => true,
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_trim' => true,
-        //'phpdoc_to_param_type' => true,
-        //'phpdoc_to_return_type' => true,
+        //'phpdoc_to_param_type' => true, // TODO: used only in tests, use in lib in next major version
+        //'phpdoc_to_return_type' => true, // TODO: used only in tests, use in lib in next major version
         'phpdoc_types' => true,
         'phpdoc_var_annotation_correct_order' => true,
-        //'pow_to_exponentiation' => true,
+        'pow_to_exponentiation' => true,
         'psr_autoloading' => true,
         'random_api_migration' => true,
         'self_accessor' => true,
@@ -126,7 +127,7 @@
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => ['elements' => ['method', 'property', 'const']],
-        //'void_return' => true,
+        //'void_return' => true, // TODO: used only in tests, use in lib in next major version
         'whitespace_after_comma_in_array' => true,
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
     ])
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6c8c4f51b..d9cb0c2c7 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,3 +1,3 @@
-<?php
+<?php declare(strict_types=1);
 
 require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/tests/functional/Chrome/ChromeDevToolsDriverTest.php b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
index 28e01965c..16298e04a 100644
--- a/tests/functional/Chrome/ChromeDevToolsDriverTest.php
+++ b/tests/functional/Chrome/ChromeDevToolsDriverTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Chrome;
 
diff --git a/tests/functional/Chrome/ChromeDriverServiceTest.php b/tests/functional/Chrome/ChromeDriverServiceTest.php
index 33526c451..9b6c46336 100644
--- a/tests/functional/Chrome/ChromeDriverServiceTest.php
+++ b/tests/functional/Chrome/ChromeDriverServiceTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Chrome;
 
diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index b3e8bea8b..8bb945061 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Chrome;
 
diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index c1d60603c..9557b0c8a 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/Firefox/FirefoxDriverServiceTest.php b/tests/functional/Firefox/FirefoxDriverServiceTest.php
index d9e60a26e..feabe0dbf 100644
--- a/tests/functional/Firefox/FirefoxDriverServiceTest.php
+++ b/tests/functional/Firefox/FirefoxDriverServiceTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Firefox;
 
diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
index 42ee45f69..c4e4f8c74 100644
--- a/tests/functional/Firefox/FirefoxDriverTest.php
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Firefox;
 
diff --git a/tests/functional/Firefox/FirefoxProfileTest.php b/tests/functional/Firefox/FirefoxProfileTest.php
index 982ebfbcc..a8ff2c62d 100644
--- a/tests/functional/Firefox/FirefoxProfileTest.php
+++ b/tests/functional/Firefox/FirefoxProfileTest.php
@@ -1,17 +1,4 @@
-<?php
-// Copyright 2004-present Facebook. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// 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.
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Firefox;
 
diff --git a/tests/functional/RemoteKeyboardTest.php b/tests/functional/RemoteKeyboardTest.php
index 09a6430f1..897d33cf7 100644
--- a/tests/functional/RemoteKeyboardTest.php
+++ b/tests/functional/RemoteKeyboardTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RemoteTargetLocatorTest.php b/tests/functional/RemoteTargetLocatorTest.php
index 8aa965181..a3080e67a 100644
--- a/tests/functional/RemoteTargetLocatorTest.php
+++ b/tests/functional/RemoteTargetLocatorTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index d55e1f681..d93fc49db 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverFindElementTest.php b/tests/functional/RemoteWebDriverFindElementTest.php
index 699442d7c..f638aa527 100644
--- a/tests/functional/RemoteWebDriverFindElementTest.php
+++ b/tests/functional/RemoteWebDriverFindElementTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RemoteWebDriverTest.php b/tests/functional/RemoteWebDriverTest.php
index 213dce0c5..95a01b9b7 100644
--- a/tests/functional/RemoteWebDriverTest.php
+++ b/tests/functional/RemoteWebDriverTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 0baff69f1..7c51e09ce 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/ReportSauceLabsStatusListener.php b/tests/functional/ReportSauceLabsStatusListener.php
index 98becc436..1a9077807 100644
--- a/tests/functional/ReportSauceLabsStatusListener.php
+++ b/tests/functional/ReportSauceLabsStatusListener.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/RetrieveEventsTrait.php b/tests/functional/RetrieveEventsTrait.php
index 68bb3dc8b..addaf1c47 100644
--- a/tests/functional/RetrieveEventsTrait.php
+++ b/tests/functional/RetrieveEventsTrait.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/ShadowDomTest.php b/tests/functional/ShadowDomTest.php
index ed442874e..f98359883 100644
--- a/tests/functional/ShadowDomTest.php
+++ b/tests/functional/ShadowDomTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/TestPage.php b/tests/functional/TestPage.php
index bf039c2e2..92629ed54 100644
--- a/tests/functional/TestPage.php
+++ b/tests/functional/TestPage.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverActionsTest.php b/tests/functional/WebDriverActionsTest.php
index aa07f721c..23d59599f 100644
--- a/tests/functional/WebDriverActionsTest.php
+++ b/tests/functional/WebDriverActionsTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverAlertTest.php b/tests/functional/WebDriverAlertTest.php
index 34c4255b5..0d2e92a44 100644
--- a/tests/functional/WebDriverAlertTest.php
+++ b/tests/functional/WebDriverAlertTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index c50a1c36e..cd1239458 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverCheckboxesTest.php b/tests/functional/WebDriverCheckboxesTest.php
index df4b4238b..64372a4c8 100644
--- a/tests/functional/WebDriverCheckboxesTest.php
+++ b/tests/functional/WebDriverCheckboxesTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverNavigationTest.php b/tests/functional/WebDriverNavigationTest.php
index 1a36244bd..400ef86f0 100644
--- a/tests/functional/WebDriverNavigationTest.php
+++ b/tests/functional/WebDriverNavigationTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverOptionsCookiesTest.php b/tests/functional/WebDriverOptionsCookiesTest.php
index ec83e65ab..a71ebafc0 100644
--- a/tests/functional/WebDriverOptionsCookiesTest.php
+++ b/tests/functional/WebDriverOptionsCookiesTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverRadiosTest.php b/tests/functional/WebDriverRadiosTest.php
index 0370e8174..f35d37a7c 100644
--- a/tests/functional/WebDriverRadiosTest.php
+++ b/tests/functional/WebDriverRadiosTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 7c8e64bb5..3f6ebea85 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 16ab4decd..0d0d29b19 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
@@ -89,7 +89,7 @@ protected function tearDown(): void
 
             if (getenv('BROWSER_NAME') === 'safari') {
                 // The Safari instance is already paired with another WebDriver session
-                usleep(2e5); // 200ms
+                usleep(200000); // 200ms
             }
         }
     }
diff --git a/tests/functional/WebDriverTimeoutsTest.php b/tests/functional/WebDriverTimeoutsTest.php
index 950cc5cd3..52534ae37 100644
--- a/tests/functional/WebDriverTimeoutsTest.php
+++ b/tests/functional/WebDriverTimeoutsTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 10ce1eb44..93c441748 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/functional/web/slow_pixel.png.php b/tests/functional/web/slow_pixel.png.php
index a834089ad..06885539a 100644
--- a/tests/functional/web/slow_pixel.png.php
+++ b/tests/functional/web/slow_pixel.png.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 sleep(5);
 
diff --git a/tests/functional/web/submit.php b/tests/functional/web/submit.php
index c53321f1f..9d1942cee 100644
--- a/tests/functional/web/submit.php
+++ b/tests/functional/web/submit.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/functional/web/upload.php b/tests/functional/web/upload.php
index 71143d46c..92b52b57a 100644
--- a/tests/functional/web/upload.php
+++ b/tests/functional/web/upload.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 ?><!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/tests/unit/CookieTest.php b/tests/unit/CookieTest.php
index 02de76772..444569499 100644
--- a/tests/unit/CookieTest.php
+++ b/tests/unit/CookieTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
index ba97b2bfa..2e2fc5617 100644
--- a/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
+++ b/tests/unit/Exception/Internal/DriverServerDiedExceptionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Exception\Internal;
 
diff --git a/tests/unit/Exception/WebDriverExceptionTest.php b/tests/unit/Exception/WebDriverExceptionTest.php
index ba0d6049d..c770533d2 100644
--- a/tests/unit/Exception/WebDriverExceptionTest.php
+++ b/tests/unit/Exception/WebDriverExceptionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Exception;
 
diff --git a/tests/unit/Firefox/FirefoxOptionsTest.php b/tests/unit/Firefox/FirefoxOptionsTest.php
index a9880ff6e..c8ac09f02 100644
--- a/tests/unit/Firefox/FirefoxOptionsTest.php
+++ b/tests/unit/Firefox/FirefoxOptionsTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Firefox;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
index a8b409a6b..f14bad0c2 100644
--- a/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverButtonReleaseActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
index 9f1e48f65..de12aab26 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
index a62820d30..da5a18dee 100644
--- a/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverClickAndHoldActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
index e2f75cbed..f3e66f6ee 100644
--- a/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverContextClickActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
index 4e62e8c63..f8faee8d8 100644
--- a/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverCoordinatesTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
index 4447ec003..d4ae699f1 100644
--- a/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverDoubleClickActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
index 2146e2fa7..0fd8aa9dd 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyDownActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
index 67fdf2bd3..f10d53b09 100644
--- a/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverKeyUpActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
index 5803c9c10..f23594852 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseMoveActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
index 995c2219f..966b88325 100644
--- a/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverMouseToOffsetActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
index a4db9c98d..b610d083f 100644
--- a/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSendKeysActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
index cca19d3f9..9a3e61160 100644
--- a/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
+++ b/tests/unit/Interactions/Internal/WebDriverSingleKeyActionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Interactions\Internal;
 
diff --git a/tests/unit/Remote/CustomWebDriverCommandTest.php b/tests/unit/Remote/CustomWebDriverCommandTest.php
index f199f13f4..8e829c615 100644
--- a/tests/unit/Remote/CustomWebDriverCommandTest.php
+++ b/tests/unit/Remote/CustomWebDriverCommandTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index 357b326dd..f5e8f17bb 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/HttpCommandExecutorTest.php b/tests/unit/Remote/HttpCommandExecutorTest.php
index b2576eada..b29d788b1 100644
--- a/tests/unit/Remote/HttpCommandExecutorTest.php
+++ b/tests/unit/Remote/HttpCommandExecutorTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/LocalFileDetectorTest.php b/tests/unit/Remote/LocalFileDetectorTest.php
index bb1e3636f..dc6112636 100644
--- a/tests/unit/Remote/LocalFileDetectorTest.php
+++ b/tests/unit/Remote/LocalFileDetectorTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index 9df4127c5..cbb4fc30d 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/RemoteWebElementTest.php b/tests/unit/Remote/RemoteWebElementTest.php
index 8da35a64c..a7ec76d8a 100644
--- a/tests/unit/Remote/RemoteWebElementTest.php
+++ b/tests/unit/Remote/RemoteWebElementTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Remote/WebDriverCommandTest.php b/tests/unit/Remote/WebDriverCommandTest.php
index 7df4b9026..182b72d94 100644
--- a/tests/unit/Remote/WebDriverCommandTest.php
+++ b/tests/unit/Remote/WebDriverCommandTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Remote;
 
diff --git a/tests/unit/Support/ScreenshotHelperTest.php b/tests/unit/Support/ScreenshotHelperTest.php
index 7266c86b6..5f7ff0ca6 100644
--- a/tests/unit/Support/ScreenshotHelperTest.php
+++ b/tests/unit/Support/ScreenshotHelperTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Support;
 
diff --git a/tests/unit/Support/XPathEscaperTest.php b/tests/unit/Support/XPathEscaperTest.php
index 5313bc408..9804d93e1 100644
--- a/tests/unit/Support/XPathEscaperTest.php
+++ b/tests/unit/Support/XPathEscaperTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver\Support;
 
diff --git a/tests/unit/WebDriverExpectedConditionTest.php b/tests/unit/WebDriverExpectedConditionTest.php
index 9e95df346..4ac75336b 100644
--- a/tests/unit/WebDriverExpectedConditionTest.php
+++ b/tests/unit/WebDriverExpectedConditionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/unit/WebDriverKeysTest.php b/tests/unit/WebDriverKeysTest.php
index f3c59042c..cfa07308f 100644
--- a/tests/unit/WebDriverKeysTest.php
+++ b/tests/unit/WebDriverKeysTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 
diff --git a/tests/unit/WebDriverOptionsTest.php b/tests/unit/WebDriverOptionsTest.php
index 31d2bfef0..4f51d12b6 100644
--- a/tests/unit/WebDriverOptionsTest.php
+++ b/tests/unit/WebDriverOptionsTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Facebook\WebDriver;
 

From 020407c72bda97189b86fd0b8fe5d3666c76b5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 11 Feb 2023 18:01:57 +0100
Subject: [PATCH 734/784] Refactor: Remove no longer needed compatibility layer
 with old Symfony

---
 lib/Remote/Service/DriverService.php | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/lib/Remote/Service/DriverService.php b/lib/Remote/Service/DriverService.php
index bb863bc82..028b8cd83 100644
--- a/lib/Remote/Service/DriverService.php
+++ b/lib/Remote/Service/DriverService.php
@@ -6,7 +6,6 @@
 use Facebook\WebDriver\Exception\Internal\RuntimeException;
 use Facebook\WebDriver\Net\URLChecker;
 use Symfony\Component\Process\Process;
-use Symfony\Component\Process\ProcessBuilder;
 
 /**
  * Start local WebDriver service (when remote WebDriver server is not used).
@@ -153,23 +152,8 @@ protected function checkWasStarted($process)
         }
     }
 
-    /**
-     * @return Process
-     */
-    private function createProcess()
+    private function createProcess(): Process
     {
-        // BC: ProcessBuilder deprecated since Symfony 3.4 and removed in Symfony 4.0.
-        if (class_exists(ProcessBuilder::class)
-            && mb_strpos('@deprecated', (new \ReflectionClass(ProcessBuilder::class))->getDocComment()) === false
-        ) {
-            $processBuilder = (new ProcessBuilder())
-                ->setPrefix($this->executable)
-                ->setArguments($this->args)
-                ->addEnvironmentVariables($this->environment);
-
-            return $processBuilder->getProcess();
-        }
-        // Safe to use since Symfony 3.3
         $commandLine = array_merge([$this->executable], $this->args);
 
         return new Process($commandLine, null, $this->environment);
@@ -177,11 +161,8 @@ private function createProcess()
 
     /**
      * Check whether given file is executable directly or using system PATH
-     *
-     * @param string $filename
-     * @return bool
      */
-    private function isExecutable($filename)
+    private function isExecutable(string $filename): bool
     {
         if (is_executable($filename)) {
             return true;

From 235c2aa07f9e2686f2b876083fc081b00d330d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 18 Apr 2023 15:41:45 +0200
Subject: [PATCH 735/784] Replace ChromeOptions::CAPABILITY with already used
 `goog:chromeOptions` (as CAPABILITY_W3C); no longer merge there two
 capabilities (fixes #1061)

---
 CHANGELOG.md                                  |  3 +++
 lib/Chrome/ChromeOptions.php                  |  9 ++++-----
 lib/Remote/DesiredCapabilities.php            | 12 +-----------
 tests/unit/Remote/DesiredCapabilitiesTest.php | 17 -----------------
 4 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 777d8a961..819493d4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
+### Changed
+- Capability key `ChromeOptions::CAPABILITY_W3C` used to set ChromeOptions is now deprecated in favor of `ChromeOptions::CAPABILITY`, which now also contains the W3C compatible value (`goog:chromeOptions`).
+- ChromeOptions are now passed to the driver always as a W3C compatible key `goog:chromeOptions`, even in the deprecated OSS JsonWire payload (as ChromeDriver [supports](https://bugs.chromium.org/p/chromedriver/issues/detail?id=1786) this since 2017).
 
 ## 1.14.0 - 2023-02-09
 ### Added
diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 1b094a048..2e2f6d2c2 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -14,14 +14,13 @@
 class ChromeOptions implements JsonSerializable
 {
     /**
-     * The key of chromeOptions in desired capabilities (in legacy OSS JsonWire protocol)
-     * @todo Replace value with 'goog:chromeOptions' after JsonWire protocol support is removed
+     * The key of chromeOptions in desired capabilities
      */
-    public const CAPABILITY = 'chromeOptions';
+    public const CAPABILITY = 'goog:chromeOptions';
     /**
-     * The key of chromeOptions in desired capabilities (in W3C compatible protocol)
+     * @deprecated Use CAPABILITY instead
      */
-    public const CAPABILITY_W3C = 'goog:chromeOptions';
+    public const CAPABILITY_W3C = self::CAPABILITY;
     /**
      * @var array
      */
diff --git a/lib/Remote/DesiredCapabilities.php b/lib/Remote/DesiredCapabilities.php
index c016a7f4f..88aa6b141 100644
--- a/lib/Remote/DesiredCapabilities.php
+++ b/lib/Remote/DesiredCapabilities.php
@@ -20,7 +20,6 @@ class DesiredCapabilities implements WebDriverCapabilities
         WebDriverCapabilityType::PLATFORM => 'platformName',
         WebDriverCapabilityType::VERSION => 'browserVersion',
         WebDriverCapabilityType::ACCEPT_SSL_CERTS => 'acceptInsecureCerts',
-        ChromeOptions::CAPABILITY => ChromeOptions::CAPABILITY_W3C,
     ];
 
     public function __construct(array $capabilities = [])
@@ -250,16 +249,7 @@ public function toW3cCompatibleArray()
 
         // Convert ChromeOptions
         if (array_key_exists(ChromeOptions::CAPABILITY, $ossCapabilities)) {
-            if (array_key_exists(ChromeOptions::CAPABILITY_W3C, $ossCapabilities)) {
-                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = new \ArrayObject(
-                    array_merge_recursive(
-                        (array) $ossCapabilities[ChromeOptions::CAPABILITY],
-                        (array) $ossCapabilities[ChromeOptions::CAPABILITY_W3C]
-                    )
-                );
-            } else {
-                $w3cCapabilities[ChromeOptions::CAPABILITY_W3C] = $ossCapabilities[ChromeOptions::CAPABILITY];
-            }
+            $w3cCapabilities[ChromeOptions::CAPABILITY] = $ossCapabilities[ChromeOptions::CAPABILITY];
         }
 
         // Convert Firefox profile
diff --git a/tests/unit/Remote/DesiredCapabilitiesTest.php b/tests/unit/Remote/DesiredCapabilitiesTest.php
index f5e8f17bb..e57b2a4d3 100644
--- a/tests/unit/Remote/DesiredCapabilitiesTest.php
+++ b/tests/unit/Remote/DesiredCapabilitiesTest.php
@@ -280,23 +280,6 @@ public function provideW3cCapabilities(): array
                     ),
                 ],
             ],
-            'chromeOptions should be merged if already defined' => [
-                new DesiredCapabilities([
-                    ChromeOptions::CAPABILITY => $chromeOptions,
-                    ChromeOptions::CAPABILITY_W3C => [
-                        'debuggerAddress' => '127.0.0.1:38947',
-                        'args' => ['window-size=1024,768'],
-                    ],
-                ]),
-                [
-                    'goog:chromeOptions' => new \ArrayObject(
-                        [
-                            'args' => ['--headless', 'window-size=1024,768'],
-                            'debuggerAddress' => '127.0.0.1:38947',
-                        ]
-                    ),
-                ],
-            ],
             'firefox_profile should be converted' => [
                 new DesiredCapabilities([
                     FirefoxDriver::PROFILE => $firefoxProfileEncoded,

From f4698414c45e1e8f1f8525cdfcf98779a9ebfa0c Mon Sep 17 00:00:00 2001
From: Christian Sciberras <uuf6429@gmail.com>
Date: Sat, 10 Jun 2023 14:27:25 +0200
Subject: [PATCH 736/784] Document exception throwing in findElement

---
 lib/WebDriverSearchContext.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/WebDriverSearchContext.php b/lib/WebDriverSearchContext.php
index 09430e674..5fb1daaf9 100644
--- a/lib/WebDriverSearchContext.php
+++ b/lib/WebDriverSearchContext.php
@@ -2,6 +2,8 @@
 
 namespace Facebook\WebDriver;
 
+use Facebook\WebDriver\Exception\NoSuchElementException;
+
 /**
  * The interface for WebDriver and WebDriverElement which is able to search for WebDriverElement inside.
  */
@@ -10,7 +12,8 @@ interface WebDriverSearchContext
     /**
      * Find the first WebDriverElement within this element using the given mechanism.
      *
-     * @return WebDriverElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
+     * @throws NoSuchElementException If no element is found
+     * @return WebDriverElement
      * @see WebDriverBy
      */
     public function findElement(WebDriverBy $locator);

From 10c7153441b6fb5dab79d91823e2076b55601e4d Mon Sep 17 00:00:00 2001
From: Oleg Andreyev <oleg@andreyev.lv>
Date: Thu, 13 Jul 2023 01:53:51 +0300
Subject: [PATCH 737/784] Add Safari workaround for detecting multi-select
 element

---
 lib/WebDriverSelect.php                  |  9 ++++++++-
 tests/functional/WebDriverSelectTest.php | 16 ++++++++++++++--
 tests/functional/web/form.html           | 16 ++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/lib/WebDriverSelect.php b/lib/WebDriverSelect.php
index 3e6e73524..85e1d26e4 100644
--- a/lib/WebDriverSelect.php
+++ b/lib/WebDriverSelect.php
@@ -26,7 +26,14 @@ public function __construct(WebDriverElement $element)
         }
         $this->element = $element;
         $value = $element->getAttribute('multiple');
-        $this->isMulti = $value === 'true';
+
+        /**
+         * There is a bug in safari webdriver that returns 'multiple' instead of 'true' which does not match the spec.
+         * Apple Feedback #FB12760673
+         *
+         * @see https://www.w3.org/TR/webdriver2/#get-element-attribute
+         */
+        $this->isMulti = $value === 'true' || $value === 'multiple';
     }
 
     public function isMultiple()
diff --git a/tests/functional/WebDriverSelectTest.php b/tests/functional/WebDriverSelectTest.php
index 3f6ebea85..a5640b1be 100644
--- a/tests/functional/WebDriverSelectTest.php
+++ b/tests/functional/WebDriverSelectTest.php
@@ -20,10 +20,13 @@ protected function setUp(): void
         $this->driver->get($this->getTestPageUrl(TestPage::FORM));
     }
 
-    public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple(): void
+    /**
+     * @dataProvider multipleSelectDataProvider
+     */
+    public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultiple(string $selector): void
     {
         $originalElement = $this->driver->findElement(WebDriverBy::cssSelector('#select'));
-        $originalMultipleElement = $this->driver->findElement(WebDriverBy::cssSelector('#select-multiple'));
+        $originalMultipleElement = $this->driver->findElement(WebDriverBy::cssSelector($selector));
 
         $select = new WebDriverSelect($originalElement);
         $selectMultiple = new WebDriverSelect($originalMultipleElement);
@@ -35,6 +38,15 @@ public function testShouldCreateNewInstanceForSelectElementAndDetectIfItIsMultip
         $this->assertTrue($selectMultiple->isMultiple());
     }
 
+    public static function multipleSelectDataProvider(): array
+    {
+        return [
+            ['#select-multiple'],
+            ['#select-multiple-2'],
+            ['#select-multiple-3'],
+        ];
+    }
+
     public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement(): void
     {
         $notSelectElement = $this->driver->findElement(WebDriverBy::cssSelector('textarea'));
diff --git a/tests/functional/web/form.html b/tests/functional/web/form.html
index 7463750a6..597baca2e 100644
--- a/tests/functional/web/form.html
+++ b/tests/functional/web/form.html
@@ -48,6 +48,22 @@
             <option value="fourth">Fourth  with   spaces   inside</option>
             <option value="fifth">   Fifth surrounded by spaces    </option>
         </select>
+        <label for="select-multiple-2"></label>
+        <select name="select-multiple-2" id="select-multiple-2" multiple="multiple">
+            <option value="first">First</option>
+            <option value="second">This is second option</option>
+            <option value="third">This is not second option</option>
+            <option value="fourth">Fourth  with   spaces   inside</option>
+            <option value="fifth">   Fifth surrounded by spaces    </option>
+        </select>
+        <label for="select-multiple-3"></label>
+        <select name="select-multiple-3" id="select-multiple-3" multiple="">
+            <option value="first">First</option>
+            <option value="second">This is second option</option>
+            <option value="third">This is not second option</option>
+            <option value="fourth">Fourth  with   spaces   inside</option>
+            <option value="fifth">   Fifth surrounded by spaces    </option>
+        </select>
         <br>
 
         <fieldset>

From 4543539aea54a59efff69b7622f8b15892c86fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 27 Jul 2023 13:28:33 +0200
Subject: [PATCH 738/784] Fix path to chromedriver in tests on latest Ubuntu

https://github.com/actions/runner-images/blob/ubuntu22/20230724.1/images/linux/Ubuntu2204-Readme.md#environment-variables-1
---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 101364c8c..7fa8f0385 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -160,7 +160,7 @@ jobs:
           # When running directly against Firefox, we test only using geckodriver (not against legacy Firefox =<45), so we must declare GECKODRIVER=1
           GECKODRIVER: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '1' || '0' }}"
           # Provide CHROMEDRIVER_PATH and GECKODRIVER_PATH so that tests for local web drivers are able to start the browser
-          CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chrome_driver/chromedriver' || '' }}"
+          CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chromedriver-linux64/chromedriver' || '' }}"
           GECKODRIVER_PATH: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '/usr/local/share/gecko_driver/geckodriver' || '' }}"
           DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
           SELENIUM_SERVER: "${{ matrix.selenium-server && '1' || '0' }}"

From 2c1b0e86a5911440b96eccecef55d51c896631b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 22 Aug 2023 11:20:04 +0200
Subject: [PATCH 739/784] Fix codestyle with latest php-cs-fixer

---
 .../Internal/WebDriverCoordinates.php         |  5 +++--
 lib/Local/LocalWebDriver.php                  | 22 ++-----------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/lib/Interactions/Internal/WebDriverCoordinates.php b/lib/Interactions/Internal/WebDriverCoordinates.php
index 91ad29f7c..3a92f0a64 100644
--- a/lib/Interactions/Internal/WebDriverCoordinates.php
+++ b/lib/Interactions/Internal/WebDriverCoordinates.php
@@ -11,7 +11,8 @@
 class WebDriverCoordinates
 {
     /**
-     * @var null
+     * @var mixed
+     * @todo remove in next major version (if it is unused)
      */
     private $onScreen;
     /**
@@ -28,7 +29,7 @@ class WebDriverCoordinates
     private $auxiliary;
 
     /**
-     * @param null $on_screen
+     * @param mixed $on_screen
      * @param string $auxiliary
      */
     public function __construct($on_screen, callable $in_view_port, callable $on_page, $auxiliary)
diff --git a/lib/Local/LocalWebDriver.php b/lib/Local/LocalWebDriver.php
index c0ab32a42..1b02bff9b 100644
--- a/lib/Local/LocalWebDriver.php
+++ b/lib/Local/LocalWebDriver.php
@@ -12,17 +12,7 @@
  */
 abstract class LocalWebDriver extends RemoteWebDriver
 {
-    /**
-     * @param string $selenium_server_url
-     * @param null $desired_capabilities
-     * @param null $connection_timeout_in_ms
-     * @param null $request_timeout_in_ms
-     * @param null $http_proxy
-     * @param null $http_proxy_port
-     * @throws LogicException
-     * @return RemoteWebDriver
-     * @todo Remove in next major version (should not be inherited)
-     */
+    // @todo Remove in next major version (should not be inherited)
     public static function create(
         $selenium_server_url = 'http://localhost:4444/wd/hub',
         $desired_capabilities = null,
@@ -35,15 +25,7 @@ public static function create(
         throw LogicException::forError('Use start() method to start local WebDriver.');
     }
 
-    /**
-     * @param string $session_id
-     * @param string $selenium_server_url
-     * @param null $connection_timeout_in_ms
-     * @param null $request_timeout_in_ms
-     * @throws LogicException
-     * @return RemoteWebDriver
-     * @todo Remove in next major version (should not be inherited)
-     */
+    // @todo Remove in next major version (should not be inherited)
     public static function createBySessionID(
         $session_id,
         $selenium_server_url = 'http://localhost:4444/wd/hub',

From ce824604045b244b5f5f34404d016bf9dad44535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 22 Aug 2023 13:14:40 +0200
Subject: [PATCH 740/784] Update PHP versions in test builds, run tests
 primarily on PHP 8

---
 .github/workflows/sauce-labs.yaml         | 2 +-
 .github/workflows/tests.yaml              | 7 +++----
 tests/functional/RemoteWebElementTest.php | 7 +++++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 41ebc4d1c..0880cbc00 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           extensions: mbstring, intl, zip
           coverage: none
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7fa8f0385..f2c94bc1d 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.2'
           extensions: mbstring, intl, zip
 
       - name: Install PHP dependencies
@@ -46,11 +46,10 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0']
+        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2']
         dependencies: ['']
         include:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }
-          - { php-version: '8.1', dependencies: '--ignore-platform-req=php' }
 
     steps:
       - uses: actions/checkout@v3
@@ -105,7 +104,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.2
           extensions: mbstring, intl, zip
           coverage: xdebug
 
diff --git a/tests/functional/RemoteWebElementTest.php b/tests/functional/RemoteWebElementTest.php
index 7c51e09ce..6a21cb36c 100644
--- a/tests/functional/RemoteWebElementTest.php
+++ b/tests/functional/RemoteWebElementTest.php
@@ -515,8 +515,11 @@ public function testShouldTakeAndSaveElementScreenshot(): void
 
         // Assert string output
         $imageFromString = imagecreatefromstring($outputPngString);
-        $this->assertNotFalse($imageFromString);
-        $this->assertTrue(is_resource($imageFromString));
+        if (version_compare(phpversion(), '8.0.0', '>=')) {
+            $this->assertInstanceOf(\GdImage::class, $imageFromString);
+        } else {
+            $this->assertTrue(is_resource($imageFromString));
+        }
 
         if ($isSafari && !$isCi) {
             $this->assertEquals(10, imagesx($imageFromString));

From 15dde790acb44f5a5d06940cbea4ed29e1121323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 25 Apr 2023 11:39:03 +0200
Subject: [PATCH 741/784] Do not fail on fatal error on unexpected response
 when getting element(s)

---
 CHANGELOG.md                                  |  5 ++++-
 .../Internal/UnexpectedResponseException.php  | 10 ++++++++++
 lib/Remote/JsonWireCompat.php                 | 12 ++++++++++-
 lib/Remote/RemoteWebDriver.php                |  8 ++------
 lib/Remote/RemoteWebElement.php               |  5 +++++
 lib/Remote/ShadowRoot.php                     |  7 +++++++
 .../functional/Remote/JsonWireCompatTest.php  | 17 ++++++++++++++++
 tests/unit/Remote/RemoteWebDriverTest.php     | 20 ++++---------------
 8 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 tests/functional/Remote/JsonWireCompatTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 819493d4a..3653e9e16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,12 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 - Capability key `ChromeOptions::CAPABILITY_W3C` used to set ChromeOptions is now deprecated in favor of `ChromeOptions::CAPABILITY`, which now also contains the W3C compatible value (`goog:chromeOptions`).
 - ChromeOptions are now passed to the driver always as a W3C compatible key `goog:chromeOptions`, even in the deprecated OSS JsonWire payload (as ChromeDriver [supports](https://bugs.chromium.org/p/chromedriver/issues/detail?id=1786) this since 2017).
 
+### Fixed
+- Handle unexpected response when getting element(s) by throwing an exception, not triggering fatal error.
+
 ## 1.14.0 - 2023-02-09
 ### Added
-- `PhpWebDriverExceptionInterface` as a common interface to identify all exceptions thrown in php-webdriver
+- `PhpWebDriverExceptionInterface` as a common interface to identify all exceptions thrown in php-webdriver.
 
 ### Changed
 - Require PHP ^7.3.
diff --git a/lib/Exception/Internal/UnexpectedResponseException.php b/lib/Exception/Internal/UnexpectedResponseException.php
index 13597c8f7..18cdc88cc 100644
--- a/lib/Exception/Internal/UnexpectedResponseException.php
+++ b/lib/Exception/Internal/UnexpectedResponseException.php
@@ -14,6 +14,16 @@ public static function forError(string $message): self
         return new self($message);
     }
 
+    public static function forElementNotArray($response): self
+    {
+        return new self(
+            sprintf(
+                "Unexpected server response for getting an element. Expected array, but the response was: '%s'\n",
+                print_r($response, true)
+            )
+        );
+    }
+
     public static function forJsonDecodingError(int $jsonLastError, string $rawResults): self
     {
         return new self(
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index 4ba791e92..ec8944816 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\WebDriverBy;
 
 /**
@@ -18,8 +19,17 @@ abstract class JsonWireCompat
      */
     public const WEB_DRIVER_ELEMENT_IDENTIFIER = 'element-6066-11e4-a52e-4f735466cecf';
 
-    public static function getElement(array $rawElement)
+    /**
+     * @param mixed $rawElement Value is validated to by an array, exception is thrown otherwise
+     * @throws UnexpectedResponseException When value of other type than array is given
+     */
+    public static function getElement($rawElement)
     {
+        // The method intentionally accept mixed, so that assertion of the rawElement format could be done on one place
+        if (!is_array($rawElement)) {
+            throw UnexpectedResponseException::forElementNotArray($rawElement);
+        }
+
         if (array_key_exists(self::WEB_DRIVER_ELEMENT_IDENTIFIER, $rawElement)) {
             // W3C's WebDriver
             return $rawElement[self::WEB_DRIVER_ELEMENT_IDENTIFIER];
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index e53abd38c..313312e59 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -219,10 +219,6 @@ public function findElement(WebDriverBy $by)
             JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
-        if ($raw_element === null) {
-            throw UnexpectedResponseException::forError('Unexpected server response to findElement command');
-        }
-
         return $this->newElement(JsonWireCompat::getElement($raw_element));
     }
 
@@ -239,8 +235,8 @@ public function findElements(WebDriverBy $by)
             JsonWireCompat::getUsing($by, $this->isW3cCompliant)
         );
 
-        if ($raw_elements === null) {
-            throw UnexpectedResponseException::forError('Unexpected server response to findElements command');
+        if (!is_array($raw_elements)) {
+            throw UnexpectedResponseException::forError('Server response to findElements command is not an array');
         }
 
         $elements = [];
diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index fa09ddc64..641f32ad8 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -5,6 +5,7 @@
 use Facebook\WebDriver\Exception\ElementNotInteractableException;
 use Facebook\WebDriver\Exception\Internal\IOException;
 use Facebook\WebDriver\Exception\Internal\LogicException;
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Exception\PhpWebDriverExceptionInterface;
 use Facebook\WebDriver\Exception\UnsupportedOperationException;
 use Facebook\WebDriver\Interactions\Internal\WebDriverCoordinates;
@@ -131,6 +132,10 @@ public function findElements(WebDriverBy $by)
             $params
         );
 
+        if (!is_array($raw_elements)) {
+            throw UnexpectedResponseException::forError('Server response to findChildElements command is not an array');
+        }
+
         $elements = [];
         foreach ($raw_elements as $raw_element) {
             $elements[] = $this->newElement(JsonWireCompat::getElement($raw_element));
diff --git a/lib/Remote/ShadowRoot.php b/lib/Remote/ShadowRoot.php
index 1baed693a..5d419b19a 100644
--- a/lib/Remote/ShadowRoot.php
+++ b/lib/Remote/ShadowRoot.php
@@ -2,6 +2,7 @@
 
 namespace Facebook\WebDriver\Remote;
 
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
 use Facebook\WebDriver\Exception\UnknownErrorException;
 use Facebook\WebDriver\WebDriverBy;
 use Facebook\WebDriver\WebDriverElement;
@@ -73,6 +74,12 @@ public function findElements(WebDriverBy $locator)
             $params
         );
 
+        if (!is_array($rawElements)) {
+            throw UnexpectedResponseException::forError(
+                'Server response to findElementsFromShadowRoot command is not an array'
+            );
+        }
+
         $elements = [];
         foreach ($rawElements as $rawElement) {
             $elements[] = new RemoteWebElement($this->executor, JsonWireCompat::getElement($rawElement), true);
diff --git a/tests/functional/Remote/JsonWireCompatTest.php b/tests/functional/Remote/JsonWireCompatTest.php
new file mode 100644
index 000000000..8dfb5e29a
--- /dev/null
+++ b/tests/functional/Remote/JsonWireCompatTest.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace Facebook\WebDriver\Remote;
+
+use Facebook\WebDriver\Exception\Internal\UnexpectedResponseException;
+use PHPUnit\Framework\TestCase;
+
+class JsonWireCompatTest extends TestCase
+{
+    public function testShouldThrowExceptionWhenElementIsNotArray()
+    {
+        $this->expectException(UnexpectedResponseException::class);
+        $this->expectExceptionMessage('Unexpected server response for getting an element. Expected array');
+
+        JsonWireCompat::getElement(null);
+    }
+}
diff --git a/tests/unit/Remote/RemoteWebDriverTest.php b/tests/unit/Remote/RemoteWebDriverTest.php
index cbb4fc30d..666ac9e5c 100644
--- a/tests/unit/Remote/RemoteWebDriverTest.php
+++ b/tests/unit/Remote/RemoteWebDriverTest.php
@@ -114,15 +114,11 @@ public function testShouldCreateWebDriverWaitInstance(): void
     }
 
     /**
-     * @covers ::findElement
      * @covers ::findElements
      * @covers \Facebook\WebDriver\Exception\Internal\UnexpectedResponseException
-     * @dataProvider provideMethods
      */
-    public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd(
-        string $method,
-        string $expectedExceptionMessage
-    ): void {
+    public function testShouldThrowExceptionOnUnexpectedValueFromRemoteEndWhenFindingElements(): void
+    {
         $executorMock = $this->createMock(HttpCommandExecutor::class);
         $executorMock->expects($this->once())
             ->method('execute')
@@ -132,15 +128,7 @@ public function testShouldThrowExceptionOnUnexpectedNullValueFromRemoteEnd(
         $this->driver->setCommandExecutor($executorMock);
 
         $this->expectException(UnexpectedResponseException::class);
-        $this->expectExceptionMessage($expectedExceptionMessage);
-        call_user_func([$this->driver, $method], $this->createMock(WebDriverBy::class));
-    }
-
-    public function provideMethods(): array
-    {
-        return [
-            ['findElement', 'Unexpected server response to findElement command'],
-            ['findElements', 'Unexpected server response to findElements command'],
-        ];
+        $this->expectExceptionMessage('Server response to findElements command is not an array');
+        $this->driver->findElements($this->createMock(WebDriverBy::class));
     }
 }

From 22242281132fca0a236a7fdd4d7cf3cb52aa3bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 29 Aug 2023 15:51:40 +0200
Subject: [PATCH 742/784] Update CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3653e9e16..c36231ccf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Capability key `ChromeOptions::CAPABILITY_W3C` used to set ChromeOptions is now deprecated in favor of `ChromeOptions::CAPABILITY`, which now also contains the W3C compatible value (`goog:chromeOptions`).
 - ChromeOptions are now passed to the driver always as a W3C compatible key `goog:chromeOptions`, even in the deprecated OSS JsonWire payload (as ChromeDriver [supports](https://bugs.chromium.org/p/chromedriver/issues/detail?id=1786) this since 2017).
+- Improve Safari compatibility for `<select multilpe>` element.
+- Remove no longer needed compatibility layer with old Symfony.
+- Docs: Document exception throwing in findElement.
 
 ### Fixed
 - Handle unexpected response when getting element(s) by throwing an exception, not triggering fatal error.

From a1578689290055586f1ee51eaf0ec9d52895bb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 29 Aug 2023 15:47:29 +0200
Subject: [PATCH 743/784] Release version 1.15.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c36231ccf..33c0a00d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## 1.15.0 - 2023-08-29
 ### Changed
 - Capability key `ChromeOptions::CAPABILITY_W3C` used to set ChromeOptions is now deprecated in favor of `ChromeOptions::CAPABILITY`, which now also contains the W3C compatible value (`goog:chromeOptions`).
 - ChromeOptions are now passed to the driver always as a W3C compatible key `goog:chromeOptions`, even in the deprecated OSS JsonWire payload (as ChromeDriver [supports](https://bugs.chromium.org/p/chromedriver/issues/detail?id=1786) this since 2017).

From 2291a923c3e8005c7eaf042b4b213d3e52b9bc99 Mon Sep 17 00:00:00 2001
From: Mior Muhammad Zaki <crynobone@gmail.com>
Date: Fri, 13 Oct 2023 07:58:16 +0800
Subject: [PATCH 744/784] Add support for Symfony Process 7

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d4b5b8a91..944c28050 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "ext-json": "*",
     "ext-zip": "*",
     "symfony/polyfill-mbstring": "^1.12",
-    "symfony/process": "^5.0 || ^6.0"
+    "symfony/process": "^5.0 || ^6.0 || ^7.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.20.0",

From a91588b759610f6a4589038425f48fd26b4eb5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Oct 2023 12:53:41 +0200
Subject: [PATCH 745/784] Update link to docs

---
 lib/Cookie.php                     | 2 +-
 lib/Remote/HttpCommandExecutor.php | 2 +-
 lib/Remote/JsonWireCompat.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Cookie.php b/lib/Cookie.php
index 85a93df79..2ae257bd1 100644
--- a/lib/Cookie.php
+++ b/lib/Cookie.php
@@ -9,7 +9,7 @@
  *
  * Implements ArrayAccess for backwards compatibility.
  *
- * @see https://w3c.github.io/webdriver/webdriver-spec.html#cookies
+ * @see https://w3c.github.io/webdriver/#cookies
  */
 class Cookie implements \ArrayAccess
 {
diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 37987f088..96b0ccc70 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -353,7 +353,7 @@ public function execute(WebDriverCommand $command)
             $sessionId = $results['sessionId'];
         }
 
-        // @see https://w3c.github.io/webdriver/webdriver-spec.html#handling-errors
+        // @see https://w3c.github.io/webdriver/#errors
         if (isset($value['error'])) {
             // W3C's WebDriver
             WebDriverException::throwException($value['error'], $message, $results);
diff --git a/lib/Remote/JsonWireCompat.php b/lib/Remote/JsonWireCompat.php
index ec8944816..b9e1b5ee4 100644
--- a/lib/Remote/JsonWireCompat.php
+++ b/lib/Remote/JsonWireCompat.php
@@ -15,7 +15,7 @@ abstract class JsonWireCompat
     /**
      * Element identifier defined in the W3C's WebDriver protocol.
      *
-     * @see https://w3c.github.io/webdriver/webdriver-spec.html#elements
+     * @see https://w3c.github.io/webdriver/#elements
      */
     public const WEB_DRIVER_ELEMENT_IDENTIFIER = 'element-6066-11e4-a52e-4f735466cecf';
 

From f529cf13883a1fed889fbb25fb23b920e66702a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Oct 2023 12:54:04 +0200
Subject: [PATCH 746/784] Update Selenium server used in tests run

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index f2c94bc1d..5a7e82260 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -82,7 +82,7 @@ jobs:
   functional-tests:
     runs-on: ${{ matrix.os }}
     env:
-      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.3.0/selenium-server-4.3.0.jar
+      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.1.jar
 
     strategy:
       fail-fast: false

From cd52d9342c5aa738c2e75a67e47a1b6df97154e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Fri, 20 Oct 2023 14:21:20 +0200
Subject: [PATCH 747/784] Release version 1.15.1

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c0a00d3..c9dc399ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+## 1.15.1 - 2023-10-20
+- Update `symfony/process` dependency to support upcoming Symfony 7.
+
 ## 1.15.0 - 2023-08-29
 ### Changed
 - Capability key `ChromeOptions::CAPABILITY_W3C` used to set ChromeOptions is now deprecated in favor of `ChromeOptions::CAPABILITY`, which now also contains the W3C compatible value (`goog:chromeOptions`).

From 2d0a58942afa2ff27173d5955a476385388769e3 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Fri, 3 Nov 2023 09:06:28 +0100
Subject: [PATCH 748/784] feat: allow symfony/var-dumper v7 (dev only)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 944c28050..bd2184262 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "php-parallel-lint/php-parallel-lint": "^1.2",
     "phpunit/phpunit": "^9.3",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/var-dumper": "^5.0 || ^6.0"
+    "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0"
   },
   "replace": {
     "facebook/webdriver": "*"

From 20b169bd3e6319c4260ac9846720fad51909d2b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 27 Nov 2023 11:40:39 +0100
Subject: [PATCH 749/784] Configure dependabot to automatically update GH
 Actions deps

---
 .github/dependabot.yaml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/dependabot.yaml

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
new file mode 100644
index 000000000..50112e87a
--- /dev/null
+++ b/.github/dependabot.yaml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "04:00"

From 17cd67d94e8d7159a831edefb213b1cc97589f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 27 Nov 2023 11:42:08 +0100
Subject: [PATCH 750/784] Add PHP 8.3 to test builds

---
 .github/workflows/sauce-labs.yaml | 2 +-
 .github/workflows/tests.yaml      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 0880cbc00..9c977ae7c 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: mbstring, intl, zip
           coverage: none
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5a7e82260..9b24c393d 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: mbstring, intl, zip
 
       - name: Install PHP dependencies
@@ -46,7 +46,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2']
+        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
         dependencies: ['']
         include:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }
@@ -104,7 +104,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: '8.3'
           extensions: mbstring, intl, zip
           coverage: xdebug
 

From 745b1482027237c10b7d86cd706e734e2686b856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 27 Nov 2023 11:43:38 +0100
Subject: [PATCH 751/784] Update selenium server in tests to 4.15

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9b24c393d..9d11084ff 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -82,7 +82,7 @@ jobs:
   functional-tests:
     runs-on: ${{ matrix.os }}
     env:
-      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.14.0/selenium-server-4.14.1.jar
+      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.15.0/selenium-server-4.15.0.jar
 
     strategy:
       fail-fast: false

From 4afa6c1b1e407e3dce4e5f93a5c06b29ce78550b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 27 Nov 2023 12:28:06 +0100
Subject: [PATCH 752/784] Exclude periodacally failing test on Safari

---
 tests/functional/FileUploadTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/functional/FileUploadTest.php b/tests/functional/FileUploadTest.php
index 9557b0c8a..e812353ea 100644
--- a/tests/functional/FileUploadTest.php
+++ b/tests/functional/FileUploadTest.php
@@ -13,6 +13,8 @@ class FileUploadTest extends WebDriverTestCase
     /**
      * @group exclude-edge
      * https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6052385/
+     * @group exclude-safari
+     * The test times out on safari.
      * @group exclude-saucelabs
      * W3C protocol does not support remote file upload: https://github.com/w3c/webdriver/issues/1355
      */

From d9dc1fc45afe72769431238a61e52b93ac3f2714 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 10:39:39 +0000
Subject: [PATCH 753/784] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9d11084ff..24ddfd9a6 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -207,7 +207,7 @@ jobs:
         run: |
           mkdir -p ./data
           echo ${{ github.run_id }} > ./data/run_id
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: data
           path: data/

From 8f550767b17306c3e1aeb670e7013621d0d87857 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 10:39:45 +0000
Subject: [PATCH 754/784] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docs-lint.yml    | 2 +-
 .github/workflows/docs-publish.yml | 2 +-
 .github/workflows/sauce-labs.yaml  | 2 +-
 .github/workflows/tests.yaml       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 .github/workflows/docs-publish.yml

diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml
index e0f0bb531..fd1c41b4f 100644
--- a/.github/workflows/docs-lint.yml
+++ b/.github/workflows/docs-lint.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
old mode 100755
new mode 100644
index edf50d967..287c1a75f
--- a/.github/workflows/docs-publish.yml
+++ b/.github/workflows/docs-publish.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_KEY_DEPLOY }}
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 9c977ae7c..802f4ed8d 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -29,7 +29,7 @@ jobs:
 
     name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9d11084ff..6e48fdb49 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -14,7 +14,7 @@ jobs:
     name: "Code style and static analysis"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -35,7 +35,7 @@ jobs:
     name: "Markdown link check"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-verbose-mode: 'yes'
@@ -52,7 +52,7 @@ jobs:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -99,7 +99,7 @@ jobs:
     name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }}, W3C: ${{ matrix.w3c }})"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From 132d0675ffd2dd10fc80e2e2be8ba8edee690272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 10:57:00 +0000
Subject: [PATCH 755/784] Bump actions/github-script from 6 to 7

Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/coveralls-workaround.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coveralls-workaround.yaml b/.github/workflows/coveralls-workaround.yaml
index 2e4fc227c..5ca45b1fe 100644
--- a/.github/workflows/coveralls-workaround.yaml
+++ b/.github/workflows/coveralls-workaround.yaml
@@ -21,7 +21,7 @@ jobs:
     steps:
       # see https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
       - name: 'Download artifact'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             var artifacts = await github.rest.actions.listWorkflowRunArtifacts({

From 62cb5c8bba9f917b9bd47e6dcc174a78b46c0d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 9 Jan 2024 15:51:48 +0100
Subject: [PATCH 756/784] Use new Chrome headless mode instead of old
 chrome-headless-shell

---
 tests/functional/Chrome/ChromeDriverTest.php | 2 +-
 tests/functional/WebDriverTestCase.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 8bb945061..02cb97614 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -87,7 +87,7 @@ private function startChromeDriver($w3cDialect = true): void
 
         // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
         $chromeOptions = new ChromeOptions();
-        $chromeOptions->addArguments(['--no-sandbox', '--headless']);
+        $chromeOptions->addArguments(['--no-sandbox', '--headless=new']);
         $chromeOptions->setExperimentalOption('w3c', $w3cDialect);
         $desiredCapabilities = DesiredCapabilities::chrome();
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 0d0d29b19..8813055f9 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -48,7 +48,7 @@ protected function setUp(): void
                 $chromeOptions = new ChromeOptions();
                 // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
                 $chromeOptions->addArguments([
-                    '--headless',
+                    '--headless=new',
                     '--window-size=1024,768',
                     '--no-sandbox',
                     '--force-color-profile=srgb',

From 5528de4dc79c5d44f55528bdc59502718888efe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Sat, 10 Feb 2024 12:34:17 +0000
Subject: [PATCH 757/784] Test: Remove SauceLabs workaround for MS Edge

---
 tests/functional/RemoteWebDriverCreateTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/functional/RemoteWebDriverCreateTest.php b/tests/functional/RemoteWebDriverCreateTest.php
index d93fc49db..a39a91070 100644
--- a/tests/functional/RemoteWebDriverCreateTest.php
+++ b/tests/functional/RemoteWebDriverCreateTest.php
@@ -140,9 +140,6 @@ public function testShouldCreateInstanceFromExistingSessionId(): void
 
         $expectedBrowserName = $this->desiredCapabilities->getBrowserName();
 
-        if ($this->isSauceLabsBuild() && $expectedBrowserName === 'MicrosoftEdge') {
-            $expectedBrowserName = 'msedge'; // SauceLabs for some reason reports MicrosoftEdge as msedge
-        }
         $this->assertEqualsIgnoringCase(
             $expectedBrowserName,
             $returnedCapabilities->getBrowserName()

From 3db7b0e1cd4579300b896538eb9403472c31d587 Mon Sep 17 00:00:00 2001
From: PrinsFrank <25006490+PrinsFrank@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:41:17 +0200
Subject: [PATCH 758/784] Fix static return types in RemoteWebElement

---
 lib/Remote/RemoteWebElement.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Remote/RemoteWebElement.php b/lib/Remote/RemoteWebElement.php
index 641f32ad8..e0ce43b55 100644
--- a/lib/Remote/RemoteWebElement.php
+++ b/lib/Remote/RemoteWebElement.php
@@ -55,7 +55,7 @@ public function __construct(RemoteExecuteMethod $executor, $id, $isW3cCompliant
     /**
      * Clear content editable or resettable element
      *
-     * @return RemoteWebElement The current instance.
+     * @return $this The current instance.
      */
     public function clear()
     {
@@ -70,7 +70,7 @@ public function clear()
     /**
      * Click this element.
      *
-     * @return RemoteWebElement The current instance.
+     * @return $this The current instance.
      */
     public function click()
     {
@@ -96,7 +96,7 @@ public function click()
      * search the entire document from the root, not just the children (relative context) of this current node.
      * Use ".//" to limit your search to the children of this element.
      *
-     * @return RemoteWebElement NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
+     * @return static NoSuchElementException is thrown in HttpCommandExecutor if no element is found.
      * @see WebDriverBy
      */
     public function findElement(WebDriverBy $by)
@@ -119,7 +119,7 @@ public function findElement(WebDriverBy $by)
      * search the entire document from the root, not just the children (relative context) of this current node.
      * Use ".//" to limit your search to the children of this element.
      *
-     * @return RemoteWebElement[] A list of all WebDriverElements, or an empty
+     * @return static[] A list of all WebDriverElements, or an empty
      *    array if nothing matches
      * @see WebDriverBy
      */
@@ -381,7 +381,7 @@ public function isSelected()
      * Simulate typing into an element, which may set its value.
      *
      * @param mixed $value The data to be typed.
-     * @return RemoteWebElement The current instance.
+     * @return static The current instance.
      */
     public function sendKeys($value)
     {
@@ -443,7 +443,7 @@ public function sendKeys($value)
      *
      *   eg. `$element->setFileDetector(new LocalFileDetector);`
      *
-     * @return RemoteWebElement
+     * @return $this
      * @see FileDetector
      * @see LocalFileDetector
      * @see UselessFileDetector
@@ -458,7 +458,7 @@ public function setFileDetector(FileDetector $detector)
     /**
      * If this current element is a form, or an element within a form, then this will be submitted to the remote server.
      *
-     * @return RemoteWebElement The current instance.
+     * @return $this The current instance.
      */
     public function submit()
     {

From 93a85f458f736cf02eef6d86d5f9a6216e7c8b3a Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 13 Aug 2024 15:33:20 +0200
Subject: [PATCH 759/784] Support PHP 8.4

Resolves: #1107
---
 .github/workflows/tests.yaml                     |  2 +-
 .php-cs-fixer.dist.php                           |  4 ++++
 lib/Chrome/ChromeDriver.php                      |  8 +++++---
 .../Internal/DriverServerDiedException.php       |  2 +-
 lib/Firefox/FirefoxDriver.php                    |  4 ++--
 .../Internal/WebDriverKeysRelatedAction.php      |  2 +-
 .../Internal/WebDriverMouseAction.php            |  2 +-
 .../Internal/WebDriverMoveToOffsetAction.php     |  2 +-
 .../Internal/WebDriverSendKeysAction.php         |  2 +-
 .../Internal/WebDriverSingleKeyAction.php        |  2 +-
 lib/Interactions/Touch/WebDriverTouchAction.php  |  2 +-
 lib/Interactions/WebDriverActions.php            | 16 ++++++++--------
 lib/Local/LocalWebDriver.php                     |  2 +-
 lib/Remote/RemoteMouse.php                       | 16 ++++++++--------
 lib/Remote/RemoteWebDriver.php                   |  2 +-
 lib/Support/Events/EventFiringWebDriver.php      |  2 +-
 lib/WebDriverEventListener.php                   |  2 +-
 tests/functional/Firefox/FirefoxDriverTest.php   |  2 +-
 tests/functional/WebDriverByTest.php             |  4 ++--
 19 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7049e4c03..da5fb4a55 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -46,7 +46,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         dependencies: ['']
         include:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 440b532b8..f754fb8b7 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -77,6 +77,10 @@
         'no_whitespace_before_comma_in_array' => ['after_heredoc' => true],
         'no_whitespace_in_blank_line' => true,
         'non_printable_character' => true,
+        'nullable_type_declaration' => [
+            'syntax' => 'question_mark',
+        ],
+        'nullable_type_declaration_for_default_null_value' => true,
         'object_operator_without_whitespace' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
diff --git a/lib/Chrome/ChromeDriver.php b/lib/Chrome/ChromeDriver.php
index 1d840eaed..e947a498e 100644
--- a/lib/Chrome/ChromeDriver.php
+++ b/lib/Chrome/ChromeDriver.php
@@ -21,8 +21,10 @@ class ChromeDriver extends LocalWebDriver
      * @todo Remove $service parameter. Use `ChromeDriver::startUsingDriverService` to pass custom $service instance.
      * @return static
      */
-    public static function start(DesiredCapabilities $desired_capabilities = null, ChromeDriverService $service = null)
-    {
+    public static function start(
+        ?DesiredCapabilities $desired_capabilities = null,
+        ?ChromeDriverService $service = null
+    ) {
         if ($service === null) { // TODO: Remove the condition (always create default service)
             $service = ChromeDriverService::createDefaultService();
         }
@@ -40,7 +42,7 @@ public static function start(DesiredCapabilities $desired_capabilities = null, C
      */
     public static function startUsingDriverService(
         ChromeDriverService $service,
-        DesiredCapabilities $capabilities = null
+        ?DesiredCapabilities $capabilities = null
     ) {
         if ($capabilities === null) {
             $capabilities = DesiredCapabilities::chrome();
diff --git a/lib/Exception/Internal/DriverServerDiedException.php b/lib/Exception/Internal/DriverServerDiedException.php
index 43c848551..7c23df5ed 100644
--- a/lib/Exception/Internal/DriverServerDiedException.php
+++ b/lib/Exception/Internal/DriverServerDiedException.php
@@ -9,7 +9,7 @@
  */
 class DriverServerDiedException extends \RuntimeException implements PhpWebDriverExceptionInterface
 {
-    public function __construct(\Exception $previous = null)
+    public function __construct(?\Exception $previous = null)
     {
         parent::__construct('The driver server has died.', 0, $previous);
     }
diff --git a/lib/Firefox/FirefoxDriver.php b/lib/Firefox/FirefoxDriver.php
index 9d86a2be4..2a13df4d0 100644
--- a/lib/Firefox/FirefoxDriver.php
+++ b/lib/Firefox/FirefoxDriver.php
@@ -26,7 +26,7 @@ class FirefoxDriver extends LocalWebDriver
      *
      * @return static
      */
-    public static function start(DesiredCapabilities $capabilities = null)
+    public static function start(?DesiredCapabilities $capabilities = null)
     {
         $service = FirefoxDriverService::createDefaultService();
 
@@ -43,7 +43,7 @@ public static function start(DesiredCapabilities $capabilities = null)
      */
     public static function startUsingDriverService(
         FirefoxDriverService $service,
-        DesiredCapabilities $capabilities = null
+        ?DesiredCapabilities $capabilities = null
     ) {
         if ($capabilities === null) {
             $capabilities = DesiredCapabilities::firefox();
diff --git a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
index a5d231f74..a5ba0875f 100644
--- a/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
+++ b/lib/Interactions/Internal/WebDriverKeysRelatedAction.php
@@ -27,7 +27,7 @@ abstract class WebDriverKeysRelatedAction
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
-        WebDriverLocatable $location_provider = null
+        ?WebDriverLocatable $location_provider = null
     ) {
         $this->keyboard = $keyboard;
         $this->mouse = $mouse;
diff --git a/lib/Interactions/Internal/WebDriverMouseAction.php b/lib/Interactions/Internal/WebDriverMouseAction.php
index 1333def5d..ecb1127ee 100644
--- a/lib/Interactions/Internal/WebDriverMouseAction.php
+++ b/lib/Interactions/Internal/WebDriverMouseAction.php
@@ -19,7 +19,7 @@ class WebDriverMouseAction
      */
     protected $locationProvider;
 
-    public function __construct(WebDriverMouse $mouse, WebDriverLocatable $location_provider = null)
+    public function __construct(WebDriverMouse $mouse, ?WebDriverLocatable $location_provider = null)
     {
         $this->mouse = $mouse;
         $this->locationProvider = $location_provider;
diff --git a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
index 4cfc74aef..c865da46a 100644
--- a/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
+++ b/lib/Interactions/Internal/WebDriverMoveToOffsetAction.php
@@ -23,7 +23,7 @@ class WebDriverMoveToOffsetAction extends WebDriverMouseAction implements WebDri
      */
     public function __construct(
         WebDriverMouse $mouse,
-        WebDriverLocatable $location_provider = null,
+        ?WebDriverLocatable $location_provider = null,
         $x_offset = null,
         $y_offset = null
     ) {
diff --git a/lib/Interactions/Internal/WebDriverSendKeysAction.php b/lib/Interactions/Internal/WebDriverSendKeysAction.php
index f8af6a98b..2ed3cfd06 100644
--- a/lib/Interactions/Internal/WebDriverSendKeysAction.php
+++ b/lib/Interactions/Internal/WebDriverSendKeysAction.php
@@ -20,7 +20,7 @@ class WebDriverSendKeysAction extends WebDriverKeysRelatedAction implements WebD
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
-        WebDriverLocatable $location_provider = null,
+        ?WebDriverLocatable $location_provider = null,
         $keys = ''
     ) {
         parent::__construct($keyboard, $mouse, $location_provider);
diff --git a/lib/Interactions/Internal/WebDriverSingleKeyAction.php b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
index 0cc4d193a..6efe9384a 100644
--- a/lib/Interactions/Internal/WebDriverSingleKeyAction.php
+++ b/lib/Interactions/Internal/WebDriverSingleKeyAction.php
@@ -36,7 +36,7 @@ abstract class WebDriverSingleKeyAction extends WebDriverKeysRelatedAction imple
     public function __construct(
         WebDriverKeyboard $keyboard,
         WebDriverMouse $mouse,
-        WebDriverLocatable $location_provider = null,
+        ?WebDriverLocatable $location_provider = null,
         $key = ''
     ) {
         parent::__construct($keyboard, $mouse, $location_provider);
diff --git a/lib/Interactions/Touch/WebDriverTouchAction.php b/lib/Interactions/Touch/WebDriverTouchAction.php
index b79e20db7..10100ea21 100644
--- a/lib/Interactions/Touch/WebDriverTouchAction.php
+++ b/lib/Interactions/Touch/WebDriverTouchAction.php
@@ -21,7 +21,7 @@ abstract class WebDriverTouchAction
 
     public function __construct(
         WebDriverTouchScreen $touch_screen,
-        WebDriverLocatable $location_provider = null
+        ?WebDriverLocatable $location_provider = null
     ) {
         $this->touchScreen = $touch_screen;
         $this->locationProvider = $location_provider;
diff --git a/lib/Interactions/WebDriverActions.php b/lib/Interactions/WebDriverActions.php
index 015f4b897..031d91ac6 100644
--- a/lib/Interactions/WebDriverActions.php
+++ b/lib/Interactions/WebDriverActions.php
@@ -47,7 +47,7 @@ public function perform()
      *
      * @return WebDriverActions
      */
-    public function click(WebDriverElement $element = null)
+    public function click(?WebDriverElement $element = null)
     {
         $this->action->addAction(
             new WebDriverClickAction($this->mouse, $element)
@@ -62,7 +62,7 @@ public function click(WebDriverElement $element = null)
      *
      * @return WebDriverActions
      */
-    public function clickAndHold(WebDriverElement $element = null)
+    public function clickAndHold(?WebDriverElement $element = null)
     {
         $this->action->addAction(
             new WebDriverClickAndHoldAction($this->mouse, $element)
@@ -77,7 +77,7 @@ public function clickAndHold(WebDriverElement $element = null)
      *
      * @return WebDriverActions
      */
-    public function contextClick(WebDriverElement $element = null)
+    public function contextClick(?WebDriverElement $element = null)
     {
         $this->action->addAction(
             new WebDriverContextClickAction($this->mouse, $element)
@@ -92,7 +92,7 @@ public function contextClick(WebDriverElement $element = null)
      *
      * @return WebDriverActions
      */
-    public function doubleClick(WebDriverElement $element = null)
+    public function doubleClick(?WebDriverElement $element = null)
     {
         $this->action->addAction(
             new WebDriverDoubleClickAction($this->mouse, $element)
@@ -186,7 +186,7 @@ public function moveToElement(WebDriverElement $element, $x_offset = null, $y_of
      *
      * @return WebDriverActions
      */
-    public function release(WebDriverElement $element = null)
+    public function release(?WebDriverElement $element = null)
     {
         $this->action->addAction(
             new WebDriverButtonReleaseAction($this->mouse, $element)
@@ -203,7 +203,7 @@ public function release(WebDriverElement $element = null)
      * @param string $key
      * @return WebDriverActions
      */
-    public function keyDown(WebDriverElement $element = null, $key = null)
+    public function keyDown(?WebDriverElement $element = null, $key = null)
     {
         $this->action->addAction(
             new WebDriverKeyDownAction($this->keyboard, $this->mouse, $element, $key)
@@ -220,7 +220,7 @@ public function keyDown(WebDriverElement $element = null, $key = null)
      * @param string $key
      * @return WebDriverActions
      */
-    public function keyUp(WebDriverElement $element = null, $key = null)
+    public function keyUp(?WebDriverElement $element = null, $key = null)
     {
         $this->action->addAction(
             new WebDriverKeyUpAction($this->keyboard, $this->mouse, $element, $key)
@@ -237,7 +237,7 @@ public function keyUp(WebDriverElement $element = null, $key = null)
      * @param string $keys
      * @return WebDriverActions
      */
-    public function sendKeys(WebDriverElement $element = null, $keys = null)
+    public function sendKeys(?WebDriverElement $element = null, $keys = null)
     {
         $this->action->addAction(
             new WebDriverSendKeysAction(
diff --git a/lib/Local/LocalWebDriver.php b/lib/Local/LocalWebDriver.php
index 1b02bff9b..a23aefe1a 100644
--- a/lib/Local/LocalWebDriver.php
+++ b/lib/Local/LocalWebDriver.php
@@ -20,7 +20,7 @@ public static function create(
         $request_timeout_in_ms = null,
         $http_proxy = null,
         $http_proxy_port = null,
-        DesiredCapabilities $required_capabilities = null
+        ?DesiredCapabilities $required_capabilities = null
     ) {
         throw LogicException::forError('Use start() method to start local WebDriver.');
     }
diff --git a/lib/Remote/RemoteMouse.php b/lib/Remote/RemoteMouse.php
index 2df87e44a..fee209f94 100644
--- a/lib/Remote/RemoteMouse.php
+++ b/lib/Remote/RemoteMouse.php
@@ -38,7 +38,7 @@ public function __construct(RemoteExecuteMethod $executor, $isW3cCompliant = fal
     /**
      * @return RemoteMouse
      */
-    public function click(WebDriverCoordinates $where = null)
+    public function click(?WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
@@ -67,7 +67,7 @@ public function click(WebDriverCoordinates $where = null)
     /**
      * @return RemoteMouse
      */
-    public function contextClick(WebDriverCoordinates $where = null)
+    public function contextClick(?WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
@@ -105,7 +105,7 @@ public function contextClick(WebDriverCoordinates $where = null)
     /**
      * @return RemoteMouse
      */
-    public function doubleClick(WebDriverCoordinates $where = null)
+    public function doubleClick(?WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $clickActions = $this->createClickActions();
@@ -133,7 +133,7 @@ public function doubleClick(WebDriverCoordinates $where = null)
     /**
      * @return RemoteMouse
      */
-    public function mouseDown(WebDriverCoordinates $where = null)
+    public function mouseDown(?WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $this->executor->execute(DriverCommand::ACTIONS, [
@@ -169,7 +169,7 @@ public function mouseDown(WebDriverCoordinates $where = null)
      * @return RemoteMouse
      */
     public function mouseMove(
-        WebDriverCoordinates $where = null,
+        ?WebDriverCoordinates $where = null,
         $x_offset = null,
         $y_offset = null
     ) {
@@ -207,7 +207,7 @@ public function mouseMove(
     /**
      * @return RemoteMouse
      */
-    public function mouseUp(WebDriverCoordinates $where = null)
+    public function mouseUp(?WebDriverCoordinates $where = null)
     {
         if ($this->isW3cCompliant) {
             $moveAction = $where ? [$this->createMoveAction($where)] : [];
@@ -237,7 +237,7 @@ public function mouseUp(WebDriverCoordinates $where = null)
         return $this;
     }
 
-    protected function moveIfNeeded(WebDriverCoordinates $where = null)
+    protected function moveIfNeeded(?WebDriverCoordinates $where = null)
     {
         if ($where) {
             $this->mouseMove($where);
@@ -251,7 +251,7 @@ protected function moveIfNeeded(WebDriverCoordinates $where = null)
      * @return array
      */
     private function createMoveAction(
-        WebDriverCoordinates $where = null,
+        ?WebDriverCoordinates $where = null,
         $x_offset = null,
         $y_offset = null
     ) {
diff --git a/lib/Remote/RemoteWebDriver.php b/lib/Remote/RemoteWebDriver.php
index 313312e59..3d65aaf0b 100644
--- a/lib/Remote/RemoteWebDriver.php
+++ b/lib/Remote/RemoteWebDriver.php
@@ -89,7 +89,7 @@ public static function create(
         $request_timeout_in_ms = null,
         $http_proxy = null,
         $http_proxy_port = null,
-        DesiredCapabilities $required_capabilities = null
+        ?DesiredCapabilities $required_capabilities = null
     ) {
         $selenium_server_url = preg_replace('#/+$#', '', $selenium_server_url);
 
diff --git a/lib/Support/Events/EventFiringWebDriver.php b/lib/Support/Events/EventFiringWebDriver.php
index 2d4d68dd5..21e5a6887 100644
--- a/lib/Support/Events/EventFiringWebDriver.php
+++ b/lib/Support/Events/EventFiringWebDriver.php
@@ -26,7 +26,7 @@ class EventFiringWebDriver implements WebDriver, JavaScriptExecutor
      */
     protected $dispatcher;
 
-    public function __construct(WebDriver $driver, WebDriverDispatcher $dispatcher = null)
+    public function __construct(WebDriver $driver, ?WebDriverDispatcher $dispatcher = null)
     {
         $this->dispatcher = $dispatcher ?: new WebDriverDispatcher();
         if (!$this->dispatcher->getDefaultDriver()) {
diff --git a/lib/WebDriverEventListener.php b/lib/WebDriverEventListener.php
index f4f03de23..9ef98d8f3 100644
--- a/lib/WebDriverEventListener.php
+++ b/lib/WebDriverEventListener.php
@@ -48,5 +48,5 @@ public function beforeChangeValueOf(EventFiringWebElement $element);
 
     public function afterChangeValueOf(EventFiringWebElement $element);
 
-    public function onException(WebDriverException $exception, EventFiringWebDriver $driver = null);
+    public function onException(WebDriverException $exception, ?EventFiringWebDriver $driver = null);
 }
diff --git a/tests/functional/Firefox/FirefoxDriverTest.php b/tests/functional/Firefox/FirefoxDriverTest.php
index c4e4f8c74..900746d2f 100644
--- a/tests/functional/Firefox/FirefoxDriverTest.php
+++ b/tests/functional/Firefox/FirefoxDriverTest.php
@@ -69,7 +69,7 @@ public function testShouldSetPreferenceWithFirefoxOptions(): void
         );
     }
 
-    private function startFirefoxDriver(FirefoxOptions $firefoxOptions = null): void
+    private function startFirefoxDriver(?FirefoxOptions $firefoxOptions = null): void
     {
         // The createDefaultService() method expect path to the executable to be present in the environment variable
         putenv(FirefoxDriverService::WEBDRIVER_FIREFOX_DRIVER . '=' . getenv('GECKODRIVER_PATH'));
diff --git a/tests/functional/WebDriverByTest.php b/tests/functional/WebDriverByTest.php
index cd1239458..2aadf8de9 100644
--- a/tests/functional/WebDriverByTest.php
+++ b/tests/functional/WebDriverByTest.php
@@ -16,8 +16,8 @@ class WebDriverByTest extends WebDriverTestCase
     public function testShouldFindTextElementByLocator(
         string $webDriverByLocatorMethod,
         string $webDriverByLocatorValue,
-        string $expectedText = null,
-        string $expectedAttributeValue = null
+        ?string $expectedText = null,
+        ?string $expectedAttributeValue = null
     ): void {
         $this->driver->get($this->getTestPageUrl(TestPage::INDEX));
 

From 871eeba8815e4340e158202097ad53725269cf1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 15 Aug 2024 11:49:20 +0200
Subject: [PATCH 760/784] Disable chrome 127+ search engine pop-up in tests

---
 tests/functional/Chrome/ChromeDriverTest.php | 2 +-
 tests/functional/WebDriverTestCase.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index 02cb97614..bdabb7f9e 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -87,7 +87,7 @@ private function startChromeDriver($w3cDialect = true): void
 
         // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
         $chromeOptions = new ChromeOptions();
-        $chromeOptions->addArguments(['--no-sandbox', '--headless=new']);
+        $chromeOptions->addArguments(['--no-sandbox', '--headless=new', '--disable-search-engine-choice-screen']);
         $chromeOptions->setExperimentalOption('w3c', $w3cDialect);
         $desiredCapabilities = DesiredCapabilities::chrome();
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 8813055f9..5fa26700f 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -46,12 +46,12 @@ protected function setUp(): void
 
             if ($browserName === WebDriverBrowserType::CHROME) {
                 $chromeOptions = new ChromeOptions();
-                // --no-sandbox is a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
                 $chromeOptions->addArguments([
                     '--headless=new',
                     '--window-size=1024,768',
-                    '--no-sandbox',
+                    '--no-sandbox', // workaround for https://github.com/SeleniumHQ/selenium/issues/4961
                     '--force-color-profile=srgb',
+                    '--disable-search-engine-choice-screen',
                 ]);
 
                 if (!static::isW3cProtocolBuild()) {

From 46c68af691e723e3b44fa26abb6ab592fe180178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2024 13:50:53 +0100
Subject: [PATCH 761/784] docs: Update selenium server host URL in example

---
 .github/CONTRIBUTING.md                | 2 +-
 .github/workflows/tests.yaml           | 2 +-
 example.php                            | 4 ++--
 tests/functional/WebDriverTestCase.php | 8 +-------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 535d9ad55..26ee86b2f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -61,7 +61,7 @@ then start the local PHP server which will serve the test pages and then run the
 
 ```sh
 export BROWSER_NAME="htmlunit" # see below for other browsers
-java -jar selenium-server-standalone-X.X.X.jar -log selenium.log &
+java -jar selenium-server-X.XX.0.jar standalone --log selenium.log &
 php -S localhost:8000 -t tests/functional/web/ &
 # Use following to run both unit and functional tests
 composer all
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index da5fb4a55..257554c88 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -127,7 +127,7 @@ jobs:
         run: |
           google-chrome --version
           xvfb-run --server-args="-screen 0, 1280x720x24" --auto-servernum \
-          chromedriver --port=4444 --url-base=/wd/hub &> ./logs/chromedriver.log &
+          chromedriver --port=4444 &> ./logs/chromedriver.log &
 
       - name: Start GeckoDriver
         if: ${{ !matrix.selenium-server && matrix.browser == 'firefox' }}
diff --git a/example.php b/example.php
index 4491df386..92cd431d6 100644
--- a/example.php
+++ b/example.php
@@ -10,8 +10,8 @@
 
 require_once('vendor/autoload.php');
 
-// This is where Selenium server 2/3 listens by default. For Selenium 4, Chromedriver or Geckodriver, use http://localhost:4444/
-$host = 'http://localhost:4444/wd/hub';
+// This is where Selenium, Chromedriver and Geckodriver 4 listens by default. For Selenium 2/3, use http://localhost:4444/wd/hub
+$host = 'http://localhost:4444/';
 
 $capabilities = DesiredCapabilities::chrome();
 
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 5fa26700f..16e8613a4 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -22,7 +22,7 @@ class WebDriverTestCase extends TestCase
     /** @var bool Indicate whether WebDriver should be created on setUp */
     protected $createWebDriver = true;
     /** @var string */
-    protected $serverUrl = 'http://localhost:4444/wd/hub';
+    protected $serverUrl = 'http://localhost:4444/';
     /** @var DesiredCapabilities */
     protected $desiredCapabilities;
     /** @var int */
@@ -60,15 +60,9 @@ protected function setUp(): void
 
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
             } elseif ($browserName === WebDriverBrowserType::FIREFOX) {
-                if (getenv('GECKODRIVER') === '1') {
-                    $this->serverUrl = 'http://localhost:4444/';
-                }
-
                 $firefoxOptions = new FirefoxOptions();
                 $firefoxOptions->addArguments(['-headless']);
                 $this->desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
-            } elseif ($browserName === WebDriverBrowserType::SAFARI) {
-                $this->serverUrl = 'http://localhost:4444/';
             }
 
             $this->desiredCapabilities->setBrowserName($browserName);

From 8844ac50b5dd4702bbeb0bbc27747bdba01fbafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2024 13:51:40 +0100
Subject: [PATCH 762/784] chore: Update to Selenium 4.26 in tests

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 257554c88..08dcc6239 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -82,7 +82,7 @@ jobs:
   functional-tests:
     runs-on: ${{ matrix.os }}
     env:
-      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.15.0/selenium-server-4.15.0.jar
+      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-server-4.26.0.jar
 
     strategy:
       fail-fast: false

From 72a7066c7a9625ece9bfabc922c487dbb07117ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2024 14:33:54 +0100
Subject: [PATCH 763/784] test: Do not use input as example element, as it have
 shadow dom by default

---
 tests/functional/web/web_components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/web/web_components.html b/tests/functional/web/web_components.html
index c76101356..65e458c30 100644
--- a/tests/functional/web/web_components.html
+++ b/tests/functional/web/web_components.html
@@ -16,7 +16,7 @@
 <body>
 <h1>WebComponents and Shadow DOM tests</h1>
 
-<div><label>Input out of Shadow DOM: <input id="no-shadow-root"/></label></div>
+<p id="no-shadow-root">Element out of Shadow DOM</p>
 <div>
     <custom-checkbox-element></custom-checkbox-element>
 </div>

From 590cf7192bc4b34606ada3d4a0e7b7a3d88ddebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 19 Nov 2024 14:34:18 +0100
Subject: [PATCH 764/784] test: Enable shadow dom tests in geckodriver

---
 tests/functional/ShadowDomTest.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/functional/ShadowDomTest.php b/tests/functional/ShadowDomTest.php
index f98359883..dc95eaa84 100644
--- a/tests/functional/ShadowDomTest.php
+++ b/tests/functional/ShadowDomTest.php
@@ -41,11 +41,6 @@ public function testShouldThrowExceptionWhenGettingShadowRootWithElementNotHavin
         $element->getShadowRoot();
     }
 
-    /**
-     * @group exclude-firefox
-     *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
-     *        Finding elements in shadow DOM is not implemented in Geckodriver
-     */
     public function testShouldFindElementUnderShadowRoot(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));
@@ -61,11 +56,6 @@ public function testShouldFindElementUnderShadowRoot(): void
         $this->assertCount(2, $elementsInShadow);
     }
 
-    /**
-     * @group exclude-firefox
-     *        https://bugzilla.mozilla.org/show_bug.cgi?id=1700097
-     *        Finding elements in shadow DOM is not implemented in Geckodriver
-     */
     public function testShouldReferenceTheSameShadowRootAsFromExecuteScript(): void
     {
         $this->driver->get($this->getTestPageUrl(TestPage::WEB_COMPONENTS));

From 38c892dff7e396a46f8c452fc31cd3caa0aff428 Mon Sep 17 00:00:00 2001
From: Christian Sciberras <christian@yumpu.com>
Date: Wed, 30 Oct 2024 10:49:28 +0100
Subject: [PATCH 765/784] test: Allow running tests in headfull (not headless)
 mode

---
 .github/CONTRIBUTING.md                |  9 ++++++++-
 .github/workflows/tests.yaml           |  1 +
 tests/functional/WebDriverTestCase.php | 13 +++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 26ee86b2f..a79b02b1f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -69,7 +69,7 @@ composer all
 composer test -- --testsuite functional
 ```
 
-If you want to run tests in different browser then "htmlunit" (Chrome or Firefox), you need to setup the browser driver (Chromedriver/Geckodriver), as it is [explained in wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome)
+If you want to run tests in different browser then "htmlunit" (Chrome or Firefox), you need to set up the browser driver (Chromedriver/Geckodriver), as it is [explained in wiki](https://github.com/php-webdriver/php-webdriver/wiki/Chrome)
 and then the `BROWSER_NAME` environment variable:
 
 ```sh
@@ -85,3 +85,10 @@ export GECKODRIVER=1
 export BROWSER_NAME="firefox"
 composer all
 ```
+
+To see the tests as they are happening (in the browser window), you can disable headless mode. This is useful eg. when debugging the tests or writing a new one:
+
+```sh
+export DISABLE_HEADLESS="1"
+composer all
+```
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 08dcc6239..870d1d0f2 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -162,6 +162,7 @@ jobs:
           CHROMEDRIVER_PATH: "${{ (matrix.browser == 'chrome' && !matrix.selenium-server) && '/usr/local/share/chromedriver-linux64/chromedriver' || '' }}"
           GECKODRIVER_PATH: "${{ (matrix.browser == 'firefox' && !matrix.selenium-server) && '/usr/local/share/gecko_driver/geckodriver' || '' }}"
           DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
+          DISABLE_HEADLESS: '0' # We always run headless tests on GitHub Actions
           SELENIUM_SERVER: "${{ matrix.selenium-server && '1' || '0' }}"
         run: |
           if [ "$BROWSER_NAME" = "chrome" ]; then EXCLUDE_GROUP+="exclude-chrome,"; fi
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 16e8613a4..4d7088d01 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -38,6 +38,7 @@ protected function setUp(): void
             $this->setUpSauceLabs();
         } else {
             $browserName = getenv('BROWSER_NAME');
+            $disableHeadless = filter_var(getenv('DISABLE_HEADLESS') ?: '', FILTER_VALIDATE_BOOLEAN);
             if ($browserName === '' || $browserName === false) {
                 $this->markTestSkipped(
                     'To execute functional tests browser name must be provided in BROWSER_NAME environment variable'
@@ -46,14 +47,18 @@ protected function setUp(): void
 
             if ($browserName === WebDriverBrowserType::CHROME) {
                 $chromeOptions = new ChromeOptions();
+
                 $chromeOptions->addArguments([
-                    '--headless=new',
                     '--window-size=1024,768',
                     '--no-sandbox', // workaround for https://github.com/SeleniumHQ/selenium/issues/4961
                     '--force-color-profile=srgb',
                     '--disable-search-engine-choice-screen',
                 ]);
 
+                if (!$disableHeadless) {
+                    $chromeOptions->addArguments(['--headless=new']);
+                }
+
                 if (!static::isW3cProtocolBuild()) {
                     $chromeOptions->setExperimentalOption('w3c', false);
                 }
@@ -61,7 +66,11 @@ protected function setUp(): void
                 $this->desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
             } elseif ($browserName === WebDriverBrowserType::FIREFOX) {
                 $firefoxOptions = new FirefoxOptions();
-                $firefoxOptions->addArguments(['-headless']);
+
+                if (!$disableHeadless) {
+                    $firefoxOptions->addArguments(['-headless']);
+                }
+
                 $this->desiredCapabilities->setCapability(FirefoxOptions::CAPABILITY, $firefoxOptions);
             }
 

From 5a73bc6834430fe5314c632871995fb547ca88aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 21 Nov 2024 16:02:09 +0100
Subject: [PATCH 766/784] Update CHANGELOG

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9dc399ad..8035eaf34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+### Fixed
+- PHP 8.4 deprecation notices, especially in nullable return types.
+- Docs: Fix static return types in RemoteWebElement phpDoc.
+- Tests: Disable chrome 127+ search engine pop-up in tests
+- Tests: Enable Shadow DOM tests in Geckodriver
+
+### Added
+- Tests: Allow running tests in headfull (not headless) mode using `DISABLE_HEADLESS` environment variable.
+
+### Changed
+- Docs: Update selenium server host URL in example.
+
 ## 1.15.1 - 2023-10-20
 - Update `symfony/process` dependency to support upcoming Symfony 7.
 

From 998e499b786805568deaf8cbf06f4044f05d91bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 21 Nov 2024 16:11:13 +0100
Subject: [PATCH 767/784] Release version 1.15.2

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8035eaf34..a468c26f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,9 @@ This project versioning adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 1.15.2 - 2024-11-21
 ### Fixed
-- PHP 8.4 deprecation notices, especially in nullable return types.
+- PHP 8.4 deprecation notices, especially in nullable type-hints.
 - Docs: Fix static return types in RemoteWebElement phpDoc.
 - Tests: Disable chrome 127+ search engine pop-up in tests
 - Tests: Enable Shadow DOM tests in Geckodriver

From dadaa12f76a322dae98b794b67507913616e7e5e Mon Sep 17 00:00:00 2001
From: Andrew Alyamovsky <andrew.alyamovsky@gmail.com>
Date: Thu, 13 Feb 2025 16:52:32 +0100
Subject: [PATCH 768/784] Add Throwable extension to
 PhpWebDriverExceptionInterface

---
 lib/Exception/PhpWebDriverExceptionInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Exception/PhpWebDriverExceptionInterface.php b/lib/Exception/PhpWebDriverExceptionInterface.php
index 04408a63b..58ebc6065 100644
--- a/lib/Exception/PhpWebDriverExceptionInterface.php
+++ b/lib/Exception/PhpWebDriverExceptionInterface.php
@@ -5,6 +5,6 @@
 /**
  * Common interface to identify all exceptions thrown in php-webdriver (both those of WebDriver protocol and internal).
  */
-interface PhpWebDriverExceptionInterface
+interface PhpWebDriverExceptionInterface extends \Throwable
 {
 }

From 18a07d951b6c3eaa398d7149851b6f7115ad004a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 18:24:03 +0100
Subject: [PATCH 769/784] ci: Update markdown link check to ignore blocked urls

---
 .gitattributes               | 1 +
 .github/workflows/tests.yaml | 2 +-
 mlc_config.json              | 7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 mlc_config.json

diff --git a/.gitattributes b/.gitattributes
index 7800fad58..2fdc4ff88 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,4 @@
 /phpstan.neon export-ignore
 /.coveralls.yml export-ignore
 /logs export-ignore
+/mlc_config.json export-ignore
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 870d1d0f2..06927b284 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gaurav-nelson/github-action-markdown-link-check@v1
+      - uses: tcort/github-action-markdown-link-check@v1
         with:
           use-verbose-mode: 'yes'
 
diff --git a/mlc_config.json b/mlc_config.json
new file mode 100644
index 000000000..5d70a03e0
--- /dev/null
+++ b/mlc_config.json
@@ -0,0 +1,7 @@
+{
+  "ignorePatterns": [
+    {
+      "pattern": "^https://stackoverflow\\.com/questions/tagged/php\\+selenium-webdriver"
+    }
+  ]
+}

From a7827e372abf59d9ebbf7c480a8a6c6e41e8060e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 18:32:38 +0100
Subject: [PATCH 770/784] style: Normalize php extensions in composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bd2184262..5aab53c63 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
     "facebook/webdriver": "*"
   },
   "suggest": {
-    "ext-SimpleXML": "For Firefox profile creation"
+    "ext-simplexml": "For Firefox profile creation"
   },
   "minimum-stability": "dev",
   "autoload": {

From 1766e85cb6e22a12635badb22088f64efcb68f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 18:35:15 +0100
Subject: [PATCH 771/784] chore: Update to Selenium 4.38 in tests

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 06927b284..3784db7d6 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -82,7 +82,7 @@ jobs:
   functional-tests:
     runs-on: ${{ matrix.os }}
     env:
-      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.26.0/selenium-server-4.26.0.jar
+      SELENIUM_SERVER_DOWNLOAD_URL: https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.38.0/selenium-server-4.38.0.jar
 
     strategy:
       fail-fast: false

From f37e67d3c743af97da3eeba5afadcdd2bc209818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 18:51:25 +0100
Subject: [PATCH 772/784] chore: Update args to properly set window size for
 new headless chrome

See https://github.com/SeleniumHQ/selenium/issues/15827
https://chromium.googlesource.com/chromium/src/+/main/components/headless/screen_info/README.md
---
 tests/functional/WebDriverTestCase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index 4d7088d01..d7e729825 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -49,7 +49,7 @@ protected function setUp(): void
                 $chromeOptions = new ChromeOptions();
 
                 $chromeOptions->addArguments([
-                    '--window-size=1024,768',
+                    '--screen-info={1280x720}',
                     '--no-sandbox', // workaround for https://github.com/SeleniumHQ/selenium/issues/4961
                     '--force-color-profile=srgb',
                     '--disable-search-engine-choice-screen',

From 487886747568132c625ae2f270a3e4606bb659f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 18:59:18 +0100
Subject: [PATCH 773/784] chore: Remove new flag from headless chrome, as it is
 already default since Chromedriver 132

---
 tests/functional/Chrome/ChromeDriverTest.php | 2 +-
 tests/functional/WebDriverTestCase.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/Chrome/ChromeDriverTest.php b/tests/functional/Chrome/ChromeDriverTest.php
index bdabb7f9e..407b65bd8 100644
--- a/tests/functional/Chrome/ChromeDriverTest.php
+++ b/tests/functional/Chrome/ChromeDriverTest.php
@@ -87,7 +87,7 @@ private function startChromeDriver($w3cDialect = true): void
 
         // Add --no-sandbox as a workaround for Chrome crashing: https://github.com/SeleniumHQ/selenium/issues/4961
         $chromeOptions = new ChromeOptions();
-        $chromeOptions->addArguments(['--no-sandbox', '--headless=new', '--disable-search-engine-choice-screen']);
+        $chromeOptions->addArguments(['--no-sandbox', '--headless', '--disable-search-engine-choice-screen']);
         $chromeOptions->setExperimentalOption('w3c', $w3cDialect);
         $desiredCapabilities = DesiredCapabilities::chrome();
         $desiredCapabilities->setCapability(ChromeOptions::CAPABILITY, $chromeOptions);
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index d7e729825..e6b97e1a9 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -56,7 +56,7 @@ protected function setUp(): void
                 ]);
 
                 if (!$disableHeadless) {
-                    $chromeOptions->addArguments(['--headless=new']);
+                    $chromeOptions->addArguments(['--headless']);
                 }
 
                 if (!static::isW3cProtocolBuild()) {

From 61a9e9dc75b3ec3988e0b759dc96cf703716d7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Thu, 11 Dec 2025 19:23:14 +0100
Subject: [PATCH 774/784] test: Skip fullscren command test broken in Safari

---
 tests/functional/WebDriverWindowTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional/WebDriverWindowTest.php b/tests/functional/WebDriverWindowTest.php
index 93c441748..219126a7e 100644
--- a/tests/functional/WebDriverWindowTest.php
+++ b/tests/functional/WebDriverWindowTest.php
@@ -50,6 +50,7 @@ public function testShouldMaximizeWindow(): void
 
     /**
      * @group exclude-edge
+     * @group exclude-safari
      * @group exclude-saucelabs
      */
     public function testShouldFullscreenWindow(): void

From b51cbcb1f9531f60e7cc972decb56f1fdb265623 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 20:00:56 +0000
Subject: [PATCH 775/784] Bump actions/checkout from 4 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docs-lint.yml    | 2 +-
 .github/workflows/docs-publish.yml | 2 +-
 .github/workflows/sauce-labs.yaml  | 2 +-
 .github/workflows/tests.yaml       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docs-lint.yml b/.github/workflows/docs-lint.yml
index fd1c41b4f..42baa0000 100644
--- a/.github/workflows/docs-lint.yml
+++ b/.github/workflows/docs-lint.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml
index 287c1a75f..d0da12f8b 100644
--- a/.github/workflows/docs-publish.yml
+++ b/.github/workflows/docs-publish.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_KEY_DEPLOY }}
diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 802f4ed8d..a90e17c90 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -29,7 +29,7 @@ jobs:
 
     name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3784db7d6..3b0056b33 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -14,7 +14,7 @@ jobs:
     name: "Code style and static analysis"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -35,7 +35,7 @@ jobs:
     name: "Markdown link check"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: tcort/github-action-markdown-link-check@v1
         with:
           use-verbose-mode: 'yes'
@@ -52,7 +52,7 @@ jobs:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -99,7 +99,7 @@ jobs:
     name: "Functional tests (${{ matrix.browser }}, Selenium server: ${{ matrix.selenium-server }}, W3C: ${{ matrix.w3c }})"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

From c5427c19fef20f49b041c52649d27dbff0549cc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Dec 2025 20:34:15 +0000
Subject: [PATCH 776/784] Bump actions/github-script from 7 to 8

Bumps [actions/github-script](https://github.com/actions/github-script) from 7 to 8.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v7...v8)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/coveralls-workaround.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coveralls-workaround.yaml b/.github/workflows/coveralls-workaround.yaml
index 5ca45b1fe..d6044861d 100644
--- a/.github/workflows/coveralls-workaround.yaml
+++ b/.github/workflows/coveralls-workaround.yaml
@@ -21,7 +21,7 @@ jobs:
     steps:
       # see https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
       - name: 'Download artifact'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var artifacts = await github.rest.actions.listWorkflowRunArtifacts({

From d784f95f00a8abc1f4caad4257bac54b7d508664 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 04:10:59 +0000
Subject: [PATCH 777/784] chore(deps): bump actions/upload-artifact from 4 to 6

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3b0056b33..598264585 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -208,7 +208,7 @@ jobs:
         run: |
           mkdir -p ./data
           echo ${{ github.run_id }} > ./data/run_id
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           name: data
           path: data/

From 6a011bb4813db85173122fd5f43b26dd39a61eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Mon, 15 Dec 2025 16:22:50 +0100
Subject: [PATCH 778/784] chore(deps): bump saucelabs/sauce-connect-action from
 2 to 3, upgrade saucelabs platform versions

---
 .github/workflows/sauce-labs.yaml      | 16 +++++++++-------
 tests/functional/WebDriverTestCase.php | 16 ++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index a90e17c90..9ef25fbc7 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -23,11 +23,11 @@ jobs:
         w3c: [true]
         include:
           # Chrome 74 is the last version which doesn't use W3C WebDriver by default and rather use OSS protocol
-          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 10", w3c: false, tunnel-id: "gh-1" }
-          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-2" }
-          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 10", tunnel-id: "gh-3" }
+          - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 11", w3c: false, tunnel-name: "gh-1-chrome-oss-legacy" }
+          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 11", tunnel-name: "gh-2-chrome-w3c" }
+          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 11", tunnel-name: "gh-3-MicrosoftEdge" }
 
-    name: ${{ matrix.name }} (${{ matrix.tunnel-id }})
+    name: ${{ matrix.name }} (${{ matrix.tunnel-name }})
     steps:
       - uses: actions/checkout@v6
 
@@ -46,11 +46,13 @@ jobs:
           php -S 127.0.0.1:8000 -t tests/functional/web/ &>>./logs/php-server.log &
 
       - name: Start Sauce Connect
-        uses: saucelabs/sauce-connect-action@v2
+        uses: saucelabs/sauce-connect-action@v3
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
-          tunnelIdentifier: ${{ matrix.tunnel-id }}
+          tunnelName: ${{ matrix.tunnel-name }}
+          proxyLocalhost: allow
+          region: 'us-west-1'
 
       - name: Run tests
         env:
@@ -58,7 +60,7 @@ jobs:
           VERSION: ${{ matrix.VERSION }}
           PLATFORM: ${{ matrix.PLATFORM }}
           DISABLE_W3C_PROTOCOL: "${{ matrix.w3c && '0' || '1' }}"
-          SAUCE_TUNNEL_IDENTIFIER: ${{ matrix.tunnel-id }}
+          SAUCE_TUNNEL_NAME: ${{ matrix.tunnel-name }}
         run: |
           if [ -n "$SAUCELABS" ]; then EXCLUDE_GROUP+="exclude-saucelabs,"; fi
           if [ "$BROWSER_NAME" = "MicrosoftEdge" ]; then EXCLUDE_GROUP+="exclude-edge,"; fi
diff --git a/tests/functional/WebDriverTestCase.php b/tests/functional/WebDriverTestCase.php
index e6b97e1a9..db0fd8b0f 100644
--- a/tests/functional/WebDriverTestCase.php
+++ b/tests/functional/WebDriverTestCase.php
@@ -198,14 +198,14 @@ protected function setUpSauceLabs(): void
         if ($ciDetector->isCiDetected()) {
             $ci = $ciDetector->detect();
             if (!empty($ci->getBuildNumber())) {
-                // SAUCE_TUNNEL_IDENTIFIER appended as a workaround for GH actions not having environment value
+                // SAUCE_TUNNEL_NAME appended as a workaround for GH actions not having environment value
                 // to distinguish runs of the matrix
-                $build = $ci->getBuildNumber() . '.' . getenv('SAUCE_TUNNEL_IDENTIFIER');
+                $build = $ci->getBuildNumber() . '.' . getenv('SAUCE_TUNNEL_NAME');
             }
         }
 
-        if (getenv('SAUCE_TUNNEL_IDENTIFIER')) {
-            $tunnelIdentifier = getenv('SAUCE_TUNNEL_IDENTIFIER');
+        if (getenv('SAUCE_TUNNEL_NAME')) {
+            $tunnelName = getenv('SAUCE_TUNNEL_NAME');
         }
 
         if (static::isW3cProtocolBuild()) {
@@ -216,16 +216,16 @@ protected function setUpSauceLabs(): void
             if (isset($build)) {
                 $sauceOptions['build'] = $build;
             }
-            if (isset($tunnelIdentifier)) {
-                $sauceOptions['tunnelIdentifier'] = $tunnelIdentifier;
+            if (isset($tunnelName)) {
+                $sauceOptions['tunnelName'] = $tunnelName;
             }
             $this->desiredCapabilities->setCapability('sauce:options', (object) $sauceOptions);
         } else {
             $this->desiredCapabilities->setCapability('name', $name);
             $this->desiredCapabilities->setCapability('tags', $tags);
 
-            if (isset($tunnelIdentifier)) {
-                $this->desiredCapabilities->setCapability('tunnel-identifier', $tunnelIdentifier);
+            if (isset($tunnelName)) {
+                $this->desiredCapabilities->setCapability('tunnel-identifier', $tunnelName);
             }
             if (isset($build)) {
                 $this->desiredCapabilities->setCapability('build', $build);

From f68a1c9c2b823deb44c027cc4e5b3ad23a94e58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Machulda?= <ondrej.machulda@gmail.com>
Date: Tue, 16 Dec 2025 13:13:23 +0100
Subject: [PATCH 779/784] ci: Reenable unintentionally skipped saucelabs test

---
 .github/workflows/sauce-labs.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sauce-labs.yaml b/.github/workflows/sauce-labs.yaml
index 9ef25fbc7..812fbfe25 100644
--- a/.github/workflows/sauce-labs.yaml
+++ b/.github/workflows/sauce-labs.yaml
@@ -20,12 +20,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        w3c: [true]
         include:
           # Chrome 74 is the last version which doesn't use W3C WebDriver by default and rather use OSS protocol
           - { name: "Chrome 74, OSS protocol", BROWSER_NAME: "chrome", VERSION: "74.0", PLATFORM: "Windows 11", w3c: false, tunnel-name: "gh-1-chrome-oss-legacy" }
-          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 11", tunnel-name: "gh-2-chrome-w3c" }
-          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 11", tunnel-name: "gh-3-MicrosoftEdge" }
+          - { name: "Chrome latest, W3C protocol", BROWSER_NAME: "chrome", VERSION: "latest", PLATFORM: "Windows 11", w3c: true, tunnel-name: "gh-2-chrome-w3c" }
+          - { name: "Edge latest, W3C protocol", BROWSER_NAME: "MicrosoftEdge", VERSION: "latest", PLATFORM: "Windows 11", w3c: true, tunnel-name: "gh-3-MicrosoftEdge" }
 
     name: ${{ matrix.name }} (${{ matrix.tunnel-name }})
     steps:

From d32a252c07586021a54c486d297241a92a406137 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Mon, 8 Dec 2025 09:14:20 +0100
Subject: [PATCH 780/784] ci: add tests for PHP 8.5

---
 .github/workflows/tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 598264585..d215e92ce 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -46,7 +46,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
         dependencies: ['']
         include:
           - { php-version: '7.3', dependencies: '--prefer-lowest' }

From 0e5cbf07609d3ad441b90e6358ef6f7daa5f94e8 Mon Sep 17 00:00:00 2001
From: chris <chris@sky-scripts.de>
Date: Mon, 15 Dec 2025 16:01:18 +0100
Subject: [PATCH 781/784] chore(deps): Allow Symfony 8

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5aab53c63..f44663100 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "ext-json": "*",
     "ext-zip": "*",
     "symfony/polyfill-mbstring": "^1.12",
-    "symfony/process": "^5.0 || ^6.0 || ^7.0"
+    "symfony/process": "^5.0 || ^6.0 || ^7.0 || ^8.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.20.0",
@@ -27,7 +27,7 @@
     "php-parallel-lint/php-parallel-lint": "^1.2",
     "phpunit/phpunit": "^9.3",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0"
+    "symfony/var-dumper": "^5.0 || ^6.0 || ^7.0 || ^8.0"
   },
   "replace": {
     "facebook/webdriver": "*"
@@ -36,6 +36,7 @@
     "ext-simplexml": "For Firefox profile creation"
   },
   "minimum-stability": "dev",
+  "prefer-stable": true,
   "autoload": {
     "psr-4": {
       "Facebook\\WebDriver\\": "lib/"

From c65b9fc07713641e79c61e81838b3119dc22b7dd Mon Sep 17 00:00:00 2001
From: Ezra <me+github@nice.kiwi>
Date: Tue, 15 Jul 2025 17:03:54 +1200
Subject: [PATCH 782/784] Fix incorrect link to driver capabilities docs

---
 lib/Chrome/ChromeOptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Chrome/ChromeOptions.php b/lib/Chrome/ChromeOptions.php
index 2e2f6d2c2..daea44c67 100644
--- a/lib/Chrome/ChromeOptions.php
+++ b/lib/Chrome/ChromeOptions.php
@@ -9,7 +9,7 @@
 /**
  * The class manages the capabilities in ChromeDriver.
  *
- * @see https://sites.google.com/a/chromium.org/chromedriver/capabilities
+ * @see https://sites.google.com/chromium.org/driver/capabilities
  */
 class ChromeOptions implements JsonSerializable
 {

From e5bf60f7a42c65a86fbfa3e2830fe99055540337 Mon Sep 17 00:00:00 2001
From: Jose' Pedro Saraiva <js@simplesurance.de>
Date: Mon, 2 Jun 2025 11:29:22 +0200
Subject: [PATCH 783/784] Fix file upload endpoint for selenium 4.x

---
 lib/Remote/HttpCommandExecutor.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Remote/HttpCommandExecutor.php b/lib/Remote/HttpCommandExecutor.php
index 96b0ccc70..3e3ef1719 100644
--- a/lib/Remote/HttpCommandExecutor.php
+++ b/lib/Remote/HttpCommandExecutor.php
@@ -175,6 +175,8 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::SET_WINDOW_SIZE => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
         DriverCommand::SET_WINDOW_POSITION => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
+        // Selenium extension of W3C protocol
+        DriverCommand::UPLOAD_FILE => ['method' => 'POST', 'url' => '/session/:sessionId/se/file'],
     ];
     /**
      * @var string

From a7f16c101fd9c85106ddfb0b73c161979e75140b Mon Sep 17 00:00:00 2001
From: Christian Sciberras <christian@sciberras.me>
Date: Wed, 17 Dec 2025 14:10:05 +0100
Subject: [PATCH 784/784] Clarify and fix timeout value type (#1120)

* Clarify and fix timeout value type
---
 lib/WebDriverTimeouts.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/WebDriverTimeouts.php b/lib/WebDriverTimeouts.php
index add6a0900..73a5cddf8 100644
--- a/lib/WebDriverTimeouts.php
+++ b/lib/WebDriverTimeouts.php
@@ -28,7 +28,7 @@ public function __construct(ExecuteMethod $executor, $isW3cCompliant = false)
     /**
      * Specify the amount of time the driver should wait when searching for an element if it is not immediately present.
      *
-     * @param int $seconds Wait time in second.
+     * @param null|int|float $seconds Wait time in seconds.
      * @return WebDriverTimeouts The current instance.
      */
     public function implicitlyWait($seconds)
@@ -36,15 +36,18 @@ public function implicitlyWait($seconds)
         if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::IMPLICITLY_WAIT,
-                ['implicit' => $seconds * 1000]
+                ['implicit' => $seconds === null ? null : floor($seconds * 1000)]
             );
 
             return $this;
         }
 
+        if ($seconds === null) {
+            throw new \InvalidArgumentException('JsonWire Protocol implicit-wait-timeout value cannot be null');
+        }
         $this->executor->execute(
             DriverCommand::IMPLICITLY_WAIT,
-            ['ms' => $seconds * 1000]
+            ['ms' => floor($seconds * 1000)]
         );
 
         return $this;
@@ -53,7 +56,7 @@ public function implicitlyWait($seconds)
     /**
      * Set the amount of time to wait for an asynchronous script to finish execution before throwing an error.
      *
-     * @param int $seconds Wait time in second.
+     * @param null|int|float $seconds Wait time in seconds.
      * @return WebDriverTimeouts The current instance.
      */
     public function setScriptTimeout($seconds)
@@ -61,15 +64,18 @@ public function setScriptTimeout($seconds)
         if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::SET_SCRIPT_TIMEOUT,
-                ['script' => $seconds * 1000]
+                ['script' => $seconds === null ? null : floor($seconds * 1000)]
             );
 
             return $this;
         }
 
+        if ($seconds === null) {
+            throw new \InvalidArgumentException('JsonWire Protocol script-timeout value cannot be null');
+        }
         $this->executor->execute(
             DriverCommand::SET_SCRIPT_TIMEOUT,
-            ['ms' => $seconds * 1000]
+            ['ms' => floor($seconds * 1000)]
         );
 
         return $this;
@@ -78,7 +84,7 @@ public function setScriptTimeout($seconds)
     /**
      * Set the amount of time to wait for a page load to complete before throwing an error.
      *
-     * @param int $seconds Wait time in second.
+     * @param null|int|float $seconds Wait time in seconds.
      * @return WebDriverTimeouts The current instance.
      */
     public function pageLoadTimeout($seconds)
@@ -86,15 +92,18 @@ public function pageLoadTimeout($seconds)
         if ($this->isW3cCompliant) {
             $this->executor->execute(
                 DriverCommand::SET_SCRIPT_TIMEOUT,
-                ['pageLoad' => $seconds * 1000]
+                ['pageLoad' => $seconds === null ? null : floor($seconds * 1000)]
             );
 
             return $this;
         }
 
+        if ($seconds === null) {
+            throw new \InvalidArgumentException('JsonWire Protocol page-load-timeout value cannot be null');
+        }
         $this->executor->execute(DriverCommand::SET_TIMEOUT, [
             'type' => 'page load',
-            'ms' => $seconds * 1000,
+            'ms' => floor($seconds * 1000),
         ]);
 
         return $this;