Update test suite to avoid unhandled promise rejections

Author: clue

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ jobs:
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }})
     runs-on: ubuntu-22.04
+    continue-on-error: ${{ matrix.php < 7.1 }} # TODO: remove me once reactphp/promise is merged
     strategy:
       matrix:
         php:
@@ -30,6 +31,8 @@ jobs:
           php-version: ${{ matrix.php }}
           coverage: xdebug
           ini-file: development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # TODO: remove me once reactphp/promise is merged
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
         if: ${{ matrix.php >= 7.3 }}

composer.json

@@ -29,10 +29,10 @@
         "php": ">=5.3.0",
         "react/cache": "^1.0 || ^0.6 || ^0.5",
         "react/event-loop": "^1.2",
-        "react/promise": "^3.0 || ^2.7 || ^1.2.1"
+        "react/promise": "dev-report-unhandled as 3.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5 || ^4.8.35",
+        "phpunit/phpunit": "^9.5 || ^7.5 || ^4.8.36",
         "react/async": "^4 || ^3 || ^2",
         "react/promise-timer": "^1.9"
     },
@@ -45,5 +45,11 @@
         "psr-4": {
             "React\\Tests\\Dns\\": "tests/"
         }
+    },
+    "repositories": {
+        "clue": {
+            "type": "vcs",
+            "url": "https://github.com/clue-labs/promise"
+        }
     }
 }

tests/FunctionalResolverTest.php

@@ -187,6 +187,9 @@ public function testResolveShouldNotCauseGarbageReferencesWhenUsingInvalidNamese
         gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $promise = $this->resolver->resolve('google.com');
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
+
         unset($promise);
 
         $this->assertEquals(0, gc_collect_cycles());
@@ -205,6 +208,9 @@ public function testResolveCachedShouldNotCauseGarbageReferencesWhenUsingInvalid
         gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $promise = $this->resolver->resolve('google.com');
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
+
         unset($promise);
 
         $this->assertEquals(0, gc_collect_cycles());

tests/Query/CoopExecutorTest.php

@@ -107,7 +107,9 @@ public function testQueryTwiceWillPassExactQueryToBaseExecutorTwiceWhenFirstQuer
 
         $connector = new CoopExecutor($base);
 
-        $connector->query($query);
+        $promise = $connector->query($query);
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
 
         $deferred->reject(new RuntimeException());
 

tests/Query/RetryExecutorTest.php

@@ -258,7 +258,9 @@ public function queryShouldNotCauseGarbageReferencesOnTimeoutErrors()
         gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $query = new Query('igor.io', Message::TYPE_A, Message::CLASS_IN);
-        $retryExecutor->query($query);
+        $promise = $retryExecutor->query($query);
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
 
         $this->assertEquals(0, gc_collect_cycles());
     }
@@ -322,7 +324,9 @@ public function queryShouldNotCauseGarbageReferencesOnNonTimeoutErrors()
         gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $query = new Query('igor.io', Message::TYPE_A, Message::CLASS_IN);
-        $retryExecutor->query($query);
+        $promise = $retryExecutor->query($query);
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
 
         $this->assertEquals(0, gc_collect_cycles());
     }

tests/Query/SelectiveTransportExecutorTest.php

@@ -226,6 +226,9 @@ public function testRejectedPromiseAfterTruncatedResponseShouldNotCreateAnyGarba
         gc_collect_cycles(); // clear twice to avoid leftovers in PHP 7.4 with ext-xdebug and code coverage turned on
 
         $promise = $this->executor->query($query);
+
+        $promise->then(null, $this->expectCallableOnce()); // avoid reporting unhandled rejection
+
         unset($promise);
 
         $this->assertEquals(0, gc_collect_cycles());

tests/Query/TcpTransportExecutorTest.php

@@ -370,8 +370,12 @@ public function testQueryRejectsWhenClientKeepsSendingWhenServerClosesSocketWith
         $query = new Query('google' . str_repeat('.com', 100), Message::TYPE_A, Message::CLASS_IN);
 
         // send a bunch of queries and keep reference to last promise
+        $exception = null;
         for ($i = 0; $i < 2000; ++$i) {
             $promise = $executor->query($query);
+            $promise->then(null, function (\Throwable $reason) use (&$exception) {
+                $exception = $reason;
+            });
         }
 
         $client = stream_socket_accept($server);
@@ -399,11 +403,6 @@ public function testQueryRejectsWhenClientKeepsSendingWhenServerClosesSocketWith
         restore_error_handler();
         $this->assertNull($error);
 
-        $exception = null;
-        $promise->then(null, function ($reason) use (&$exception) {
-            $exception = $reason;
-        });
-
         // expect EPIPE (Broken pipe), except for macOS kernel race condition or legacy HHVM
         $this->setExpectedException(
             'RuntimeException',
@@ -472,7 +471,6 @@ public function testQueryKeepsPendingIfServerSendsIncompleteMessageLength()
             null,
             function ($e) use (&$wait) {
                 $wait = false;
-                throw $e;
             }
         );
 
@@ -509,7 +507,6 @@ public function testQueryKeepsPendingIfServerSendsIncompleteMessageBody()
             null,
             function ($e) use (&$wait) {
                 $wait = false;
-                throw $e;
             }
         );
 

tests/Query/UdpTransportExecutorTest.php

@@ -269,7 +269,6 @@ public function testQueryKeepsPendingIfServerSendsInvalidMessage()
             null,
             function ($e) use (&$wait) {
                 $wait = false;
-                throw $e;
             }
         );
 
@@ -307,7 +306,6 @@ public function testQueryKeepsPendingIfServerSendsInvalidId()
             null,
             function ($e) use (&$wait) {
                 $wait = false;
-                throw $e;
             }
         );