clean up

Author: samsonasik

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

@@ -24,7 +24,11 @@ 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

@@ -174,10 +174,12 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
         $hasChanged = false;
 
         $newArray = new Array_();
+        $newArray->setAttributes($array->getAttributes());
+
         foreach ($array->items as $item) {
+            $newArray->items[] = $item;
             $type = $this->resolveItemType($item);
             if (! $type instanceof FullyQualifiedObjectType) {
-                $newArray->items[] = $item;
                 continue;
             }
 
@@ -188,7 +190,6 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
             /** @var Identifier $name */
             $classLike = $this->astResolver->resolveClassFromName($type->getClassName());
             if (! $classLike instanceof ClassLike) {
-                $newArray->items[] = $item;
                 continue;
             }
 
@@ -198,6 +199,7 @@ private function refactorArrayConstValue(Array_ $array): ?Array_
                 $const = $constant->consts[0];
 
                 if ($const->name->toString() === $name->toString() && $const->value instanceof Array_) {
+                    array_pop($newArray->items);
                     $newArray->items = array_merge($newArray->items, $const->value->items);
 
                     $hasChanged = true;