Combined Conditions

Author: luke-

src/Queue.php

@@ -227,12 +227,10 @@ protected function handleMessage($id, $message, $ttr, $attempt)
         list($job, $error) = $this->unserializeMessage($message);
 
         // Handle aborted jobs without thrown error
-        if ($attempt > 1) {
-            if ($job instanceof RetryableJobInterface && !$job->canRetry($attempt - 1, $error)) {
-                return true;
-            } elseif (!($job instanceof RetryableJobInterface) && $attempt > $this->attempts) {
-                return true;
-            }
+        if ($attempt > 1 &&
+            (($job instanceof RetryableJobInterface && !$job->canRetry($attempt - 1, $error))
+            || (!($job instanceof RetryableJobInterface) && $attempt > $this->attempts))) {
+            return true;
         }
 
         $event = new ExecEvent([