Set the job instance when creating a new instance of command after failure

willrowe · willrowe · commit 6fffe415c022 · 2025-04-30T19:56:10.000-04:00
diff --git a/src/Illuminate/Queue/CallQueuedHandler.php b/src/Illuminate/Queue/CallQueuedHandler.php
@@ -276,10 +276,14 @@ protected function ensureUniqueJobLockIsReleasedViaContext()
      * @param  string  $uuid
      * @return void
      */
-    public function failed(array $data, $e, string $uuid)
+    public function failed(array $data, $e, string $uuid, Job|null $job = null)
     {
         $command = $this->getCommand($data);
 
+        if (! is_null($job)) {
+            $command = $this->setJobInstanceIfNecessary($job, $command);
+        }
+
         if (! $command instanceof ShouldBeUniqueUntilProcessing) {
             $this->ensureUniqueJobLockIsReleased($command);
         }
diff --git a/src/Illuminate/Queue/Jobs/Job.php b/src/Illuminate/Queue/Jobs/Job.php
@@ -251,7 +251,7 @@ protected function failed($e)
         [$class, $method] = JobName::parse($payload['job']);
 
         if (method_exists($this->instance = $this->resolve($class), 'failed')) {
-            $this->instance->failed($payload['data'], $e, $payload['uuid'] ?? '');
+            $this->instance->failed($payload['data'], $e, $payload['uuid'] ?? '', $this);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ protected function failed($e)`
`251`	`251`	`[$class, $method] = JobName::parse($payload['job']);`
`252`	`252`
`253`	`253`	`if (method_exists($this->instance = $this->resolve($class), 'failed')) {`
`254`		`- $this->instance->failed($payload['data'], $e, $payload['uuid'] ?? '');`
	`254`	`+ $this->instance->failed($payload['data'], $e, $payload['uuid'] ?? '', $this);`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`