From 019ab5b78d0894c12c53300f0eef98aeef9f6a83 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Wed, 2 Oct 2024 10:06:39 +0400 Subject: [PATCH] prevent calling tries twice --- src/Illuminate/Queue/Queue.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php index 7b08da689dae..b93f4053a0c1 100755 --- a/src/Illuminate/Queue/Queue.php +++ b/src/Illuminate/Queue/Queue.php @@ -143,7 +143,7 @@ protected function createObjectPayload($job, $queue) 'uuid' => (string) Str::uuid(), 'displayName' => $this->getDisplayName($job), 'job' => 'Illuminate\Queue\CallQueuedHandler@call', - 'maxTries' => $this->getJobTries($job) ?? null, + 'maxTries' => $this->getJobTries($job), 'maxExceptions' => $job->maxExceptions ?? null, 'failOnTimeout' => $job->failOnTimeout ?? false, 'backoff' => $this->getJobBackoff($job), @@ -191,13 +191,11 @@ public function getJobTries($job) return; } - if (isset($job->tries)) { - return $job->tries; + if (is_null($tries = $job->tries ?? $job->tries())) { + return; } - if (method_exists($job, 'tries') && ! is_null($job->tries())) { - return $job->tries(); - } + return $tries; } /**