Remove internal Queue leftovers

reactphp · Oct 6, 2022 · dd6a739 · dd6a739
1 parent ee59eae
commit dd6a739
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 130 deletions.
diff --git a/src/Internal/FulfilledPromise.php b/src/Internal/FulfilledPromise.php
@@ -4,7 +4,6 @@
 
 use React\Promise\Promise;
 use React\Promise\PromiseInterface;
-use function React\Promise\enqueue;
 use function React\Promise\resolve;
 
 /**
@@ -30,13 +29,11 @@ public function then(callable $onFulfilled = null, callable $onRejected = null):
         }
 
         return new Promise(function (callable $resolve, callable $reject) use ($onFulfilled): void {
-            enqueue(function () use ($resolve, $reject, $onFulfilled): void {
-                try {
-                    $resolve($onFulfilled($this->value));
-                } catch (\Throwable $exception) {
-                    $reject($exception);
-                }
-            });
+            try {
+                $resolve($onFulfilled($this->value));
+            } catch (\Throwable $exception) {
+                $reject($exception);
+            }
         });
     }
 

diff --git a/src/Internal/Queue.php b/src/Internal/Queue.php
diff --git a/src/Internal/RejectedPromise.php b/src/Internal/RejectedPromise.php
@@ -5,7 +5,6 @@
 use React\Promise\Promise;
 use React\Promise\PromiseInterface;
 use function React\Promise\_checkTypehint;
-use function React\Promise\enqueue;
 use function React\Promise\resolve;
 
 /**
@@ -27,13 +26,11 @@ public function then(callable $onFulfilled = null, callable $onRejected = null):
         }
 
         return new Promise(function (callable $resolve, callable $reject) use ($onRejected): void {
-            enqueue(function () use ($resolve, $reject, $onRejected): void {
-                try {
-                    $resolve($onRejected($this->reason));
-                } catch (\Throwable $exception) {
-                    $reject($exception);
-                }
-            });
+            try {
+                $resolve($onRejected($this->reason));
+            } catch (\Throwable $exception) {
+                $reject($exception);
+            }
         });
     }
 

diff --git a/src/functions.php b/src/functions.php
@@ -205,20 +205,6 @@ function (\Throwable $reason) use ($i, &$reasons, &$toReject, $reject, &$continu
     }, $cancellationQueue);
 }
 
-/**
- * @internal
- */
-function enqueue(callable $task): void
-{
-    static $queue;
-
-    if (!$queue) {
-        $queue = new Internal\Queue();
-    }
-
-    $queue->enqueue($task);
-}
-
 /**
  * @internal
  */

diff --git a/tests/Internal/QueueTest.php b/tests/Internal/QueueTest.php