Merge branch '7.x' of https://github.com/lupinitylabs/framework into …

…lupinitylabs-7.x

src/Illuminate/Events/Dispatcher.php

@@ -489,7 +489,7 @@ protected function queueHandler($class, $method, $arguments)
             $listener->connection ?? null
         );
 
-        $queue = $listener->queue ?? null;
+        $queue = method_exists($listener, 'getQueue') ? $listener->getQueue() : $listener->queue ?? null;
 
         isset($listener->delay)
                     ? $connection->laterOn($queue, $listener->delay, $job)

tests/Events/QueuedEventsTest.php

@@ -50,6 +50,22 @@ public function testCustomizedQueuedEventHandlersAreQueued()
 
         $fakeQueue->assertPushedOn('my_queue', CallQueuedListener::class);
     }
+
+    public function testQueueIsSetByGetQueue()
+    {
+        $d = new Dispatcher;
+
+        $fakeQueue = new QueueFake(new Container());
+
+        $d->setQueueResolver(function () use ($fakeQueue) {
+            return $fakeQueue;
+        });
+
+        $d->listen('some.event', TestDispatcherGetQueue::class.'@handle');
+        $d->dispatch('some.event', ['foo', 'bar']);
+
+        $fakeQueue->assertPushedOn('some_other_queue', CallQueuedListener::class);
+    }
 }
 
 class TestDispatcherQueuedHandler implements ShouldQueue
@@ -73,3 +89,18 @@ public function handle()
         //
     }
 }
+
+class TestDispatcherGetQueue implements ShouldQueue
+{
+    public $queue = 'my_queue';
+
+    public function handle()
+    {
+        //
+    }
+
+    public function getQueue()
+    {
+        return 'some_other_queue';
+    }
+}