Merge pull request #82 from reactphp/queue-class

Replace the queue() function with a static Queue class

Author: jsor

src/FulfilledPromise.php

@@ -22,7 +22,7 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
         }
 
         return new Promise(function (callable $resolve, callable $reject) use ($onFulfilled) {
-            queue()->enqueue(function () use ($resolve, $reject, $onFulfilled) {
+            Queue::enqueue(function () use ($resolve, $reject, $onFulfilled) {
                 try {
                     $resolve($onFulfilled($this->value));
                 } catch (\Throwable $exception) {
@@ -40,7 +40,7 @@ public function done(callable $onFulfilled = null, callable $onRejected = null)
             return;
         }
 
-        queue()->enqueue(function () use ($onFulfilled) {
+        Queue::enqueue(function () use ($onFulfilled) {
             $result = $onFulfilled($this->value);
 
             if ($result instanceof PromiseInterface) {

src/Queue.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace React\Promise;
+
+use React\Promise\Queue\DriverInterface;
+
+final class Queue
+{
+    /**
+     * @var DriverInterface
+     */
+    private static $driver;
+
+    public static function setDriver(DriverInterface $driver = null)
+    {
+        self::$driver = $driver;
+    }
+
+    public static function getDriver()
+    {
+        if (!self::$driver) {
+            self::$driver = new Queue\SynchronousDriver();
+        }
+
+        return self::$driver;
+    }
+
+    public static function enqueue(callable $task)
+    {
+        if (!self::$driver) {
+            self::getDriver();
+        }
+
+        self::$driver->enqueue($task);
+    }
+}

src/Queue/QueueInterface.php src/Queue/DriverInterface.phpsrc/Queue/QueueInterface.php renamed to src/Queue/DriverInterface.php

@@ -2,7 +2,7 @@
 
 namespace React\Promise\Queue;
 
-interface QueueInterface
+interface DriverInterface
 {
     public function enqueue(callable $task);
 }

src/Queue/SynchronousQueue.php src/Queue/SynchronousDriver.phpsrc/Queue/SynchronousQueue.php renamed to src/Queue/SynchronousDriver.php

@@ -2,7 +2,7 @@
 
 namespace React\Promise\Queue;
 
-final class SynchronousQueue implements QueueInterface
+final class SynchronousDriver implements DriverInterface
 {
     private $queue = [];
 

src/RejectedPromise.php

@@ -22,7 +22,7 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
         }
 
         return new Promise(function (callable $resolve, callable $reject) use ($onRejected) {
-            queue()->enqueue(function () use ($resolve, $reject, $onRejected) {
+            Queue::enqueue(function () use ($resolve, $reject, $onRejected) {
                 try {
                     $resolve($onRejected($this->reason));
                 } catch (\Throwable $exception) {
@@ -36,7 +36,7 @@ public function then(callable $onFulfilled = null, callable $onRejected = null)
 
     public function done(callable $onFulfilled = null, callable $onRejected = null)
     {
-        queue()->enqueue(function () use ($onRejected) {
+        Queue::enqueue(function () use ($onRejected) {
             if (null === $onRejected) {
                 throw UnhandledRejectionException::resolve($this->reason);
             }

src/functions.php

@@ -189,21 +189,6 @@ function reduce(array $promisesOrValues, callable $reduceFunc, $initialValue = n
     }, $cancellationQueue);
 }
 
-function queue(Queue\QueueInterface $queue = null)
-{
-    static $globalQueue;
-
-    if ($queue) {
-        return ($globalQueue = $queue);
-    }
-
-    if (!$globalQueue) {
-        $globalQueue = new Queue\SynchronousQueue();
-    }
-
-    return $globalQueue;
-}
-
 /**
  * @internal
  */

tests/QueueTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace React\Promise;
+
+class QueueTest extends TestCase
+{
+    /** @test */
+    public function canSetDriver()
+    {
+        $oldDriver = Queue::getDriver();
+
+        $newDriver = $this
+            ->getMockBuilder('React\Promise\Queue\DriverInterface')
+            ->getMock();
+
+        Queue::setDriver($newDriver);
+
+        $this->assertSame($newDriver, Queue::getDriver());
+
+        Queue::setDriver($oldDriver);
+    }
+}