Merge remote-tracking branch 'refs/remotes/upstream/master' into update_branche_30

# Conflicts:
#	src/Queue.php

Author: s1lver

CHANGELOG.md

@@ -5,7 +5,7 @@ Yii2 Queue Extension Change Log
 -----------------------
 - Enh #516: Ensure Redis driver messages are consumed at least once (soul11201)
 - Bug #522: Fix SQS driver type error with custom value passed to `queue/listen` (flaviovs)
-
+- Bug #528: Prevent multiple execution of aborted jobs (luke-)
 
 2.3.7 April 29, 2024
 --------------------

src/Queue.php

@@ -209,6 +209,12 @@ public function getWorkerPid(): ?int
     protected function handleMessage(int|string $id, string $message, int $ttr, int $attempt): bool
     {
         [$job, $error] = $this->unserializeMessage($message);
+        // Handle aborted jobs without throwing an error.
+        if ($attempt > 1 &&
+            (($job instanceof RetryableJobInterface && !$job->canRetry($attempt - 1, $error))
+                || (!($job instanceof RetryableJobInterface) && $attempt > $this->attempts))) {
+            return true;
+        }
         $event = new ExecEvent([
             'id' => $id,
             'job' => $job,