Merge branch '7.0' into 6.0

DavertMik · web-flow · commit 164e896d268e · 2018-02-19T03:19:24.000+02:00
diff --git a/composer.json b/composer.json
@@ -10,10 +10,10 @@
         }
     ],
     "require": {
-        "phpunit/phpunit": ">=4.8.28 <5.0.0 || >=5.6.3 <7.0",
-        "phpunit/php-code-coverage": ">=2.2.4 <6.0",
-        "sebastian/comparator": ">1.1 <3.0",
-        "sebastian/diff": ">=1.4 <4.0"
+        "phpunit/phpunit": "^7.0",
+        "phpunit/php-code-coverage": "^6.0",
+        "sebastian/comparator": "^2.0",
+        "sebastian/diff": "^3.0"
     },
     "autoload":{
         "psr-4":{
diff --git a/src/Constraint/Crawler.php b/src/Constraint/Crawler.php
@@ -8,7 +8,7 @@
 
 class Crawler extends Page
 {
-    protected function matches($nodes)
+    protected function matches($nodes) : bool
     {
         /** @var $nodes DomCrawler  * */
         if (!$nodes->count()) {
@@ -26,7 +26,7 @@ protected function matches($nodes)
         return false;
     }
 
-    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)
+    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null):void
     {
         /** @var $nodes DomCrawler  * */
         if (!$nodes->count()) {
@@ -51,7 +51,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         );
     }
 
-    protected function failureDescription($other)
+    protected function failureDescription($other) : string
     {
         $desc = '';
         foreach ($other as $o) {
diff --git a/src/Constraint/CrawlerNot.php b/src/Constraint/CrawlerNot.php
@@ -5,12 +5,12 @@
 
 class CrawlerNot extends Crawler
 {
-    protected function matches($nodes)
+    protected function matches($nodes) : bool
     {
         return !parent::matches($nodes);
     }
 
-    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)
+    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void
     {
         if (!$this->string) {
             throw new \PHPUnit\Framework\ExpectationFailedException(
diff --git a/src/Constraint/JsonContains.php b/src/Constraint/JsonContains.php
@@ -28,7 +28,7 @@ public function __construct(array $expected)
      *
      * @return bool
      */
-    protected function matches($other)
+    protected function matches($other) : bool
     {
         $jsonResponseArray = new JsonArray($other);
         if (!is_array($jsonResponseArray->toArray())) {
@@ -62,7 +62,7 @@ public function toString()
         return '';
     }
 
-    protected function failureDescription($other)
+    protected function failureDescription($other) : string
     {
         //unused
         return '';
diff --git a/src/Constraint/JsonType.php b/src/Constraint/JsonType.php
@@ -25,7 +25,7 @@ public function __construct(array $jsonType, $match = true)
      *
      * @return bool
      */
-    protected function matches($jsonArray)
+    protected function matches($jsonArray) : bool
     {
         if ($jsonArray instanceof JsonArray) {
             $jsonArray = $jsonArray->toArray();
@@ -56,7 +56,7 @@ public function toString()
         return '';
     }
 
-    protected function failureDescription($other)
+    protected function failureDescription($other) : string
     {
         //unused
         return '';
diff --git a/src/Constraint/Page.php b/src/Constraint/Page.php
@@ -22,7 +22,7 @@ public function __construct($string, $uri = '')
      *
      * @return bool
      */
-    protected function matches($other)
+    protected function matches($other) : bool
     {
         $other = $this->normalizeText($other);
         return mb_stripos($other, $this->string, null, 'UTF-8') !== false;
@@ -53,7 +53,7 @@ public function toString()
         );
     }
 
-    protected function failureDescription($pageContent)
+    protected function failureDescription($pageContent) : string
     {
         $message = $this->uriMessage('on page');
         $message->append("\n--> ");
diff --git a/src/Constraint/WebDriver.php b/src/Constraint/WebDriver.php
@@ -9,7 +9,7 @@
 class WebDriver extends Page
 {
 
-    protected function matches($nodes)
+    protected function matches($nodes) : bool
     {
         if (!count($nodes)) {
             return false;
@@ -30,7 +30,7 @@ protected function matches($nodes)
         return false;
     }
 
-    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)
+    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void
     {
         if (!count($nodes)) {
             throw new ElementNotFound($selector, 'Element located either by name, CSS or XPath');
@@ -54,7 +54,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure
         );
     }
 
-    protected function failureDescription($nodes)
+    protected function failureDescription($nodes) : string
     {
         $desc = '';
         foreach ($nodes as $node) {
diff --git a/src/Constraint/WebDriverNot.php b/src/Constraint/WebDriverNot.php
@@ -6,12 +6,12 @@
 
 class WebDriverNot extends WebDriver
 {
-    protected function matches($nodes)
+    protected function matches($nodes) : bool
     {
         return !parent::matches($nodes);
     }
 
-    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)
+    protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void
     {
         $selectorString = Locator::humanReadableString($selector);
         if (!$this->string) {
diff --git a/src/FilterTest.php b/src/FilterTest.php
@@ -11,7 +11,7 @@
  */
 class FilterTest extends \PHPUnit\Runner\Filter\NameFilterIterator
 {
-    public function accept()
+    public function accept():bool
     {
         $test = $this->getInnerIterator()->current();
 
diff --git a/src/Init.php b/src/Init.php
@@ -10,5 +10,6 @@ class Init
     public static function init()
     {
         require_once __DIR__ . DIRECTORY_SEPARATOR . 'shim.php';
+        require_once __DIR__ . DIRECTORY_SEPARATOR . 'phpunit7-interfaces.php';
     }
 }
diff --git a/src/Listener.php b/src/Listener.php
@@ -30,32 +30,32 @@ public function __construct(EventDispatcher $dispatcher)
      * Risky test.
      *
      * @param PHPUnit\Framework\Test $test
-     * @param Exception $e
+     * @param \Throwable $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, \Throwable $e, float $time) : void
     {
     }
 
-    public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\AssertionFailedError $e, $time)
+    public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\AssertionFailedError $e, float $time) : void
     {
         $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, \Throwable $e, float $time) : void
     {
         $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, float $time) : void
     {
     }
 
-    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
+    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Throwable $e, float $time) : void
     {
         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, \Throwable $e, float $time) : void
     {
         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) : void
     {
         $this->dispatcher->dispatch('suite.start', new SuiteEvent($suite));
     }
 
-    public function endTestSuite(\PHPUnit\Framework\TestSuite $suite)
+    public function endTestSuite(\PHPUnit\Framework\TestSuite $suite) : void
     {
         $this->dispatcher->dispatch('suite.end', new SuiteEvent($suite));
     }
 
-    public function startTest(\PHPUnit\Framework\Test $test)
+    public function startTest(\PHPUnit\Framework\Test $test) : void
     {
         $this->dispatcher->dispatch(Events::TEST_START, new TestEvent($test));
         if (!$test instanceof TestInterface) {
@@ -102,12 +102,12 @@ public function startTest(\PHPUnit\Framework\Test $test)
             $test->getTestResultObject()->addFailure($test, $e, 0);
         } catch (\PHPUnit\Framework\SkippedTestError $e) {
             $test->getTestResultObject()->addFailure($test, $e, 0);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $test->getTestResultObject()->addError($test, $e, 0);
         }
     }
 
-    public function endTest(\PHPUnit\Framework\Test $test, $time)
+    public function endTest(\PHPUnit\Framework\Test $test, float $time) : void
     {
         $hash = spl_object_hash($test);
         if (!in_array($hash, $this->unsuccessfulTests)) {
diff --git a/src/Log/JUnit.php b/src/Log/JUnit.php
@@ -9,10 +9,11 @@ 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):void
     {
         if (!$test instanceof Reported) {
-            return parent::startTest($test);
+            parent::startTest($test);
+            return;
         }
 
         $this->currentTestCase = $this->document->createElement('testcase');
@@ -27,7 +28,7 @@ public function startTest(\PHPUnit\Framework\Test $test)
         }
     }
 
-    public function endTest(\PHPUnit\Framework\Test $test, $time)
+    public function endTest(\PHPUnit\Framework\Test $test, float $time):void
     {
         if ($this->currentTestCase !== null and $test instanceof Test) {
             $numAssertions = $test->getNumAssertions();
diff --git a/src/ResultPrinter.php b/src/ResultPrinter.php
@@ -11,10 +11,10 @@ class ResultPrinter extends \PHPUnit\Util\TestDox\ResultPrinter
      * An error occurred.
      *
      * @param \PHPUnit\Framework\Test $test
-     * @param \Exception $e
+     * @param \Throwable $e
      * @param float $time
      */
-    public function addError(\PHPUnit\Framework\Test $test, \Exception $e, $time)
+    public function addError(\PHPUnit\Framework\Test $test, \Throwable $e, float $time) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_ERROR;
         $this->failed++;
@@ -27,7 +27,7 @@ public function addError(\PHPUnit\Framework\Test $test, \Exception $e, $time)
      * @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, float $time) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_FAILURE;
         $this->failed++;
@@ -37,10 +37,10 @@ public function addFailure(\PHPUnit\Framework\Test $test, \PHPUnit\Framework\Ass
      * Incomplete test.
      *
      * @param \PHPUnit\Framework\Test $test
-     * @param \Exception $e
+     * @param \Throwable $e
      * @param float $time
      */
-    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Exception $e, $time)
+    public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Throwable $e, float $time) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_INCOMPLETE;
         $this->incomplete++;
@@ -50,12 +50,12 @@ public function addIncompleteTest(\PHPUnit\Framework\Test $test, \Exception $e,
      * Risky test.
      *
      * @param \PHPUnit\Framework\Test $test
-     * @param \Exception $e
+     * @param \Throwable $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, \Throwable $e, float $time) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_RISKY;
         $this->risky++;
@@ -65,18 +65,18 @@ public function addRiskyTest(\PHPUnit\Framework\Test $test, \Exception $e, $time
      * Skipped test.
      *
      * @param \PHPUnit\Framework\Test $test
-     * @param \Exception $e
+     * @param \Throwable $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, \Throwable $e, float $time) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_SKIPPED;
         $this->skipped++;
     }
 
-    public function startTest(\PHPUnit\Framework\Test $test)
+    public function startTest(\PHPUnit\Framework\Test $test) : void
     {
         $this->testStatus = \PHPUnit\Runner\BaseTestRunner::STATUS_PASSED;
     }
diff --git a/src/ResultPrinter/HTML.php b/src/ResultPrinter/HTML.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/phpunit7-interfaces.php b/src/phpunit7-interfaces.php
diff --git a/src/shim.php b/src/shim.php

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`class Crawler extends Page`
`10`	`10`	`{`
`11`		`- protected function matches($nodes)`
	`11`	`+ protected function matches($nodes) : bool`
`12`	`12`	`{`
`13`	`13`	`/** @var $nodes DomCrawler * */`
`14`	`14`	`if (!$nodes->count()) {`
`@@ -26,7 +26,7 @@ protected function matches($nodes)`
`26`	`26`	`return false;`
`27`	`27`	`}`
`28`	`28`
`29`		`- protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)`
	`29`	`+ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null):void`
`30`	`30`	`{`
`31`	`31`	`/** @var $nodes DomCrawler * */`
`32`	`32`	`if (!$nodes->count()) {`
`@@ -51,7 +51,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure`
`51`	`51`	`);`
`52`	`52`	`}`
`53`	`53`
`54`		`- protected function failureDescription($other)`
	`54`	`+ protected function failureDescription($other) : string`
`55`	`55`	`{`
`56`	`56`	`$desc = '';`
`57`	`57`	`foreach ($other as $o) {`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`
`6`	`6`	`class CrawlerNot extends Crawler`
`7`	`7`	`{`
`8`		`- protected function matches($nodes)`
	`8`	`+ protected function matches($nodes) : bool`
`9`	`9`	`{`
`10`	`10`	`return !parent::matches($nodes);`
`11`	`11`	`}`
`12`	`12`
`13`		`- protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)`
	`13`	`+ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void`
`14`	`14`	`{`
`15`	`15`	`if (!$this->string) {`
`16`	`16`	`throw new \PHPUnit\Framework\ExpectationFailedException(`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(array $expected)`
`28`	`28`	`*`
`29`	`29`	`* @return bool`
`30`	`30`	`*/`
`31`		`- protected function matches($other)`
	`31`	`+ protected function matches($other) : bool`
`32`	`32`	`{`
`33`	`33`	`$jsonResponseArray = new JsonArray($other);`
`34`	`34`	`if (!is_array($jsonResponseArray->toArray())) {`
`@@ -62,7 +62,7 @@ public function toString()`
`62`	`62`	`return '';`
`63`	`63`	`}`
`64`	`64`
`65`		`- protected function failureDescription($other)`
	`65`	`+ protected function failureDescription($other) : string`
`66`	`66`	`{`
`67`	`67`	`//unused`
`68`	`68`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function __construct(array $jsonType, $match = true)`
`25`	`25`	`*`
`26`	`26`	`* @return bool`
`27`	`27`	`*/`
`28`		`- protected function matches($jsonArray)`
	`28`	`+ protected function matches($jsonArray) : bool`
`29`	`29`	`{`
`30`	`30`	`if ($jsonArray instanceof JsonArray) {`
`31`	`31`	`$jsonArray = $jsonArray->toArray();`
`@@ -56,7 +56,7 @@ public function toString()`
`56`	`56`	`return '';`
`57`	`57`	`}`
`58`	`58`
`59`		`- protected function failureDescription($other)`
	`59`	`+ protected function failureDescription($other) : string`
`60`	`60`	`{`
`61`	`61`	`//unused`
`62`	`62`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct($string, $uri = '')`
`22`	`22`	`*`
`23`	`23`	`* @return bool`
`24`	`24`	`*/`
`25`		`- protected function matches($other)`
	`25`	`+ protected function matches($other) : bool`
`26`	`26`	`{`
`27`	`27`	`$other = $this->normalizeText($other);`
`28`	`28`	`return mb_stripos($other, $this->string, null, 'UTF-8') !== false;`
`@@ -53,7 +53,7 @@ public function toString()`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`
`56`		`- protected function failureDescription($pageContent)`
	`56`	`+ protected function failureDescription($pageContent) : string`
`57`	`57`	`{`
`58`	`58`	`$message = $this->uriMessage('on page');`
`59`	`59`	`$message->append("\n--> ");`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class WebDriver extends Page`
`10`	`10`	`{`
`11`	`11`
`12`		`- protected function matches($nodes)`
	`12`	`+ protected function matches($nodes) : bool`
`13`	`13`	`{`
`14`	`14`	`if (!count($nodes)) {`
`15`	`15`	`return false;`
`@@ -30,7 +30,7 @@ protected function matches($nodes)`
`30`	`30`	`return false;`
`31`	`31`	`}`
`32`	`32`
`33`		`- protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)`
	`33`	`+ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void`
`34`	`34`	`{`
`35`	`35`	`if (!count($nodes)) {`
`36`	`36`	`throw new ElementNotFound($selector, 'Element located either by name, CSS or XPath');`
`@@ -54,7 +54,7 @@ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure`
`54`	`54`	`);`
`55`	`55`	`}`
`56`	`56`
`57`		`- protected function failureDescription($nodes)`
	`57`	`+ protected function failureDescription($nodes) : string`
`58`	`58`	`{`
`59`	`59`	`$desc = '';`
`60`	`60`	`foreach ($nodes as $node) {`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`class WebDriverNot extends WebDriver`
`8`	`8`	`{`
`9`		`- protected function matches($nodes)`
	`9`	`+ protected function matches($nodes) : bool`
`10`	`10`	`{`
`11`	`11`	`return !parent::matches($nodes);`
`12`	`12`	`}`
`13`	`13`
`14`		`- protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null)`
	`14`	`+ protected function fail($nodes, $selector, ComparisonFailure $comparisonFailure = null) : void`
`15`	`15`	`{`
`16`	`16`	`$selectorString = Locator::humanReadableString($selector);`
`17`	`17`	`if (!$this->string) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`	`class FilterTest extends \PHPUnit\Runner\Filter\NameFilterIterator`
`13`	`13`	`{`
`14`		`- public function accept()`
	`14`	`+ public function accept():bool`
`15`	`15`	`{`
`16`	`16`	`$test = $this->getInnerIterator()->current();`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ class Init`
`10`	`10`	`public static function init()`
`11`	`11`	`{`
`12`	`12`	`require_once __DIR__ . DIRECTORY_SEPARATOR . 'shim.php';`
	`13`	`+ require_once __DIR__ . DIRECTORY_SEPARATOR . 'phpunit7-interfaces.php';`
`13`	`14`	`}`
`14`	`15`	`}`