[8.x] Rename some queue configurations

src/Illuminate/Contracts/Queue/Job.php

@@ -125,7 +125,7 @@ public function timeout();
      *
      * @return int|null
      */
-    public function timeoutAt();
+    public function retryUntil();
 
     /**
      * Get the name of the queued job class.

src/Illuminate/Events/CallQueuedListener.php

@@ -40,18 +40,18 @@ class CallQueuedListener implements ShouldQueue
     public $tries;
 
     /**
-     * The number of seconds to wait before retrying the job.
+     * The number of seconds before a released job will be available.
      *
      * @var int
      */
-    public $retryAfter;
+    public $backoff;
 
     /**
      * The timestamp indicating when the job should timeout.
      *
      * @var int
      */
-    public $timeoutAt;
+    public $retryUntil;
 
     /**
      * The number of seconds the job can run before timing out.

src/Illuminate/Events/Dispatcher.php

@@ -524,10 +524,10 @@ protected function propagateListenerOptions($listener, $job)
     {
         return tap($job, function ($job) use ($listener) {
             $job->tries = $listener->tries ?? null;
-            $job->retryAfter = method_exists($listener, 'retryAfter')
-                                ? $listener->retryAfter() : ($listener->retryAfter ?? null);
+            $job->backoff = method_exists($listener, 'backoff')
+                                ? $listener->backoff() : ($listener->backoff ?? null);
             $job->timeout = $listener->timeout ?? null;
-            $job->timeoutAt = method_exists($listener, 'retryUntil')
+            $job->retryUntil = method_exists($listener, 'retryUntil')
                                 ? $listener->retryUntil() : null;
         });
     }

src/Illuminate/Mail/SendQueuedMailable.php

@@ -76,17 +76,17 @@ public function failed($e)
     }
 
     /**
-     * Get the retry delay for the mailable object.
+     * Get number of seconds before a released mailable will be available.
      *
      * @return mixed
      */
