diff --git a/.travis.yml b/.travis.yml
index 497273f7..ff153ad6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,5 +8,7 @@ matrix:
     allow_failures:
         - php: hhvm
 
-before_script: ./.ci/before_script.sh
+before_script:
+  - ./.ci/before_script.sh
+  - vendor/bin/phpcs --standard=ruleset.xml PHPUnit/
 script: "vendor/bin/phpunit Tests"
diff --git a/PHPUnit/Extensions/Selenium2TestCase.php b/PHPUnit/Extensions/Selenium2TestCase.php
index 95c35181..cf119969 100644
--- a/PHPUnit/Extensions/Selenium2TestCase.php
+++ b/PHPUnit/Extensions/Selenium2TestCase.php
@@ -1,50 +1,17 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions;
 
 use Exception;
+use InvalidArgumentException;
 use PHPUnit\Extensions\Selenium2TestCase\Element;
 use PHPUnit\Extensions\Selenium2TestCase\Element\Select;
 use PHPUnit\Extensions\Selenium2TestCase\ElementCriteria;
@@ -59,7 +26,6 @@
 use PHPUnit\Extensions\Selenium2TestCase\WaitUntil;
 use PHPUnit\Extensions\Selenium2TestCase\Window;
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
-use PHPUnit\Framework\InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestResult;
 use RuntimeException;
@@ -70,13 +36,6 @@
  * (WebDriver API and JsonWire protocol) to provide
  * the functionality required for web testing.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  * @method void acceptAlert() Press OK on an alert, or confirms a dialog
  * @method mixed alertText() alertText($value = NULL) Gets the alert dialog text, or sets the text for a prompt dialog
  * @method void back()
