Merge pull request #39 from SimonFrings/async

clue · web-flow · commit 1dc00406f7af · 2022-09-02T14:33:43.000+02:00
Update to use new reactphp/async package instead of clue/reactphp-block
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
         "react/stream": "^1.2"
     },
     "require-dev": {
-        "clue/block-react": "^1.5",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36",
+        "react/async": "^4 || ^3 || ^2",
         "react/http": "^1.5",
         "react/mysql": "^0.5.5"
     },
diff --git a/tests/FunctionalSshProcessConnectorTest.php b/tests/FunctionalSshProcessConnectorTest.php
@@ -3,7 +3,6 @@
 namespace Clue\Tests\React\SshProxy;
 
 use Clue\React\SshProxy\SshProcessConnector;
-use React\EventLoop\Loop;
 
 class FunctionalSshProcessConnectorTest extends TestCase
 {
@@ -30,15 +29,15 @@ public function testConnectInvalidProxyUriWillReturnRejectedPromise()
         $promise = $this->connector->connect('example.com:80');
 
         $this->setExpectedException('RuntimeException', 'Connection to example.com:80 failed because SSH client died');
-        \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
     }
 
     public function testConnectInvalidTargetWillReturnRejectedPromise()
     {
         $promise = $this->connector->connect('example.invalid:80');
 
         $this->setExpectedException('RuntimeException', 'Connection to example.invalid:80 rejected:');
-        \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
     }
 
     public function testCancelConnectWillReturnRejectedPromise()
@@ -47,14 +46,14 @@ public function testCancelConnectWillReturnRejectedPromise()
         $promise->cancel();
 
         $this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled while waiting for SSH client');
-        \Clue\React\Block\await($promise, Loop::get(), 0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 0));
     }
 
     public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection()
     {
         $promise = $this->connector->connect('example.com:80');
 
-        $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
 
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
         $this->assertTrue($connection->isReadable());
diff --git a/tests/FunctionalSshSocksConnectorTest.php b/tests/FunctionalSshSocksConnectorTest.php
@@ -3,7 +3,6 @@
 namespace Clue\Tests\React\SshProxy;
 
 use Clue\React\SshProxy\SshSocksConnector;
-use React\EventLoop\Loop;
 
 class FunctionalSshSocksConnectorTest extends TestCase
 {
@@ -30,7 +29,7 @@ public function setUpConnector()
     public function tearDownSSHClientProcess()
     {
         // run loop in order to shut down SSH client process again
-        \Clue\React\Block\sleep(0.001, Loop::get());
+        \React\Async\await(\React\Promise\Timer\sleep(0.001));
     }
 
     public function testConnectInvalidProxyUriWillReturnRejectedPromise()
@@ -40,15 +39,15 @@ public function testConnectInvalidProxyUriWillReturnRejectedPromise()
         $promise = $this->connector->connect('example.com:80');
 
         $this->setExpectedException('RuntimeException', 'Connection to example.com:80 failed because SSH client process died');
-        \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
     }
 
     public function testConnectInvalidTargetWillReturnRejectedPromise()
     {
         $promise = $this->connector->connect('example.invalid:80');
 
         $this->setExpectedException('RuntimeException', 'Connection to tcp://example.invalid:80 failed because connection to proxy was lost');
-        \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
     }
 
     public function testCancelConnectWillReturnRejectedPromise()
@@ -57,14 +56,14 @@ public function testCancelConnectWillReturnRejectedPromise()
         $promise->cancel();
 
         $this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled while waiting for SSH client');
-        \Clue\React\Block\await($promise, Loop::get(), 0);
+        \React\Async\await(\React\Promise\Timer\timeout($promise, 0));
     }
 
     public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection()
     {
         $promise = $this->connector->connect('example.com:80');
 
-        $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
 
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
         $this->assertTrue($connection->isReadable());
@@ -74,10 +73,10 @@ public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection
 
     public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnectionForCustomBindAddress()
     {
-        $this->connector = new SshSocksConnector(getenv('SSH_PROXY') . '?bind=127.0.0.1:1081', Loop::get());
+        $this->connector = new SshSocksConnector(getenv('SSH_PROXY') . '?bind=127.0.0.1:1081');
         $promise = $this->connector->connect('example.com:80');
 
-        $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);
+        $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));
 
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
         $this->assertTrue($connection->isReadable());

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Clue\Tests\React\SshProxy;`
`4`	`4`
`5`	`5`	`use Clue\React\SshProxy\SshProcessConnector;`
`6`		`-use React\EventLoop\Loop;`
`7`	`6`
`8`	`7`	`class FunctionalSshProcessConnectorTest extends TestCase`
`9`	`8`	`{`
`@@ -30,15 +29,15 @@ public function testConnectInvalidProxyUriWillReturnRejectedPromise()`
`30`	`29`	`$promise = $this->connector->connect('example.com:80');`
`31`	`30`
`32`	`31`	`$this->setExpectedException('RuntimeException', 'Connection to example.com:80 failed because SSH client died');`
`33`		`- \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`32`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public function testConnectInvalidTargetWillReturnRejectedPromise()`
`37`	`36`	`{`
`38`	`37`	`$promise = $this->connector->connect('example.invalid:80');`
`39`	`38`
`40`	`39`	`$this->setExpectedException('RuntimeException', 'Connection to example.invalid:80 rejected:');`
`41`		`- \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`40`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`public function testCancelConnectWillReturnRejectedPromise()`
`@@ -47,14 +46,14 @@ public function testCancelConnectWillReturnRejectedPromise()`
`47`	`46`	`$promise->cancel();`
`48`	`47`
`49`	`48`	`$this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled while waiting for SSH client');`
`50`		`- \Clue\React\Block\await($promise, Loop::get(), 0);`
	`49`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, 0));`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection()`
