update to modern class names

DavertMik · DavertMik · commit 412645f52bf6 · 2018-02-18T22:05:08.000+02:00
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     },
     "autoload":{
         "psr-4":{
-            "Codeception\\PHPUnit": "src\\"
+            "Codeception\\PHPUnit\\": "src\\"
         }
     }
 }
diff --git a/src/ConsolePrinter.php b/src/ConsolePrinter.php
@@ -11,5 +11,5 @@ interface ConsolePrinter
 {
     public function write($buffer);
 
-    public function printResult(\PHPUnit_Framework_TestResult $result);
+    public function printResult(\PHPUnit\Framework\TestResult $result);
 }
diff --git a/src/Constraint/Crawler.php b/src/Constraint/Crawler.php
@@ -45,7 +45,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         }
         $output .= "\ncontains text '{$this->string}'";
 
-        throw new \PHPUnit_Framework_ExpectationFailedException(
+        throw new \PHPUnit\Framework\ExpectationFailedException(
             $output,
             $comparisonFailure
         );
diff --git a/src/Constraint/CrawlerNot.php b/src/Constraint/CrawlerNot.php
@@ -13,7 +13,7 @@ protected function matches($nodes)
     protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)
     {
         if (!$this->string) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(
+            throw new \PHPUnit\Framework\ExpectationFailedException(
                 "Element '$selector' was found",
                 $comparisonFailure
             );
@@ -25,7 +25,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         $output .= $this->nodesList($nodes, $this->string);
         $output .= "\ncontaining '{$this->string}'";
 
-        throw new \PHPUnit_Framework_ExpectationFailedException(
+        throw new \PHPUnit\Framework\ExpectationFailedException(
             $output,
             $comparisonFailure
         );
diff --git a/src/Constraint/JsonContains.php b/src/Constraint/JsonContains.php
@@ -7,7 +7,7 @@
 use SebastianBergmann\Comparator\Factory;
 use Codeception\Util\JsonArray;
 
-class JsonContains extends \PHPUnit_Framework_Constraint
+class JsonContains extends \PHPUnit\Framework\Constraint
 {
     /**
      * @var
@@ -32,7 +32,7 @@ protected function matches($other)
     {
         $jsonResponseArray = new JsonArray($other);
         if (!is_array($jsonResponseArray->toArray())) {
-            throw new \PHPUnit_Framework_AssertionFailedError('JSON response is not an array: ' . $other);
+            throw new \PHPUnit\Framework\AssertionFailedError('JSON response is not an array: ' . $other);
         }
 
         if ($jsonResponseArray->containsArray($this->expected)) {
@@ -44,7 +44,7 @@ protected function matches($other)
         try {
             $comparator->assertEquals($this->expected, $jsonResponseArray->toArray());
         } catch (ComparisonFailure $failure) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(
+            throw new \PHPUnit\Framework\ExpectationFailedException(
                 "Response JSON does not contain the provided JSON\n",
                 $failure
             );
diff --git a/src/Constraint/JsonType.php b/src/Constraint/JsonType.php
@@ -5,7 +5,7 @@
 use Codeception\Util\JsonType as JsonTypeUtil;
 use Codeception\Util\JsonArray;
 
-class JsonType extends \PHPUnit_Framework_Constraint
+class JsonType extends \PHPUnit\Framework\Constraint
 {
     protected $jsonType;
     private $match;
@@ -35,11 +35,11 @@ protected function matches($jsonArray)
 
         if ($this->match) {
             if ($matched !== true) {
-                throw new \PHPUnit_Framework_ExpectationFailedException($matched);
+                throw new \PHPUnit\Framework\ExpectationFailedException($matched);
             }
         } else {
             if ($matched === true) {
-                throw new \PHPUnit_Framework_ExpectationFailedException('Unexpectedly response matched: ' . json_encode($jsonArray));
+                throw new \PHPUnit\Framework\ExpectationFailedException('Unexpectedly response matched: ' . json\encode($jsonArray));
             }
         }
         return true;
diff --git a/src/Constraint/Page.php b/src/Constraint/Page.php
@@ -3,7 +3,7 @@
 
 use Codeception\Lib\Console\Message;
 
-class Page extends \PHPUnit_Framework_Constraint
+class Page extends \PHPUnit\Framework\Constraint
 {
     protected $uri;
 
diff --git a/src/Constraint/WebDriver.php b/src/Constraint/WebDriver.php
@@ -48,7 +48,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         }
         $output .= "\ncontains text '" . $this->string . "'";
 
-        throw new \PHPUnit_Framework_ExpectationFailedException(
+        throw new \PHPUnit\Framework\ExpectationFailedException(
             $output,
             $comparisonFailure
         );
diff --git a/src/Constraint/WebDriverNot.php b/src/Constraint/WebDriverNot.php
@@ -15,7 +15,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
     {
         $selectorString = Locator::humanReadableString($selector);
         if (!$this->string) {
-            throw new \PHPUnit_Framework_ExpectationFailedException(
+            throw new \PHPUnit\Framework\ExpectationFailedException(
                 "Element $selectorString was found",
                 $comparisonFailure
             );
@@ -26,7 +26,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         $output .= $this->nodesList($nodes, $this->string);
         $output .= "\ncontaining '{$this->string}'";
 
-        throw new \PHPUnit_Framework_ExpectationFailedException(
+        throw new \PHPUnit\Framework\ExpectationFailedException(
             $output,
             $comparisonFailure
         );
diff --git a/src/FilterTest.php b/src/FilterTest.php
@@ -9,13 +9,13 @@
  * Class FilterTest
  * @package Codeception\PHPUnit
  */
-class FilterTest extends \PHPUnit_Runner_Filter_Test
+class FilterTest extends \PHPUnit\Runner\Filter\NameFilterIterator
 {
     public function accept()
     {
         $test = $this->getInnerIterator()->current();
 
-        if ($test instanceof \PHPUnit_Framework_TestSuite) {
+        if ($test instanceof \PHPUnit\Framework\TestSuite) {
             return true;
         }
 
diff --git a/src/Listener.php b/src/Listener.php
@@ -7,10 +7,10 @@
 use Codeception\Events;
 use Codeception\TestInterface;
 use Exception;
-use PHPUnit_Framework_Test;
+use PHPUnit\Framework\Test;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-class Listener implements \PHPUnit_Framework_TestListener
+class Listener implements \PHPUnit\Framework\TestListener
 {
     /**
      * @var \Symfony\Component\EventDispatcher\EventDispatcher
@@ -29,33 +29,33 @@ public function __construct(EventDispatcher $dispatcher)
     /**
      * Risky test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param PHPUnit\Framework\Test $test
      * @param Exception $e
      * @param float $time
      * @since  Method available since Release 4.0.0
      */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    public function addRiskyTest(\PHPUnit\Framework\Test $test, Exception $e, $time)
     {
     }
 
-    public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\AssertionFailedError $e, $time)
     {
         $this->unsuccessfulTests[] = spl_object_hash($test);
         $this->fire(Events::TEST_FAIL, new FailEvent($test, $time, $e));
     }
 
-    public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addError(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
         $this->unsuccessfulTests[] = spl_object_hash($test);
         $this->fire(Events::TEST_ERROR, new FailEvent($test, $time, $e));
     }
 
     // This method was added in PHPUnit 6
-    public function addWarning(\PhpUnit_Framework_Test $test, \PHPUnit_Framework_Warning $e, $time)
+    public function addWarning(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\Warning $e, $time)
     {
     }
 
-    public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
         if (in_array(spl_object_hash($test), $this->skippedTests)) {
             return;
@@ -65,7 +65,7 @@ public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e,
         $this->skippedTests[] = spl_object_hash($test);
     }
 
-    public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addSkippedTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
         if (in_array(spl_object_hash($test), $this->skippedTests)) {
             return;
@@ -75,17 +75,17 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti
         $this->skippedTests[] = spl_object_hash($test);
     }
 
-    public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function startTestSuite(\PHPUnit\Framework\TestSuite $suite)
     {
         $this->dispatcher->dispatch('suite.start', new SuiteEvent($suite));
     }
 
-    public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
+    public function endTestSuite(\PHPUnit\Framework\TestSuite $suite)
     {
         $this->dispatcher->dispatch('suite.end', new SuiteEvent($suite));
     }
 
-    public function startTest(\PHPUnit_Framework_Test $test)
+    public function startTest(\PHPUnit\Framework\Test $test)
     {
         $this->dispatcher->dispatch(Events::TEST_START, new TestEvent($test));
         if (!$test instanceof TestInterface) {
@@ -98,16 +98,16 @@ public function startTest(\PHPUnit_Framework_Test $test)
         try {
             $this->startedTests[] = spl_object_hash($test);
             $this->fire(Events::TEST_BEFORE, new TestEvent($test));
-        } catch (\PHPUnit_Framework_IncompleteTestError $e) {
+        } catch (\PHPUnit\Framework\IncompleteTestError $e) {
             $test->getTestResultObject()->addFailure($test, $e, 0);
-        } catch (\PHPUnit_Framework_SkippedTestError $e) {
+        } catch (\PHPUnit\Framework\SkippedTestError $e) {
             $test->getTestResultObject()->addFailure($test, $e, 0);
         } catch (\Exception $e) {
             $test->getTestResultObject()->addError($test, $e, 0);
         }
     }
 
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(\PHPUnit\Framework\Test $test, $time)
     {
         $hash = spl_object_hash($test);
         if (!in_array($hash, $this->unsuccessfulTests)) {
diff --git a/src/Log/JUnit.php b/src/Log/JUnit.php
@@ -5,11 +5,11 @@
 use Codeception\Test\Interfaces\Reported;
 use Codeception\Test\Test;
 
-class JUnit extends \PHPUnit_Util_Log_JUnit
+class JUnit extends \PHPUnit\Util\Log\JUnit
 {
     protected $strictAttributes = ['file', 'name', 'class'];
 
-    public function startTest(\PHPUnit_Framework_Test $test)
+    public function startTest(\PHPUnit\Framework\Test $test)
     {
         if (!$test instanceof Reported) {
             return parent::startTest($test);
@@ -27,7 +27,7 @@ public function startTest(\PHPUnit_Framework_Test $test)
         }
     }
 
-    public function endTest(\PHPUnit_Framework_Test $test, $time)
+    public function endTest(\PHPUnit\Framework\Test $test, $time)
     {
         if ($this->currentTestCase !== null and $test instanceof Test) {
             $numAssertions = $test->getNumAssertions();
diff --git a/src/Overrides/Filter.php b/src/Overrides/Filter.php
@@ -1,7 +1,7 @@
 <?php
-
+namespace PHPUnit\Util;
 // @codingStandardsIgnoreStart
-class PHPUnit_Util_Filter
+class Filter
 {
     // @codingStandardsIgnoreEnd
     protected static $filteredClassesPattern = [
@@ -15,7 +15,7 @@ public static function getFilteredStackTrace($e, $asString = true, $filter = tru
         $stackTrace = $asString ? '' : [];
 
         $trace = $e->getPrevious() ? $e->getPrevious()->getTrace() : $e->getTrace();
-        if ($e instanceof \PHPUnit_Framework_ExceptionWrapper) {
+        if ($e instanceof \PHPUnit\Framework\ExceptionWrapper) {
             $trace = $e->getSerializableTrace();
         }
 
diff --git a/src/ResultPrinter.php b/src/ResultPrinter.php
@@ -1,83 +1,83 @@
 <?php
 namespace Codeception\PHPUnit;
 
-use PHPUnit_Framework_AssertionFailedError;
-use PHPUnit_Framework_Test;
-use PHPUnit_Runner_BaseTestRunner;
+use \PHPUnit\Framework\AssertionFailedError;
+use \PHPUnit\Framework\Test;
+use \PHPUnit\Runner\BaseTestRunner;
 
-class ResultPrinter extends \PHPUnit_Util_TestDox_ResultPrinter
+class ResultPrinter extends \PHPUnit\Util\TestDox\ResultPrinter
 {
     /**
      * An error occurred.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param \PHPUnit\Framework\Test $test
      * @param \Exception $e
      * @param float $time
      */
-    public function addError(PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addError(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_ERROR;
         $this->failed++;
     }
 
     /**
      * A failure occurred.
      *
-     * @param PHPUnit_Framework_Test $test
-     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param \PHPUnit\Framework\Test $test
+     * @param \PHPUnit\Framework\AssertionFailedError $e
      * @param float $time
      */
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\AssertionFailedError $e, $time)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_FAILURE;
         $this->failed++;
     }
 
     /**
      * Incomplete test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param \PHPUnit\Framework\Test $test
      * @param \Exception $e
      * @param float $time
      */
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_INCOMPLETE;
         $this->incomplete++;
     }
 
     /**
      * Risky test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param \PHPUnit\Framework\Test $test
      * @param \Exception $e
      * @param float $time
      *
      * @since  Method available since Release 4.0.0
      */
-    public function addRiskyTest(PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addRiskyTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_RISKY;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_RISKY;
         $this->risky++;
     }
 
     /**
      * Skipped test.
      *
-     * @param PHPUnit_Framework_Test $test
+     * @param \PHPUnit\Framework\Test $test
      * @param \Exception $e
      * @param float $time
      *
      * @since  Method available since Release 3.0.0
      */
-    public function addSkippedTest(PHPUnit_Framework_Test $test, \Exception $e, $time)
+    public function addSkippedTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED;
         $this->skipped++;
     }
 
-    public function startTest(PHPUnit_Framework_Test $test)
+    public function startTest(\PHPUnit\Framework\Test $test)
     {
-        $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
+        $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_PASSED;
     }
 }
diff --git a/src/ResultPrinter/HTML.php b/src/ResultPrinter/HTML.php
diff --git a/src/ResultPrinter/Report.php b/src/ResultPrinter/Report.php
diff --git a/src/ResultPrinter/UI.php b/src/ResultPrinter/UI.php
diff --git a/src/Runner.php b/src/Runner.php
diff --git a/src/phpunit5-loggers.php b/src/phpunit5-loggers.php
diff --git a/src/shim.php b/src/shim.php

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`},`
`18`	`18`	`"autoload":{`
`19`	`19`	`"psr-4":{`
`20`		`- "Codeception\\PHPUnit": "src\\"`
	`20`	`+ "Codeception\\PHPUnit\\": "src\\"`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ interface ConsolePrinter`
`11`	`11`	`{`
`12`	`12`	`public function write($buffer);`
`13`	`13`
`14`		`- public function printResult(\PHPUnit_Framework_TestResult $result);`
	`14`	`+ public function printResult(\PHPUnit\Framework\TestResult $result);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure`
`45`	`45`	`}`
`46`	`46`	`$output .= "\ncontains text '{$this->string}'";`
`47`	`47`
`48`		`- throw new \PHPUnit_Framework_ExpectationFailedException(`
	`48`	`+ throw new \PHPUnit\Framework\ExpectationFailedException(`
`49`	`49`	`$output,`
`50`	`50`	`$comparisonFailure`
`51`	`51`	`);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Codeception\Util\JsonType as JsonTypeUtil;`
`6`	`6`	`use Codeception\Util\JsonArray;`
`7`	`7`
`8`		`-class JsonType extends \PHPUnit_Framework_Constraint`
	`8`	`+class JsonType extends \PHPUnit\Framework\Constraint`
`9`	`9`	`{`
`10`	`10`	`protected $jsonType;`
`11`	`11`	`private $match;`
`@@ -35,11 +35,11 @@ protected function matches($jsonArray)`
`35`	`35`
`36`	`36`	`if ($this->match) {`
`37`	`37`	`if ($matched !== true) {`
`38`		`- throw new \PHPUnit_Framework_ExpectationFailedException($matched);`
	`38`	`+ throw new \PHPUnit\Framework\ExpectationFailedException($matched);`
`39`	`39`	`}`
`40`	`40`	`} else {`
`41`	`41`	`if ($matched === true) {`
`42`		`- throw new \PHPUnit_Framework_ExpectationFailedException('Unexpectedly response matched: ' . json_encode($jsonArray));`
	`42`	`+ throw new \PHPUnit\Framework\ExpectationFailedException('Unexpectedly response matched: ' . json\encode($jsonArray));`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use Codeception\Lib\Console\Message;`
`5`	`5`
`6`		`-class Page extends \PHPUnit_Framework_Constraint`
	`6`	`+class Page extends \PHPUnit\Framework\Constraint`
`7`	`7`	`{`
`8`	`8`	`protected $uri;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure`
`48`	`48`	`}`
`49`	`49`	`$output .= "\ncontains text '" . $this->string . "'";`
`50`	`50`
`51`		`- throw new \PHPUnit_Framework_ExpectationFailedException(`
	`51`	`+ throw new \PHPUnit\Framework\ExpectationFailedException(`
`52`	`52`	`$output,`
`53`	`53`	`$comparisonFailure`
`54`	`54`	`);`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@`
`9`	`9`	`* Class FilterTest`
`10`	`10`	`* @package Codeception\PHPUnit`
`11`	`11`	`*/`
`12`		`-class FilterTest extends \PHPUnit_Runner_Filter_Test`
	`12`	`+class FilterTest extends \PHPUnit\Runner\Filter\NameFilterIterator`
`13`	`13`	`{`
`14`	`14`	`public function accept()`
`15`	`15`	`{`
`16`	`16`	`$test = $this->getInnerIterator()->current();`
`17`	`17`
`18`		`- if ($test instanceof \PHPUnit_Framework_TestSuite) {`
	`18`	`+ if ($test instanceof \PHPUnit\Framework\TestSuite) {`
`19`	`19`	`return true;`
`20`	`20`	`}`
`21`	`21`