Update to PHPUnit 7.5+

Author: clue

composer.json

@@ -31,7 +31,7 @@
         "react/promise": "^2.8 || ^1.2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.3 || ^5.7"
+        "phpunit/phpunit": "^9.3 || ^7.5"
     },
     "autoload": {
         "files": [

phpunit.xml.legacy

@@ -2,7 +2,7 @@
 
 <!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>

tests/AwaitTest.php

@@ -14,7 +14,8 @@ public function testAwaitThrowsExceptionWhenPromiseIsRejectedWithException()
             throw new \Exception('test');
         });
 
-        $this->setExpectedException('Exception', 'test');
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('test');
         React\Async\await($promise);
     }
 
@@ -28,7 +29,8 @@ public function testAwaitThrowsUnexpectedValueExceptionWhenPromiseIsRejectedWith
             $reject(false);
         });
 
-        $this->setExpectedException('UnexpectedValueException', 'Promise rejected with unexpected value of type bool');
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Promise rejected with unexpected value of type bool');
         React\Async\await($promise);
     }
 
@@ -42,7 +44,8 @@ public function testAwaitThrowsUnexpectedValueExceptionWhenPromiseIsRejectedWith
             $reject(null);
         });
 
-        $this->setExpectedException('UnexpectedValueException', 'Promise rejected with unexpected value of type NULL');
+        $this->expectException(\UnexpectedValueException::class);
+        $this->expectExceptionMessage('Promise rejected with unexpected value of type NULL');
         React\Async\await($promise);
     }
 
@@ -52,7 +55,9 @@ public function testAwaitThrowsErrorWhenPromiseIsRejectedWithError()
             throw new \Error('Test', 42);
         });
 
-        $this->setExpectedException('Error', 'Test', 42);
+        $this->expectException(\Error::class);
+        $this->expectExceptionMessage('Test');
+        $this->expectExceptionCode(42);
         React\Async\await($promise);
     }
 
@@ -141,21 +146,4 @@ public function testAwaitShouldNotCreateAnyGarbageReferencesForPromiseRejectedWi
 
         $this->assertEquals(0, gc_collect_cycles());
     }
-
-    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);
-        }
-    }
 }

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace React\Tests\Async;
 
+use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\TestCase as BaseTestCase;
 
 class TestCase extends BaseTestCase
@@ -39,12 +40,12 @@ protected function expectCallableNever()
 
     protected function createCallableMock()
     {
-        if (method_exists('PHPUnit\Framework\MockObject\MockBuilder', 'addMethods')) {
+        if (method_exists(MockBuilder::class, 'addMethods')) {
             // PHPUnit 9+
-            return $this->getMockBuilder('stdClass')->addMethods(array('__invoke'))->getMock();
+            return $this->getMockBuilder(\stdClass::class)->addMethods(['__invoke'])->getMock();
         } else {
-            // legacy PHPUnit 4 - PHPUnit 8
-            return $this->getMockBuilder('stdClass')->setMethods(array('__invoke'))->getMock();
+            // PHPUnit < 9
+            return $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock();
         }
     }
 }