To promise version 3 + php 81 82

Author: mmoreram

.circleci/config.yml

@@ -16,9 +16,9 @@ jobs:
             rm -Rf var/*
             php vendor/bin/phpunit --testsuite=with-stopwatch --exclude-group=with-filesystem
 
-  test-php74-filesystem:
+  test-php80-no-filesystem:
     docker:
-      - image: circleci/php:7.4-cli
+      - image: circleci/php:8.0-cli
 
     working_directory: ~/project
     steps:
@@ -27,14 +27,28 @@ jobs:
       - run:
           name: Run tests / Highest
           command: |
-            composer require react/filesystem:^0.1 --no-update
             composer update -n --prefer-dist
             rm -Rf var/*
-            php vendor/bin/phpunit --testsuite=base --exclude-group=without-filesystem
+            php vendor/bin/phpunit --testsuite=base --exclude-group=with-filesystem
 
-  test-php80-no-filesystem:
+  test-php81-no-filesystem:
     docker:
-      - image: circleci/php:8.0-cli
+      - image: cimg/php:8.1
+
+    working_directory: ~/project
+    steps:
+      - checkout
+
+      - run:
+          name: Run tests / Highest
+          command: |
+            composer update -n --prefer-dist
+            rm -Rf var/*
+            php vendor/bin/phpunit --testsuite=base --exclude-group=with-filesystem
+
+  test-php82-no-filesystem:
+    docker:
+      - image: cimg/php:8.2
 
     working_directory: ~/project
     steps:
@@ -52,5 +66,6 @@ workflows:
   test:
     jobs:
       - test-php74-no-filesystem
-      - test-php74-filesystem
-      - test-php80-no-filesystem
+      - test-php80-no-filesystem
+      - test-php81-no-filesystem
+      - test-php82-no-filesystem

AsyncEventDispatcherMethods.php

@@ -68,7 +68,7 @@ private function doAsyncDispatch(
         string $eventName,
         Event $event
     ) {
-        $promise = resolve();
+        $promise = resolve(null);
         foreach ($listeners as $listener) {
             $promise = $promise->then(function () use ($event, $eventName, $listener) {
                 return

AsyncHttpKernel.php

@@ -221,7 +221,7 @@ private function callAsyncView(
         int $type
     ): PromiseInterface {
         return
-            (resolve())
+            (resolve(null))
             ->then(function () use ($request, $response, $controller, $type) {
                 $event = new ViewEvent($this, $request, $type, $response);
 

AsyncKernel.php

@@ -29,7 +29,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -58,21 +57,41 @@ public function boot()
             $this->uid = $this->generateUID();
 
             if (!$this->forceCacheUsage && ($_ENV['DRIFT_CACHE_ENABLED'] ?? '0') !== '1') {
-                $fs = new Filesystem();
                 // AsyncKernel loads the container only once when it loads. Storing it in the filesystem is not for cache purposes
                 // but more for using the same loading process as Kernel class use.
                 // Hence, everytime before AsyncKernel initiates the container it deletes the cache dir,
                 // to make sure it is building the updated kernel
                 $cachePath = $this->getCacheDir();
-                if ($fs->exists($cachePath)) {
-                    $fs->remove($cachePath);
+                if (is_dir($cachePath)) {
+                    $this->rrmdir($cachePath);
                 }
             }
         }
 
         parent::boot();
     }
 
+    /**
+     * @param $src
+     * @return void
+     */
+    function rrmdir($src) {
+        $dir = opendir($src);
+        while(false !== ( $file = readdir($dir)) ) {
+            if (( $file != '.' ) && ( $file != '..' )) {
+                $full = $src . '/' . $file;
+                if ( is_dir($full) ) {
+                    $this->rrmdir($full);
+                }
+                else {
+                    unlink($full);
+                }
+            }
+        }
+        closedir($dir);
+        rmdir($src);
+    }
+
     /**
      * Preload kernel.
      */

Tests/Listener.php

@@ -42,7 +42,7 @@ class Listener
      */
     public function handleGetResponsePromiseA(RequestEvent $event)
     {
-        return (resolve())
+        return (resolve(null))
             ->then(function () use ($event) {
                 $event->setResponse(new Response('A'));
             });
@@ -57,7 +57,7 @@ public function handleGetResponsePromiseA(RequestEvent $event)
      */
     public function handleGetResponsePromiseB(RequestEvent $event)
     {
-        return (resolve())
+        return (resolve(null))
             ->then(function () use ($event) {
                 $event->setResponse(new Response('B'));
             });
@@ -90,7 +90,7 @@ public function handleGetExceptionNothing(ExceptionEvent $event)
      */
     public function handleGetExceptionA(ExceptionEvent $event)
     {
-        return (resolve())
+        return (resolve(null))
             ->then(function () use ($event) {
                 $event->setResponse(new Response('EXC', 404));
             });
@@ -106,7 +106,7 @@ public function handleGetExceptionA(ExceptionEvent $event)
     public function handleGetResponsePromise1(RequestEvent $event): PromiseInterface
     {
         return
-            (resolve())
+            (resolve(null))
                 ->then(function () {
                     $_GET['partial'] .= '1';
                 });

Tests/Services/AFactory.php

@@ -41,7 +41,7 @@ public function __construct(LoopInterface $loop)
      */
     public static function createAFulfilledClass(): PromiseInterface
     {
-        return (resolve())
+        return (resolve(null))
             ->then(function () {
                 return new AClass();
             });
@@ -52,7 +52,7 @@ public static function createAFulfilledClass(): PromiseInterface
      */
     public static function createARejectedClass(): PromiseInterface
     {
-        return (resolve())
+        return (resolve(null))
             ->then(function () {
                 throw new \Exception();
             });

composer.json

@@ -18,7 +18,7 @@
         "symfony/event-dispatcher-contracts": "^2.0",
         "symfony/http-foundation": "^5.0",
         "symfony/routing": "^5.0",
-        "react/promise": "^2.7",
+        "react/promise": "^3",
         "react/http": "^1.0",
         "clue/block-react": "^1.3"
     },
@@ -29,9 +29,6 @@
         "symfony/yaml": "^5.0",
         "symfony/console": "^5.0"
     },
-    "suggest": {
-        "react/filesystem": "*"
-    },
     "autoload": {
         "psr-4": {
             "Drift\\HttpKernel\\": ""