use tries as the property

laravel · Nov 4, 2016 · ee385fa · ee385fa
1 parent 2382dc3
commit ee385fa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/Illuminate/Queue/Jobs/Job.php b/src/Illuminate/Queue/Jobs/Job.php
@@ -239,9 +239,9 @@ public function payload()
      *
      * @return int|null
      */
-    public function retries()
+    public function maxTries()
     {
-        return array_get($this->payload(), 'retries');
+        return array_get($this->payload(), 'maxTries');
     }
 
     /**

diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php
@@ -81,7 +81,7 @@ protected function createPayload($job, $data = '', $queue = null)
         if (is_object($job)) {
             $payload = json_encode([
                 'job' => 'Illuminate\Queue\CallQueuedHandler@call',
-                'retries' => isset($job->retries) ? $job->retries : null,
+                'maxTries' => isset($job->tries) ? $job->tries : null,
                 'timeout' => isset($job->timeout) ? $job->timeout : null,
                 'data' => [
                     'commandName' => get_class($job),

diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -281,7 +281,7 @@ protected function handleJobException($connectionName, $job, WorkerOptions $opti
      */
     protected function markJobAsFailedIfAlreadyExceedsMaxAttempts($connectionName, $job, $maxTries)
     {
-        $maxTries = ! is_null($job->retries()) ? $job->retries() : $maxTries;
+        $maxTries = ! is_null($job->maxTries()) ? $job->maxTries() : $maxTries;
 
         if ($maxTries === 0 || $job->attempts() <= $maxTries) {
             return;
@@ -308,7 +308,7 @@ protected function markJobAsFailedIfAlreadyExceedsMaxAttempts($connectionName, $
     protected function markJobAsFailedIfHasExceededMaxAttempts(
         $connectionName, $job, $maxTries, $e
     ) {
-        $maxTries = ! is_null($job->retries()) ? $job->retries() : $maxTries;
+        $maxTries = ! is_null($job->maxTries()) ? $job->maxTries() : $maxTries;
 
         if ($maxTries === 0 || $job->attempts() < $maxTries) {
             return;

diff --git a/tests/Queue/QueueWorkerTest.php b/tests/Queue/QueueWorkerTest.php
@@ -136,7 +136,7 @@ public function test_job_based_max_retries()
         });
         $job->attempts = 2;
 
-        $job->retries = 10;
+        $job->maxTries = 10;
 
         $worker = $this->getWorker('default', ['queue' => [$job]]);
         $worker->runNextJob('default', 'queue', $this->workerOptions(['maxTries' => 1]));
@@ -239,7 +239,7 @@ class WorkerFakeJob
     public $callback;
     public $deleted = false;
     public $releaseAfter;
-    public $retries;
+    public $maxTries;
     public $attempts = 0;
     public $failedWith;
 
@@ -260,9 +260,9 @@ public function payload()
         return [];
     }
 
-    public function retries()
+    public function maxTries()
     {
-        return $this->retries;
+        return $this->maxTries;
     }
 
     public function delete()