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
2 changes: 1 addition & 1 deletion src/Illuminate/Events/Dispatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ protected function propagateListenerOptions($listener, $job)
$job->shouldBeEncrypted = $listener instanceof ShouldBeEncrypted;
$job->timeout = $listener->timeout ?? null;
$job->failOnTimeout = $listener->failOnTimeout ?? false;
$job->tries = $listener->tries ?? null;
$job->tries = method_exists($listener, 'tries') ? $listener->tries(...$data) : ($listener->tries ?? null);

$job->through(array_merge(
method_exists($listener, 'middleware') ? $listener->middleware(...$data) : [],
Expand Down
23 changes: 23 additions & 0 deletions tests/Events/QueuedEventsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,24 @@ public function testQueuePropagateRetryUntilAndMaxExceptions()
});
}

public function testQueuePropagateTries()
{
$d = new Dispatcher;

$fakeQueue = new QueueFake(new Container);

$d->setQueueResolver(function () use ($fakeQueue) {
return $fakeQueue;
});

$d->listen('some.event', TestDispatcherOptions::class.'@handle');
$d->dispatch('some.event', ['foo', 'bar']);

$fakeQueue->assertPushed(CallQueuedListener::class, function ($job) {
return $job->tries === 5;
});
}

public function testQueuePropagateMiddleware()
{
$d = new Dispatcher;
Expand Down Expand Up @@ -294,6 +312,11 @@ public function retryUntil()
return now()->addHour(1);
}

public function tries()
{
return 5;
}

public function handle()
{
//
Expand Down