Pass listener arguments to middleware method

Author: adriaanzon

src/Illuminate/Events/Dispatcher.php

@@ -612,7 +612,7 @@ protected function createListenerAndJob($class, $method, $arguments)
      * Propagate listener options to the job.
      *
      * @param  mixed  $listener
-     * @param  mixed  $job
+     * @param  \Illuminate\Events\CallQueuedListener  $job
      * @return mixed
      */
     protected function propagateListenerOptions($listener, $job)
@@ -627,7 +627,7 @@ protected function propagateListenerOptions($listener, $job)
             $job->tries = $listener->tries ?? null;
 
             $job->through(array_merge(
-                method_exists($listener, 'middleware') ? $listener->middleware() : [],
+                method_exists($listener, 'middleware') ? $listener->middleware(...$job->data) : [],
                 $listener->middleware ?? []
             ));
         });

tests/Events/QueuedEventsTest.php

@@ -116,7 +116,10 @@ public function testQueuePropagateMiddleware()
         $d->dispatch('some.event', ['foo', 'bar']);
 
         $fakeQueue->assertPushed(CallQueuedListener::class, function ($job) {
-            return count($job->middleware) === 1 && $job->middleware[0] instanceof TestMiddleware;
+            return count($job->middleware) === 1
+                && $job->middleware[0] instanceof TestMiddleware
+                && $job->middleware[0]->a === 'foo'
+                && $job->middleware[0]->b === 'bar';
         });
     }
 }
@@ -190,19 +193,28 @@ public function handle()
 
 class TestDispatcherMiddleware implements ShouldQueue
 {
-    public function middleware()
+    public function middleware($a, $b)
     {
-        return [new TestMiddleware()];
+        return [new TestMiddleware($a, $b)];
     }
 
-    public function handle()
+    public function handle($a, $b)
     {
         //
     }
 }
 
 class TestMiddleware
 {
+    public $a;
+    public $b;
+
+    public function __construct($a, $b)
+    {
+        $this->a = $a;
+        $this->b = $b;
+    }
+
     public function handle($job, $next)
     {
         $next($job);