`54`	`53`	`{`
`55`	`54`	`$promise = $this->connector->connect('example.com:80');`
`56`	`55`
`57`		`- $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`56`	`+ $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`58`	`57`
`59`	`58`	`$this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);`
`60`	`59`	`$this->assertTrue($connection->isReadable());`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Clue\Tests\React\SshProxy;`
`4`	`4`
`5`	`5`	`use Clue\React\SshProxy\SshSocksConnector;`
`6`		`-use React\EventLoop\Loop;`
`7`	`6`
`8`	`7`	`class FunctionalSshSocksConnectorTest extends TestCase`
`9`	`8`	`{`
`@@ -30,7 +29,7 @@ public function setUpConnector()`
`30`	`29`	`public function tearDownSSHClientProcess()`
`31`	`30`	`{`
`32`	`31`	`// run loop in order to shut down SSH client process again`
`33`		`- \Clue\React\Block\sleep(0.001, Loop::get());`
	`32`	`+ \React\Async\await(\React\Promise\Timer\sleep(0.001));`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`public function testConnectInvalidProxyUriWillReturnRejectedPromise()`
`@@ -40,15 +39,15 @@ public function testConnectInvalidProxyUriWillReturnRejectedPromise()`
`40`	`39`	`$promise = $this->connector->connect('example.com:80');`
`41`	`40`
`42`	`41`	`$this->setExpectedException('RuntimeException', 'Connection to example.com:80 failed because SSH client process died');`
`43`		`- \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`42`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`public function testConnectInvalidTargetWillReturnRejectedPromise()`
`47`	`46`	`{`
`48`	`47`	`$promise = $this->connector->connect('example.invalid:80');`
`49`	`48`
`50`	`49`	`$this->setExpectedException('RuntimeException', 'Connection to tcp://example.invalid:80 failed because connection to proxy was lost');`
`51`		`- \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`50`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`public function testCancelConnectWillReturnRejectedPromise()`
`@@ -57,14 +56,14 @@ public function testCancelConnectWillReturnRejectedPromise()`
`57`	`56`	`$promise->cancel();`
`58`	`57`
`59`	`58`	`$this->setExpectedException('RuntimeException', 'Connection to example.com:80 cancelled while waiting for SSH client');`
`60`		`- \Clue\React\Block\await($promise, Loop::get(), 0);`
	`59`	`+ \React\Async\await(\React\Promise\Timer\timeout($promise, 0));`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection()`
`64`	`63`	`{`
`65`	`64`	`$promise = $this->connector->connect('example.com:80');`
`66`	`65`
`67`		`- $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`66`	`+ $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`68`	`67`
`69`	`68`	`$this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);`
`70`	`69`	`$this->assertTrue($connection->isReadable());`
`@@ -74,10 +73,10 @@ public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnection`
`74`	`73`
`75`	`74`	`public function testConnectValidTargetWillReturnPromiseWhichResolvesToConnectionForCustomBindAddress()`
`76`	`75`	`{`
`77`		`- $this->connector = new SshSocksConnector(getenv('SSH_PROXY') . '?bind=127.0.0.1:1081', Loop::get());`
	`76`	`+ $this->connector = new SshSocksConnector(getenv('SSH_PROXY') . '?bind=127.0.0.1:1081');`
`78`	`77`	`$promise = $this->connector->connect('example.com:80');`
`79`	`78`
`80`		`- $connection = \Clue\React\Block\await($promise, Loop::get(), self::TIMEOUT);`
	`79`	`+ $connection = \React\Async\await(\React\Promise\Timer\timeout($promise, self::TIMEOUT));`
`81`	`80`
`82`	`81`	`$this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);`
`83`	`82`	`$this->assertTrue($connection->isReadable());`