[9.x] Passing event into viaQueue and viaConnection of Queued Listener (#44080)

* Queue dispatcher patch

* Fixed CI style

Author: sethsandaru

src/Illuminate/Events/Dispatcher.php

@@ -579,11 +579,11 @@ protected function queueHandler($class, $method, $arguments)
         [$listener, $job] = $this->createListenerAndJob($class, $method, $arguments);
 
         $connection = $this->resolveQueue()->connection(method_exists($listener, 'viaConnection')
-                    ? $listener->viaConnection()
+                    ? $listener->viaConnection($arguments[0])
                     : $listener->connection ?? null);
 
         $queue = method_exists($listener, 'viaQueue')
-                    ? $listener->viaQueue()
+                    ? $listener->viaQueue($arguments[0])
                     : $listener->queue ?? null;
 
         isset($listener->delay)

tests/Events/QueuedEventsTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Events\CallQueuedListener;
 use Illuminate\Events\Dispatcher;
+use Illuminate\Queue\QueueManager;
 use Illuminate\Support\Testing\Fakes\QueueFake;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -84,6 +85,48 @@ public function testQueueIsSetByGetConnection()
         $d->dispatch('some.event', ['foo', 'bar']);
     }
 
+    public function testQueueIsSetByGetQueueDynamically()
+    {
+        $d = new Dispatcher;
+
+        $fakeQueue = new QueueFake(new Container);
+
+        $d->setQueueResolver(function () use ($fakeQueue) {
+            return $fakeQueue;
+        });
+
+        $d->listen('some.event', TestDispatcherGetQueueDynamically::class.'@handle');
+        $d->dispatch('some.event', [['useHighPriorityQueue' => true], 'bar']);
+
+        $fakeQueue->assertPushedOn('p0', CallQueuedListener::class);
+    }
+
+    public function testQueueIsSetByGetConnectionDynamically()
+    {
+        $d = new Dispatcher;
+        $queueManager = $this->createMock(QueueManager::class);
+        $queue = $this->createMock(Queue::class);
+
+        $queueManager->expects($this->once())
+            ->method('connection')
+            ->with('redis')
+            ->willReturn($queue);
+
+        $queue->expects($this->once())
+            ->method('pushOn')
+            ->with(null, $this->isInstanceOf(CallQueuedListener::class));
+
+        $d->setQueueResolver(function () use ($queueManager) {
+            return $queueManager;
+        });
+
+        $d->listen('some.event', TestDispatcherGetConnectionDynamically::class.'@handle');
+        $d->dispatch('some.event', [
+            ['shouldUseRedisConnection' => true],
+            'bar',
+        ]);
+    }
+
     public function testQueuePropagateRetryUntilAndMaxExceptions()
     {
         $d = new Dispatcher;
@@ -220,3 +263,39 @@ public function handle($job, $next)
         $next($job);
     }
 }
+
+class TestDispatcherGetConnectionDynamically implements ShouldQueue
+{
+    public function handle()
+    {
+        //
+    }
+
+    public function viaConnection($event)
+    {
+        if ($event['shouldUseRedisConnection']) {
+            return 'redis';
+        }
+
+        return 'sqs';
+    }
+}
+
+class TestDispatcherGetQueueDynamically implements ShouldQueue
+{
+    public $queue = 'my_queue';
+
+    public function handle()
+    {
+        //
+    }
+
+    public function viaQueue($event)
+    {
+        if ($event['useHighPriorityQueue']) {
+            return 'p0';
+        }
+
+        return 'p99';
+    }
+}