@@ -121,31 +80,22 @@
  */
 abstract class Selenium2TestCase extends TestCase
 {
-    const VERSION = '9.0.0';
 
-    /**
-     * @var string  override to provide code coverage data from the server
-     */
+    public const VERSION = '9.0.0';
+
+    /** @var string  override to provide code coverage data from the server */
     protected $coverageScriptUrl;
 
-    /**
-     * @var Session
-     */
+    /** @var Session */
     private $session;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     private $parameters;
 
-    /**
-     * @var SessionStrategy
-     */
+    /** @var SessionStrategy */
     protected static $sessionStrategy;
 
-    /**
-     * @var SessionStrategy
-     */
+    /** @var SessionStrategy */
     protected static $browserSessionStrategy;
 
     /**
@@ -162,132 +112,111 @@ abstract class Selenium2TestCase extends TestCase
      */
     private static $defaultWaitUntilSleepInterval = 500;
 
-    /**
-     * @var SessionStrategy
-     */
+    /** @var SessionStrategy */
     protected $localSessionStrategy;
 
-    /**
-     * @var array
-     */
+    /** @var array */
     private static $lastBrowserParams;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $testId;
 
-    /**
-     * @var boolean
-     */
+    /** @var bool */
     private $collectCodeCoverageInformation;
 
-    /**
-     * @var KeysHolder
-     */
+    /** @var KeysHolder */
     private $keysHolder;
 
-    /**
-     * @param boolean
-     */
-    private static $keepSessionOnFailure = FALSE;
+    /** @param boolean */
+    private static $keepSessionOnFailure = false;
 
-    /**
-     * @param boolean
-     */
-    public static function shareSession($shareSession)
+    public static function shareSession(bool $shareSession): void
     {
-        if (!is_bool($shareSession)) {
-            throw new \InvalidArgumentException("The shared session support can only be switched on or off.");
-        }
-        if (!$shareSession) {
+        if (! $shareSession) {
             self::$sessionStrategy = self::defaultSessionStrategy();
         } else {
             self::$sessionStrategy = new Shared(
-              self::defaultSessionStrategy(), self::$keepSessionOnFailure
-              );
+                self::defaultSessionStrategy(),
+                self::$keepSessionOnFailure
+            );
         }
     }
 
-    public static function keepSessionOnFailure($keepSession)
+    public static function keepSessionOnFailure(bool $keepSession): void
     {
-      if (!is_bool($keepSession)) {
-            throw new \InvalidArgumentException("The keep session on fail support can only be switched on or off.");
+        if ($keepSession) {
+            self::$keepSessionOnFailure = true;
         }
-      if ($keepSession){
-            self::$keepSessionOnFailure = TRUE;
-      }
     }
 
-    private static function sessionStrategy()
+    private static function sessionStrategy(): SessionStrategy
     {
-        if (!self::$sessionStrategy) {
+        if (! self::$sessionStrategy) {
             self::$sessionStrategy = self::defaultSessionStrategy();
         }
+
         return self::$sessionStrategy;
     }
 
-    private static function defaultSessionStrategy()
+    private static function defaultSessionStrategy(): SessionStrategy
     {
-        return new Isolated;
+        return new Isolated();
     }
 
     /**
      * Get the default timeout for WaitUntil
-     * @return int the default timeout
      */
-    public static function defaultWaitUntilTimeout(){
+    public static function defaultWaitUntilTimeout(): int
+    {
         return self::$defaultWaitUntilTimeout;
     }
 
     /**
      * Set the default timeout for WaitUntil
-     * @param int $timeout the new default timeout
      */
-    public static function setDefaultWaitUntilTimeout($timeout){
-        $timeout = (int) $timeout;
+    public static function setDefaultWaitUntilTimeout(int $timeout): void
+    {
         self::$defaultWaitUntilTimeout = $timeout > 0 ? $timeout : 0;
     }
 
     /**
      * Get the default sleep delay for WaitUntil
-     * @return int
      */
-    public static function defaultWaitUntilSleepInterval(){
+    public static function defaultWaitUntilSleepInterval(): int
+    {
         return self::$defaultWaitUntilSleepInterval;
     }
 
     /**
      * Set default sleep delay for WaitUntil
-     * @param int $sleepDelay the new default sleep delay
      */
-    public static function setDefaultWaitUntilSleepInterval($sleepDelay){
-        $sleepDelay = (int) $sleepDelay;
+    public static function setDefaultWaitUntilSleepInterval(int $sleepDelay): void
+    {
         self::$defaultWaitUntilSleepInterval = $sleepDelay > 0 ? $sleepDelay : 0;
     }
 
-
-    public function __construct($name = NULL, array $data = array(), $dataName = '')
+    public function __construct($name = null, array $data = [], $dataName = '')
     {
         parent::__construct($name, $data, $dataName);
-        $this->parameters = array(
+        $this->parameters = [
             'host' => 'localhost',
             'port' => 4444,
-            'browser' => NULL,
-            'browserName' => NULL,
-            'desiredCapabilities' => array(),
+            'browser' => null,
+            'browserName' => null,
+            'desiredCapabilities' => [],
             'seleniumServerRequestsTimeout' => 60,
-            'secure' => FALSE
-        );
+            'secure' => false,
+        ];
 
         $this->keysHolder = new KeysHolder();
     }
 
-    public function setupSpecificBrowser($params)
+    public function setupSpecificBrowser(array $params): void
     {
         if (isset($params['keepSession'])) {
-            $this->keepSessionOnFailure(TRUE);
+            $this->keepSessionOnFailure(true);
         }
+
         $this->setUpSessionStrategy($params);
         $params = array_merge($this->parameters, $params);
         $this->setHost($params['host']);
@@ -296,36 +225,38 @@ public function setupSpecificBrowser($params)
         $this->parameters['browser'] = $params['browser'];
         $this->setDesiredCapabilities($params['desiredCapabilities']);
         $this->setSeleniumServerRequestsTimeout(
-            $params['seleniumServerRequestsTimeout']);
+            $params['seleniumServerRequestsTimeout']
+        );
     }
 
-    protected function setUpSessionStrategy($params)
+    protected function setUpSessionStrategy(array $params): void
     {
         // This logic enables us to have a session strategy reused for each
         // item in self::$browsers. We don't want them both to share one
         // and we don't want each test for a specific browser to have a
         // new strategy
-        if ($params == self::$lastBrowserParams) {
-            // do nothing so we use the same session strategy for this
-            // browser
+
+        // phpcs:disable Generic.CodeAnalysis.EmptyStatement
+        if ($params === self::$lastBrowserParams) {
+            // do nothing so we use the same session strategy for this browser
         } elseif (isset($params['sessionStrategy'])) {
             $strat = $params['sessionStrategy'];
-            if ($strat != "isolated" && $strat != "shared") {
-                throw new \InvalidArgumentException("Session strategy must be either 'isolated' or 'shared'");
-            } elseif ($strat == "isolated") {
-                self::$browserSessionStrategy = new Isolated;
+            if ($strat !== 'isolated' && $strat !== 'shared') {
+                throw new InvalidArgumentException("Session strategy must be either 'isolated' or 'shared'");
+            } elseif ($strat === 'isolated') {
+                self::$browserSessionStrategy = new Isolated();
             } else {
                 self::$browserSessionStrategy = new Shared(self::defaultSessionStrategy(), self::$keepSessionOnFailure);
             }
         } else {
             self::$browserSessionStrategy = self::defaultSessionStrategy();
         }
-        self::$lastBrowserParams = $params;
-        $this->localSessionStrategy = self::$browserSessionStrategy;
 
+        self::$lastBrowserParams    = $params;
+        $this->localSessionStrategy = self::$browserSessionStrategy;
     }
 
-    private function getStrategy()
+    private function getStrategy(): SessionStrategy
     {
         if ($this->localSessionStrategy) {
             return $this->localSessionStrategy;
@@ -334,23 +265,24 @@ private function getStrategy()
         }
     }
 
-    public function prepareSession()
+    public function prepareSession(): Session
     {
         try {
-            if (!$this->session) {
+            if (! $this->session) {
                 $this->session = $this->getStrategy()->session($this->parameters);
             }
         } catch (NoSeleniumException $e) {
-            $this->markTestSkipped("The Selenium Server is not active on host {$this->parameters['host']} at port {$this->parameters['port']}.");
+            $this->markTestSkipped(sprintf('The Selenium Server is not active on host %s at port %s.', $this->parameters['host'], $this->parameters['port']));
         }
+
         return $this->session;
     }
 
-    public function run(TestResult $result = NULL): TestResult
+    public function run(?TestResult $result = null): TestResult
     {
-        $this->testId = get_class($this) . '__' . $this->getName();
+        $this->testId = static::class . '__' . $this->getName();
 
-        if ($result === NULL) {
+        if ($result === null) {
             $result = $this->createResult();
         }
 
@@ -364,7 +296,8 @@ public function run(TestResult $result = NULL): TestResult
                 $this->testId
             );
             $result->getCodeCoverage()->append(
-                $coverage->get(), $this
+                $coverage->get(),
+                $this
             );
         }
 
@@ -382,7 +315,7 @@ protected function runTest()
     {
         $this->prepareSession();
 
-        $thrownException = NULL;
+        $thrownException = null;
 
         if ($this->collectCodeCoverageInformation) {
             $this->url($this->coverageScriptUrl);   // phpunit_coverage.php won't do anything if the cookie isn't set, which is exactly what we want
@@ -393,7 +326,7 @@ protected function runTest()
             $this->setUpPage();
             $result = parent::runTest();
 
-            if (!empty($this->verificationErrors)) {
+            if (! empty($this->verificationErrors)) {
                 $this->fail(implode("\n", $this->verificationErrors));
             }
         } catch (Exception $e) {
@@ -404,15 +337,17 @@ protected function runTest()
             $this->session->cookie()->remove('PHPUNIT_SELENIUM_TEST_ID');
         }
 
-        if (NULL !== $thrownException) {
+        if ($thrownException !== null) {
             throw $thrownException;
         }
 
         return $result;
     }
 
-
-    public static function suite($className)
+    /**
+     * @return SeleniumTestSuite
+     */
+    public static function suite(string $className)
     {
         return SeleniumTestSuite::fromTestCaseClass($className);
     }
@@ -428,183 +363,137 @@ public function onNotSuccessfulTest(Throwable $e): void
      *
      * @param  string $command
      * @param  array  $arguments
+     *
      * @return mixed
      */
     public function __call($command, $arguments)
     {
-        if ($this->session === NULL) {
-            throw new \PHPUnit\Extensions\Selenium2TestCase\Exception("There is currently no active session to execute the '$command' command. You're probably trying to set some option in setUp() with an incorrect setter name. You may consider using setUpPage() instead.");
+        if ($this->session === null) {
+            throw new \PHPUnit\Extensions\Selenium2TestCase\Exception(sprintf("There is currently no active session to execute the '%s' command. You're probably trying to set some option in setUp() with an incorrect setter name. You may consider using setUpPage() instead.", $command));
         }
-        $result = call_user_func_array(
-          array($this->session, $command), $arguments
-        );
 
-        return $result;
+        return call_user_func_array(
+            [$this->session, $command],
+            $arguments
+        );
     }
 
-    /**
-     * @param  string $host
-     * @throws InvalidArgumentException
-     */
-    public function setHost($host)
+    public function setHost(string $host): void
     {
-        if (!is_string($host)) {
-            throw InvalidArgumentException::create(1, 'string');
-        }
-
         $this->parameters['host'] = $host;
     }
 
-    public function getHost()
+    public function getHost(): string
     {
         return $this->parameters['host'];
     }
 
-    /**
-     * @param  integer $port
-     * @throws InvalidArgumentException
-     */
-    public function setPort($port)
+    public function setPort(int $port): void
     {
-        if (!is_int($port)) {
-            throw InvalidArgumentException::create(1, 'integer');
-        }
-
         $this->parameters['port'] = $port;
     }
 
-    public function getPort()
+    public function getPort(): int
     {
         return $this->parameters['port'];
     }
 
-    /**
-     * @param boolean $secure
-     * @throws InvalidArgumentException
-     */
-    public function setSecure($secure)
+    public function setSecure(bool $secure): void
     {
-        if(!is_bool($secure)) {
-            throw InvalidArgumentException::create(1, 'boolean');
-        }
-
         $this->parameters['secure'] = $secure;
     }
 
-    public function getSecure()
+    public function getSecure(): bool
     {
         return $this->parameters['secure'];
     }
 
-    /**
-     * @param  string $browser
-     * @throws InvalidArgumentException
-     */
-    public function setBrowser($browserName)
+    public function setBrowser(string $browserName): void
     {
-        if (!is_string($browserName)) {
-            throw InvalidArgumentException::create(1, 'string');
-        }
-
         $this->parameters['browserName'] = $browserName;
     }
 
-    public function getBrowser()
+    public function getBrowser(): string
     {
         return $this->parameters['browserName'];
     }
 
-    /**
-     * @param  string $browserUrl
-     * @throws InvalidArgumentException
-     */
-    public function setBrowserUrl($browserUrl)
+    public function setBrowserUrl(string $browserUrl): void
     {
-        if (!is_string($browserUrl)) {
-            throw InvalidArgumentException::create(1, 'string');
-        }
-
         $this->parameters['browserUrl'] = new URL($browserUrl);
     }
 
-    public function getBrowserUrl()
+    public function getBrowserUrl(): string
     {
-        if (isset($this->parameters['browserUrl'])) {
-            return $this->parameters['browserUrl'];
-        }
-        return '';
+        return $this->parameters['browserUrl'] ?? '';
     }
 
     /**
      * @see http://code.google.com/p/selenium/wiki/JsonWireProtocol
      */
-    public function setDesiredCapabilities(array $capabilities)
+    public function setDesiredCapabilities(array $capabilities): void
     {
         $this->parameters['desiredCapabilities'] = $capabilities;
     }
 
-
-    public function getDesiredCapabilities()
+    public function getDesiredCapabilities(): array
     {
         return $this->parameters['desiredCapabilities'];
     }
 
-    /**
-     * @param int $timeout  seconds
-     */
-    public function setSeleniumServerRequestsTimeout($timeout)
+    public function setSeleniumServerRequestsTimeout(int $timeout): void
     {
         $this->parameters['seleniumServerRequestsTimeout'] = $timeout;
     }
 
-    public function getSeleniumServerRequestsTimeout()
+    public function getSeleniumServerRequestsTimeout(): int
     {
         return $this->parameters['seleniumServerRequestsTimeout'];
     }
 
     /**
      * Get test id (generated internally)
-     * @return string
      */
-    public function getTestId()
+    public function getTestId(): string
     {
         return $this->testId;
     }
 
     /**
      * Get Selenium2 current session id
-     * @return string
      */
-    public function getSessionId()
+    public function getSessionId(): string
     {
         if ($this->session) {
             return $this->session->id();
         }
-        return FALSE;
+
+        return false;
     }
 
     /**
      * Wait until callback isn't null or timeout occurs
      *
-     * @param $callback
-     * @param null $timeout
      * @return mixed
      */
-    public function waitUntil($callback, $timeout = NULL)
+    public function waitUntil($callback, $timeout = null)
     {
         $waitUntil = new WaitUntil($this);
+
         return $waitUntil->run($callback, $timeout);
     }
 
     /**
      * Sends a special key
      * Deprecated due to issues with IE webdriver. Use keys() method instead
+     *
      * @deprecated
-     * @param string $name
-     * @throws \PHPUnit\Extensions\Selenium2TestCase\Exception
+     *
      * @see KeysHolder
+     *
+     * @throws \PHPUnit\Extensions\Selenium2TestCase\Exception
      */
-    public function keysSpecial($name)
+    public function keysSpecial(string $name): void
     {
         $names = explode(',', $name);
 
@@ -619,19 +508,21 @@ public function keysSpecial($name)
      */
     public function setUpPage()
     {
-
     }
 
     /**
      * Check whether an alert box is present
+     *
+     * @return true|null
      */
     public function alertIsPresent()
     {
         try {
             $this->alertText();
-            return TRUE;
+
+            return true;
         } catch (Exception $e) {
-            return NULL;
+            return null;
         }
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Command.php b/PHPUnit/Extensions/Selenium2TestCase/Command.php
index 033b641e..fcf16b2c 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Command.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Command.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -48,45 +14,32 @@
 
 /**
  * Base class for implementing commands with special semantics.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 abstract class Command
 {
     protected $jsonParameters;
-    private $commandName;
+    private $url;
 
     /**
-     * @param array $jsonParameters     null in case of no parameters
+     * @param array $jsonParameters null in case of no parameters
      */
-    public function __construct($jsonParameters, URL $url)
+    public function __construct(?array $jsonParameters, URL $url)
     {
-        if (!is_array($jsonParameters) && $jsonParameters !== NULL) {
-            throw new InvalidArgumentException("The JSON parameters must be an array, or a NULL value in case they are not required.");
+        if (! is_array($jsonParameters) && $jsonParameters !== null) {
+            throw new InvalidArgumentException('The JSON parameters must be an array, or a NULL value in case they are not required.');
         }
+
         $this->jsonParameters = $jsonParameters;
-        $this->url = $url;
+        $this->url            = $url;
     }
 
-    public function url()
+    public function url(): URL
     {
         return $this->url;
     }
 
-    /**
-     * @return string
-     */
-    abstract public function httpMethod();
+    abstract public function httpMethod(): string;
 
-    /**
-     * @param array $jsonParameters     null in case of no parameters
-     */
     public function jsonParameters()
     {
         return $this->jsonParameters;
diff --git a/PHPUnit/Extensions/Selenium2TestCase/CommandsHolder.php b/PHPUnit/Extensions/Selenium2TestCase/CommandsHolder.php
index 1f7c56dd..99c6cd42 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/CommandsHolder.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/CommandsHolder.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -50,92 +16,80 @@
 
 /**
  * Object representing elements, or everything that may have subcommands.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 abstract class CommandsHolder
 {
-    /**
-     * @var Driver
-     */
+    /** @var Driver */
     protected $driver;
 
-    /**
-     * @var string  the API URL for this element,
-     */
+    /** @var string the API URL for this element, */
     protected $url;
 
-    /**
-     * @var array   instances of
-     *              PHPUnit_Extensions_Selenium2TestCase_ElementCommand
-     */
+    /** @var array instances of PHPUnit_Extensions_Selenium2TestCase_ElementCommand */
     protected $commands;
 
-    public function __construct($driver, URL $url)
+    public function __construct(Driver $driver, URL $url)
     {
-        $this->driver = $driver;
-        $this->url = $url;
-        $this->commands = array();
+        $this->driver   = $driver;
+        $this->url      = $url;
+        $this->commands = [];
         foreach ($this->initCommands() as $commandName => $handler) {
             if (is_string($handler)) {
                 $this->commands[$commandName] = $this->factoryMethod($handler);
-            } else if (is_callable($handler)) {
+            } elseif (is_callable($handler)) {
                 $this->commands[$commandName] = $handler;
             } else {
-                throw new InvalidArgumentException("Command $commandName is not configured correctly.");
+                throw new InvalidArgumentException(sprintf('Command %s is not configured correctly.', $commandName));
             }
         }
     }
 
     /**
-     * @return array    class names, or
-     *                  callables of the form function($parameter, $commandUrl)
+     * @return array class names, or callables of the form function($parameter, $commandUrl)
      */
-    protected abstract function initCommands();
+    abstract protected function initCommands(): array;
 
     public function __call($commandName, $arguments)
     {
         $jsonParameters = $this->extractJsonParameters($arguments);
-        $response = $this->driver->execute($this->newCommand($commandName, $jsonParameters));
+        $response       = $this->driver->execute($this->newCommand($commandName, $jsonParameters));
+
         return $response->getValue();
     }
 
-    protected function postCommand($name, ElementCriteria $criteria)
+    protected function postCommand(string $name, ElementCriteria $criteria)
     {
-        $response = $this->driver->curl('POST',
-                                        $this->url->addCommand($name),
-                                        $criteria->getArrayCopy());
+        $response = $this->driver->curl(
+            'POST',
+            $this->url->addCommand($name),
+            $criteria->getArrayCopy()
+        );
+
         return $response->getValue();
     }
 
     /**
-     * @params string $commandClass     a class name, descending from Command
-     * @return callable
+     * @param string $commandClass a class name, descending from Command
      */
-    private function factoryMethod($commandClass)
+    private function factoryMethod(string $commandClass): callable
     {
-        return function($jsonParameters, $url) use ($commandClass) {
+        return static function ($jsonParameters, $url) use ($commandClass) {
             return new $commandClass($jsonParameters, $url);
         };
     }
 
-    private function extractJsonParameters($arguments)
+    private function extractJsonParameters(array $arguments)
     {
         $this->checkArguments($arguments);
 
-        if (count($arguments) == 0) {
-            return NULL;
+        if (count($arguments) === 0) {
+            return null;
         }
+
         return $arguments[0];
     }
 
-    private function checkArguments($arguments)
+    private function checkArguments(array $arguments): void
     {
         if (count($arguments) > 1) {
             throw new Exception('You cannot call a command with multiple method arguments.');
@@ -143,19 +97,18 @@ private function checkArguments($arguments)
     }
 
     /**
-     * @param string $commandName  The called method name
-     *                              defined as a key in initCommands()
-     * @param array $jsonParameters
-     * @return Command
+     * @param string            $commandName    The called method name defined as a key in initCommands()
+     * @param string|array|null $jsonParameters
      */
-    protected function newCommand($commandName, $jsonParameters)
+    protected function newCommand(string $commandName, $jsonParameters): Command
     {
         if (isset($this->commands[$commandName])) {
             $factoryMethod = $this->commands[$commandName];
-            $url = $this->url->addCommand($commandName);
-            $command = $factoryMethod($jsonParameters, $url);
-            return $command;
+            $url           = $this->url->addCommand($commandName);
+
+            return $factoryMethod($jsonParameters, $url);
         }
-        throw new BadMethodCallException("The command '$commandName' is not existent or not supported yet.");
+
+        throw new BadMethodCallException(sprintf("The command '%s' is not existent or not supported yet.", $commandName));
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Driver.php b/PHPUnit/Extensions/Selenium2TestCase/Driver.php
index 1ffc4587..8bc55406 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Driver.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Driver.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -49,14 +15,6 @@
 
 /**
  * Driver for creating browser session with Selenium 2 (WebDriver API).
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Driver
 {
@@ -65,23 +23,22 @@ class Driver
 
     public function __construct(URL $seleniumServerUrl, $timeout = 60)
     {
-        $this->seleniumServerUrl = $seleniumServerUrl;
+        $this->seleniumServerUrl             = $seleniumServerUrl;
         $this->seleniumServerRequestsTimeout = $timeout;
     }
 
-    public function startSession(array $desiredCapabilities, URL $browserUrl)
+    public function startSession(array $desiredCapabilities, URL $browserUrl): Session
     {
-        $sessionCreation = $this->seleniumServerUrl->descend("/wd/hub/session");
-        $response = $this->curl('POST', $sessionCreation, array(
-            'desiredCapabilities' => $desiredCapabilities
-        ));
-        $sessionPrefix = $response->getURL();
+        $sessionCreation = $this->seleniumServerUrl->descend('/wd/hub/session');
+        $response        = $this->curl('POST', $sessionCreation, ['desiredCapabilities' => $desiredCapabilities,]);
+        $sessionPrefix   = $response->getURL();
 
         $timeouts = new Timeouts(
             $this,
             $sessionPrefix->descend('timeouts'),
             $this->seleniumServerRequestsTimeout * 1000
         );
+
         return new Session(
             $this,
             $sessionPrefix,
@@ -93,31 +50,34 @@ public function startSession(array $desiredCapabilities, URL $browserUrl)
     /**
      * Performs an HTTP request to the Selenium 2 server.
      *
-     * @param string $method      'GET'|'POST'|'DELETE'|...
+     * @param string $method 'GET'|'POST'|'DELETE'|...
      * @param string $url
-     * @param array $params       JSON parameters for POST requests
+     * @param array  $params JSON parameters for POST requests
      */
-    public function curl($http_method, URL $url, $params = NULL)
+    public function curl(string $httpMethod, URL $url, ?array $params = null): Response
     {
         $curl = curl_init($url->getValue());
         curl_setopt($curl, CURLOPT_TIMEOUT, $this->seleniumServerRequestsTimeout);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
-        curl_setopt($curl,
-                    CURLOPT_HTTPHEADER,
-                    array(
-                        'Content-type: application/json;charset=UTF-8',
-                        'Accept: application/json;charset=UTF-8'
-                     ));
-
-        if ($http_method === 'POST') {
-            curl_setopt($curl, CURLOPT_POST, TRUE);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt(
+            $curl,
+            CURLOPT_HTTPHEADER,
+            [
+                'Content-type: application/json;charset=UTF-8',
+                'Accept: application/json;charset=UTF-8',
+            ]
+        );
+
+        if ($httpMethod === 'POST') {
+            curl_setopt($curl, CURLOPT_POST, true);
             if ($params && is_array($params)) {
                 curl_setopt($curl, CURLOPT_POSTFIELDS, json_encode($params));
             } else {
                 curl_setopt($curl, CURLOPT_POSTFIELDS, '');
             }
-            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, TRUE);
-        } else if ($http_method == 'DELETE') {
+
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+        } elseif ($httpMethod === 'DELETE') {
             curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
         }
 
@@ -125,27 +85,31 @@ public function curl($http_method, URL $url, $params = NULL)
         if (curl_errno($curl)) {
             throw new NoSeleniumException(
                 'Error connection[' . curl_errno($curl) . '] to ' .
-                $url->getValue()  . ': ' . curl_error($curl)
+                $url->getValue() . ': ' . curl_error($curl)
             );
         }
+
         $info = curl_getinfo($curl);
-        if ($info['http_code'] == 0) {
+        if ($info['http_code'] === 0) {
             throw new NoSeleniumException();
         }
-        if ($info['http_code'] == 404) {
-            throw new BadMethodCallException("The command $url is not recognized by the server.");
+
+        if ($info['http_code'] === 404) {
+            throw new BadMethodCallException(sprintf('The command %s is not recognized by the server.', $url));
         }
+
         if (($info['http_code'] >= 400) && ($info['http_code'] < 500)) {
-            throw new BadMethodCallException("Something unexpected happened: '$rawResponse'");
+            throw new BadMethodCallException(sprintf("Something unexpected happened: '%s'", $rawResponse));
         }
+
         curl_close($curl);
-        $content = json_decode($rawResponse, TRUE);
+        $content = json_decode($rawResponse, true);
 
         if ($content === null && json_last_error() !== JSON_ERROR_NONE) {
             throw new \PHPUnit\Extensions\Selenium2TestCase\Exception(
                 sprintf(
-                    "JSON decoding of remote response failed.\n".
-                    "Error code: %d\n".
+                    "JSON decoding of remote response failed.\n" .
+                    "Error code: %d\n" .
                     "The response: '%s'\n",
                     json_last_error(),
                     $rawResponse
@@ -163,7 +127,7 @@ public function curl($http_method, URL $url, $params = NULL)
             $message = $value['message'];
         }
 
-        $status = isset($content['status']) ? $content['status'] : 0;
+        $status = $content['status'] ?? 0;
         if ($status !== WebDriverException::Success) {
             throw new WebDriverException($message, $status);
         }
@@ -171,10 +135,12 @@ public function curl($http_method, URL $url, $params = NULL)
         return new Response($content, $info);
     }
 
-    public function execute(Command $command)
+    public function execute(Command $command): Response
     {
-        return $this->curl($command->httpMethod(),
-                           $command->url(),
-                           $command->jsonParameters());
+        return $this->curl(
+            $command->httpMethod(),
+            $command->url(),
+            $command->jsonParameters()
+        );
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Element.php b/PHPUnit/Extensions/Selenium2TestCase/Element.php
index 5932b224..daa362e8 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Element.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Element.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -58,13 +24,6 @@
 /**
  * Object representing a DOM element.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  * @method string attribute($name) Retrieves an element's attribute
  * @method void clear() Empties the content of a form element.
  * @method void click() Clicks on element
@@ -82,32 +41,30 @@
 class Element extends Accessor
 {
     /**
-     * @return \self
      * @throws InvalidArgumentException
      */
-    public static function fromResponseValue(array $value, URL $parentFolder, Driver $driver)
+    public static function fromResponseValue(array $value, URL $parentFolder, Driver $driver): Element
     {
-        if (!isset($value['ELEMENT'])) {
+        if (! isset($value['ELEMENT'])) {
             throw new InvalidArgumentException('Element not found.');
         }
+
         $url = $parentFolder->descend($value['ELEMENT']);
+
         return new self($driver, $url);
     }
 
-    /**
-     * @return integer
-     */
-    public function getId()
+    public function getId(): int
     {
         return $this->url->lastSegment();
     }
 
     /**
-     * @return array    class names
+     * @return array class names
      */
-    protected function initCommands()
+    protected function initCommands(): array
     {
-        return array(
+        return [
             'attribute' => Attribute::class,
             'clear' => GenericPost::class,
             'click' => Click::class,
@@ -127,61 +84,58 @@ protected function initCommands()
             'scroll' => $this->touchCommandFactoryMethod('touch/scroll'),
             'doubletap' => $this->touchCommandFactoryMethod('touch/doubleclick'),
             'longtap' => $this->touchCommandFactoryMethod('touch/longclick'),
-            'flick' => $this->touchCommandFactoryMethod('touch/flick')
-        );
+            'flick' => $this->touchCommandFactoryMethod('touch/flick'),
+        ];
     }
 
-    protected function getSessionUrl()
+    protected function getSessionUrl(): URL
     {
         return $this->url->ascend()->ascend();
     }
 
-    private function touchCommandFactoryMethod($urlSegment)
+    private function touchCommandFactoryMethod(string $urlSegment): callable
     {
-        $url = $this->getSessionUrl()->addCommand($urlSegment);
+        $url  = $this->getSessionUrl()->addCommand($urlSegment);
         $self = $this;
-        return function ($jsonParameters, $commandUrl) use ($url, $self) {
+
+        return static function ($jsonParameters, $commandUrl) use ($url, $self) {
             if ((is_array($jsonParameters) &&
-                    !isset($jsonParameters['element'])) ||
-                    is_null($jsonParameters)) {
+                    ! isset($jsonParameters['element'])) ||
+                    $jsonParameters === null) {
                 $jsonParameters['element'] = $self->getId();
             }
+
             return new GenericPost($jsonParameters, $url);
         };
     }
 
     /**
      * Retrieves the tag name
-     * @return string
      */
-    public function name()
+    public function name(): string
     {
         return strtolower(parent::name());
     }
 
     /**
      * Generates an array that is structured as the WebDriver Object of the JSONWireProtocoll
-     *
-     * @return array
      */
-    public function toWebDriverObject()
+    public function toWebDriverObject(): array
     {
-        return array('ELEMENT' => (string)$this->getId());
+        return ['ELEMENT' => (string) $this->getId()];
     }
 
     /**
      * Get or set value of form elements. If the element already has a value, the set one will be appended to it.
      * Created **ONLY** for keeping backward compatibility, since in selenium v2.42.0 it was removed
      * The currently recommended solution is to use `$element->attribute('value')`
+     *
      * @see https://code.google.com/p/selenium/source/detail?r=953007b48e83f90450f3e41b11ec31e2928f1605
      * @see https://code.google.com/p/selenium/source/browse/java/CHANGELOG
-     *
-     * @param string $newValue
-     * @return null|string
      */
-    public function value($newValue = NULL)
+    public function value(?string $newValue = null): ?string
     {
-        if ($newValue !== NULL) {
+        if ($newValue !== null) {
             return parent::value($newValue);
         }
 
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Element/Accessor.php b/PHPUnit/Extensions/Selenium2TestCase/Element/Accessor.php
index 6e87b125..9625026d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Element/Accessor.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Element/Accessor.php
@@ -1,43 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Element;
@@ -47,135 +15,108 @@
 use PHPUnit\Extensions\Selenium2TestCase\ElementCriteria;
 use PHPUnit\Extensions\Selenium2TestCase\URL;
 
-
 /**
  * Provides access to /element and /elements commands
- * 
- * @package    PHPUnit_Selenium
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
  */
 abstract class Accessor extends CommandsHolder
 {
-
     /**
-     * @param string $value     e.g. 'container'
-     * @return Element
+     * @param string $value e.g. 'container'
      */
-    public function byClassName($value)
+    public function byClassName(string $value): Element
     {
         return $this->by('class name', $value);
     }
 
     /**
-     * @param string $value     e.g. 'div.container'
-     * @return Element
+     * @param string $value e.g. 'div.container'
      */
-    public function byCssSelector($value)
+    public function byCssSelector(string $value): Element
     {
         return $this->by('css selector', $value);
     }
 
     /**
-     * @param string $value     e.g. 'uniqueId'
-     * @return Element
+     * @param string $value e.g. 'uniqueId'
      */
-    public function byId($value)
+    public function byId(string $value): Element
     {
         return $this->by('id', $value);
     }
 
     /**
-     * @param string $value     e.g. 'Link text'
-     * @return Element
+     * @param string $value e.g. 'Link text'
      */
-    public function byLinkText($value)
+    public function byLinkText(string $value): Element
     {
         return $this->by('link text', $value);
     }
 
     /**
-     * @param string $value     e.g. 'Link te'
-     * @return Element
+     * @param string $value e.g. 'Link te'
      */
-    public function byPartialLinkText($value)
+    public function byPartialLinkText(string $value): Element
     {
         return $this->by('partial link text', $value);
     }
 
     /**
-     * @param string $value     e.g. 'email_address'
-     * @return Element
+     * @param string $value e.g. 'email_address'
      */
-    public function byName($value)
+    public function byName(string $value): Element
     {
         return $this->by('name', $value);
     }
 
     /**
-     * @param string $value     e.g. 'body'
-     * @return Element
+     * @param string $value e.g. 'body'
      */
-    public function byTag($value)
+    public function byTag(string $value): Element
     {
         return $this->by('tag name', $value);
     }
 
     /**
-     * @param string $value     e.g. '/div[@attribute="value"]'
-     * @return Element
+     * @param string $value e.g. '/div[@attribute="value"]'
      */
-    public function byXPath($value)
+    public function byXPath(string $value): Element
     {
         return $this->by('xpath', $value);
     }
 
-    /**
-     * @return Element
-     */
-    public function element(ElementCriteria $criteria)
+    public function element(ElementCriteria $criteria): Element
     {
         $value = $this->postCommand('element', $criteria);
+
         return Element::fromResponseValue($value, $this->getSessionUrl()->descend('element'), $this->driver);
     }
 
     /**
      * @return Element[]
      */
-    public function elements(ElementCriteria $criteria)
+    public function elements(ElementCriteria $criteria): array
     {
-        $values = $this->postCommand('elements', $criteria);
-        $elements = array();
+        $values   = $this->postCommand('elements', $criteria);
+        $elements = [];
         foreach ($values as $value) {
             $elements[] = Element::fromResponseValue($value, $this->getSessionUrl()->descend('element'), $this->driver);
         }
+
         return $elements;
     }
 
-    /**
-     * @param string $strategy
-     * @return ElementCriteria
-     */
-    public function using($strategy)
+    public function using(string $strategy): ElementCriteria
     {
         return new ElementCriteria($strategy);
     }
 
-    /**
-     * @return URL
-     */
-    protected abstract function getSessionUrl();
+    abstract protected function getSessionUrl(): URL;
 
     /**
-     * @param string $strategy     supported by JsonWireProtocol element/ command
-     * @param string $value
-     * @return Element
+     * @param string $strategy supported by JsonWireProtocol element/ command
      */
-    private function by($strategy, $value)
+    private function by(string $strategy, string $value): Element
     {
         return $this->element($this->using($strategy)->value($value));
     }
-
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Element/Select.php b/PHPUnit/Extensions/Selenium2TestCase/Element/Select.php
index 3180a60d..d2c7d618 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Element/Select.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Element/Select.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.2
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Element;
@@ -49,187 +15,172 @@
 
 /**
  * Object representing a <select> element.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.2
  */
 class Select extends Element
 {
-    /**
-     * @return Select
-     */
-    public static function fromElement(Element $element)
+    public static function fromElement(Element $element): Select
     {
         return new self($element->driver, $element->url);
     }
 
-    /**
-     * @return string
-     */
-    public function selectedLabel()
+    public function selectedLabel(): string
     {
         $selectedOption = $this->selectedOption();
-        if ($selectedOption === NULL) {
+        if ($selectedOption === null) {
             return '';
         }
+
         return $selectedOption->text();
     }
 
-    /**
-     * @return string
-     */
-    public function selectedValue()
+    public function selectedValue(): string
     {
         $selectedOption = $this->selectedOption();
-        if ($selectedOption === NULL) {
+        if ($selectedOption === null) {
             return '';
         }
+
         return $selectedOption->value();
     }
 
-    /**
-     * @return string
-     */
-    public function selectedId()
+    public function selectedId(): string
     {
         $selectedOption = $this->selectedOption();
-        if ($selectedOption === NULL) {
+        if ($selectedOption === null) {
             return '';
         }
+
         return $selectedOption->attribute('id');
     }
 
     /**
-     * @return array
+     * @return Element[]
      */
-    public function selectedLabels()
+    public function selectedLabels(): array
     {
-        $labels = array();
+        $labels = [];
         foreach ($this->selectedOptions() as $option) {
             $labels[] = $option->text();
         }
+
         return $labels;
     }
 
-    /**
-     * @return array
-     */
-    public function selectedValues()
+    public function selectedValues(): array
     {
-        $values = array();
+        $values = [];
         foreach ($this->selectedOptions() as $option) {
             $values[] = $option->value();
         }
+
         return $values;
     }
 
-    /**
-     * @return array
-     */
-    public function selectedIds()
+    public function selectedIds(): array
     {
-        $id = array();
+        $id = [];
         foreach ($this->selectedOptions() as $option) {
             $values[] = $option->attribute('id');
         }
+
         return $id;
     }
 
     /**
      * @param string $label the text appearing in the option
-     * @return void
      */
-    public function selectOptionByLabel($label)
+    public function selectOptionByLabel(string $label): void
     {
-        $toSelect = $this->using('xpath')->value(".//option[.='$label']");
+        $toSelect = $this->using('xpath')->value(sprintf(".//option[.='%s']", $label));
         $this->selectOptionByCriteria($toSelect);
     }
 
     /**
      * @param string $value the value attribute of the option
-     * @return void
      */
-    public function selectOptionByValue($value)
+    public function selectOptionByValue(string $value): void
     {
-        $toSelect = $this->using('xpath')->value(".//option[@value='$value']");
+        $toSelect = $this->using('xpath')->value(sprintf(".//option[@value='%s']", $value));
         $this->selectOptionByCriteria($toSelect);
     }
 
     /**
-     * @param ElementCriteria $localCriteria  condiotions for selecting an option
-     * @return void
+     * @param ElementCriteria $localCriteria condiotions for selecting an option
      */
-    public function selectOptionByCriteria(ElementCriteria $localCriteria)
+    public function selectOptionByCriteria(ElementCriteria $localCriteria): void
     {
         $option = $this->element($localCriteria);
-        if (!$option->selected()) {
+        if (! $option->selected()) {
             $option->click();
         }
     }
 
     /**
-     * @return array
+     * @return Element[]
      */
-    public function selectOptionValues()
+    public function selectOptionValues(): array
     {
-        $options = array();
+        $options = [];
         foreach ($this->options() as $option) {
             $options[] = $option->value();
         }
+
         return $options;
     }
 
     /**
-     * @return array
+     * @return Element[]
      */
-    public function selectOptionLabels()
+    public function selectOptionLabels(): array
     {
-        $options = array();
+        $options = [];
         foreach ($this->options() as $option) {
             $options[] = $option->text();
         }
+
         return $options;
     }
 
-    /***
-     * @return array
+    /**
+     * @return Element[]
      */
-    private function selectedOptions()
+    private function selectedOptions(): array
     {
-        $options = array();
+        $options = [];
         foreach ($this->options() as $option) {
             if ($option->selected()) {
                 $options[] = $option;
             }
         }
+
         return $options;
     }
 
-    public function clearSelectedOptions()
+    public function clearSelectedOptions(): void
     {
         foreach ($this->selectedOptions() as $option) {
             $option->click();
         }
     }
 
-    private function selectedOption()
+    private function selectedOption(): ?Element
     {
         foreach ($this->options() as $option) {
             if ($option->selected()) {
                 return $option;
             }
         }
-        return NULL;
+
+        return null;
     }
 
-    private function options()
+    /**
+     * @return Element[]
+     */
+    private function options(): array
     {
         $onlyTheOptions = $this->using('css selector')->value('option');
+
         return $this->elements($onlyTheOptions);
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Attribute.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Attribute.php
index 5d39f0aa..6b3f7e71 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Attribute.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Attribute.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -49,27 +15,15 @@
 
 /**
  * Retrieves an attribute of a DOM element.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Attribute extends Command
 {
-    /**
-     * @param array $parameter
-     */
-    public function __construct($parameter, URL $attributeResourceBaseUrl)
+    public function __construct(string $parameter, URL $attributeResourceBaseUrl)
     {
-        $this->jsonParameters = array();
-        $this->url = $attributeResourceBaseUrl->descend($parameter);
+        parent::__construct([], $attributeResourceBaseUrl->descend($parameter));
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Click.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Click.php
index 058173b4..e1dee42c 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Click.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Click.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -48,18 +14,10 @@
 
 /**
  * Clicks ok on an alert popup.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Click extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Css.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Css.php
index 37d5bdbe..9436520c 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Css.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Css.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -49,27 +15,15 @@
 
 /**
  * Retrieves the value of a CSS property.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Css extends Command
 {
-    /**
-     * @param array $propertyName
-     */
-    public function __construct($propertyName, URL $cssResourceBaseUrl)
+    public function __construct(string $propertyName, URL $cssResourceBaseUrl)
     {
-        $this->jsonParameters = array();
-        $this->url = $cssResourceBaseUrl->descend($propertyName);
+        parent::__construct([], $cssResourceBaseUrl->descend($propertyName));
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Equals.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Equals.php
index f6bb1bf5..4447aa14 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Equals.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Equals.php
@@ -1,80 +1,30 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
 
-use InvalidArgumentException;
 use PHPUnit\Extensions\Selenium2TestCase\Command;
 use PHPUnit\Extensions\Selenium2TestCase\Element;
 use PHPUnit\Extensions\Selenium2TestCase\URL;
 
 /**
  * Checks equality (same element on the page) with another DOM element.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Equals extends Command
 {
-    /**
-     * @param array $parameter
-     */
-    public function __construct($parameter, URL $equalsResourceBaseUrl)
+    public function __construct(Element $parameter, URL $equalsResourceBaseUrl)
     {
-        $this->jsonParameters = array();
-        if (!($parameter instanceof Element)) {
-            throw new InvalidArgumentException("Elements can only test equality with other Element instances.");
-        }
-        $this->url = $equalsResourceBaseUrl->descend($parameter->getId());
+        parent::__construct([], $equalsResourceBaseUrl->descend($parameter->getId()));
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php
index 0d8663c8..5a509deb 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -47,20 +13,12 @@
 use PHPUnit\Extensions\Selenium2TestCase\Command;
 
 /**
- * Class for implementing commands that just return a value 
+ * Class for implementing commands that just return a value
  * (obtained with GET).
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class GenericAccessor extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php
index 0d281e29..45509c8a 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2012 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -48,18 +14,10 @@
 
 /**
  * Class for implementing commands that just accomplishes an action (via POST).
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2012 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class GenericPost extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Rect.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Rect.php
index dbce6d77..bf53d448 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Rect.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Rect.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -49,27 +15,16 @@
 
 /**
  * Retrieves the element's coordinates
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Rect extends Command
 {
-    /**
-     * @param array $parameter
-     */
+    /** @param null $parameter */
     public function __construct($parameter, URL $attributeResourceBaseUrl)
     {
-        $this->jsonParameters = array();
-        $this->url = $attributeResourceBaseUrl->descend($parameter);
+        parent::__construct([], $attributeResourceBaseUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Value.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Value.php
index 3b79dfbe..8d64b175 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Value.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCommand/Value.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\ElementCommand;
@@ -49,22 +15,15 @@
 
 /**
  * Get and set the element's value attribute.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Value extends Keys
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
-        throw new BadMethodCallException("JSON Wire Protocol only supports POST to /value now. To get the value of an element GET /attribute/:naem should be used and this object should never be involved.");
+
+        throw new BadMethodCallException('JSON Wire Protocol only supports POST to /value now. To get the value of an element GET /attribute/:naem should be used and this object should never be involved.');
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ElementCriteria.php b/PHPUnit/Extensions/Selenium2TestCase/ElementCriteria.php
index 8e71a690..e3e7b30d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ElementCriteria.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ElementCriteria.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -49,28 +15,19 @@
 /**
  * Conditions for selecting a DOM element.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  * @see        http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element
  */
 class ElementCriteria extends ArrayObject
 {
-    public function __construct($strategy)
+    public function __construct(string $strategy)
     {
         $this['using'] = $strategy;
     }
 
-    /**
-     * @return ElementCriteria
-     */
-    public function value($searchTarget)
+    public function value(string $searchTarget): ElementCriteria
     {
         $this['value'] = $searchTarget;
+
         return $this;
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Exception.php b/PHPUnit/Extensions/Selenium2TestCase/Exception.php
index 35acb4a8..6ca83d42 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Exception.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Exception.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -48,14 +14,6 @@
 
 /**
  * Indicates an exception during the execution of Selenium 2 commands.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Exception extends RuntimeException
 {
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Keys.php b/PHPUnit/Extensions/Selenium2TestCase/Keys.php
index 30e221c5..3af4baba 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Keys.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Keys.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.12
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -47,70 +13,63 @@
 /**
  * Class to hold the special keys Unicode entities
  *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.3.0
  * @see        http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value
  */
 class Keys
 {
-    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_   = "\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 PAGEUP    = "\xEE\x80\x8E";
-    const PAGEDOWN  = "\xEE\x80\x8F";
-    const END       = "\xEE\x80\x90";
-    const HOME      = "\xEE\x80\x91";
-    const LEFT      = "\xEE\x80\x92";
-    const UP        = "\xEE\x80\x93";
-    const RIGHT     = "\xEE\x80\x94";
-    const 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 COMMAND   = "\xEE\x80\xBD";
+    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_   = "\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 PAGEUP    = "\xEE\x80\x8E";
+    public const PAGEDOWN  = "\xEE\x80\x8F";
+    public const END       = "\xEE\x80\x90";
+    public const HOME      = "\xEE\x80\x91";
+    public const LEFT      = "\xEE\x80\x92";
+    public const UP        = "\xEE\x80\x93";
+    public const RIGHT     = "\xEE\x80\x94";
+    public const 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 COMMAND   = "\xEE\x80\xBD";
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/KeysHolder.php b/PHPUnit/Extensions/Selenium2TestCase/KeysHolder.php
index 37d28b9b..01e4380e 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/KeysHolder.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/KeysHolder.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.12
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -47,18 +13,11 @@
 /**
  * Class-mapper, that converts requested special key into correspondent Unicode character
  *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.12
  * @see        http://code.google.com/p/selenium/wiki/JsonWireProtocol#/session/:sessionId/element/:id/value
  */
 class KeysHolder
 {
-    private $_keys = array(
+    private $keys = [
         'null'      => "\xEE\x80\x80",
         'cancel'    => "\xEE\x80\x81",
         'help'      => "\xEE\x80\x82",
@@ -114,16 +73,16 @@ class KeysHolder
         'f11'       => "\xEE\x80\xBB",
         'f12'       => "\xEE\x80\xBC",
         'command'   => "\xEE\x80\xBD",
-    );
+    ];
 
-    public function specialKey($name)
+    public function specialKey(string $name): string
     {
         $normalizedName = strtolower($name);
 
-        if (!isset($this->_keys[$normalizedName])) {
-            throw new \PHPUnit\Extensions\Selenium2TestCase\Exception("There is no special key '$name' defined");
+        if (! isset($this->keys[$normalizedName])) {
+            throw new \PHPUnit\Extensions\Selenium2TestCase\Exception(sprintf("There is no special key '%s' defined", $name));
         }
 
-        return $this->_keys[$normalizedName];
+        return $this->keys[$normalizedName];
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/NoSeleniumException.php b/PHPUnit/Extensions/Selenium2TestCase/NoSeleniumException.php
index 10f94d39..96b143e3 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/NoSeleniumException.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/NoSeleniumException.php
@@ -1,58 +1,15 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.9
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
-/**
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.8
- */
 class NoSeleniumException extends \PHPUnit\Extensions\Selenium2TestCase\Exception
 {
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Response.php b/PHPUnit/Extensions/Selenium2TestCase/Response.php
index afe4427e..25fd61c1 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Response.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Response.php
@@ -1,76 +1,30 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
 /**
  * Object representing an HTTP response from the Selenium Server.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Response
 {
-    /**
-     * @var array   decoded response
-     */
+    /** @var array decoded response */
     private $jsonResponse;
 
-    /**
-     * @var array   CURL info for the response.
-     */
+    /** @var array CURL info for the response. */
     private $info;
 
-    public function __construct($jsonResponse, $info)
+    public function __construct(array $jsonResponse, array $info)
     {
         $this->jsonResponse = $jsonResponse;
-        $this->info = $info;
+        $this->info         = $info;
     }
 
     public function getValue()
@@ -80,19 +34,16 @@ public function getValue()
         }
     }
 
-    /**
-     * @return URL
-     */
-    public function getURL()
+    public function getURL(): URL
     {
-        $url = $this->info['url'];
+        $url       = $this->info['url'];
         $sessionId = $this->jsonResponse['sessionId'];
 
         // if url doesn't have sessionId included - append it manually
         // this change was performed in selenium v2.34
         // @see https://code.google.com/p/selenium/issues/detail?id=6089
         // @see https://github.com/sebastianbergmann/phpunit-selenium/issues/265
-        if (strpos($url, $sessionId) === FALSE) {
+        if (strpos($url, $sessionId) === false) {
             $url .= '/' . $sessionId;
         }
 
diff --git a/PHPUnit/Extensions/Selenium2TestCase/ScreenshotListener.php b/PHPUnit/Extensions/Selenium2TestCase/ScreenshotListener.php
index 5f3cd27a..56b37507 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/ScreenshotListener.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/ScreenshotListener.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.8
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -53,14 +19,6 @@
 
 /**
  * Base class for implementing commands with special semantics.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.8
  */
 class ScreenshotListener implements TestListener
 {
@@ -68,7 +26,7 @@ class ScreenshotListener implements TestListener
 
     private $directory;
 
-    public function __construct($directory)
+    public function __construct(string $directory)
     {
         $this->directory = $directory;
     }
@@ -83,20 +41,17 @@ public function addFailure(Test $test, AssertionFailedError $e, float $time): vo
         $this->storeAScreenshot($test);
     }
 
-    private function storeAScreenshot(Test $test)
+    private function storeAScreenshot(Test $test): void
     {
-        if ($test instanceof Selenium2TestCase)
-        {
+        if ($test instanceof Selenium2TestCase) {
             $className = str_replace('\\', '_', get_class($test));
 
             try {
                 $file = $this->directory . '/' . $className . '__' . $test->getName() . '__' . date('Y-m-d\TH-i-s') . '.png';
-                file_put_contents($file,        $test->currentScreenshot());
+                file_put_contents($file, $test->currentScreenshot());
             } catch (\Exception $e) {
                 $file = $this->directory . '/' . $className . '__' . $test->getName() . '__' . date('Y-m-d\TH-i-s') . '.txt';
-                file_put_contents($file, "Screenshot generation doesn't work." . "\n"
-                                         . $e->getMessage() . "\n"
-                                         . $e->getTraceAsString());
+                file_put_contents($file, sprintf("Screenshot generation doesn't work.\n%s\n%s", $e->getMessage(), $e->getTraceAsString()));
             }
         }
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Session.php b/PHPUnit/Extensions/Selenium2TestCase/Session.php
index 6b9cfcf0..23ba25c0 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Session.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Session.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -71,13 +37,6 @@
 /**
  * Browser session for Selenium 2: main point of entry for functionality.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  * @method void acceptAlert() Press OK on an alert, or confirms a dialog
  * @method mixed alertText($value = NULL) Gets the alert dialog text, or sets the text for a prompt dialog
  * @method void back()
@@ -102,44 +61,36 @@
  */
 class Session extends Accessor
 {
-    /**
-     * @var string  the base URL for this session,
-     *              which all relative URLs will refer to
-     */
+    /** @var string  the base URL for this session, which all relative URLs will refer to */
     private $baseUrl;
 
-    /**
-     * @var Timeouts
-     */
+    /** @var Timeouts */
     private $timeouts;
 
-    /**
-     * @var boolean
-     */
-    private $stopped = FALSE;
+    /** @var bool */
+    private $stopped = false;
 
-    public function __construct($driver,
-                                URL $url,
-                                URL $baseUrl,
-                                Timeouts $timeouts)
-    {
-        $this->baseUrl = $baseUrl;
+    public function __construct(
+        Driver $driver,
+        URL $url,
+        URL $baseUrl,
+        Timeouts $timeouts
+    ) {
+        $this->baseUrl  = $baseUrl;
         $this->timeouts = $timeouts;
         parent::__construct($driver, $url);
     }
 
-    /**
-     * @return string
-     */
-    public function id()
+    public function id(): string
     {
         return $this->url->lastSegment();
     }
 
-    protected function initCommands()
+    protected function initCommands(): array
     {
         $baseUrl = $this->baseUrl;
-        return array(
+
+        return [
             'acceptAlert' => AcceptAlert::class,
             'alertText' => AlertText::class,
             'back' => GenericPost::class,
@@ -160,7 +111,7 @@ protected function initCommands()
             'title' => SessionGenericAccessor::class,
             'log' => Log::class,
             'logTypes' => $this->attributeCommandFactoryMethod('log/types'),
-            'url' => function ($jsonParameters, $commandUrl) use ($baseUrl) {
+            'url' => static function ($jsonParameters, $commandUrl) use ($baseUrl) {
                 return new \PHPUnit\Extensions\Selenium2TestCase\SessionCommand\Url($jsonParameters, $commandUrl, $baseUrl);
             },
             'window' => SessionWindow::class,
@@ -173,22 +124,24 @@ protected function initCommands()
             'flick' => $this->touchCommandFactoryMethod('touch/flick'),
             'location' => Location::class,
             'orientation' => Orientation::class,
-            'file' => File::class
-        );
+            'file' => File::class,
+        ];
     }
 
-    private function attributeCommandFactoryMethod($urlSegment)
+    private function attributeCommandFactoryMethod(string $urlSegment): callable
     {
         $url = $this->url->addCommand($urlSegment);
-        return function ($jsonParameters, $commandUrl) use ($url) {
+
+        return static function ($jsonParameters, $commandUrl) use ($url) {
             return new GenericAttribute($jsonParameters, $url);
         };
     }
 
-    private function touchCommandFactoryMethod($urlSegment)
+    private function touchCommandFactoryMethod(string $urlSegment): callable
     {
         $url = $this->url->addCommand($urlSegment);
-        return function ($jsonParameters, $commandUrl) use ($url) {
+
+        return static function ($jsonParameters, $commandUrl) use ($url) {
             return new GenericPost($jsonParameters, $url);
         };
     }
@@ -198,128 +151,115 @@ public function __destruct()
         $this->stop();
     }
 
-    /**
-     * @return URL
-     */
-    public function getSessionUrl()
+    public function getSessionUrl(): URL
     {
         return $this->url;
     }
 
     /**
      * Closed the browser.
-     * @return void
      */
-    public function stop()
+    public function stop(): void
     {
         if ($this->stopped) {
             return;
         }
+
         try {
             $this->driver->curl('DELETE', $this->url);
         } catch (Exception $e) {
             // sessions which aren't closed because of sharing can time out on the server. In no way trying to close them should make a test fail, as it already finished before arriving here.
-            "Closing sessions: " . $e->getMessage() . "\n";
+            'Closing sessions: ' . $e->getMessage() . "\n";
         }
-        $this->stopped = TRUE;
+
+        $this->stopped = true;
         if ($this->stopped) {
             return;
         }
     }
 
-    /**
-     * @return Select
-     */
-    public function select(Element $element)
+    public function select(Element $element): Select
     {
         $tag = $element->name();
         if ($tag !== 'select') {
-            throw new InvalidArgumentException("The element is not a `select` tag but a `$tag`.");
+            throw new InvalidArgumentException(sprintf('The element is not a `select` tag but a `%s`.', $tag));
         }
+
         return Select::fromElement($element);
     }
 
     /**
-     * @param array   WebElement JSON object
-     * @return Element
+     * @param array $value WebElement JSON object
      */
-    public function elementFromResponseValue($value)
+    public function elementFromResponseValue(array $value): Element
     {
         return Element::fromResponseValue($value, $this->getSessionUrl()->descend('element'), $this->driver);
     }
 
     /**
-     * @param string $id    id attribute, e.g. 'container'
-     * @return void
+     * @param string $id id attribute, e.g. 'container'
      */
-    public function clickOnElement($id)
+    public function clickOnElement(string $id): void
     {
-        return $this->element($this->using('id')->value($id))->click();
+        $this->element($this->using('id')->value($id))->click();
     }
 
-    public function timeouts()
+    public function timeouts(): Timeouts
     {
         return $this->timeouts;
     }
 
     /**
-     * @return string   a BLOB of a PNG file
+     * @return string a BLOB of a PNG file
      */
-    public function currentScreenshot()
+    public function currentScreenshot(): string
     {
         return base64_decode($this->screenshot());
     }
 
-    /**
-     * @return Window
-     */
-    public function currentWindow()
+    public function currentWindow(): Window
     {
         $url = $this->url->descend('window')->descend(trim($this->windowHandle(), '{}'));
+
         return new Window($this->driver, $url);
     }
 
-    public function closeWindow()
+    public function closeWindow(): void
     {
         $this->driver->curl('DELETE', $this->url->descend('window'));
     }
 
     /**
      * Get the element on the page that currently has focus.
-     *
-     * @return Element
      */
-    public function active()
+    public function active(): Element
     {
-        $command = new Active(null, $this->url);
+        $command  = new Active(null, $this->url);
         $response = $this->driver->execute($command);
+
         return $this->elementFromResponseValue($response->getValue());
     }
 
-    /**
-     * @return Cookie
-     */
-    public function cookie()
+    public function cookie(): Cookie
     {
         $url = $this->url->descend('cookie');
+
         return new Cookie($this->driver, $url);
     }
 
-    /**
-     * @return Storage
-     */
-    public function localStorage()
+    public function localStorage(): Storage
     {
         $url = $this->url->addCommand('localStorage');
+
         return new Storage($this->driver, $url);
     }
 
-    public function landscape()
+    public function landscape(): void
     {
         $this->orientation('LANDSCAPE');
     }
 
-    public function portrait()
+    public function portrait(): void
     {
         $this->orientation('PORTRAIT');
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie.php b/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie.php
index 58899a31..ee7f680d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Session;
@@ -50,14 +16,6 @@
 
 /**
  * Adds and remove cookies.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Cookie
 {
@@ -67,63 +25,46 @@ class Cookie
     public function __construct(Driver $driver, URL $url)
     {
         $this->driver = $driver;
-        $this->url = $url;
+        $this->url    = $url;
     }
 
-    /**
-     * @param string $name
-     * @param string $value
-     * @return Builder
-     */
-    public function add($name, $value)
+    public function add(string $name, string $value): Builder
     {
         return new Builder($this, $name, $value);
     }
 
-    /**
-     * @param string $name
-     * @return string
-     */
-    public function get($name)
+    public function get(string $name): string
     {
         $cookies = $this->driver->curl('GET', $this->url)->getValue();
         foreach ($cookies as $cookie) {
-            if ($cookie['name'] == $name) {
+            if ($cookie['name'] === $name) {
                 return $cookie['value'];
             }
         }
-        throw new \PHPUnit\Extensions\Selenium2TestCase\Exception("There is no '$name' cookie available on this page.");
+
+        throw new \PHPUnit\Extensions\Selenium2TestCase\Exception(sprintf("There is no '%s' cookie available on this page.", $name));
     }
 
-    /**
-     * @param string $name
-     * @return void
-     */
-    public function remove($name)
+    public function remove(string $name): void
     {
         $url = $this->url->descend($name);
         $this->driver->curl('DELETE', $url);
     }
 
-    /**
-     * @return void
-     */
-    public function clear()
+    public function clear(): void
     {
         $this->driver->curl('DELETE', $this->url);
     }
 
     /**
      * @internal
-     * @param array $data
-     * @return void
      */
-    public function postCookie(array $data)
+    public function postCookie(array $data): void
     {
-        $this->driver->curl('POST',
-                            $this->url,
-                            array(
-                                'cookie' => $data
-                            ));
+        $this->driver->curl(
+            'POST',
+            $this->url,
+            ['cookie' => $data,]
+        );
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie/Builder.php b/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie/Builder.php
index 98e627c7..00e328f4 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie/Builder.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Session/Cookie/Builder.php
@@ -1,131 +1,79 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Session\Cookie;
 
+// phpcs:disable SlevomatCodingStandard.Classes.UnusedPrivateElements
+use PHPUnit\Extensions\Selenium2TestCase\Session\Cookie;
+
 /**
  * Adds a cookie.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Builder
 {
+    private $cookieFacade;
     private $name;
     private $value;
     private $path;
     private $domain;
-    private $secure = FALSE;
+    private $secure = false;
     private $expiry;
 
-    public function __construct($cookieFacade, $name, $value)
+    public function __construct(Cookie $cookieFacade, string $name, string $value)
     {
         $this->cookieFacade = $cookieFacade;
-        $this->name = $name;
-        $this->value = $value;
+        $this->name         = $name;
+        $this->value        = $value;
     }
 
-    /**
-     * @param string
-     * @return Builder
-     */
-    public function path($path)
+    public function path(string $path): self
     {
         $this->path = $path;
+
         return $this;
     }
 
-    /**
-     * @param string
-     * @return Builder
-     */
-    public function domain($domain)
+    public function domain(string $domain): self
     {
         $this->domain = $domain;
+
         return $this;
     }
 
-    /**
-     * @param boolean
-     * @return Builder
-     */
-    public function secure($secure)
+    public function secure(bool $secure): self
     {
         $this->secure = $secure;
+
         return $this;
     }
 
-    /**
-     * @param integer
-     * @return Builder
-     */
-    public function expiry($expiry)
+    public function expiry(int $expiry): self
     {
         $this->expiry = $expiry;
+
         return $this;
     }
 
-    /**
-     * @return void
-     */
-    public function set()
+    public function set(): void
     {
-        $cookieData = array(
+        $cookieData = [
             'name' => $this->name,
             'value' => $this->value,
             'secure' => $this->secure,
-        );
-        foreach (array('path', 'domain', 'expiry') as $parameter) {
-            if ($this->$parameter !== NULL) {
+        ];
+        foreach (['path', 'domain', 'expiry'] as $parameter) {
+            if ($this->$parameter !== null) {
                 $cookieData[$parameter] = $this->$parameter;
             }
         }
+
         $this->cookieFacade->postCookie($cookieData);
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Session/Storage.php b/PHPUnit/Extensions/Selenium2TestCase/Session/Storage.php
index d72677f7..563dfa56 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Session/Storage.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Session/Storage.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Session;
@@ -49,14 +15,6 @@
 
 /**
  * Manage the local storage HTML 5 database.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Storage
 {
@@ -66,15 +24,15 @@ class Storage
     public function __construct(Driver $driver, URL $url)
     {
         $this->driver = $driver;
-        $this->url = $url;
+        $this->url    = $url;
     }
 
     public function __set($name, $value)
     {
-        $this->driver->curl('POST', $this->url, array(
+        $this->driver->curl('POST', $this->url, [
             'key' => $name,
-            'value' => (string)$value
-        ));
+            'value' => (string) $value,
+        ]);
     }
 
     public function __get($name)
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Session/Timeouts.php b/PHPUnit/Extensions/Selenium2TestCase/Session/Timeouts.php
index 2a4ab87d..162b2808 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Session/Timeouts.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Session/Timeouts.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\Session;
@@ -51,13 +17,6 @@
 /**
  * Manages timeouts for the current browser session.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  * @method implicitWait(int $ms) Sets timeout when searching for elements
  * @method asyncScript(int $ms) Sets timeout for asynchronous scripts executed by Session::executeAsync()
  */
@@ -66,42 +25,45 @@ class Timeouts extends CommandsHolder
     private $maximumTimeout;
     private $lastImplicitWaitValue = 0;
 
-    public function __construct($driver, URL $url, $maximumTimeout)
+    public function __construct($driver, URL $url, int $maximumTimeout)
     {
         parent::__construct($driver, $url);
         $this->maximumTimeout = $maximumTimeout;
     }
 
-    protected function initCommands()
+    protected function initCommands(): array
     {
         $self = $this;
-        return array(
-            'implicitWait' => function ($milliseconds, $commandUrl) use ($self) {
+
+        return [
+            'implicitWait' => static function ($milliseconds, $commandUrl) use ($self) {
                 $self->check($milliseconds);
                 $self->setLastImplicitWaitValue($milliseconds);
-                $jsonParameters = array('ms' => $milliseconds);
+                $jsonParameters = ['ms' => $milliseconds];
+
                 return new GenericPost($jsonParameters, $commandUrl);
             },
-            'asyncScript' => function ($milliseconds, $commandUrl) use ($self) {
+            'asyncScript' => static function ($milliseconds, $commandUrl) use ($self) {
                 $self->check($milliseconds);
-                $jsonParameters = array('ms' => $milliseconds);
+                $jsonParameters = ['ms' => $milliseconds];
+
                 return new GenericPost($jsonParameters, $commandUrl);
             },
 
-        );
+        ];
     }
 
-    public function setLastImplicitWaitValue($implicitWait)
+    public function setLastImplicitWaitValue(int $implicitWait): void
     {
         $this->lastImplicitWaitValue = $implicitWait;
     }
 
-    public function getLastImplicitWaitValue()
+    public function getLastImplicitWaitValue(): int
     {
         return $this->lastImplicitWaitValue;
     }
 
-    public function check($timeout)
+    public function check($timeout): void
     {
         if ($timeout > $this->maximumTimeout) {
             throw new \PHPUnit\Extensions\Selenium2TestCase\Exception('There is no use in setting this timeout unless you also call $this->setSeleniumServerRequestsTimeout($seconds) in setUp().');
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php
index ede53468..6255e1aa 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -48,18 +14,10 @@
 
 /**
  * Clicks Ok on an alert popup.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class AcceptAlert extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Active.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Active.php
index 43f3f75e..58a1ff98 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Active.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Active.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -49,25 +15,16 @@
 
 /**
  * Gets the active element from the session
- *
- * @package    PHPUnit_Selenium
- * @author     Marcel Erz <marcel.erz@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release
  */
 class Active extends Command
 {
-
-    public function __construct($jsonParameters, URL $url)
+    public function __construct(?array $jsonParameters, URL $url)
     {
         $url = $url->addCommand('element')->addCommand('active');
         parent::__construct($jsonParameters, $url);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AlertText.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AlertText.php
index cb58a626..204cfac4 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AlertText.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/AlertText.php
@@ -1,83 +1,38 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
-use BadMethodCallException;
 use PHPUnit\Extensions\Selenium2TestCase\Command;
 use PHPUnit\Extensions\Selenium2TestCase\URL;
 
 /**
  * Obtains the text of an alert, or types into a prompt.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class AlertText extends Command
 {
-    public function __construct($argument, URL $url)
+    public function __construct(?string $jsonParameters, URL $url)
     {
-        if (is_string($argument)) {
-            $jsonParameters =array('text' => $argument);
-        } else if ($argument == NULL) {
-            $jsonParameters = NULL;
-        } else {
-            throw new BadMethodCallException('Wrong parameters for alertText().');
+        if ($jsonParameters !== null) {
+            $jsonParameters = ['text' => $jsonParameters];
         }
+
         parent::__construct($jsonParameters, $url);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Click.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Click.php
index c25bf690..7be7335f 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Click.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Click.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.13
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -50,37 +16,31 @@
 
 /**
  * Sends session click command for emulating LEFT, MIDDLE or RIGHT mouse buttons
- *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.13
  */
 class Click extends Command
 {
-    const LEFT = 0;
-    const MIDDLE = 1;
-    const RIGHT = 2;
+    public const LEFT   = 0;
+    public const MIDDLE = 1;
+    public const RIGHT  = 2;
 
     public function __construct($argument, URL $url)
     {
-        if (is_null($argument)) {
-            $jsonParameters = NULL;
-        } elseif (!is_scalar($argument) || !in_array($argument, array(
-            self::LEFT, self::RIGHT, self::MIDDLE
-        ))) {
+        if ($argument === null) {
+            $jsonParameters = null;
+        } elseif (! is_scalar($argument) || ! in_array($argument, [
+            self::LEFT,
+            self::RIGHT,
+            self::MIDDLE,
+        ])) {
             throw new BadMethodCallException('Wrong parameter for click(): expecting 0, 1 or 2.');
         } else {
-            $jsonParameters = array('button' => $argument);
+            $jsonParameters = ['button' => $argument];
         }
 
         parent::__construct($jsonParameters, $url);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php
index f75cf13c..4540166f 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -48,18 +14,10 @@
 
 /**
  * Clicks Cancel on an alert popup.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class DismissAlert extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/File.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/File.php
index 2d19dd9b..3ea5132f 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/File.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/File.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.3.2
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -53,44 +19,33 @@
 /**
  * Sends a file to a RC
  * Returns the FQ path to the transfered file
- *
- * @package    PHPUnit_Selenium
- * @author     Kevin Ran  <heilong24@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.3.2
  */
 class File extends Command
 {
+    /** @var */
+    private static $zipArchive;
 
-    /**
-     * @var
-     */
-    private static $_zipArchive;
-
-    public function __construct($argument, URL $url)
+    public function __construct(string $argument, URL $url)
     {
-        if (!is_file($argument)) {
-            throw new BadMethodCallException("No such file: {$argument}");
+        if (! is_file($argument)) {
+            throw new BadMethodCallException(sprintf('No such file: %s', $argument));
         }
 
-        $zipfile_path = $this->_zipArchiveFile($argument);
-        $contents     = file_get_contents($zipfile_path);
+        $zipfilePath = $this->zipArchiveFile($argument);
+        $contents    = file_get_contents($zipfilePath);
 
         if ($contents === false) {
-            throw new Exception("Unable to read generated zip file: {$zipfile_path}");
+            throw new Exception(sprintf('Unable to read generated zip file: %s', $zipfilePath));
         }
 
         $file = base64_encode($contents);
 
-        parent::__construct(array('file' => $file), $url);
+        parent::__construct(['file' => $file], $url);
 
-        unlink($zipfile_path);
+        unlink($zipfilePath);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
@@ -98,56 +53,50 @@ public function httpMethod()
     /**
      * Creates a zip archive with the given file
      *
-     * @param   string $file_path   FQ path to file
+     * @param   string $filePath FQ path to file
+     *
      * @return  string              Generated zip file
      */
-    protected function _zipArchiveFile( $file_path )
+    protected function zipArchiveFile(string $filePath): string
     {
-
         // file MUST be readable
-        if( !is_readable( $file_path ) ) {
-
-            throw new Exception( "Unable to read {$file_path}" );
-
+        if (! is_readable($filePath)) {
+            throw new Exception(sprintf('Unable to read %s', $filePath));
         } // if !file_data
 
-        $filename_hash  = sha1( time() . $file_path );
-        $tmp_dir        = $this->_getTmpDir();
-        $zip_filename   = "{$tmp_dir}{$filename_hash}.zip";
-        $zip            = $this->_getZipArchiver();
+        $filenameHash = sha1(time() . $filePath);
+        $tmpDir       = $this->getTmpDir();
+        $zipFilename  = sprintf('%s%s.zip', $tmpDir, $filenameHash);
+        $zip          = $this->getZipArchiver();
 
-        if ($zip->open($zip_filename, ZIPARCHIVE::CREATE) === FALSE) {
-            throw new Exception( "Unable to create zip archive: {$zip_filename}" );
+        if ($zip->open($zipFilename, ZipArchive::CREATE) === false) {
+            throw new Exception(sprintf('Unable to create zip archive: %s', $zipFilename));
         }
 
-        $zip->addFile($file_path, basename($file_path));
+        $zip->addFile($filePath, basename($filePath));
         $zip->close();
 
-        return $zip_filename;
+        return $zipFilename;
     }
 
     /**
      * Returns a runtime instance of a ZipArchive
-     *
-     * @return ZipArchive
      */
-    protected function _getZipArchiver()
+    protected function getZipArchiver(): ZipArchive
     {
         // create ZipArchive if necessary
-        if (!static::$_zipArchive) {
-            static::$_zipArchive = new ZipArchive();
+        if (! static::$zipArchive) {
+            static::$zipArchive = new ZipArchive();
         }
 
-        return static::$_zipArchive;
+        return static::$zipArchive;
     }
 
     /**
      * Calls sys_get_temp_dir and ensures that it has a trailing slash
      * ( behavior varies across systems )
-     *
-     * @return string
      */
-    protected function _getTmpDir()
+    protected function getTmpDir(): string
     {
         return rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Frame.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Frame.php
index 4055431c..00afd74e 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Frame.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Frame.php
@@ -1,81 +1,41 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
 use PHPUnit\Extensions\Selenium2TestCase\Command;
 use PHPUnit\Extensions\Selenium2TestCase\Element;
+use PHPUnit\Extensions\Selenium2TestCase\URL;
 
 /**
  * Changes the focus to a frame.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Frame extends Command
 {
-    public function __construct($id, $commandUrl)
+    public function __construct($id, URL $commandUrl)
     {
-        $jsonParameters = array(
-            'id' => $this->extractId($id)
-        );
+        $jsonParameters = [
+            'id' => $this->extractId($id),
+        ];
 
         parent::__construct($jsonParameters, $commandUrl);
     }
 
     /**
-     * @param $id
      * @return array
      */
     private function extractId($id)
     {
-        if ($this->isElement($id)) { //selenium-element
+        if ($this->isElement($id)) {
+            //selenium-element
+
             return $id->toWebDriverObject();
         }
 
@@ -83,16 +43,12 @@ private function extractId($id)
         return $id;
     }
 
-    /**
-     * @param $id
-     * @return bool
-     */
-    private function isElement($id)
+    private function isElement($id): bool
     {
         return $id instanceof Element;
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php
index 16584424..5562d0a2 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -48,18 +14,10 @@
 
 /**
  * Gets an attribute from the session (title, alert text, etc.)
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class GenericAccessor extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'GET';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php
index f436c4f1..485fae3f 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -48,22 +14,15 @@
 
 /**
  * Gets or posts an attribute from/to the session (title, alert text, etc.)
- *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.9
  */
 class GenericAttribute extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Keys.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Keys.php
index 3288b4d3..0591ca3d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Keys.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Keys.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Christian Soronellas <csoronellas@emagister.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -50,31 +16,20 @@
 
 /**
  * Gets or sets the current URL of the window.
- *
- * @package    PHPUnit_Selenium
- * @author     Christian Soronellas <csoronellas@emagister.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Keys extends Command
 {
     public function __construct($jsonParameters, URL $url)
     {
-        if ($jsonParameters === NULL) {
-            parent::__construct(NULL, $url);
+        if ($jsonParameters === null) {
+            parent::__construct(null, $url);
         } else {
             $jsonParameters = $this->keysForText($jsonParameters);
             parent::__construct($jsonParameters, $url);
         }
     }
 
-    /**
-     * @return string
-     */
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
@@ -82,18 +37,20 @@ public function httpMethod()
     /**
      * Given a string returns an array of the characters that compose the string
      *
-     * @param string $text
+     * @param string|array $text
+     *
      * @throws InvalidArgumentException
-     * @return array
      */
-    public function keysForText($text)
+    public function keysForText($text): array
     {
         if (is_scalar($text)) {
-            return array('value' => preg_split('//u', (string) $text, -1, PREG_SPLIT_NO_EMPTY));
+            return ['value' => preg_split('//u', (string) $text, -1, PREG_SPLIT_NO_EMPTY)];
         }
+
         if (is_array($text)) {
             return $text;
         }
+
         throw new InvalidArgumentException('The "text" argument should be a string or an array of special characters!');
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Location.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Location.php
index 86a8e64c..e5c20cf9 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Location.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Location.php
@@ -1,78 +1,39 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
+use PHPUnit\Extensions\Selenium2TestCase\URL;
+
 /**
  * Gets or posts an attribute from/to the session (title, alert text, etc.)
- *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.9
  */
 class Location extends GenericAttribute
 {
-
-    public function __construct($location, $commandUrl)
+    public function __construct($location, URL $commandUrl)
     {
-        if ($location !== NULL) {
-            $jsonParameters = array('location' => $location);
+        if ($location !== null) {
+            $jsonParameters = ['location' => $location];
         } else {
-            $jsonParameters = NULL;
+            $jsonParameters = null;
         }
+
         parent::__construct($jsonParameters, $commandUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Log.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Log.php
index 8b2d14e4..8399b409 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Log.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Log.php
@@ -1,72 +1,31 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Andrew Krasichkov <krasichkovandrew@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.3.2
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
 use PHPUnit\Extensions\Selenium2TestCase\Command;
+use PHPUnit\Extensions\Selenium2TestCase\URL;
 
 /**
  * Get the log for a given log type. Log buffer is reset after each request.
- *
- * @package    PHPUnit_Selenium
- * @author     Andrew Krasichkov <krasichkovandrew@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.3.2
  */
 class Log extends Command
 {
-    public function __construct($type, $commandUrl)
+    public function __construct($type, URL $commandUrl)
     {
-        $jsonParameters = array('type' => $type);
+        $jsonParameters = ['type' => $type];
         parent::__construct($jsonParameters, $commandUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
-}
\ No newline at end of file
+}
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php
index fd227a0a..21568653 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.8
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -50,35 +16,25 @@
 
 /**
  * Moves the mouse pointer.
- *
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @package    PHPUnit_Selenium
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.8
  */
 class MoveTo extends Command
 {
     public function __construct($element, URL $url)
     {
-        if (!is_array($element)) {
-            $element = array(
-                'element' => $element,
-            );
+        if (! is_array($element)) {
+            $element = ['element' => $element,];
         }
 
-        $validKeys = array(
-            'element' => NULL,
-            'xoffset' => NULL,
-            'yoffset' => NULL,
-        );
+        $validKeys = [
+            'element' => null,
+            'xoffset' => null,
+            'yoffset' => null,
+        ];
 
         $jsonParameters = array_intersect_key($element, $validKeys);
 
         if (isset($jsonParameters['element'])) {
-            if (!($jsonParameters['element'] instanceof Element)) {
+            if (! ($jsonParameters['element'] instanceof Element)) {
                 throw new \PHPUnit\Extensions\Selenium2TestCase\Exception(sprintf('Only moving over an element is supported. Please pass a \'%s\' instance.', Element::class));
             }
 
@@ -94,10 +50,7 @@ public function __construct($element, URL $url)
         parent::__construct($jsonParameters, $url);
     }
 
-    /**
-     * @return string
-     */
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Orientation.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Orientation.php
index ea827adc..94d30ff5 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Orientation.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Orientation.php
@@ -1,78 +1,39 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
+use PHPUnit\Extensions\Selenium2TestCase\URL;
+
 /**
  * Gets or posts an attribute from/to the session (title, alert text, etc.)
- *
- * @package    PHPUnit_Selenium
- * @author     Jonathan Lipps <jlipps@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.9
  */
 class Orientation extends GenericAttribute
 {
-
-    public function __construct($orientation, $commandUrl)
+    public function __construct($orientation, URL $commandUrl)
     {
-        if ($orientation !== NULL) {
-            $jsonParameters = array('orientation' => $orientation);
+        if ($orientation !== null) {
+            $jsonParameters = ['orientation' => $orientation];
         } else {
-            $jsonParameters = NULL;
+            $jsonParameters = null;
         }
+
         parent::__construct($jsonParameters, $commandUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Url.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Url.php
index 0b267087..0f8020ef 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Url.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Url.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
@@ -49,33 +15,27 @@
 
 /**
  * Gets or sets the current URL of the window.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class Url extends Command
 {
-    public function __construct($url, $commandUrl, SeleniumURL $baseUrl)
+    public function __construct(?string $url, SeleniumURL $commandUrl, SeleniumURL $baseUrl)
     {
-        if ($url !== NULL) {
+        if ($url !== null) {
             $absoluteLocation = $baseUrl->jump($url)->getValue();
-            $jsonParameters = array('url' => $absoluteLocation);
+            $jsonParameters   = ['url' => $absoluteLocation];
         } else {
-            $jsonParameters = NULL;
+            $jsonParameters = null;
         }
+
         parent::__construct($jsonParameters, $commandUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Window.php b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Window.php
index 3a9583d5..1b50c283 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Window.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionCommand/Window.php
@@ -1,71 +1,30 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.4
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionCommand;
 
 use PHPUnit\Extensions\Selenium2TestCase\Command;
+use PHPUnit\Extensions\Selenium2TestCase\URL;
 
 /**
  * Changes the focus to a window.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.4
  */
 class Window extends Command
 {
-    public function __construct($name, $commandUrl)
+    public function __construct($name, URL $commandUrl)
     {
-        $jsonParameters = array('name' => $name);
+        $jsonParameters = ['name' => $name];
         parent::__construct($jsonParameters, $commandUrl);
     }
 
-    public function httpMethod()
+    public function httpMethod(): string
     {
         return 'POST';
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
index 00a0a520..1eb6fd23 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy.php
@@ -1,59 +1,17 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
 /**
  * Specifies how to create Session objects for running tests.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 interface SessionStrategy
 {
@@ -64,9 +22,9 @@ interface SessionStrategy
                                 'browser' => a browser name
      *                          'browserUrl' => base URL to use during the test
      */
-    public function session(array $parameters);
+    public function session(array $parameters): Session;
 
-    public function notSuccessfulTest();
+    public function notSuccessfulTest(): void;
 
-    public function endOfTest(Session $session = NULL);
+    public function endOfTest(?Session $session = null): void;
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
index fffab02b..20a556b6 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionStrategy;
@@ -51,36 +17,30 @@
 
 /**
  * Produces a new Session object shared for each test.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Isolated implements SessionStrategy
 {
-    public function session(array $parameters)
+    public function session(array $parameters): Session
     {
         $seleniumServerUrl = URL::fromHostAndPort($parameters['host'], $parameters['port'], $parameters['secure']);
-        $driver = new Driver($seleniumServerUrl, $parameters['seleniumServerRequestsTimeout']);
-        $capabilities = array_merge($parameters['desiredCapabilities'],
-                                    array(
-                                        'browserName' => $parameters['browserName']
-                                    ));
-        $session = $driver->startSession($capabilities, $parameters['browserUrl']);
-        return $session;
+        $driver            = new Driver($seleniumServerUrl, $parameters['seleniumServerRequestsTimeout']);
+        $capabilities      = array_merge(
+            $parameters['desiredCapabilities'],
+            [
+                'browserName' => $parameters['browserName'],
+            ]
+        );
+
+        return $driver->startSession($capabilities, $parameters['browserUrl']);
     }
 
-    public function notSuccessfulTest()
+    public function notSuccessfulTest(): void
     {
     }
 
-    public function endOfTest(Session $session = NULL)
+    public function endOfTest(?Session $session = null): void
     {
-        if ($session !== NULL) {
+        if ($session !== null) {
             $session->stop();
         }
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
index 59d9e1e2..b9474137 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/SessionStrategy/Shared.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase\SessionStrategy;
@@ -49,53 +15,48 @@
 
 /**
  * Keeps a Session object shared between test runs to save time.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class Shared implements SessionStrategy
 {
     private $original;
     private $session;
     private $mainWindow;
-    private $lastTestWasNotSuccessful = FALSE;
+    private $lastTestWasNotSuccessful = false;
     private $keepSessionOnFailure;
 
     public function __construct(SessionStrategy $originalStrategy, $keepSessionOnFailure)
     {
-        $this->original = $originalStrategy;
+        $this->original             = $originalStrategy;
         $this->keepSessionOnFailure = $keepSessionOnFailure;
     }
 
-    public function session(array $parameters)
+    public function session(array $parameters): Session
     {
-        if ($this->lastTestWasNotSuccessful && !$this->keepSessionOnFailure) {
-            if ($this->session !== NULL) {
+        if ($this->lastTestWasNotSuccessful && ! $this->keepSessionOnFailure) {
+            if ($this->session !== null) {
                 $this->session->stop();
-                $this->session = NULL;
+                $this->session = null;
             }
-            $this->lastTestWasNotSuccessful = FALSE;
+
+            $this->lastTestWasNotSuccessful = false;
         }
-        if ($this->session === NULL) {
-            $this->session = $this->original->session($parameters);
+
+        if ($this->session === null) {
+            $this->session    = $this->original->session($parameters);
             $this->mainWindow = $this->session->windowHandle();
         } else {
             $this->session->window($this->mainWindow);
         }
+
         return $this->session;
     }
 
-    public function notSuccessfulTest()
+    public function notSuccessfulTest(): void
     {
-        $this->lastTestWasNotSuccessful = TRUE;
+        $this->lastTestWasNotSuccessful = true;
     }
 
-    public function endOfTest(Session $session = NULL)
+    public function endOfTest(?Session $session = null): void
     {
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/StateCommand.php b/PHPUnit/Extensions/Selenium2TestCase/StateCommand.php
index 2d440b9b..6d72b361 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/StateCommand.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/StateCommand.php
@@ -1,67 +1,26 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.5
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
 /**
  * Gets or sets an attribute of an object.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.5
  */
 class StateCommand extends Command
 {
-    public function httpMethod()
+    public function httpMethod(): string
     {
         if ($this->jsonParameters) {
             return 'POST';
         }
+
         return 'GET';
     }
 }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/URL.php b/PHPUnit/Extensions/Selenium2TestCase/URL.php
index 911b6b01..768d822d 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/URL.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/URL.php
@@ -1,94 +1,39 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+/*
+ * This file is part of PHPUnit.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
 /**
  * URL Value Object allowing easy concatenation.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 final class URL
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     private $value;
 
-    /**
-     * @param string $value
-     */
-    public function __construct($value)
+    public function __construct(string $value)
     {
         $this->value = $value;
     }
 
-    /**
-     * @param string $host
-     * @param int port
-     * @param bool secure
-     * @return URL
-     */
-    public static function fromHostAndPort($host, $port, $secure)
+    public static function fromHostAndPort(string $host, int $port, bool $secure): URL
     {
-        $prefix = "http://";
+        $prefix = 'http://';
         if ($secure) {
-            $prefix = "https://";
+            $prefix = 'https://';
         }
-        return new self($prefix.$host.":".$port);
+
+        return new self($prefix . $host . ':' . $port);
     }
 
-    /**
-     * @return string
-     */
-    public function getValue()
+    public function getValue(): string
     {
         return $this->value;
     }
@@ -98,13 +43,9 @@ public function __toString()
         return $this->getValue();
     }
 
-    /**
-     * @param string $addition
-     * @return URL
-     */
-    public function descend($addition)
+    public function descend(?string $addition): URL
     {
-        if ($addition == '') {
+        if ($addition === '') {
             // if we're adding nothing, respect the current url's choice of
             // whether or not to include a trailing slash; prevents inadvertent
             // adding of slashes to urls that can't handle it
@@ -114,42 +55,31 @@ public function descend($addition)
                       . '/'
                       . ltrim($addition, '/');
         }
+
         return new self($newValue);
     }
 
-    /**
-     * @return URL
-     */
-    public function ascend()
+    public function ascend(): URL
     {
-        $lastSlash = strrpos($this->value, "/");
-        $newValue = substr($this->value, 0, $lastSlash);
+        $lastSlash = strrpos($this->value, '/');
+        $newValue  = substr($this->value, 0, $lastSlash);
+
         return new self($newValue);
     }
 
-    /**
-     * @return string
-     */
-    public function lastSegment()
+    public function lastSegment(): string
     {
         $segments = explode('/', $this->value);
+
         return end($segments);
     }
 
-    /**
-     * @param string $command
-     * @return URL
-     */
-    public function addCommand($command)
+    public function addCommand(string $command): URL
     {
         return $this->descend($this->camelCaseToUnderScores($command));
     }
 
-    /**
-     * @param string $newUrl
-     * @return URL
-     */
-    public function jump($newUrl)
+    public function jump(string $newUrl): URL
     {
         if ($this->isAbsolute($newUrl)) {
             return new self($newUrl);
@@ -158,14 +88,15 @@ public function jump($newUrl)
         }
     }
 
-    private function camelCaseToUnderScores($string)
+    private function camelCaseToUnderScores(string $string): string
     {
         $string = preg_replace('/([A-Z]{1,1})/', ' \1', $string);
         $string = strtolower($string);
+
         return str_replace(' ', '_', $string);
     }
 
-    private function isAbsolute($urlValue)
+    private function isAbsolute(string $urlValue): bool
     {
         return preg_match('/^(http|https):\/\//', $urlValue) > 0;
     }
diff --git a/PHPUnit/Extensions/Selenium2TestCase/WaitUntil.php b/PHPUnit/Extensions/Selenium2TestCase/WaitUntil.php
index aa62e5fd..ff6be07a 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/WaitUntil.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/WaitUntil.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.12
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -49,13 +15,6 @@
 /**
  * The WaitUntil implementation, inspired by Java and .NET clients
  *
- * @package    PHPUnit_Selenium
- * @author     Ivan Kurnosov <zerkms@zerkms.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.12
  * @see        http://selenium.googlecode.com/svn/trunk/dotnet/src/WebDriver.Support/UI/WebDriverWait.cs
  * @see        http://selenium.googlecode.com/svn/trunk/java/client/src/org/openqa/selenium/support/ui/FluentWait.java
  */
@@ -66,75 +25,69 @@ class WaitUntil
      *
      * @var Selenium2TestCase
      */
-    private $_testCase;
+    private $testCase;
 
-
-    /**
-     * @param Selenium2TestCase $testCase
-     */
     public function __construct(Selenium2TestCase $testCase)
     {
-        $this->_testCase = $testCase;
+        $this->testCase = $testCase;
     }
 
     /**
-     * @param $callback Callback to run until it returns not null or timeout occurs
-     * @param null|int $timeout
-     * @param null|int $sleepInterval the delay between 2 iterations of the callback
+     * @param callable $callback      Callback to run until it returns not null or timeout occurs
+     * @param int|null $timeout
+     * @param int|null $sleepInterval the delay between 2 iterations of the callback
+     *
      * @return mixed
+     *
      * @throws \PHPUnit\Extensions\Selenium2TestCase\Exception
      * @throws WebDriverException
      */
-    public function run($callback, $timeout = NULL, $sleepInterval = NULL)
+    public function run(callable $callback, ?int $timeout = null, ?int $sleepInterval = null)
     {
-        if (!is_callable($callback)) {
-            throw new \PHPUnit\Extensions\Selenium2TestCase\Exception('The valid callback is expected');
-        }
-
         // if there was an implicit timeout specified - remember it and temporarily turn it off
-        $implicitWait = $this->_testCase->timeouts()->getLastImplicitWaitValue();
+        $implicitWait = $this->testCase->timeouts()->getLastImplicitWaitValue();
         if ($implicitWait) {
-            $this->_testCase->timeouts()->implicitWait(0);
+            $this->testCase->timeouts()->implicitWait(0);
         }
 
-        if(is_null($sleepInterval)){
+        if ($sleepInterval === null) {
             $sleepInterval = Selenium2TestCase::defaultWaitUntilSleepInterval();
         }
 
         $sleepInterval *= 1000;
 
-
-        if (is_null($timeout)) {
+        if ($timeout === null) {
             $timeout = Selenium2TestCase::defaultWaitUntilTimeout();
         }
 
         $timeout /= 1000;
 
-        $endTime = microtime(TRUE) + $timeout;
+        $endTime = microtime(true) + $timeout;
 
-        $lastException = NULL;
+        $lastException = null;
 
-        while (TRUE) {
+        while (true) {
             try {
-                $result = call_user_func($callback, $this->_testCase);
+                $result = call_user_func($callback, $this->testCase);
 
-                if (!is_null($result)) {
+                if ($result !== null) {
                     if ($implicitWait) {
-                        $this->_testCase->timeouts()->implicitWait($implicitWait);
+                        $this->testCase->timeouts()->implicitWait($implicitWait);
                     }
 
                     return $result;
                 }
-            } catch(\Exception $e) {
+            } catch (\Exception $e) {
                 $lastException = $e;
             }
 
-            if (microtime(TRUE) > $endTime) {
+            if (microtime(true) > $endTime) {
                 if ($implicitWait) {
-                    $this->_testCase->timeouts()->implicitWait($implicitWait);
+                    $this->testCase->timeouts()->implicitWait($implicitWait);
                 }
 
-                $message = "Timed out after {$timeout} second" . ($timeout != 1 ? 's' : '');
+                $message = sprintf('Timed out after %s second', $timeout) . ($timeout !== 1 ? 's' : '');
+
                 throw new WebDriverException($message, WebDriverException::Timeout, $lastException);
             }
 
diff --git a/PHPUnit/Extensions/Selenium2TestCase/WebDriverException.php b/PHPUnit/Extensions/Selenium2TestCase/WebDriverException.php
index 7a41a9ad..e9440cd5 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/WebDriverException.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/WebDriverException.php
@@ -1,86 +1,44 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Christian Becker <chris@beckr.org>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
 
 /**
  * Indicates an exception as a result of a non-sucessful WebDriver response status code.
- *
- * @package    PHPUnit_Selenium
- * @author     Christian Becker <chris@beckr.org>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      
  */
 class WebDriverException extends \PHPUnit\Extensions\Selenium2TestCase\Exception
 {
     /* @see http://code.google.com/p/selenium/wiki/JsonWireProtocol#Response_Status_Codes */
-    const Success = 0;
-    const NoSuchDriver = 6;
-    const NoSuchElement = 7;
-    const NoSuchFrame = 8;
-    const UnknownCommand = 9;
-    const StaleElementReference = 10;
-    const ElementNotVisible = 11;
-    const InvalidElementState = 12;
-    const UnknownError = 13;
-    const ElementIsNotSelectable = 15;
-    const JavaScriptError = 17;
-    const XPathLookupError = 19;
-    const Timeout = 21;
-    const NoSuchWindow = 23;
-    const InvalidCookieDomain = 24;
-    const UnableToSetCookie = 25;
-    const UnexpectedAlertOpen = 26;
-    const NoAlertOpenError = 27;
-    const ScriptTimeout = 28;
-    const InvalidElementCoordinates = 29;
-    const IMENotAvailable = 30;
-    const IMEEngineActivationFailed = 31;
-    const InvalidSelector = 32;
-    const SessionNotCreatedException = 33;
-    const MoveTargetOutOfBounds = 34;
-}
\ No newline at end of file
+    public const Success                    = 0;
+    public const NoSuchDriver               = 6;
+    public const NoSuchElement              = 7;
+    public const NoSuchFrame                = 8;
+    public const UnknownCommand             = 9;
+    public const StaleElementReference      = 10;
+    public const ElementNotVisible          = 11;
+    public const InvalidElementState        = 12;
+    public const UnknownError               = 13;
+    public const ElementIsNotSelectable     = 15;
+    public const JavaScriptError            = 17;
+    public const XPathLookupError           = 19;
+    public const Timeout                    = 21;
+    public const NoSuchWindow               = 23;
+    public const InvalidCookieDomain        = 24;
+    public const UnableToSetCookie          = 25;
+    public const UnexpectedAlertOpen        = 26;
+    public const NoAlertOpenError           = 27;
+    public const ScriptTimeout              = 28;
+    public const InvalidElementCoordinates  = 29;
+    public const IMENotAvailable            = 30;
+    public const IMEEngineActivationFailed  = 31;
+    public const InvalidSelector            = 32;
+    public const SessionNotCreatedException = 33;
+    public const MoveTargetOutOfBounds      = 34;
+}
diff --git a/PHPUnit/Extensions/Selenium2TestCase/Window.php b/PHPUnit/Extensions/Selenium2TestCase/Window.php
index 89231d69..88b055fc 100644
--- a/PHPUnit/Extensions/Selenium2TestCase/Window.php
+++ b/PHPUnit/Extensions/Selenium2TestCase/Window.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.5
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions\Selenium2TestCase;
@@ -49,13 +15,6 @@
 /**
  * Object representing a browser window.
  *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.5
  * @method array size(array $size = null) Window size as array('width' => $x, 'height' => $y)
  * @method array position(array $position = null) Window position as array('x' => $x, 'y' => $y)
  * @method array maximize() Maximize window
@@ -63,15 +22,14 @@
 class Window extends CommandsHolder
 {
     /**
-     * @return array    class names
+     * @return array class names
      */
-    protected function initCommands()
+    protected function initCommands(): array
     {
-        return array(
+        return [
             'size' => StateCommand::class,
             'position' => StateCommand::class,
             'maximize' => GenericPost::class,
-        );
+        ];
     }
-
 }
diff --git a/PHPUnit/Extensions/SeleniumBrowserSuite.php b/PHPUnit/Extensions/SeleniumBrowserSuite.php
index b73e6c3b..82eb6d30 100644
--- a/PHPUnit/Extensions/SeleniumBrowserSuite.php
+++ b/PHPUnit/Extensions/SeleniumBrowserSuite.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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 file is part of PHPUnit.
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.6
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions;
@@ -51,48 +17,43 @@
 /**
  * TestSuite class for a set of tests from a single Testcase Class
  * executed with a particular browser.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.6
  */
 class SeleniumBrowserSuite extends TestSuite
 {
     /**
      * Overriding the default: Selenium suites are always built from a TestCase class.
-     * @var boolean
+     *
+     * @var bool
      */
-    protected $testCase = TRUE;
+    protected $testCase = true;
 
     public function addTestMethod(ReflectionClass $class, ReflectionMethod $method): void
     {
         parent::addTestMethod($class, $method);
     }
 
-    public static function fromClassAndBrowser($className, array $browser)
+    public static function fromClassAndBrowser(string $className, array $browser): self
     {
         $browserSuite = new self();
         if (isset($browser['browserName'])) {
             $name = $browser['browserName'];
-        } else if (isset($browser['name'])) {
+        } elseif (isset($browser['name'])) {
             $name = $browser['name'];
         } else {
             $name = $browser['browser'];
         }
+
         $browserSuite->setName($className . ': ' . $name);
+
         return $browserSuite;
     }
 
-    public function setupSpecificBrowser(array $browser)
+    public function setupSpecificBrowser(array $browser): void
     {
         $this->browserOnAllTests($this, $browser);
     }
 
-    private function browserOnAllTests(TestSuite $suite, array $browser)
+    private function browserOnAllTests(TestSuite $suite, array $browser): void
     {
         foreach ($suite->tests() as $test) {
             if ($test instanceof TestSuite) {
diff --git a/PHPUnit/Extensions/SeleniumCommon/Autoload.php b/PHPUnit/Extensions/SeleniumCommon/Autoload.php
index dc832b1f..78034060 100644
--- a/PHPUnit/Extensions/SeleniumCommon/Autoload.php
+++ b/PHPUnit/Extensions/SeleniumCommon/Autoload.php
@@ -1,118 +1,84 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 require_once 'File/Iterator/Autoload.php';
 
 spl_autoload_register(
-  function ($class) {
-      static $classes = NULL;
-      static $path = NULL;
+    static function ($class) {
+        static $classes = null;
+        static $path    = null;
 
-      if ($classes === NULL) {
-          $classes = array(
-            'phpunit_extensions_selenium2testcase' => '/Extensions/Selenium2TestCase.php',
-            'phpunit_extensions_selenium2testcase_command' => '/Extensions/Selenium2TestCase/Command.php',
-            'phpunit_extensions_selenium2testcase_commandsholder' => '/Extensions/Selenium2TestCase/CommandsHolder.php',
-            'phpunit_extensions_selenium2testcase_driver' => '/Extensions/Selenium2TestCase/Driver.php',
-            'phpunit_extensions_selenium2testcase_element' => '/Extensions/Selenium2TestCase/Element.php',
-            'phpunit_extensions_selenium2testcase_element_accessor' => '/Extensions/Selenium2TestCase/Element/Accessor.php',
-            'phpunit_extensions_selenium2testcase_element_select' => '/Extensions/Selenium2TestCase/Element/Select.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_attribute' => '/Extensions/Selenium2TestCase/ElementCommand/Attribute.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_click' => '/Extensions/Selenium2TestCase/ElementCommand/Click.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_css' => '/Extensions/Selenium2TestCase/ElementCommand/Css.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_equals' => '/Extensions/Selenium2TestCase/ElementCommand/Equals.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_genericaccessor' => '/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_genericpost' => '/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php',
-            'phpunit_extensions_selenium2testcase_elementcommand_value' => '/Extensions/Selenium2TestCase/ElementCommand/Value.php',
-            'phpunit_extensions_selenium2testcase_elementcriteria' => '/Extensions/Selenium2TestCase/ElementCriteria.php',
-            'phpunit_extensions_selenium2testcase_exception' => '/Extensions/Selenium2TestCase/Exception.php',
-            'phpunit_extensions_selenium2testcase_keys' => '/Extensions/Selenium2TestCase/Keys.php',
-            'phpunit_extensions_selenium2testcase_keysholder' => '/Extensions/Selenium2TestCase/KeysHolder.php',
-            'phpunit_extensions_selenium2testcase_noseleniumexception' => '/Extensions/Selenium2TestCase/NoSeleniumException.php',
-            'phpunit_extensions_selenium2testcase_response' => '/Extensions/Selenium2TestCase/Response.php',
-            'phpunit_extensions_selenium2testcase_screenshotlistener' => '/Extensions/Selenium2TestCase/ScreenshotListener.php',
-            'phpunit_extensions_selenium2testcase_session' => '/Extensions/Selenium2TestCase/Session.php',
-            'phpunit_extensions_selenium2testcase_session_cookie' => '/Extensions/Selenium2TestCase/Session/Cookie.php',
-            'phpunit_extensions_selenium2testcase_session_cookie_builder' => '/Extensions/Selenium2TestCase/Session/Cookie/Builder.php',
-            'phpunit_extensions_selenium2testcase_session_storage' => '/Extensions/Selenium2TestCase/Session/Storage.php',
-            'phpunit_extensions_selenium2testcase_session_timeouts' => '/Extensions/Selenium2TestCase/Session/Timeouts.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_acceptalert' => '/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_active' => '/Extensions/Selenium2TestCase/SessionCommand/Active.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_alerttext' => '/Extensions/Selenium2TestCase/SessionCommand/AlertText.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_click' => '/Extensions/Selenium2TestCase/SessionCommand/Click.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_dismissalert' => '/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_file' => '/Extensions/Selenium2TestCase/SessionCommand/File.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_frame' => '/Extensions/Selenium2TestCase/SessionCommand/Frame.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_genericaccessor' => '/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_genericattribute' => '/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_keys' => '/Extensions/Selenium2TestCase/SessionCommand/Keys.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_location' => '/Extensions/Selenium2TestCase/SessionCommand/Location.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_moveto' => '/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_orientation' => '/Extensions/Selenium2TestCase/SessionCommand/Orientation.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_url' => '/Extensions/Selenium2TestCase/SessionCommand/Url.php',
-            'phpunit_extensions_selenium2testcase_sessioncommand_window' => '/Extensions/Selenium2TestCase/SessionCommand/Window.php',
-            'phpunit_extensions_selenium2testcase_sessionstrategy' => '/Extensions/Selenium2TestCase/SessionStrategy.php',
-            'phpunit_extensions_selenium2testcase_sessionstrategy_isolated' => '/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php',
-            'phpunit_extensions_selenium2testcase_sessionstrategy_shared' => '/Extensions/Selenium2TestCase/SessionStrategy/Shared.php',
-            'phpunit_extensions_selenium2testcase_statecommand' => '/Extensions/Selenium2TestCase/StateCommand.php',
-            'phpunit_extensions_selenium2testcase_url' => '/Extensions/Selenium2TestCase/URL.php',
-            'phpunit_extensions_selenium2testcase_waituntil' => '/Extensions/Selenium2TestCase/WaitUntil.php',
-            'phpunit_extensions_selenium2testcase_webdriverexception' => '/Extensions/Selenium2TestCase/WebDriverException.php',
-            'phpunit_extensions_selenium2testcase_window' => '/Extensions/Selenium2TestCase/Window.php',
-            'phpunit_extensions_seleniumbrowsersuite' => '/Extensions/SeleniumBrowserSuite.php',
-            'phpunit_extensions_seleniumcommon_remotecoverage' => '/Extensions/SeleniumCommon/RemoteCoverage.php',
-            'phpunit_extensions_seleniumcommon_exithandler' => '/Extensions/SeleniumCommon/ExitHandler.php',
-            'phpunit_extensions_seleniumtestsuite' => '/Extensions/SeleniumTestSuite.php'
-          );
+        if ($classes === null) {
+            $classes = [
+                'phpunit_extensions_selenium2testcase' => '/Extensions/Selenium2TestCase.php',
+                'phpunit_extensions_selenium2testcase_command' => '/Extensions/Selenium2TestCase/Command.php',
+                'phpunit_extensions_selenium2testcase_commandsholder' => '/Extensions/Selenium2TestCase/CommandsHolder.php',
+                'phpunit_extensions_selenium2testcase_driver' => '/Extensions/Selenium2TestCase/Driver.php',
+                'phpunit_extensions_selenium2testcase_element' => '/Extensions/Selenium2TestCase/Element.php',
+                'phpunit_extensions_selenium2testcase_element_accessor' => '/Extensions/Selenium2TestCase/Element/Accessor.php',
+                'phpunit_extensions_selenium2testcase_element_select' => '/Extensions/Selenium2TestCase/Element/Select.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_attribute' => '/Extensions/Selenium2TestCase/ElementCommand/Attribute.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_click' => '/Extensions/Selenium2TestCase/ElementCommand/Click.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_css' => '/Extensions/Selenium2TestCase/ElementCommand/Css.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_equals' => '/Extensions/Selenium2TestCase/ElementCommand/Equals.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_genericaccessor' => '/Extensions/Selenium2TestCase/ElementCommand/GenericAccessor.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_genericpost' => '/Extensions/Selenium2TestCase/ElementCommand/GenericPost.php',
+                'phpunit_extensions_selenium2testcase_elementcommand_value' => '/Extensions/Selenium2TestCase/ElementCommand/Value.php',
+                'phpunit_extensions_selenium2testcase_elementcriteria' => '/Extensions/Selenium2TestCase/ElementCriteria.php',
+                'phpunit_extensions_selenium2testcase_exception' => '/Extensions/Selenium2TestCase/Exception.php',
+                'phpunit_extensions_selenium2testcase_keys' => '/Extensions/Selenium2TestCase/Keys.php',
+                'phpunit_extensions_selenium2testcase_keysholder' => '/Extensions/Selenium2TestCase/KeysHolder.php',
+                'phpunit_extensions_selenium2testcase_noseleniumexception' => '/Extensions/Selenium2TestCase/NoSeleniumException.php',
+                'phpunit_extensions_selenium2testcase_response' => '/Extensions/Selenium2TestCase/Response.php',
+                'phpunit_extensions_selenium2testcase_screenshotlistener' => '/Extensions/Selenium2TestCase/ScreenshotListener.php',
+                'phpunit_extensions_selenium2testcase_session' => '/Extensions/Selenium2TestCase/Session.php',
+                'phpunit_extensions_selenium2testcase_session_cookie' => '/Extensions/Selenium2TestCase/Session/Cookie.php',
+                'phpunit_extensions_selenium2testcase_session_cookie_builder' => '/Extensions/Selenium2TestCase/Session/Cookie/Builder.php',
+                'phpunit_extensions_selenium2testcase_session_storage' => '/Extensions/Selenium2TestCase/Session/Storage.php',
+                'phpunit_extensions_selenium2testcase_session_timeouts' => '/Extensions/Selenium2TestCase/Session/Timeouts.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_acceptalert' => '/Extensions/Selenium2TestCase/SessionCommand/AcceptAlert.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_active' => '/Extensions/Selenium2TestCase/SessionCommand/Active.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_alerttext' => '/Extensions/Selenium2TestCase/SessionCommand/AlertText.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_click' => '/Extensions/Selenium2TestCase/SessionCommand/Click.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_dismissalert' => '/Extensions/Selenium2TestCase/SessionCommand/DismissAlert.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_file' => '/Extensions/Selenium2TestCase/SessionCommand/File.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_frame' => '/Extensions/Selenium2TestCase/SessionCommand/Frame.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_genericaccessor' => '/Extensions/Selenium2TestCase/SessionCommand/GenericAccessor.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_genericattribute' => '/Extensions/Selenium2TestCase/SessionCommand/GenericAttribute.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_keys' => '/Extensions/Selenium2TestCase/SessionCommand/Keys.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_location' => '/Extensions/Selenium2TestCase/SessionCommand/Location.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_moveto' => '/Extensions/Selenium2TestCase/SessionCommand/MoveTo.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_orientation' => '/Extensions/Selenium2TestCase/SessionCommand/Orientation.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_url' => '/Extensions/Selenium2TestCase/SessionCommand/Url.php',
+                'phpunit_extensions_selenium2testcase_sessioncommand_window' => '/Extensions/Selenium2TestCase/SessionCommand/Window.php',
+                'phpunit_extensions_selenium2testcase_sessionstrategy' => '/Extensions/Selenium2TestCase/SessionStrategy.php',
+                'phpunit_extensions_selenium2testcase_sessionstrategy_isolated' => '/Extensions/Selenium2TestCase/SessionStrategy/Isolated.php',
+                'phpunit_extensions_selenium2testcase_sessionstrategy_shared' => '/Extensions/Selenium2TestCase/SessionStrategy/Shared.php',
+                'phpunit_extensions_selenium2testcase_statecommand' => '/Extensions/Selenium2TestCase/StateCommand.php',
+                'phpunit_extensions_selenium2testcase_url' => '/Extensions/Selenium2TestCase/URL.php',
+                'phpunit_extensions_selenium2testcase_waituntil' => '/Extensions/Selenium2TestCase/WaitUntil.php',
+                'phpunit_extensions_selenium2testcase_webdriverexception' => '/Extensions/Selenium2TestCase/WebDriverException.php',
+                'phpunit_extensions_selenium2testcase_window' => '/Extensions/Selenium2TestCase/Window.php',
+                'phpunit_extensions_seleniumbrowsersuite' => '/Extensions/SeleniumBrowserSuite.php',
+                'phpunit_extensions_seleniumcommon_remotecoverage' => '/Extensions/SeleniumCommon/RemoteCoverage.php',
+                'phpunit_extensions_seleniumcommon_exithandler' => '/Extensions/SeleniumCommon/ExitHandler.php',
+                'phpunit_extensions_seleniumtestsuite' => '/Extensions/SeleniumTestSuite.php',
+            ];
 
-          $path = dirname(dirname(dirname(__FILE__)));
-      }
+            $path = dirname(dirname(dirname(__FILE__)));
+        }
 
-      $cn = strtolower($class);
+        $cn = strtolower($class);
 
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
+        if (isset($classes[$cn])) {
+            require $path . $classes[$cn];
+        }
+    }
 );
diff --git a/PHPUnit/Extensions/SeleniumCommon/Autoload.php.in b/PHPUnit/Extensions/SeleniumCommon/Autoload.php.in
index 9e97b3f1..5219a12a 100644
--- a/PHPUnit/Extensions/SeleniumCommon/Autoload.php.in
+++ b/PHPUnit/Extensions/SeleniumCommon/Autoload.php.in
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.1.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 require_once 'File/Iterator/Autoload.php';
diff --git a/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php b/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php
index 30de270f..9040395f 100644
--- a/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php
+++ b/PHPUnit/Extensions/SeleniumCommon/ExitHandler.php
@@ -6,19 +6,16 @@
  * If Ececution was stopped by calling exit();
  * php does not append append.php, so no code coverage date is collected
  * We have to add shutdown handler to append this file manualy.
- * @author Arbuzov <info@whitediver.com>
- *
  */
 class ExitHandler
 {
     /**
      * Register handler.
      * If project have own shutdown hanldler user have to add function to handler
-     *
      */
     public static function init()
     {
-        register_shutdown_function(array(ExitHandler::class, 'handle'));
+        register_shutdown_function([self::class, 'handle']);
     }
 
     /**
@@ -28,7 +25,7 @@ public static function handle()
     {
         $execFile = ini_get('auto_append_file');
         if ($execFile!=='') {
-            include_once ($execFile);
+            include_once $execFile;
         }
     }
 }
diff --git a/PHPUnit/Extensions/SeleniumCommon/RemoteCoverage.php b/PHPUnit/Extensions/SeleniumCommon/RemoteCoverage.php
index dd18c4b4..bce9d1ea 100644
--- a/PHPUnit/Extensions/SeleniumCommon/RemoteCoverage.php
+++ b/PHPUnit/Extensions/SeleniumCommon/RemoteCoverage.php
@@ -9,21 +9,21 @@ class RemoteCoverage
     public function __construct($coverageScriptUrl, $testId)
     {
         $this->coverageScriptUrl = $coverageScriptUrl;
-        $this->testId = $testId;
+        $this->testId            = $testId;
     }
 
     public function get()
     {
-        if (!empty($this->coverageScriptUrl)) {
+        if (! empty($this->coverageScriptUrl)) {
             $url = sprintf(
-              '%s?PHPUNIT_SELENIUM_TEST_ID=%s',
-              $this->coverageScriptUrl,
-              urlencode($this->testId)
+                '%s?PHPUNIT_SELENIUM_TEST_ID=%s',
+                $this->coverageScriptUrl,
+                urlencode($this->testId)
             );
 
             $buffer = @file_get_contents($url);
 
-            if ($buffer !== FALSE) {
+            if ($buffer !== false) {
                 $coverageData = unserialize($buffer);
                 if (is_array($coverageData)) {
                     return $this->matchLocalAndRemotePaths($coverageData);
@@ -33,28 +33,28 @@ public function get()
             }
         }
 
-        return array();
+        return [];
     }
 
     /**
      * @param  array $coverage
+     *
      * @return array
-     * @author Mattis Stordalen Flister <mattis@xait.no>
      */
     protected function matchLocalAndRemotePaths(array $coverage)
     {
-        $coverageWithLocalPaths = array();
+        $coverageWithLocalPaths = [];
 
         foreach ($coverage as $originalRemotePath => $data) {
             $remotePath = $originalRemotePath;
             $separator  = $this->findDirectorySeparator($remotePath);
 
-            while (!($localpath = stream_resolve_include_path($remotePath)) &&
-                   strpos($remotePath, $separator) !== FALSE) {
+            while (! ($localpath = stream_resolve_include_path($remotePath)) &&
+                   strpos($remotePath, $separator) !== false) {
                 $remotePath = substr($remotePath, strpos($remotePath, $separator) + 1);
             }
 
-            if ($localpath && md5_file($localpath) == $data['md5']) {
+            if ($localpath && md5_file($localpath) === $data['md5']) {
                 $coverageWithLocalPaths[$localpath] = $data['coverage'];
             }
         }
@@ -64,12 +64,12 @@ protected function matchLocalAndRemotePaths(array $coverage)
 
     /**
      * @param  string $path
+     *
      * @return string
-     * @author Mattis Stordalen Flister <mattis@xait.no>
      */
     protected function findDirectorySeparator($path)
     {
-        if (strpos($path, '/') !== FALSE) {
+        if (strpos($path, '/') !== false) {
             return '/';
         }
 
diff --git a/PHPUnit/Extensions/SeleniumCommon/append.php b/PHPUnit/Extensions/SeleniumCommon/append.php
index 227f19eb..47e31da3 100644
--- a/PHPUnit/Extensions/SeleniumCommon/append.php
+++ b/PHPUnit/Extensions/SeleniumCommon/append.php
@@ -1,49 +1,15 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
-if ( isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
-    !isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
+if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
+    ! isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
     extension_loaded('xdebug')) {
     $GLOBALS['PHPUNIT_FILTERED_FILES'][] = __FILE__;
 
@@ -62,8 +28,8 @@
         $file = $_SERVER['SCRIPT_FILENAME'];
     }
 
-    $sanitizedCookieName = str_replace(array('\\'), '_', $_COOKIE['PHPUNIT_SELENIUM_TEST_ID']);
-    $fullPath = $file . '.' . md5(uniqid(rand(), TRUE)) . '.' . $sanitizedCookieName;
+    $sanitizedCookieName = str_replace(['\\'], '_', $_COOKIE['PHPUNIT_SELENIUM_TEST_ID']);
+    $fullPath            = $file . '.' . md5(uniqid(rand(), true)) . '.' . $sanitizedCookieName;
 
     file_put_contents($fullPath, serialize($data));
 }
diff --git a/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php b/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php
index 338cae0c..316a9098 100644
--- a/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php
+++ b/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php
@@ -1,54 +1,21 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 $directory = realpath(__DIR__);
-while ($directory != '/') {
+while ($directory !== '/') {
     $autoloadCandidate = $directory . '/vendor/autoload.php';
     if (file_exists($autoloadCandidate)) {
         require_once $autoloadCandidate;
         break;
     }
+
     $directory = realpath($directory . '/..');
 }
 
@@ -58,14 +25,14 @@
 $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = getcwd();
 
 if (isset($_GET['PHPUNIT_SELENIUM_TEST_ID'])) {
-    $facade = new \SebastianBergmann\FileIterator\Facade();
-    $sanitizedCookieName = str_replace(array('\\'), '_', $_GET['PHPUNIT_SELENIUM_TEST_ID']);
-    $files  = $facade->getFilesAsArray(
-      $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'],
-      $sanitizedCookieName
+    $facade              = new \SebastianBergmann\FileIterator\Facade();
+    $sanitizedCookieName = str_replace(['\\'], '_', $_GET['PHPUNIT_SELENIUM_TEST_ID']);
+    $files               = $facade->getFilesAsArray(
+        $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'],
+        $sanitizedCookieName
     );
 
-    $coverage = array();
+    $coverage = [];
 
     foreach ($files as $file) {
         $data = unserialize(file_get_contents($file));
@@ -75,13 +42,14 @@
 
         foreach ($data as $file => $lines) {
             if ($filter->isFile($file)) {
-                if (!isset($coverage[$file])) {
-                    $coverage[$file] = array(
-                      'md5' => md5_file($file), 'coverage' => $lines
-                    );
+                if (! isset($coverage[$file])) {
+                    $coverage[$file] = [
+                        'md5' => md5_file($file),
+                        'coverage' => $lines,
+                    ];
                 } else {
                     foreach ($lines as $line => $flag) {
-                        if (!isset($coverage[$file]['coverage'][$line]) ||
+                        if (! isset($coverage[$file]['coverage'][$line]) ||
                             $flag > $coverage[$file]['coverage'][$line]) {
                             $coverage[$file]['coverage'][$line] = $flag;
                         }
diff --git a/PHPUnit/Extensions/SeleniumCommon/prepend.php b/PHPUnit/Extensions/SeleniumCommon/prepend.php
index 6e766a8a..29d44b4d 100644
--- a/PHPUnit/Extensions/SeleniumCommon/prepend.php
+++ b/PHPUnit/Extensions/SeleniumCommon/prepend.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
+/*
+ * This file is part of PHPUnit.
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * 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.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.0.0
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 use PHPUnit\Extensions\SeleniumCommon\ExitHandler;
@@ -51,17 +17,17 @@
 // the same directory in phpunit_coverage.php. Also note that the webserver
 // needs write access to the directory.
 
-if (!isset($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'])) {
-    $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = FALSE;
+if (! isset($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'])) {
+    $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = false;
 }
 
-if ( isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
-    !isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
+if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
+    ! isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
     extension_loaded('xdebug')) {
-    $GLOBALS['PHPUNIT_FILTERED_FILES'] = array(__FILE__);
+    $GLOBALS['PHPUNIT_FILTERED_FILES'] = [__FILE__];
 
     xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
 }
 
-include ('ExitHandler.php');
+include 'ExitHandler.php';
 ExitHandler::init();
diff --git a/PHPUnit/Extensions/SeleniumTestSuite.php b/PHPUnit/Extensions/SeleniumTestSuite.php
index 6bb88e10..15288ec7 100644
--- a/PHPUnit/Extensions/SeleniumTestSuite.php
+++ b/PHPUnit/Extensions/SeleniumTestSuite.php
@@ -1,45 +1,11 @@
 <?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+/*
+ * This file is part of PHPUnit.
  *
- *   * 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.
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
  *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE
- * COPYRIGHT OWNER OR 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.
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 1.2.2
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace PHPUnit\Extensions;
@@ -52,26 +18,20 @@
 
 /**
  * TestSuite class for Selenium 1 tests
- *
- * @package    PHPUnit_Selenium
- * @author     Giorgio Sironi <info@giorgiosironi.com>
- * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 1.2.0
  */
 class SeleniumTestSuite extends TestSuite
 {
     /**
      * Overriding the default: Selenium suites are always built from a TestCase class.
-     * @var boolean
+     *
+     * @var bool
      */
-    protected $testCase = TRUE;
+    protected $testCase = true;
 
     /**
      * Making the method public.
-     * @param ReflectionClass $class
+     *
+     * @param ReflectionClass  $class
      * @param ReflectionMethod $method
      */
     public function addTestMethod(ReflectionClass $class, ReflectionMethod $method): void
@@ -80,7 +40,8 @@ public function addTestMethod(ReflectionClass $class, ReflectionMethod $method):
     }
 
     /**
-     * @param string $className     extending PHPUnit_Extensions_SeleniumTestCase
+     * @param string $className extending PHPUnit_Extensions_SeleniumTestCase
+     *
      * @return SeleniumTestSuite
      */
     public static function fromTestCaseClass($className)
@@ -93,25 +54,24 @@ public static function fromTestCaseClass($className)
         $staticProperties = $class->getStaticProperties();
         if (isset($staticProperties['browsers'])) {
             $browsers = $staticProperties['browsers'];
-        } else if (is_callable("{$className}::browsers")) {
+        } elseif (is_callable(sprintf('%s::browsers', $className))) {
             $browsers = $className::browsers();
         } else {
             $browsers = null;
         }
 
         //BC: renamed seleneseDirectory -> selenesePath
-        if (!isset($staticProperties['selenesePath']) && isset($staticProperties['seleneseDirectory'])) {
+        if (! isset($staticProperties['selenesePath']) && isset($staticProperties['seleneseDirectory'])) {
             $staticProperties['selenesePath'] = $staticProperties['seleneseDirectory'];
         }
 
         // Create tests from Selenese/HTML files.
         if (isset($staticProperties['selenesePath']) &&
             (is_dir($staticProperties['selenesePath']) || is_file($staticProperties['selenesePath']))) {
-
             if (is_dir($staticProperties['selenesePath'])) {
                 $files = array_merge(
-                  self::getSeleneseFiles($staticProperties['selenesePath'], '.htm'),
-                  self::getSeleneseFiles($staticProperties['selenesePath'], '.html')
+                    self::getSeleneseFiles($staticProperties['selenesePath'], '.htm'),
+                    self::getSeleneseFiles($staticProperties['selenesePath'], '.html')
                 );
             } else {
                 $files[] = realpath($staticProperties['selenesePath']);
@@ -123,21 +83,23 @@ public static function fromTestCaseClass($className)
                     $browserSuite = SeleniumBrowserSuite::fromClassAndBrowser($className, $browser);
 
                     foreach ($files as $file) {
-                        self::addGeneratedTestTo($browserSuite,
-                          new $className($file, array(), '', $browser),
-                          $classGroups
+                        self::addGeneratedTestTo(
+                            $browserSuite,
+                            new $className($file, [], '', $browser),
+                            $classGroups
                         );
                     }
 
                     $suite->addTest($browserSuite);
                 }
-            }
-            else {
+            } else {
                 // Create tests from Selenese/HTML files for single browser.
                 foreach ($files as $file) {
-                    self::addGeneratedTestTo($suite,
-                                              new $className($file),
-                                              $classGroups);
+                    self::addGeneratedTestTo(
+                        $suite,
+                        new $className($file),
+                        $classGroups
+                    );
                 }
             }
         }
@@ -149,12 +111,12 @@ public static function fromTestCaseClass($className)
                 foreach ($class->getMethods() as $method) {
                     $browserSuite->addTestMethod($class, $method);
                 }
+
                 $browserSuite->setupSpecificBrowser($browser);
 
                 $suite->addTest($browserSuite);
             }
-        }
-        else {
+        } else {
             // Create tests from test methods for single browser.
             foreach ($class->getMethods() as $method) {
                 if (!TestUtil::isTestMethod($method)) {
@@ -184,13 +146,13 @@ private static function addGeneratedTestTo(TestSuite $suite, \PHPUnit\Framework\
     /**
      * @param  string $directory
      * @param  string $suffix
+     *
      * @return array
      */
     private static function getSeleneseFiles($directory, $suffix)
     {
-        $facade = new File_Iterator_Facade;
+        $facade = new File_Iterator_Facade();
 
         return $facade->getFilesAsArray($directory, $suffix);
     }
-
 }
diff --git a/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php b/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php
index 9e4d8646..a35ed012 100644
--- a/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php
+++ b/Tests/Selenium2TestCase/MultipleBrowsersPropertyTest.php
@@ -91,7 +91,7 @@ public function setUp(): void
         $this->setBrowserUrl(PHPUNIT_TESTSUITE_EXTENSION_SELENIUM_TESTS_URL);
     }
 
-    public function setupSpecificBrowser($params)
+    public function setupSpecificBrowser(array $params): void
     {
         $this->_browserWeSetUp = $params['browserName'];
         parent::setupSpecificBrowser($params);
diff --git a/Tests/Selenium2TestCase/WaitUntilTest.php b/Tests/Selenium2TestCase/WaitUntilTest.php
index 617aa015..ee31746b 100644
--- a/Tests/Selenium2TestCase/WaitUntilTest.php
+++ b/Tests/Selenium2TestCase/WaitUntilTest.php
@@ -86,13 +86,6 @@ public function testWaitUnsuccessfully()
         }, 42);
     }
 
-    public function testInvalidCallback()
-    {
-        $this->expectException(\PHPUnit\Extensions\Selenium2TestCase\Exception::class);
-        $this->expectExceptionMessage('The valid callback is expected');
-        $this->waitUntil('not a callback');
-    }
-
     public function testImplicitWaitIsRestoredAfterFailure()
     {
         $this->url('html/test_wait.html');
diff --git a/composer.json b/composer.json
index dc2c6d0b..8c832182 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,9 @@
         "phpunit/phpunit": ">=9.0,<10.0"
     },
     "require-dev": {
-       "phing/phing": "2.*"
+        "phing/phing": "2.*",
+        "squizlabs/php_codesniffer": "3.*",
+        "doctrine/coding-standard": "7.*"
     },
     "autoload": {
         "classmap": [
diff --git a/ruleset.xml b/ruleset.xml
new file mode 100644
index 00000000..1c49c850
--- /dev/null
+++ b/ruleset.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<ruleset name="phpunit-selenium">
+    <rule ref="Doctrine">
+        <exclude name="Generic.Files.LineLength"/>
+        <exclude name="Squiz.Arrays.ArrayDeclaration.CommaAfterLast"/>
+
+        <exclude name="Squiz.Arrays.Operators.DisallowEqualOperators"/>
+        <exclude name="Generic.NamingConventions.UpperCaseConstantName"/>
+        <exclude name="Generic.CodeAnalysis.UselessOverridingMethod"/>
+
+        <exclude name="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
+        <exclude name="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
+
+        <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
+        <properties>
+            <property name="forbiddenAnnotations" type="array">
+                <element value="@link"/>
+            </property>
+        </properties>
+    </rule>
+</ruleset>
\ No newline at end of file