-    public function retryAfter()
+    public function backoff()
     {
-        if (! method_exists($this->mailable, 'retryAfter') && ! isset($this->mailable->retryAfter)) {
+        if (! method_exists($this->mailable, 'backoff') && ! isset($this->mailable->backoff)) {
             return;
         }
 
-        return $this->mailable->retryAfter ?? $this->mailable->retryAfter();
+        return $this->mailable->backoff ?? $this->mailable->backoff();
     }
 
     /**

src/Illuminate/Notifications/SendQueuedNotifications.php

@@ -118,17 +118,17 @@ public function failed($e)
     }
 
     /**
-     * Get the retry delay for the notification.
+     * Get number of seconds before a released notification will be available.
      *
      * @return mixed
      */
-    public function retryAfter()
+    public function backoff()
     {
-        if (! method_exists($this->notification, 'retryAfter') && ! isset($this->notification->retryAfter)) {
+        if (! method_exists($this->notification, 'backoff') && ! isset($this->notification->backoff)) {
             return;
         }
 
-        return $this->notification->retryAfter ?? $this->notification->retryAfter();
+        return $this->notification->backoff ?? $this->notification->backoff();
     }
 
     /**
@@ -138,11 +138,11 @@ public function retryAfter()
      */
     public function retryUntil()
     {
-        if (! method_exists($this->notification, 'retryUntil') && ! isset($this->notification->timeoutAt)) {
+        if (! method_exists($this->notification, 'retryUntil') && ! isset($this->notification->retryUntil)) {
             return;
         }
 
-        return $this->notification->timeoutAt ?? $this->notification->retryUntil();
+        return $this->notification->retryUntil ?? $this->notification->retryUntil();
     }
 
     /**

src/Illuminate/Queue/Console/ListenCommand.php

@@ -15,7 +15,8 @@ class ListenCommand extends Command
      */
     protected $signature = 'queue:listen
                             {connection? : The name of connection}
-                            {--delay=0 : The number of seconds to delay failed jobs}
+                            {--delay=0 : The number of seconds to delay failed jobs (Deprecated)}
+                            {--backoff=0 : The number of seconds before a released job will be available}
                             {--force : Force the worker to run even in maintenance mode}
                             {--memory=128 : The memory limit in megabytes}
                             {--queue= : The queue to listen on}
@@ -91,8 +92,12 @@ protected function getQueue($connection)
      */
     protected function gatherOptions()
     {
+        $backoff = $this->hasOption('backoff')
+                ? $this->option('backoff')
+                : $this->option('delay');
+
         return new ListenerOptions(
-            $this->option('env'), $this->option('delay'),
+            $this->option('env'), $backoff,
             $this->option('memory'), $this->option('timeout'),
             $this->option('sleep'), $this->option('tries'),
             $this->option('force')

src/Illuminate/Queue/Console/WorkCommand.php

@@ -25,7 +25,8 @@ class WorkCommand extends Command
                             {--daemon : Run the worker in daemon mode (Deprecated)}
                             {--once : Only process the next job on the queue}
                             {--stop-when-empty : Stop when the queue is empty}
-                            {--delay=0 : The number of seconds to delay failed jobs}
+                            {--delay=0 : The number of seconds to delay failed jobs (Deprecated)}
+                            {--backoff=0 : The number of seconds before a released job will be available}
                             {--force : Force the worker to run even in maintenance mode}
                             {--memory=128 : The memory limit in megabytes}
                             {--sleep=3 : Number of seconds to sleep when no job is available}
@@ -120,8 +121,12 @@ protected function runWorker($connection, $queue)
      */
     protected function gatherWorkerOptions()
     {
+        $backoff = $this->hasOption('backoff')
+                    ? $this->option('backoff')
+                    : $this->option('delay');
+
         return new WorkerOptions(
-            $this->option('delay'), $this->option('memory'),
+            $backoff, $this->option('memory'),
             $this->option('timeout'), $this->option('sleep'),
             $this->option('tries'), $this->option('force'),
             $this->option('stop-when-empty')

src/Illuminate/Queue/Jobs/Job.php

@@ -266,13 +266,13 @@ public function maxExceptions()
     }
 
     /**
-     * Get the number of seconds to delay a failed job before retrying it.
+     * Get the number of seconds before a released job will be available.
      *
      * @return int|null
      */
-    public function delaySeconds()
+    public function backoff()
     {
-        return $this->payload()['delay'] ?? null;
+        return $this->payload()['backoff'] ?? $this->payload()['delay'] ?? null;
     }
 
     /**
@@ -290,9 +290,9 @@ public function timeout()
      *
      * @return int|null
      */
-    public function timeoutAt()
+    public function retryUntil()
     {
-        return $this->payload()['timeoutAt'] ?? null;
+        return $this->payload()['retryUntil'] ?? $this->payload()['timeoutAt'] ?? null;
     }
 
     /**

src/Illuminate/Queue/Listener.php

@@ -152,7 +152,7 @@ protected function createCommand($connection, $queue, ListenerOptions $options)
             $connection,
             '--once',
             "--queue={$queue}",
-            "--delay={$options->delay}",
+            "--backoff={$options->backoff}",
             "--memory={$options->memory}",
             "--sleep={$options->sleep}",
             "--tries={$options->maxTries}",

src/Illuminate/Queue/ListenerOptions.php

@@ -15,18 +15,18 @@ class ListenerOptions extends WorkerOptions
      * Create a new listener options instance.
      *
      * @param  string|null  $environment
-     * @param  int  $delay
+     * @param  int  $backoff
      * @param  int  $memory
      * @param  int  $timeout
      * @param  int  $sleep
      * @param  int  $maxTries
      * @param  bool  $force
      * @return void
      */
-    public function __construct($environment = null, $delay = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 1, $force = false)
+    public function __construct($environment = null, $backoff = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 1, $force = false)
     {
         $this->environment = $environment;
 
-        parent::__construct($delay, $memory, $timeout, $sleep, $maxTries, $force);
+        parent::__construct($backoff, $memory, $timeout, $sleep, $maxTries, $force);
     }
 }

src/Illuminate/Queue/Queue.php

@@ -132,9 +132,9 @@ protected function createObjectPayload($job, $queue)
             'job' => 'Illuminate\Queue\CallQueuedHandler@call',
             'maxTries' => $job->tries ?? null,
             'maxExceptions' => $job->maxExceptions ?? null,
-            'delay' => $this->getJobRetryDelay($job),
+            'backoff' => $this->getJobBackoff($job),
             'timeout' => $job->timeout ?? null,
-            'timeoutAt' => $this->getJobExpiration($job),
+            'retryUntil' => $this->getJobExpiration($job),
             'data' => [
                 'commandName' => $job,
                 'command' => $job,
@@ -162,21 +162,21 @@ protected function getDisplayName($job)
     }
 
     /**
-     * Get the retry delay for an object-based queue handler.
+     * Get the backoff for an object-based queue handler.
      *
      * @param  mixed  $job
      * @return mixed
      */
-    public function getJobRetryDelay($job)
+    public function getJobBackoff($job)
     {
-        if (! method_exists($job, 'retryAfter') && ! isset($job->retryAfter)) {
+        if (! method_exists($job, 'backoff') && ! isset($job->backoff)) {
             return;
         }
 
-        $delay = $job->retryAfter ?? $job->retryAfter();
+        $backoff = $job->backoff ?? $job->backoff();
 
-        return $delay instanceof DateTimeInterface
-                        ? $this->secondsUntil($delay) : $delay;
+        return $backoff instanceof DateTimeInterface
+                        ? $this->secondsUntil($backoff) : $backoff;
     }
 
     /**
@@ -187,11 +187,11 @@ public function getJobRetryDelay($job)
      */
     public function getJobExpiration($job)
     {
-        if (! method_exists($job, 'retryUntil') && ! isset($job->timeoutAt)) {
+        if (! method_exists($job, 'retryUntil') && ! isset($job->retryUntil)) {
             return;
         }
 
-        $expiration = $job->timeoutAt ?? $job->retryUntil();
+        $expiration = $job->retryUntil ?? $job->retryUntil();
 
         return $expiration instanceof DateTimeInterface
                         ? $expiration->getTimestamp() : $expiration;
@@ -213,7 +213,7 @@ protected function createStringPayload($job, $queue, $data)
             'job' => $job,
             'maxTries' => null,
             'maxExceptions' => null,
-            'delay' => null,
+            'backoff' => null,
             'timeout' => null,
             'data' => $data,
         ]);

src/Illuminate/Queue/Worker.php

@@ -397,9 +397,9 @@ protected function handleJobException($connectionName, $job, WorkerOptions $opti
             // another listener (or this same one). We will re-throw this exception after.
             if (! $job->isDeleted() && ! $job->isReleased() && ! $job->hasFailed()) {
                 $job->release(
-                    method_exists($job, 'delaySeconds') && ! is_null($job->delaySeconds())
-                                ? $job->delaySeconds()
-                                : $options->delay
+                    method_exists($job, 'backoff') && ! is_null($job->backoff())
+                                ? $job->backoff()
+                                : $options->backoff
                 );
             }
         }
@@ -421,13 +421,13 @@ protected function markJobAsFailedIfAlreadyExceedsMaxAttempts($connectionName, $
     {
         $maxTries = ! is_null($job->maxTries()) ? $job->maxTries() : $maxTries;
 
-        $timeoutAt = $job->timeoutAt();
+        $retryUntil = $job->retryUntil();
 
-        if ($timeoutAt && Carbon::now()->getTimestamp() <= $timeoutAt) {
+        if ($retryUntil && Carbon::now()->getTimestamp() <= $retryUntil) {
             return;
         }
 
-        if (! $timeoutAt && ($maxTries === 0 || $job->attempts() <= $maxTries)) {
+        if (! $retryUntil && ($maxTries === 0 || $job->attempts() <= $maxTries)) {
             return;
         }
 
@@ -449,7 +449,7 @@ protected function markJobAsFailedIfWillExceedMaxAttempts($connectionName, $job,
     {
         $maxTries = ! is_null($job->maxTries()) ? $job->maxTries() : $maxTries;
 
-        if ($job->timeoutAt() && $job->timeoutAt() <= Carbon::now()->getTimestamp()) {
+        if ($job->retryUntil() && $job->retryUntil() <= Carbon::now()->getTimestamp()) {
             $this->failJob($job, $e);
         }
 

src/Illuminate/Queue/WorkerOptions.php

@@ -9,7 +9,7 @@ class WorkerOptions
      *
      * @var int
      */
-    public $delay;
+    public $backoff;
 
     /**
      * The maximum amount of RAM the worker may consume.
@@ -56,7 +56,7 @@ class WorkerOptions
     /**
      * Create a new worker options instance.
      *
-     * @param  int  $delay
+     * @param  int  $backoff
      * @param  int  $memory
      * @param  int  $timeout
      * @param  int  $sleep
@@ -65,9 +65,9 @@ class WorkerOptions
      * @param  bool  $stopWhenEmpty
      * @return void
      */
-    public function __construct($delay = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 1, $force = false, $stopWhenEmpty = false)
+    public function __construct($backoff = 0, $memory = 128, $timeout = 60, $sleep = 3, $maxTries = 1, $force = false, $stopWhenEmpty = false)
     {
-        $this->delay = $delay;
+        $this->backoff = $backoff;
         $this->sleep = $sleep;
         $this->force = $force;
         $this->memory = $memory;

tests/Queue/QueueBeanstalkdQueueTest.php

@@ -30,7 +30,7 @@ public function testPushProperlyPushesJobOntoBeanstalkd()
         $pheanstalk = $queue->getPheanstalk();
         $pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
         $pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
-        $pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]), 1024, 0, 60);
+        $pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), 1024, 0, 60);
 
         $queue->push('foo', ['data'], 'stack');
         $queue->push('foo', ['data']);
@@ -50,7 +50,7 @@ public function testDelayedPushProperlyPushesJobOntoBeanstalkd()
         $pheanstalk = $queue->getPheanstalk();
         $pheanstalk->shouldReceive('useTube')->once()->with('stack')->andReturn($pheanstalk);
         $pheanstalk->shouldReceive('useTube')->once()->with('default')->andReturn($pheanstalk);
-        $pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]), Pheanstalk::DEFAULT_PRIORITY, 5, Pheanstalk::DEFAULT_TTR);
+        $pheanstalk->shouldReceive('put')->twice()->with(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), Pheanstalk::DEFAULT_PRIORITY, 5, Pheanstalk::DEFAULT_TTR);
 
         $queue->later(5, 'foo', ['data'], 'stack');
         $queue->later(5, 'foo', ['data']);

tests/Queue/QueueDatabaseQueueUnitTest.php

@@ -31,7 +31,7 @@ public function testPushProperlyPushesJobOntoDatabase()
         $database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
         $query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
             $this->assertSame('default', $array['queue']);
-            $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
+            $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
             $this->assertEquals(0, $array['attempts']);
             $this->assertNull($array['reserved_at']);
             $this->assertIsInt($array['available_at']);
@@ -59,7 +59,7 @@ public function testDelayedPushProperlyPushesJobOntoDatabase()
         $database->shouldReceive('table')->with('table')->andReturn($query = m::mock(stdClass::class));
         $query->shouldReceive('insertGetId')->once()->andReturnUsing(function ($array) use ($uuid) {
             $this->assertSame('default', $array['queue']);
-            $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
+            $this->assertEquals(json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]), $array['payload']);
             $this->assertEquals(0, $array['attempts']);
             $this->assertNull($array['reserved_at']);
             $this->assertIsInt($array['available_at']);
@@ -119,14 +119,14 @@ public function testBulkBatchPushesOntoDatabase()
         $query->shouldReceive('insert')->once()->andReturnUsing(function ($records) use ($uuid) {
             $this->assertEquals([[
                 'queue' => 'queue',
-                'payload' => json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]),
+                'payload' => json_encode(['uuid' => $uuid, 'displayName' => 'foo', 'job' => 'foo', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]),
                 'attempts' => 0,
                 'reserved_at' => null,
                 'available_at' => 'available',
                 'created_at' => 'created',
             ], [
                 'queue' => 'queue',
-                'payload' => json_encode(['uuid' => $uuid, 'displayName' => 'bar', 'job' => 'bar', 'maxTries' => null, 'maxExceptions' => null, 'delay' => null, 'timeout' => null, 'data' => ['data']]),
+                'payload' => json_encode(['uuid' => $uuid, 'displayName' => 'bar', 'job' => 'bar', 'maxTries' => null, 'maxExceptions' => null, 'backoff' => null, 'timeout' => null, 'data' => ['data']]),
                 'attempts' => 0,
                 'reserved_at' => null,
                 'available_at' => 'available',