Fix laravel/framework#56317 laravel/framework#54261 & laravel/framework#56318 & improve laravel/framework#54000

Author: Admin

illuminate/Bus/UniqueLock.php

@@ -3,8 +3,6 @@
 namespace Illuminate\Bus;
 
 use Illuminate\Contracts\Cache\Repository as Cache;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Queue\SerializesModels;
 
 class UniqueLock
 {
@@ -34,13 +32,6 @@ public function __construct(Cache $cache)
      */
     public function acquire($job): bool
     {
-        if (
-            $job instanceof ShouldBeUnique
-            && \in_array(SerializesModels::class, \class_uses_recursive($job::class), true)
-        ) {
-            throw new \RuntimeException('ShouldBeUnique not supported in combination with SerializesModels');
-        }
-
         $uniqueFor = method_exists($job, 'uniqueFor')
             ? $job->uniqueFor()
             : ($job->uniqueFor ?? 0);
@@ -72,12 +63,22 @@ public function release($job): void
      *
      * @param mixed $job
      */
-    protected function getKey($job): string
+    public static function getKey($job): string
     {
         $uniqueId = method_exists($job, 'uniqueId')
             ? $job->uniqueId()
             : ($job->uniqueId ?? '');
 
         return 'laravel_unique_job:' . get_class($job) . $uniqueId;
     }
+
+    /**
+     * Determine the cache store used by the unique job to acquire locks.
+     */
+    public static function getUniqueJobCacheStore(mixed $job): ?string
+    {
+        return \method_exists($job, 'uniqueVia')
+            ? $job->uniqueVia()->getName()
+            : \config('cache.default');
+    }
 }

illuminate/Queue/CallQueuedHandler.php

@@ -6,6 +6,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Bus\UniqueLock;
 use Illuminate\Contracts\Bus\Dispatcher;
+use Illuminate\Contracts\Cache\Factory as CacheFactory;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Encryption\Encrypter;
@@ -250,6 +251,8 @@ protected function handleModelNotFound(Job $job, $e)
             $shouldDelete = false;
         }
 
+        $this->ensureUniqueJobLockIsReleasedViaJobPayload($job);
+
         if ($shouldDelete) {
             $job->delete();
 
@@ -259,6 +262,26 @@ protected function handleModelNotFound(Job $job, $e)
         $job->fail($e);
     }
 
+    /**
+     * Ensure the lock for a unique job is released via job payload.
+     *
+     * This is required when we can't unserialize the job due to missing models.
+     */
+    protected function ensureUniqueJobLockIsReleasedViaJobPayload(Job $job): void
+    {
+        $store = $job->payload()['uniqueJobCacheStore'] ?? '';
+        $key = $job->payload()['uniqueJobKey'] ?? '';
+
+        if ('' === $store || '' === $key) {
+            return;
+        }
+
+        $this->container->make(CacheFactory::class)
+            ->store($store)
+            ->lock($key)
+            ->forceRelease();
+    }
+
     /**
      * Call the failed method on the job instance.
      *

illuminate/Queue/Queue.php

@@ -4,9 +4,11 @@
 
 use Closure;
 use DateTimeInterface;
+use Illuminate\Bus\UniqueLock;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Queue\ShouldBeEncrypted;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
 use Illuminate\Queue\Events\JobQueued;
 use Illuminate\Queue\Events\JobQueueing;
@@ -104,6 +106,13 @@ protected function createPayload($job, $queue, $data = '')
             $job = CallQueuedClosure::create($job);
         }
 
+        if ($job instanceof ShouldBeUnique) {
+            self::createPayloadUsing(fn (): array => [
+                'uniqueJobKey' => UniqueLock::getKey($job),
+                'uniqueJobCacheStore' => UniqueLock::getUniqueJobCacheStore($job)
+            ]);
+        }
+
         $payload = json_encode($value = $this->createPayloadArray($job, $queue, $data), \JSON_UNESCAPED_UNICODE);
 
         if (json_last_error() !== JSON_ERROR_NONE) {

src/Bus/PendingDispatch.php

@@ -2,11 +2,11 @@
 
 namespace Laravel\Lumen\Bus;
 
+use Illuminate\Bus\UniqueLock;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Bus\Dispatcher;
 use Illuminate\Contracts\Cache\Repository as Cache;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Queue\SerializesModels;
 
 class PendingDispatch
 {
@@ -17,6 +17,14 @@ class PendingDispatch
      */
     protected $job;
 
+    /**
+     * Indicates if the job should be dispatched immediately after sending the response.
+     *
+     * @var bool
+     */
+    protected $afterResponse = false;
+
+
     /**
      * Create a new pending job dispatch.
      *
@@ -54,34 +62,32 @@ public function onQueue($queue)
         return $this;
     }
 
+    /**
+     * Indicate that the job should be dispatched after the response is sent to the browser.
+     */
+    public function afterResponse(): static
+    {
+        $this->afterResponse = true;
+
+        return $this;
+    }
+
     /**
      * Determine if the job should be dispatched.
      *
      * @return bool
      * @throws \RuntimeException
+     * @throws \ReflectionException
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     protected function shouldDispatch(): bool
     {
         if (!$this->job instanceof ShouldBeUnique) {
             return true;
         }
 
-        if (\in_array(SerializesModels::class, \class_uses_recursive($this->job::class), true)) {
-            throw new \RuntimeException('ShouldBeUnique not supported in combination with SerializesModels');
-        }
-
-        $uniqueId = method_exists($this->job, 'uniqueId')
-            ? $this->job->uniqueId()
-            : ($this->job->uniqueId ?? '');
-
-        $cache = method_exists($this->job, 'uniqueVia')
-            ? $this->job->uniqueVia()
-            : Container::getInstance()->make(Cache::class);
-
-        return (bool)$cache->lock(
-            $key = 'laravel_unique_job:' . get_class($this->job) . $uniqueId,
-            $this->job->uniqueFor ?? 0
-        )->get();
+        return (new UniqueLock(Container::getInstance()->make(Cache::class)))
+            ->acquire($this->job);
     }
 
     /**
@@ -93,6 +99,8 @@ public function __destruct()
     {
         if (!$this->shouldDispatch()) {
             return;
+        } elseif ($this->afterResponse) {
+            app(Dispatcher::class)->dispatchAfterResponse($this->job);
         } else {
             app(Dispatcher::class)->dispatch($this->job);
         }