Update test suite to use new reactphp/async package instead of clue/r…

…eactphp-block See https://github.com/reactphp/async Refs reactphp/socket#296
WyriHaximus-labs · Aug 25, 2022 · 18401db · 18401db
1 parent 41fefa4
commit 18401db
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 132 deletions.
diff --git a/composer.json b/composer.json
@@ -21,8 +21,8 @@
         "wyrihaximus/react-child-process-promise-closure": "^1.0"
     },
     "require-dev": {
-        "clue/block-react": "^1.4",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5",
+        "react/async": "^4 || ^3"
     },
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/tests/AbstractFilesystemTestCase.php b/tests/AbstractFilesystemTestCase.php
@@ -11,8 +11,6 @@
 use React\EventLoop\LoopInterface;
 use React\Filesystem\Factory;
 use React\Filesystem\AdapterInterface;
-use React\Promise\PromiseInterface;
-use function Clue\React\Block\await;
 
 abstract class AbstractFilesystemTestCase extends TestCase
 {
@@ -35,9 +33,4 @@ final public function provideFilesystems(): iterable
 
         yield 'factory' => [Factory::create()];
     }
-
-    public function await(PromiseInterface $promise)
-    {
-        return await($promise, EventLoop\Loop::get(), 30);
-    }
 }
diff --git a/tests/DirectoryTest.php b/tests/DirectoryTest.php
@@ -8,7 +8,7 @@
 use React\Filesystem\Node\FileInterface;
 use React\Filesystem\Stat;
 use React\Promise\PromiseInterface;
-use function Clue\React\Block\await;
+use function React\Async\await;
 
 final class DirectoryTest extends AbstractFilesystemTestCase
 {
@@ -19,7 +19,7 @@ final class DirectoryTest extends AbstractFilesystemTestCase
      */
     public function stat(AdapterInterface $filesystem): void
     {
-        $stat = $this->await($filesystem->detect(__DIR__)->then(static function (DirectoryInterface $directory): PromiseInterface {
+        $stat = await($filesystem->detect(__DIR__)->then(static function (DirectoryInterface $directory): PromiseInterface {
             return $directory->stat();
         }));
 
@@ -48,7 +48,7 @@ public function ls(AdapterInterface $filesystem): void
 
         ksort($expectedListing);
 
-        $directoryListing = $this->await($filesystem->detect(__DIR__)->then(static function (DirectoryInterface $directory): PromiseInterface {
+        $directoryListing = await($filesystem->detect(__DIR__)->then(static function (DirectoryInterface $directory): PromiseInterface {
             return $directory->ls();
         }));
 

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -8,7 +8,7 @@
 use React\Filesystem\AdapterInterface;
 use React\Filesystem\Node\DirectoryInterface;
 use React\Filesystem\Node\FileInterface;
-use function Clue\React\Block\await;
+use function React\Async\await;
 
 final class FactoryTest extends AbstractFilesystemTestCase
 {
@@ -17,7 +17,7 @@ final class FactoryTest extends AbstractFilesystemTestCase
      */
     public function factory(): void
     {
-        $node = $this->await(Factory::create()->detect(__FILE__));
+        $node = await(Factory::create()->detect(__FILE__));
 
         self::assertInstanceOf(FileInterface::class, $node);
     }