DowngradeTo74: Fix rector rule if ReflectionClass is nullable (#201)

* Run rector * DowngradeTo74: Fix rector rule if ReflectionClass is nullable
rectorphp · Nov 3, 2023 · da60f65 · da60f65
1 parent 2d20783
commit da60f65
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 17 deletions.
diff --git a/...ector/MethodCall/DowngradeReflectionGetAttributesRector/Fixture/class_is_nullable.php.inc b/...ector/MethodCall/DowngradeReflectionGetAttributesRector/Fixture/class_is_nullable.php.inc
@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\MethodCall\DowngradeReflectionGetAttributesRector\Fixture;
+
+class SomeClass
+{
+    public function run(?\ReflectionClass $reflectionClass)
+    {
+        if ($reflectionClass->getAttributes('SomeAttribute')[0] ?? null) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DowngradePhp80\Rector\MethodCall\DowngradeReflectionGetAttributesRector\Fixture;
+
+class SomeClass
+{
+    public function run(?\ReflectionClass $reflectionClass)
+    {
+        if ((method_exists($reflectionClass, 'getAttributes') ? $reflectionClass->getAttributes('SomeAttribute') : [])[0] ?? null) {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+?>
diff --git a/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php b/rules/DowngradePhp73/Rector/List_/DowngradeListReferenceAssignmentRector.php
@@ -234,15 +234,12 @@ private function createAssignRefArrayFromListReferences(
             // Nested list. Combine with the nodes from the recursive call
             /** @var List_ $nestedList */
             $nestedList = $listItem->value;
-            $listNestedArrayIndexes = array_merge($nestedArrayIndexes, [$key]);
-            $newNodes = array_merge(
-                $newNodes,
-                $this->createAssignRefArrayFromListReferences(
-                    $nestedList->items,
-                    $exprVariable,
-                    $listNestedArrayIndexes
-                )
-            );
+            $listNestedArrayIndexes = [...$nestedArrayIndexes, $key];
+            $newNodes = [...$newNodes, ...$this->createAssignRefArrayFromListReferences(
+                $nestedList->items,
+                $exprVariable,
+                $listNestedArrayIndexes
+            )];
         }
 
         return $newNodes;

diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeContravariantArgumentTypeRector.php
@@ -173,7 +173,7 @@ private function getDifferentParamTypeFromAncestorClass(Param $param, ClassMetho
 
         // parent classes or implemented interfaces
         /** @var ClassReflection[] $parentClassReflections */
-        $parentClassReflections = array_merge($classReflection->getParents(), $classReflection->getInterfaces());
+        $parentClassReflections = [...$classReflection->getParents(), ...$classReflection->getInterfaces()];
 
         foreach ($parentClassReflections as $parentClassReflection) {
             $parentReflectionMethod = $this->resolveParentReflectionMethod($parentClassReflection, $methodName);

diff --git a/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php b/rules/DowngradePhp74/Rector/ClassMethod/DowngradeCovariantReturnTypeRector.php
@@ -173,7 +173,7 @@ private function resolveDifferentAncestorReturnType(
         $methodName = $this->getName($classMethod);
 
         /** @var ClassReflection[] $parentClassesAndInterfaces */
-        $parentClassesAndInterfaces = array_merge($classReflection->getParents(), $classReflection->getInterfaces());
+        $parentClassesAndInterfaces = [...$classReflection->getParents(), ...$classReflection->getInterfaces()];
 
         return $this->resolveMatchingReturnType($parentClassesAndInterfaces, $methodName, $classMethod, $returnType);
     }

diff --git a/rules/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector.php b/rules/DowngradePhp74/Rector/Interface_/DowngradePreviouslyImplementedInterfaceRector.php
@@ -89,10 +89,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            $collectInterfaces = array_merge(
-                $collectInterfaces,
-                $this->familyRelationsAnalyzer->getClassLikeAncestorNames($extend)
-            );
+            $collectInterfaces = [
+                ...$collectInterfaces,
+                ...$this->familyRelationsAnalyzer->getClassLikeAncestorNames($extend),
+            ];
         }
 
         if (! $isCleaned) {

diff --git a/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php b/rules/DowngradePhp80/Rector/Class_/DowngradePropertyPromotionRector.php
@@ -193,7 +193,7 @@ private function addPropertyAssignsToConstructorClassMethod(
 
         /** @var ClassMethod $constructorClassMethod */
         $constructorClassMethod = $class->getMethod(MethodName::CONSTRUCT);
-        $constructorClassMethod->stmts = array_merge($assigns, (array) $constructorClassMethod->stmts);
+        $constructorClassMethod->stmts = [...$assigns, ...(array) $constructorClassMethod->stmts];
     }
 
     /**

diff --git a/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector.php b/rules/DowngradePhp80/Rector/MethodCall/DowngradeReflectionGetAttributesRector.php
@@ -80,7 +80,10 @@ public function refactor(Node $node): Ternary|null|int
             return null;
         }
 
-        if (! $this->isObjectType($node->var, new ObjectType('Reflector'))) {
+        if (
+            ! $this->isObjectType($node->var, new ObjectType('Reflector'))
+            && ! $this->isObjectType($node->var, new ObjectType('ReflectionClass'))
+        ) {
             return null;
         }