diff --git a/src/Illuminate/Events/Dispatcher.php b/src/Illuminate/Events/Dispatcher.php index ee409586efc8..c49a49d30ad7 100755 --- a/src/Illuminate/Events/Dispatcher.php +++ b/src/Illuminate/Events/Dispatcher.php @@ -21,6 +21,8 @@ use Illuminate\Support\Traits\ReflectsClosures; use ReflectionClass; +use function Illuminate\Support\enum_value; + class Dispatcher implements DispatcherContract { use Macroable, ReflectsClosures; @@ -631,8 +633,8 @@ protected function queueHandler($class, $method, $arguments) : $listener->delay ?? null; is_null($delay) - ? $connection->pushOn($queue, $job) - : $connection->laterOn($queue, $delay, $job); + ? $connection->pushOn(enum_value($queue), $job) + : $connection->laterOn(enum_value($queue), $delay, $job); } /** diff --git a/tests/Events/QueuedEventsTest.php b/tests/Events/QueuedEventsTest.php index 9724a36bdbd2..4f9ec170ba1f 100644 --- a/tests/Events/QueuedEventsTest.php +++ b/tests/Events/QueuedEventsTest.php @@ -199,6 +199,23 @@ public function testQueuePropagateMiddleware() && $job->middleware[0]->b === 'bar'; }); } + + public function testDispatchesOnQueueDefinedWithEnum() + { + $d = new Dispatcher; + $queue = m::mock(Queue::class); + + $fakeQueue = new QueueFake(new Container); + + $d->setQueueResolver(function () use ($fakeQueue) { + return $fakeQueue; + }); + + $d->listen('some.event', TestDispatcherViaQueueSupportsEnum::class.'@handle'); + $d->dispatch('some.event', ['foo', 'bar']); + + $fakeQueue->assertPushedOn('enumerated-queue', CallQueuedListener::class); + } } class TestDispatcherQueuedHandler implements ShouldQueue @@ -367,3 +384,16 @@ public function withDelay($event) return 20; } } + +enum TestQueueType: string +{ + case EnumeratedQueue = 'enumerated-queue'; +} + +class TestDispatcherViaQueueSupportsEnum implements ShouldQueue +{ + public function viaQueue() + { + return TestQueueType::EnumeratedQueue; + } +}