Merge pull request #238 from clue-labs/dequeue

Remove internal `Queue` leftovers

Author: WyriHaximus

src/Internal/FulfilledPromise.php

@@ -2,9 +2,7 @@
 
 namespace React\Promise\Internal;
 
-use React\Promise\Promise;
 use React\Promise\PromiseInterface;
-use function React\Promise\enqueue;
 use function React\Promise\resolve;
 
 /**
@@ -29,15 +27,11 @@ public function then(callable $onFulfilled = null, callable $onRejected = null):
             return $this;
         }
 
-        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 {
+            return resolve($onFulfilled($this->value));
+        } catch (\Throwable $exception) {
+            return new RejectedPromise($exception);
+        }
     }
 
     public function catch(callable $onRejected): PromiseInterface

src/Internal/Queue.php

@@ -2,10 +2,8 @@
 
 namespace React\Promise\Internal;
 
-use React\Promise\Promise;
 use React\Promise\PromiseInterface;
 use function React\Promise\_checkTypehint;
-use function React\Promise\enqueue;
 use function React\Promise\resolve;
 
 /**
@@ -26,15 +24,11 @@ public function then(callable $onFulfilled = null, callable $onRejected = null):
             return $this;
         }
 
-        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 {
+            return resolve($onRejected($this->reason));
+        } catch (\Throwable $exception) {
+            return new RejectedPromise($exception);
+        }
     }
 
     public function catch(callable $onRejected): PromiseInterface

src/Internal/RejectedPromise.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
  */