From b40d1d002321f5f210f9448d7e71a4d82d1b70ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=ABl=20Hagestein?=
 <6616996+Neol3108@users.noreply.github.com>
Date: Wed, 17 Jan 2024 20:40:34 +0100
Subject: [PATCH] Add DeleteWhenMissingModels attribute

---
 .../Attributes/DeleteWhenMissingModels.php    | 11 ++++++
 src/Illuminate/Queue/CallQueuedHandler.php    |  7 ++--
 .../Queue/CallQueuedHandlerTest.php           | 36 +++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 src/Illuminate/Queue/Attributes/DeleteWhenMissingModels.php

diff --git a/src/Illuminate/Queue/Attributes/DeleteWhenMissingModels.php b/src/Illuminate/Queue/Attributes/DeleteWhenMissingModels.php
new file mode 100644
index 000000000000..d4c10261a512
--- /dev/null
+++ b/src/Illuminate/Queue/Attributes/DeleteWhenMissingModels.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Illuminate\Queue\Attributes;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class DeleteWhenMissingModels
+{
+    //
+}
diff --git a/src/Illuminate/Queue/CallQueuedHandler.php b/src/Illuminate/Queue/CallQueuedHandler.php
index 5bee1d9ebb4c..4f2e9e9ce9ef 100644
--- a/src/Illuminate/Queue/CallQueuedHandler.php
+++ b/src/Illuminate/Queue/CallQueuedHandler.php
@@ -14,6 +14,7 @@
 use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Pipeline\Pipeline;
+use Illuminate\Queue\Attributes\DeleteWhenMissingModels;
 use ReflectionClass;
 use RuntimeException;
 
@@ -218,8 +219,10 @@ protected function handleModelNotFound(Job $job, $e)
         $class = $job->resolveName();
 
         try {
-            $shouldDelete = (new ReflectionClass($class))
-                    ->getDefaultProperties()['deleteWhenMissingModels'] ?? false;
+            $reflectionClass = new ReflectionClass($class);
+
+            $shouldDelete = $reflectionClass->getDefaultProperties()['deleteWhenMissingModels']
+                ?? count($reflectionClass->getAttributes(DeleteWhenMissingModels::class)) !== 0;
         } catch (Exception) {
             $shouldDelete = false;
         }
diff --git a/tests/Integration/Queue/CallQueuedHandlerTest.php b/tests/Integration/Queue/CallQueuedHandlerTest.php
index bd4a179322ac..8afa8fe9e025 100644
--- a/tests/Integration/Queue/CallQueuedHandlerTest.php
+++ b/tests/Integration/Queue/CallQueuedHandlerTest.php
@@ -6,6 +6,7 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\Job;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Queue\Attributes\DeleteWhenMissingModels;
 use Illuminate\Queue\CallQueuedHandler;
 use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Queue\InteractsWithQueue;
@@ -117,6 +118,27 @@ public function testJobIsDeletedIfHasDeleteProperty()
 
         Event::assertNotDispatched(JobFailed::class);
     }
+
+    public function testJobIsDeletedIfHasDeleteAttribute()
+    {
+        Event::fake();
+
+        $instance = new CallQueuedHandler(new Dispatcher($this->app), $this->app);
+
+        $job = m::mock(Job::class);
+        $job->shouldReceive('getConnectionName')->andReturn('connection');
+        $job->shouldReceive('resolveName')->andReturn(CallQueuedHandlerAttributeExceptionThrower::class);
+        $job->shouldReceive('markAsFailed')->never();
+        $job->shouldReceive('isDeleted')->andReturn(false);
+        $job->shouldReceive('delete')->once();
+        $job->shouldReceive('failed')->never();
+
+        $instance->call($job, [
+            'command' => serialize(new CallQueuedHandlerAttributeExceptionThrower()),
+        ]);
+
+        Event::assertNotDispatched(JobFailed::class);
+    }
 }
 
 class CallQueuedHandlerTestJob
@@ -179,6 +201,20 @@ public function __wakeup()
     }
 }
 
+#[DeleteWhenMissingModels]
+class CallQueuedHandlerAttributeExceptionThrower
+{
+    public function handle()
+    {
+        //
+    }
+
+    public function __wakeup()
+    {
+        throw new ModelNotFoundException('Foo');
+    }
+}
+
 class TestJobMiddleware
 {
     public function handle($command, $next)