[DowngradePhp74] Handle merge const on DowngradeArraySpreadStringKeyRector + DowngradeArraySpreadRector

rules/DowngradePhp74/Rector/Array_/DowngradeArraySpreadRector.php

@@ -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,7 +173,11 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
     {
         $hasChanged = false;
 
-        foreach ($array->items as $key => $item) {
+        $newArray = new Array_();
+        $newArray->setAttributes($array->getAttributes());
+
+        foreach ($array->items as $item) {
+            $newArray->items[] = $item;
             $type = $this->resolveItemType($item);
             if (! $type instanceof FullyQualifiedObjectType) {
                 continue;
@@ -188,16 +199,16 @@ 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);
+                    array_pop($newArray->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

@@ -0,0 +1,86 @@
+<?php
+
+namespace Rector\Tests\Issues\IssueDowngradeArraySpread\Fixture;
+
+use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\FCT;
+
+class MergeConst
+{
+    private const PROPERTY_TYPE_DECLARATION_KINDS = [
+        \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_GENERIC = [
+        \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
+    ];
+
+    private const EXPECTED_KINDS_PROPERTY_KINDS = [
+        ...self::EXPECTED_KINDS_GENERIC,
+        ...self::PROPERTY_TYPE_DECLARATION_KINDS
+    ];
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Issues\IssueDowngradeArraySpread\Fixture;
+
+use PhpCsFixer\Tokenizer\CT;
+use PhpCsFixer\Tokenizer\FCT;
+
+class MergeConst
+{
+    private const PROPERTY_TYPE_DECLARATION_KINDS = [
+        \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_GENERIC = [
+        \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
+    ];
+
+    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];
+}
+
+?>