Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/FulfilledPromise.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down
36 changes: 36 additions & 0 deletions src/Queue.php
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace React\Promise\Queue;

interface QueueInterface
interface DriverInterface
{
public function enqueue(callable $task);
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace React\Promise\Queue;

final class SynchronousQueue implements QueueInterface
final class SynchronousDriver implements DriverInterface
{
private $queue = [];

Expand Down
4 changes: 2 additions & 2 deletions src/RejectedPromise.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
Expand Down
15 changes: 0 additions & 15 deletions src/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
22 changes: 22 additions & 0 deletions tests/QueueTest.php
Original file line number Diff line number Diff line change
@@ -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);
}
}