Merge pull request #443 from pajon/refactor-namespaces

Refactor class namespaces (Change from PSR0 to PSR4)

Author: thewunder

.ci/common_env.sh

@@ -3,6 +3,6 @@
 SELENIUM_HUB_URL='http://127.0.0.1:4444'
 SELENIUM_JAR=/usr/share/selenium/selenium-server-standalone.jar
 SELENIUM_DOWNLOAD_URL=https://selenium-release.storage.googleapis.com/3.4/selenium-server-standalone-3.4.0.jar
-GECKODRIVER_DOWNLOAD_URL=https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz
+GECKODRIVER_DOWNLOAD_URL=https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz
 GECKODRIVER_TAR=/tmp/geckodriver.tar.gz
 PHP_VERSION=$(php -v)

.ci/setup.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
 
-if [ ! -f "/usr/local/bin/composer" ]; then
+sudo apt-get update
+
+if [ ! -x "$(command -v composer)" ]; then
     echo "Installing Composer"
     php -r "readfile('https://getcomposer.org/installer');" | sudo php -d apc.enable_cli=0 -- --install-dir=/usr/local/bin --filename=composer
 else
     echo "Updating Composer"
-    sudo /usr/local/bin/composer self-update
+    sudo composer self-update
 fi
 
 echo "Installing dependencies"

.ci/vagrant_pre_setup.sh

@@ -1,20 +1,12 @@
 #!/bin/sh
 
-sed -i "/mirror:\\/\\//d" /etc/apt/sources.list
-sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise main restricted universe multiverse" /etc/apt/sources.list
-sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-updates main restricted universe multiverse" /etc/apt/sources.list
-sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-backports main restricted universe multiverse" /etc/apt/sources.list
-sed -i "1ideb mirror://mirrors.ubuntu.com/mirrors.txt precise-security main restricted universe multiverse" /etc/apt/sources.list
+apt-add-repository ppa:ondrej/php -y
 
 apt-get update
 
 apt-get install software-properties-common -y
 apt-get install python-software-properties -y
 
-apt-add-repository ppa:ondrej/php -y
-
-apt-get update
-
 # installing xvfb, java and php
-apt-get install xvfb php5.6-cli php5.6-curl php5.6-xml php5.6-mbstring php-xdebug ncurses-term unzip xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic vim -y --no-install-recommends
+apt-get install xvfb php7.2-cli php7.2-curl php7.2-xml php7.2-mbstring php-xdebug ncurses-term unzip xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic vim -y --no-install-recommends
 

.travis.yml

@@ -1,8 +1,9 @@
 language: php
-dist: trusty
+dist: xenial
 php:
-  - 7
-  - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
 
 matrix:
     allow_failures:

PHPUnit/Extensions/Selenium2TestCase.php

@@ -41,9 +41,30 @@
  * @link       http://www.phpunit.de/
  * @since      File available since Release 1.2.0
  */
+
+namespace PHPUnit\Extensions;
+
+use Exception;
+use InvalidArgumentException;
+use PHPUnit\Extensions\Selenium2TestCase\Element;
+use PHPUnit\Extensions\Selenium2TestCase\Element\Select;
+use PHPUnit\Extensions\Selenium2TestCase\ElementCriteria;
+use PHPUnit\Extensions\Selenium2TestCase\KeysHolder;
+use PHPUnit\Extensions\Selenium2TestCase\NoSeleniumException;
+use PHPUnit\Extensions\Selenium2TestCase\Session;
+use PHPUnit\Extensions\Selenium2TestCase\Session\Timeouts;
+use PHPUnit\Extensions\Selenium2TestCase\SessionStrategy;
+use PHPUnit\Extensions\Selenium2TestCase\SessionStrategy\Isolated;
+use PHPUnit\Extensions\Selenium2TestCase\SessionStrategy\Shared;
+use PHPUnit\Extensions\Selenium2TestCase\URL;
+use PHPUnit\Extensions\Selenium2TestCase\WaitUntil;
+use PHPUnit\Extensions\Selenium2TestCase\Window;
+use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\TestResult;
 use PHPUnit\Util\InvalidArgumentHelper;
