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
10 changes: 9 additions & 1 deletion src/Traits/AwaitWithTimeouts.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use function React\Promise\resolve;
use Workflow\Serializers\Serializer;
use Workflow\Signal;
use Workflow\Timer;

trait AwaitWithTimeouts
{
Expand All @@ -19,7 +20,14 @@ public static function awaitWithTimeout(int|string|CarbonInterval $seconds, $con

if ($log) {
++self::$context->index;
return resolve(Serializer::unserialize($log->result));

$result = Serializer::unserialize($log->result);

if ($log->class === Timer::class) {
return resolve(! $result);
}

return resolve($result);
}

$result = $condition();
Expand Down
13 changes: 13 additions & 0 deletions tests/Feature/AwaitWithTimeoutWorkflowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Tests\Feature;

use Tests\Fixtures\TestAwaitWithTimeoutReplayWorkflow;
use Tests\Fixtures\TestAwaitWithTimeoutWorkflow;
use Tests\TestCase;
use Workflow\States\WorkflowCompletedStatus;
Expand Down Expand Up @@ -40,4 +41,16 @@ public function testTimedout(): void
$this->assertSame(WorkflowCompletedStatus::class, $workflow->status());
$this->assertSame('workflow_timed_out', $workflow->output());
}

public function testTimedoutResultStaysFalseAfterReplay(): void
{
$workflow = WorkflowStub::make(TestAwaitWithTimeoutReplayWorkflow::class);

$workflow->start();

while ($workflow->running());

$this->assertSame(WorkflowCompletedStatus::class, $workflow->status());
$this->assertFalse($workflow->output());
}
}
21 changes: 21 additions & 0 deletions tests/Fixtures/TestAwaitWithTimeoutReplayWorkflow.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

declare(strict_types=1);

namespace Tests\Fixtures;

use function Workflow\activity;
use function Workflow\awaitWithTimeout;
use Workflow\Workflow;

final class TestAwaitWithTimeoutReplayWorkflow extends Workflow
{
public function execute()
{
$result = yield awaitWithTimeout(1, static fn (): bool => false);

yield activity(TestCountActivity::class, $result ? 1 : 0);

return $result;
}
}
22 changes: 22 additions & 0 deletions tests/Unit/Traits/AwaitWithTimeoutsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Workflow\Serializers\Serializer;
use Workflow\Signal;
use Workflow\States\WorkflowPendingStatus;
use Workflow\Timer;
use Workflow\WorkflowStub;

final class AwaitWithTimeoutsTest extends TestCase
Expand Down Expand Up @@ -87,6 +88,27 @@ public function testLoadsStoredResult(): void
$this->assertTrue(Serializer::unserialize($workflow->logs()->firstWhere('index', 0)->result));
}

public function testLoadsStoredTimerResultAsTimedOut(): void
{
$workflow = WorkflowStub::load(WorkflowStub::make(TestWorkflow::class)->id());
$storedWorkflow = StoredWorkflow::findOrFail($workflow->id());
$storedWorkflow->logs()
->create([
'index' => 0,
'now' => WorkflowStub::now(),
'class' => Timer::class,
'result' => Serializer::serialize(true),
]);

WorkflowStub::awaitWithTimeout('1 minute', static fn () => true)
->then(static function ($value) use (&$result) {
$result = $value;
});

$this->assertSame(false, $result);
$this->assertSame(1, $workflow->logs()->count());
}

public function testResolvesConflictingResult(): void
{
$workflow = WorkflowStub::load(WorkflowStub::make(TestWorkflow::class)->id());
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Traits/TimersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function testLoadsStoredResult(): void
$result = $value;
});

$this->assertSame(true, $result);
$this->assertSame(false, $result);
$this->assertSame(1, $workflow->logs()->count());
$this->assertDatabaseHas('workflow_logs', [
'stored_workflow_id' => $workflow->id(),
Expand Down