[5.4] Add ability to set queue parameters from within a queued listener

src/Illuminate/Events/CallQueuedListener.php

@@ -32,6 +32,20 @@ class CallQueuedListener implements ShouldQueue
      */
     public $data;
 
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     *
+     * @var int
+     */
+    public $timeout;
+
     /**
      * Create a new job instance.
      *

src/Illuminate/Events/Dispatcher.php

@@ -452,13 +452,23 @@ protected function queueHandler($class, $method, $arguments)
     {
         $listener = (new ReflectionClass($class))->newInstanceWithoutConstructor();
 
+        $job = new CallQueuedListener($class, $method, $arguments);
+
         $connection = isset($listener->connection) ? $listener->connection : null;
 
         $queue = isset($listener->queue) ? $listener->queue : null;
 
-        $this->resolveQueue()
-                ->connection($connection)
-                ->pushOn($queue, new CallQueuedListener($class, $method, $arguments));
+        $job->tries = isset($listener->tries) ? $listener->tries : null;
+
+        $job->timeout = isset($listener->timeout) ? $listener->timeout : null;
+
+        $resolvedQueue = $this->resolveQueue()->connection($connection);
+
+        if (isset($listener->delay)) {
+            $resolvedQueue->laterOn($queue, $listener->delay, $job);
+        } else {
+            $resolvedQueue->pushOn($queue, $job);
+        }
     }
 
     /**