+use RuntimeException;
+use Throwable;
 
 /**
  * TestCase class that uses Selenium 2
@@ -60,33 +81,33 @@
  * @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()
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byClassName() byClassName($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byCssSelector() byCssSelector($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byId() byId($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byLinkText() byLinkText($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byPartialLinkText() byPartialLinkText($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byName() byName($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byTag() byTag($value)
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element byXPath() byXPath($value)
+ * @method Element byClassName() byClassName($value)
+ * @method Element byCssSelector() byCssSelector($value)
+ * @method Element byId() byId($value)
+ * @method Element byLinkText() byLinkText($value)
+ * @method Element byPartialLinkText() byPartialLinkText($value)
+ * @method Element byName() byName($value)
+ * @method Element byTag() byTag($value)
+ * @method Element byXPath() byXPath($value)
  * @method void click() click(int $button = 0) Click any mouse button (at the coordinates set by the last moveto command).
  * @method void clickOnElement() clickOnElement($id)
  * @method string currentScreenshot() BLOB of the image file
  * @method void dismissAlert() Press Cancel on an alert, or does not confirm a dialog
  * @method void doubleclick() Double clicks (at the coordinates set by the last moveto command).
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element element() element(\PHPUnit_Extensions_Selenium2TestCase_ElementCriteria $criteria) Retrieves an element
- * @method array elements() elements(\PHPUnit_Extensions_Selenium2TestCase_ElementCriteria $criteria) Retrieves an array of Element instances
+ * @method Element element() element(ElementCriteria $criteria) Retrieves an element
+ * @method array elements() elements(ElementCriteria $criteria) Retrieves an array of Element instances
  * @method string execute() execute($javaScriptCode) Injects arbitrary JavaScript in the page and returns the last
  * @method string executeAsync() executeAsync($javaScriptCode) Injects arbitrary JavaScript and wait for the callback (last element of arguments) to be called
  * @method void forward()
- * @method void frame() frame(mixed $element) Changes the focus to a frame in the page (by frameCount of type int, htmlId of type string, htmlName of type string or element of type \PHPUnit_Extensions_Selenium2TestCase_Element)
- * @method void moveto() moveto(\PHPUnit_Extensions_Selenium2TestCase_Element $element) Move the mouse by an offset of the specificed element.
+ * @method void frame() frame(mixed $element) Changes the focus to a frame in the page (by frameCount of type int, htmlId of type string, htmlName of type string or element of type Element)
+ * @method void moveto() moveto(Element $element) Move the mouse by an offset of the specificed element.
  * @method void refresh()
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element_Select select() select($element)
+ * @method Select select() select($element)
  * @method string source() Returns the HTML source of the page
- * @method \PHPUnit_Extensions_Selenium2TestCase_Session_Timeouts timeouts()
+ * @method Timeouts timeouts()
  * @method string title()
  * @method void|string url() url($url = NULL)
- * @method PHPUnit_Extensions_Selenium2TestCase_ElementCriteria using() using($strategy) Factory Method for Criteria objects
+ * @method ElementCriteria using() using($strategy) Factory Method for Criteria objects
  * @method void window() window($name) Changes the focus to another window
  * @method string windowHandle() Retrieves the current window handle
  * @method string windowHandles() Retrieves a list of all available window handles
@@ -96,10 +117,10 @@
  * @method array logTypes() Get available log types.
  * @method void closeWindow() Close the current window.
  * @method void stop() Close the current window and clear session data.
- * @method \PHPUnit_Extensions_Selenium2TestCase_Element active() Get the element on the page that currently has focus.
- * @method \PHPUnit_Extensions_Selenium2TestCase_Window currentWindow() get the current Window Object
+ * @method Element active() Get the element on the page that currently has focus.
+ * @method Window currentWindow() get the current Window Object
  */
