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
9 changes: 4 additions & 5 deletions src/Internal/Queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ public function enqueue(callable $task): void
private function drain(): void
{
for ($i = \key($this->queue); isset($this->queue[$i]); $i++) {
try {
($this->queue[$i])();
} finally {
unset($this->queue[$i]);
}
$task = $this->queue[$i];
unset($this->queue[$i]);

$task();
}

$this->queue = [];
Expand Down
21 changes: 21 additions & 0 deletions tests/Internal/QueueTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,27 @@ public function executesNestedEnqueuedTasks()
$queue->enqueue($task);
}

/**
* @test
* @requires PHP 8.1
*/
public function executesFollowingTasksIfPriorTaskSuspendsFiber()
{
$queue = new Queue();

$fiber = new \Fiber(function () use ($queue) {
$queue->enqueue(function () {
\Fiber::suspend(2);
});
return 1;
});

$ret = $fiber->start();
$this->assertEquals(2, $ret);

$queue->enqueue($this->expectCallableOnce());
}

/**
* @test
*/
Expand Down
27 changes: 27 additions & 0 deletions tests/PromiseTest/PromiseFulfilledTestTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,33 @@ public function thenShouldSwitchFromCallbacksToErrbacksWhenCallbackThrows()
);
}

/**
* @test
* @requires PHP 8.1
*/
public function thenShouldContinueToExecuteCallbacksWhenPriorCallbackSuspendsFiber()
{
$adapter = $this->getPromiseTestAdapter();
$adapter->resolve(42);

$fiber = new \Fiber(function () use ($adapter) {
$adapter->promise()->then(function (int $value) {
\Fiber::suspend($value);
});
});

$ret = $fiber->start();
$this->assertEquals(42, $ret);

$mock = $this->createCallableMock();
$mock
->expects($this->once())
->method('__invoke')
->with($this->identicalTo(42));

$adapter->promise()->then($mock);
}

/** @test */
public function cancelShouldReturnNullForFulfilledPromise()
{
Expand Down