From a82ba204a7927b40943956c73172b4eaa7fe6866 Mon Sep 17 00:00:00 2001
From: geni_jaho <jahogeni@gmail.com>
Date: Mon, 8 Jul 2024 20:56:12 +0200
Subject: [PATCH 1/2] Fix DispatchNonShouldQueueToDispatchSyncRector for
 aliased jobs that implement ShouldQueue

---
 ...atchNonShouldQueueToDispatchSyncRector.php | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php b/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
index 849eefe6..5a8320ae 100644
--- a/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
+++ b/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
@@ -12,11 +12,11 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PHPStan\Broker\ClassNotFoundException;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
+use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -25,6 +25,14 @@
  */
 class DispatchNonShouldQueueToDispatchSyncRector extends AbstractRector
 {
+    private const string SHOULD_QUEUE_INTERFACE = 'Illuminate\Contracts\Queue\ShouldQueue';
+
+    private const string BUS_FACADE = 'Illuminate\Support\Facades\Bus';
+
+    private const string DISPATCHER_INTERFACE = 'Illuminate\Contracts\Bus\Dispatcher';
+
+    private const string DISPATCHABLE_TRAIT = 'Illuminate\Foundation\Bus\Dispatchable';
+
     public function __construct(private readonly ReflectionProvider $reflectionProvider)
     {
     }
@@ -92,20 +100,17 @@ public function refactor(Node $node): FuncCall|MethodCall|StaticCall|null
 
     private function processCall(FuncCall|MethodCall|StaticCall $call): FuncCall|MethodCall|StaticCall|null
     {
-        static $shouldQueueType = new ObjectType('Illuminate\Contracts\Queue\ShouldQueue');
-
         if (! $call->args[0] instanceof Arg) {
             return null;
         }
 
+        $objectType = new ObjectType(self::SHOULD_QUEUE_INTERFACE);
+        $argumentType = $this->getType($call->args[0]->value);
+
         if (
-            $this->getType($call->args[0]->value)->isSuperTypeOf(
-                $shouldQueueType
-            )->yes() ||
-            $this->isObjectType(
-                $call->args[0]->value,
-                $shouldQueueType
-            )
+            $argumentType->isSuperTypeOf($objectType)->yes() ||
+            $this->isObjectType($call->args[0]->value, $objectType) ||
+            $argumentType instanceof AliasedObjectType && $this->isSubclassOfShouldQueueInterface($argumentType)
         ) {
             return null;
         }
@@ -141,7 +146,7 @@ private function isDispatchablesCall(MethodCall $methodCall): bool
                 $type->getClassName()
             );
 
-            if ($this->usesDispatchablesTrait($reflection)) {
+            if ($reflection->hasTraitUse(self::DISPATCHABLE_TRAIT)) {
                 return true;
             }
 
@@ -151,22 +156,26 @@ private function isDispatchablesCall(MethodCall $methodCall): bool
         return false;
     }
 
-    private function usesDispatchablesTrait(ClassReflection $classReflection): bool
+    private function isSubclassOfShouldQueueInterface(AliasedObjectType $aliasedObjectType): bool
     {
-        return in_array(
-            'Illuminate\Foundation\Bus\Dispatchable',
-            array_keys($classReflection->getTraits(true)),
-            true
-        );
+        try {
+            $reflection = $this->reflectionProvider->getClass(
+                $aliasedObjectType->getFullyQualifiedName(),
+            );
+        } catch (ClassNotFoundException) {
+            return false;
+        }
+
+        return $reflection->isSubclassOf(self::SHOULD_QUEUE_INTERFACE);
     }
 
     private function isCallOnBusFacade(StaticCall $staticCall): bool
     {
-        return $this->isName($staticCall->class, 'Illuminate\Support\Facades\Bus');
+        return $this->isName($staticCall->class, self::BUS_FACADE);
     }
 
     private function isCallOnDispatcherContract(MethodCall $methodCall): bool
     {
-        return $this->isObjectType($methodCall->var, new ObjectType('Illuminate\Contracts\Bus\Dispatcher'));
+        return $this->isObjectType($methodCall->var, new ObjectType(self::DISPATCHER_INTERFACE));
     }
 }

From 9d78802bf9127522b14da185859dbc752b454c6f Mon Sep 17 00:00:00 2001
From: Geni Jaho <jahogeni@gmail.com>
Date: Wed, 17 Jul 2024 22:39:47 +0200
Subject: [PATCH 2/2] Use static variable in
 DispatchNonShouldQueueToDispatchSyncRector

Co-authored-by: Peter Fox <peter.fox@peterfox.me>
---
 .../FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php b/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
index 5a8320ae..29f6eddb 100644
--- a/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
+++ b/src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php
@@ -104,7 +104,7 @@ private function processCall(FuncCall|MethodCall|StaticCall $call): FuncCall|Met
             return null;
         }
 
-        $objectType = new ObjectType(self::SHOULD_QUEUE_INTERFACE);
+        static $objectType = new ObjectType(self::SHOULD_QUEUE_INTERFACE);
         $argumentType = $this->getType($call->args[0]->value);
 
         if (