-abstract class PHPUnit_Extensions_Selenium2TestCase extends TestCase
+abstract class Selenium2TestCase extends TestCase
 {
     const VERSION = '7.0.1';
 
@@ -109,7 +130,7 @@ abstract class PHPUnit_Extensions_Selenium2TestCase extends TestCase
     protected $coverageScriptUrl;
 
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_Session
+     * @var Session
      */
     private $session;
 
@@ -119,12 +140,12 @@ abstract class PHPUnit_Extensions_Selenium2TestCase extends TestCase
     private $parameters;
 
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_SessionStrategy
+     * @var SessionStrategy
      */
     protected static $sessionStrategy;
 
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_SessionStrategy
+     * @var SessionStrategy
      */
     protected static $browserSessionStrategy;
 
@@ -143,7 +164,7 @@ abstract class PHPUnit_Extensions_Selenium2TestCase extends TestCase
     private static $defaultWaitUntilSleepInterval = 500;
 
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_SessionStrategy
+     * @var SessionStrategy
      */
     protected $localSessionStrategy;
 
@@ -163,7 +184,7 @@ abstract class PHPUnit_Extensions_Selenium2TestCase extends TestCase
     private $collectCodeCoverageInformation;
 
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_KeysHolder
+     * @var KeysHolder
      */
     private $keysHolder;
 
@@ -183,7 +204,7 @@ public static function shareSession($shareSession)
         if (!$shareSession) {
             self::$sessionStrategy = self::defaultSessionStrategy();
         } else {
-            self::$sessionStrategy = new PHPUnit_Extensions_Selenium2TestCase_SessionStrategy_Shared(
+            self::$sessionStrategy = new Shared(
               self::defaultSessionStrategy(), self::$keepSessionOnFailure
               );
         }
@@ -209,7 +230,7 @@ private static function sessionStrategy()
 
     private static function defaultSessionStrategy()
     {
-        return new PHPUnit_Extensions_Selenium2TestCase_SessionStrategy_Isolated;
+        return new Isolated;
     }
 
     /**
@@ -260,7 +281,7 @@ public function __construct($name = NULL, array $data = array(), $dataName = '')
             'secure' => FALSE
         );
 
-        $this->keysHolder = new PHPUnit_Extensions_Selenium2TestCase_KeysHolder();
+        $this->keysHolder = new KeysHolder();
     }
 
     public function setupSpecificBrowser($params)
@@ -293,9 +314,9 @@ protected function setUpSessionStrategy($params)
             if ($strat != "isolated" && $strat != "shared") {
                 throw new InvalidArgumentException("Session strategy must be either 'isolated' or 'shared'");
             } elseif ($strat == "isolated") {
-                self::$browserSessionStrategy = new PHPUnit_Extensions_Selenium2TestCase_SessionStrategy_Isolated;
+                self::$browserSessionStrategy = new Isolated;
             } else {
-                self::$browserSessionStrategy = new PHPUnit_Extensions_Selenium2TestCase_SessionStrategy_Shared(self::defaultSessionStrategy(), self::$keepSessionOnFailure);
+                self::$browserSessionStrategy = new Shared(self::defaultSessionStrategy(), self::$keepSessionOnFailure);
             }
         } else {
             self::$browserSessionStrategy = self::defaultSessionStrategy();
@@ -320,7 +341,7 @@ public function prepareSession()
             if (!$this->session) {
                 $this->session = $this->getStrategy()->session($this->parameters);
             }
-        } catch (PHPUnit_Extensions_Selenium2TestCase_NoSeleniumException $e) {
+        } catch (NoSeleniumException $e) {
             $this->markTestSkipped("The Selenium Server is not active on host {$this->parameters['host']} at port {$this->parameters['port']}.");
         }
         return $this->session;
@@ -339,7 +360,7 @@ public function run(TestResult $result = NULL): TestResult
         parent::run($result);
 
         if ($this->collectCodeCoverageInformation) {
-            $coverage = new PHPUnit_Extensions_SeleniumCommon_RemoteCoverage(
+            $coverage = new RemoteCoverage(
                 $this->coverageScriptUrl,
                 $this->testId
             );
@@ -394,7 +415,7 @@ protected function runTest()
 
     public static function suite($className)
     {
-        return PHPUnit_Extensions_SeleniumTestSuite::fromTestCaseClass($className);
+        return SeleniumTestSuite::fromTestCaseClass($className);
     }
 
     public function onNotSuccessfulTest(Throwable $e): void
@@ -413,7 +434,7 @@ public function onNotSuccessfulTest(Throwable $e): void
     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.");
+            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.");
         }
         $result = call_user_func_array(
           array($this->session, $command), $arguments
@@ -504,7 +525,7 @@ public function setBrowserUrl($browserUrl)
             throw InvalidArgumentHelper::factory(1, 'string');
         }
 
-        $this->parameters['browserUrl'] = new PHPUnit_Extensions_Selenium2TestCase_URL($browserUrl);
+        $this->parameters['browserUrl'] = new URL($browserUrl);
     }
 
     public function getBrowserUrl()
@@ -572,7 +593,7 @@ public function getSessionId()
      */
     public function waitUntil($callback, $timeout = NULL)
     {
-        $waitUntil = new PHPUnit_Extensions_Selenium2TestCase_WaitUntil($this);
+        $waitUntil = new WaitUntil($this);
         return $waitUntil->run($callback, $timeout);
     }
 
@@ -581,8 +602,8 @@ public function waitUntil($callback, $timeout = NULL)
      * Deprecated due to issues with IE webdriver. Use keys() method instead
      * @deprecated
      * @param string $name
-     * @throws PHPUnit_Extensions_Selenium2TestCase_Exception
-     * @see PHPUnit_Extensions_Selenium2TestCase_KeysHolder
+     * @throws \PHPUnit\Extensions\Selenium2TestCase\Exception
+     * @see KeysHolder
      */
     public function keysSpecial($name)
     {

PHPUnit/Extensions/Selenium2TestCase/Command.php

@@ -42,6 +42,10 @@
  * @since      File available since Release 1.2.0
  */
 
+namespace PHPUnit\Extensions\Selenium2TestCase;
+
+use InvalidArgumentException;
+
 /**
  * Base class for implementing commands with special semantics.
  *
@@ -53,16 +57,15 @@
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 1.2.0
  */
-abstract class PHPUnit_Extensions_Selenium2TestCase_Command
+abstract class Command
 {
     protected $jsonParameters;
     private $commandName;
 
     /**
      * @param array $jsonParameters     null in case of no parameters
      */
-    public function __construct($jsonParameters,
-                                PHPUnit_Extensions_Selenium2TestCase_URL $url)
+    public function __construct($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.");

PHPUnit/Extensions/Selenium2TestCase/CommandsHolder.php

@@ -42,6 +42,12 @@
  * @since      File available since Release 1.2.4
  */
 
+namespace PHPUnit\Extensions\Selenium2TestCase;
+
+use BadMethodCallException;
+use Exception;
+use InvalidArgumentException;
+
 /**
  * Object representing elements, or everything that may have subcommands.
  *
@@ -53,10 +59,10 @@
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 1.2.4
  */
-abstract class PHPUnit_Extensions_Selenium2TestCase_CommandsHolder
+abstract class CommandsHolder
 {
     /**
-     * @var PHPUnit_Extensions_Selenium2TestCase_Driver
+     * @var Driver
      */
     protected $driver;
 
@@ -71,8 +77,7 @@ abstract class PHPUnit_Extensions_Selenium2TestCase_CommandsHolder
      */
     protected $commands;
 
-    public function __construct($driver,
-                                PHPUnit_Extensions_Selenium2TestCase_URL $url)
+    public function __construct($driver, URL $url)
     {
         $this->driver = $driver;
         $this->url = $url;
@@ -101,7 +106,7 @@ public function __call($commandName, $arguments)
         return $response->getValue();
     }
 
-    protected function postCommand($name, PHPUnit_Extensions_Selenium2TestCase_ElementCriteria $criteria)
+    protected function postCommand($name, ElementCriteria $criteria)
     {
         $response = $this->driver->curl('POST',
                                         $this->url->addCommand($name),
@@ -110,8 +115,7 @@ protected function postCommand($name, PHPUnit_Extensions_Selenium2TestCase_Eleme
     }
 
     /**
-     * @params string $commandClass     a class name, descending from
-                                        PHPUnit_Extensions_Selenium2TestCase_Command
+     * @params string $commandClass     a class name, descending from Command
      * @return callable
      */
     private function factoryMethod($commandClass)
@@ -142,7 +146,7 @@ private function checkArguments($arguments)
      * @param string $commandName  The called method name
      *                              defined as a key in initCommands()
      * @param array $jsonParameters
-     * @return PHPUnit_Extensions_Selenium2TestCase_Command
+     * @return Command
      */
     protected function newCommand($commandName, $jsonParameters)
     {