Use reactphp/async instead of clue/reactphp-block

clue · Oct 4, 2022 · b919e5a · b919e5a
1 parent 09366dd
commit b919e5a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "ringcentral/psr7": "^1.2"
     },
     "require-dev": {
-        "clue/block-react": "^1.5",
+        "react/async": "^4 || ^3 || ^2",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8",
         "react/event-loop": "^1.2",
         "react/http": "^1.5"

diff --git a/tests/FunctionalTest.php b/tests/FunctionalTest.php
@@ -2,7 +2,6 @@
 
 namespace Clue\Tests\React\HttpProxy;
 
-use Clue\React\Block;
 use Clue\React\HttpProxy\ProxyConnector;
 use React\EventLoop\Loop;
 
@@ -20,7 +19,7 @@ public function testNonListeningSocketRejectsConnection()
             'Connection to tcp://google.com:80 failed because connection to proxy failed (ECONNREFUSED)',
             defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
         );
-        Block\await($promise, Loop::get(), 3.0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 3.0));
     }
 
     public function testPlainGoogleDoesNotAcceptConnectMethod()
@@ -34,7 +33,7 @@ public function testPlainGoogleDoesNotAcceptConnectMethod()
             'Connection to tcp://google.com:80 failed because proxy refused connection with HTTP error code 405 (Method Not Allowed) (ECONNREFUSED)',
             defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
         );
-        Block\await($promise, Loop::get(), 3.0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 3.0));
     }
 
     public function testSecureGoogleDoesNotAcceptConnectMethod()
@@ -52,7 +51,7 @@ public function testSecureGoogleDoesNotAcceptConnectMethod()
             'Connection to tcp://google.com:80 failed because proxy refused connection with HTTP error code 405 (Method Not Allowed) (ECONNREFUSED)',
             defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
         );
-        Block\await($promise, Loop::get(), 3.0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 3.0));
     }
 
     public function testSecureGoogleDoesNotAcceptPlainStream()
@@ -66,7 +65,7 @@ public function testSecureGoogleDoesNotAcceptPlainStream()
             'Connection to tcp://google.com:80 failed because connection to proxy was lost while waiting for response (ECONNRESET)',
             defined('SOCKET_ECONNRESET') ? SOCKET_ECONNRESET : 104
         );
-        Block\await($promise, Loop::get(), 3.0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 3.0));
     }
 
     /**