Run tests on PHPUnit 9

Author: SimonFrings

.travis.yml

@@ -15,4 +15,4 @@ install:
   - composer install --prefer-source
 
 script:
-  - phpunit -v --coverage-text
+  - vendor/bin/phpunit --coverage-text

composer.json

@@ -5,9 +5,6 @@
     "authors": [
         {"name": "Jan Sorgalla", "email": "jsorgalla@gmail.com"}
     ],
-    "require": {
-        "php": ">=5.3.3"
-    },
     "autoload": {
         "psr-0": {
             "React\\Promise": "src/"
@@ -18,5 +15,11 @@
         "branch-alias": {
             "dev-master": "1.1-dev"
         }
+    },
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.0 || ^5.7 || ^4.8.35"
     }
 }

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>

tests/React/Promise/DeferredTest.php

@@ -204,10 +204,10 @@ public function shouldInvokeCancellationHandleWhenCancellingAllDerived()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function shouldThrowIfCancellerIsNotACallable()
     {
+        $this->setExpectedException('InvalidArgumentException');
         new Deferred(false);
     }
 }

tests/React/Promise/ErrorCollector.php

@@ -33,6 +33,6 @@ public function assertCollectedError($errstr, $errno)
 
         $message = 'Error with level ' . $errno . ' and message "' . $errstr . '" not found in ' . var_export($this->errors, true);
 
-        throw new \PHPUnit_Framework_AssertionFailedError($message);
+        throw new \PHPUnit\Framework\AssertionFailedError($message);
     }
 }

tests/React/Promise/PromiseTest.php

@@ -10,7 +10,7 @@ class PromiseTest extends TestCase
     /** @test */
     public function shouldThrowIfResolverIsNotACallable()
     {
-        $this->setExpectedException('\InvalidArgumentException');
+        $this->setExpectedException('InvalidArgumentException');
 
         new Promise(null);
     }
@@ -93,10 +93,10 @@ public function shouldInvokeCancellationHandlerAndStayPendingWhenCallingCancel()
 
     /**
      * @test
-     * @expectedException InvalidArgumentException
      */
     public function shouldThrowIfCancellerIsNotACallable()
     {
+        $this->setExpectedException('InvalidArgumentException');
         new Promise(function () { }, false);
     }
 }

tests/React/Promise/Stub/CallableStub.php

@@ -2,7 +2,7 @@
 
 namespace React\Promise;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     public function expectCallableExactly($amount)
     {
@@ -36,9 +36,13 @@ public function expectCallableNever()
 
     public function createCallableMock()
     {
-        return $this
-            ->getMockBuilder('React\\Promise\Stub\CallableStub')
-            ->getMock();
+        if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
+            // PHPUnit 9+
+            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+        } else {
+            // legacy PHPUnit 4 - PHPUnit 9
+            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+        }
     }
 
     public function invalidCallbackDataProvider()
@@ -52,4 +56,21 @@ public function invalidCallbackDataProvider()
             'falsey'       => array(0)
         );
     }
+
+    public function setExpectedException($exception, $exceptionMessage = '', $exceptionCode = null)
+    {
+        if (method_exists($this, 'expectException')) {
+            // PHPUnit 5+
+            $this->expectException($exception);
+            if ($exceptionMessage !== '') {
+                $this->expectExceptionMessage($exceptionMessage);
+            }
+            if ($exceptionCode !== null) {
+                $this->expectExceptionCode($exceptionCode);
+            }
+        } else {
+            // legacy PHPUnit 4
+            parent::setExpectedException($exception, $exceptionMessage, $exceptionCode);
+        }
+    }
 }