Fix

Author: samsonasik

rules-tests/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector/Fixture/on_class_constant.php.inc

@@ -24,11 +24,7 @@ abstract class OnClassConstant
 {
     private const TYPE_END_TOKENS = [')', [T_CALLABLE], [T_NS_SEPARATOR], [T_STATIC], [T_STRING], [CT::T_ARRAY_TYPEHINT]];
 
-    private const TYPE_TOKENS = [
-        '|', '&', '(', ')', [T_CALLABLE], [T_NS_SEPARATOR], [T_STATIC], [T_STRING], [CT::T_ARRAY_TYPEHINT],
-        [CT::T_TYPE_ALTERNATION], [CT::T_TYPE_INTERSECTION],
-        [T_WHITESPACE], [T_COMMENT], [T_DOC_COMMENT],
-    ];
+    private const TYPE_TOKENS = ['|', '&', '(', ')', [T_CALLABLE], [T_NS_SEPARATOR], [T_STATIC], [T_STRING], [CT::T_ARRAY_TYPEHINT], [CT::T_TYPE_ALTERNATION], [CT::T_TYPE_INTERSECTION], [T_WHITESPACE], [T_COMMENT], [T_DOC_COMMENT]];
 }
 
 ?>

rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php

@@ -12,7 +12,6 @@
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassLike;
-use PHPStan\Analyser\MutatingScope;
 use PHPStan\Type\Type;
 use Rector\DowngradePhp81\NodeAnalyzer\ArraySpreadAnalyzer;
 use Rector\DowngradePhp81\NodeFactory\ArrayMergeFromArraySpreadFactory;
@@ -23,6 +22,7 @@
 use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use PHPStan\Analyser\MutatingScope;
 
 /**
  * @changelog https://wiki.php.net/rfc/spread_operator_for_array
@@ -123,12 +123,19 @@ private function refactorUnderClassConst(ClassConst $classConst): ?ClassConst
 
         $hasChanged = false;
 
-        foreach ($arrays as $array) {
-            $refactorArrayConstValue = $this->refactorArrayConstValue($array);
+        $this->traverseNodesWithCallable($classConst->consts, function (Node $subNode) use (&$hasChanged): ?Node {
+            if (! $subNode instanceof Array_) {
+                return null;
+            }
+
+            $refactorArrayConstValue = $this->refactorArrayConstValue($subNode);
             if ($refactorArrayConstValue instanceof Array_) {
                 $hasChanged = true;
+                return $refactorArrayConstValue;
             }
-        }
+
+            return null;
+        });
 
         if ($hasChanged) {
             return $classConst;
@@ -166,9 +173,11 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
     {
         $hasChanged = false;
 
-        foreach ($array->items as $key => $item) {
+        $newArray = new Array_();
+        foreach ($array->items as $item) {
             $type = $this->resolveItemType($item);
             if (! $type instanceof FullyQualifiedObjectType) {
+                $newArray->items[] = $item;
                 continue;
             }
 
@@ -179,6 +188,7 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
             /** @var Identifier $name */
             $classLike = $this->astResolver->resolveClassFromName($type->getClassName());
             if (! $classLike instanceof ClassLike) {
+                $newArray->items[] = $item;
                 continue;
             }
 
@@ -188,16 +198,15 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
                 $const = $constant->consts[0];
 
                 if ($const->name->toString() === $name->toString() && $const->value instanceof Array_) {
-                    unset($array->items[$key]);
-                    array_splice($array->items, $key, 0, $const->value->items);
+                    $newArray->items = array_merge($newArray->items, $const->value->items);
 
                     $hasChanged = true;
                 }
             }
         }
 
         if ($hasChanged) {
-            return $array;
+            return $newArray;
         }
 
         return null;

tests/Issues/IssueDowngradeArraySpread/Fixture/merge_const.php.inc

@@ -80,30 +80,7 @@ class MergeConst
         FCT::T_PUBLIC_SET
     ];
 
-    private const EXPECTED_KINDS_PROPERTY_KINDS = [
-        \T_ABSTRACT,
-        \T_FINAL,
-        \T_PRIVATE,
-        \T_PROTECTED,
-        \T_PUBLIC,
-        \T_STATIC,
-        \T_VAR,
-        CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC,
-        CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED,
-        CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE,
-        FCT::T_READONLY,
-        FCT::T_PRIVATE_SET,
-        FCT::T_PROTECTED_SET,
-        FCT::T_PUBLIC_SET,
-        \T_STRING,
-        \T_NS_SEPARATOR,
-        CT::T_NULLABLE_TYPE,
-        CT::T_ARRAY_TYPEHINT,
-        CT::T_TYPE_ALTERNATION,
-        CT::T_TYPE_INTERSECTION,
-        CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_OPEN,
-        CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_CLOSE
-    ];
+    private const EXPECTED_KINDS_PROPERTY_KINDS = [\T_ABSTRACT, \T_FINAL, \T_PRIVATE, \T_PROTECTED, \T_PUBLIC, \T_STATIC, \T_VAR, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED, CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE, FCT::T_READONLY, FCT::T_PRIVATE_SET, FCT::T_PROTECTED_SET, FCT::T_PUBLIC_SET, \T_STRING, \T_NS_SEPARATOR, CT::T_NULLABLE_TYPE, CT::T_ARRAY_TYPEHINT, CT::T_TYPE_ALTERNATION, CT::T_TYPE_INTERSECTION, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_OPEN, CT::T_DISJUNCTIVE_NORMAL_FORM_TYPE_PARENTHESIS_CLOSE];
 }
 
 ?>