Remove array items directly RemoveDuplicatedArrayKeyRector (#4013)

rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/Fixture/fixture.php.inc

@@ -11,12 +11,6 @@ class Fixture
             1 => 'B',
             1 => 'A'
         ];
-
-        $key = 1;
-        $items = [
-            $key => 'A',
-            $key => 'A',
-        ];
     }
 }
 
@@ -33,11 +27,6 @@ class Fixture
         $items = [
             1 => 'A'
         ];
-
-        $key = 1;
-        $items = [
-            $key => 'A',
-        ];
     }
 }
 

rules-tests/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector/Fixture/variable_key.php.inc

@@ -0,0 +1,36 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector\Fixture;
+
+class VariableKey
+{
+    public function lists()
+    {
+        $key = 1;
+
+        $items = [
+            $key => 'A',
+            $key => 'A',
+        ];
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector\Fixture;
+
+class VariableKey
+{
+    public function lists()
+    {
+        $key = 1;
+
+        $items = [
+            $key => 'A',
+        ];
+    }
+}
+
+?>

rules/DeadCode/Rector/Array_/RemoveDuplicatedArrayKeyRector.php

@@ -66,24 +66,30 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        $arrayItemsWithDuplicatedKey = $this->getArrayItemsWithDuplicatedKey($node);
-        if ($arrayItemsWithDuplicatedKey === []) {
+        $duplicatedKeysArrayItems = $this->resolveDuplicateKeysArrayItems($node);
+        if ($duplicatedKeysArrayItems === []) {
             return null;
         }
 
-        foreach ($arrayItemsWithDuplicatedKey as $arrayItemWithDuplicatedKey) {
-            // keep last item
-            array_pop($arrayItemWithDuplicatedKey);
-            $this->nodeRemover->removeNodes($arrayItemWithDuplicatedKey);
+        foreach ($node->items as $key => $arrayItem) {
+            if (! $arrayItem instanceof ArrayItem) {
+                continue;
+            }
+
+            if (! $this->isArrayItemDuplicated($duplicatedKeysArrayItems, $arrayItem)) {
+                continue;
+            }
+
+            unset($node->items[$key]);
         }
 
         return $node;
     }
 
     /**
-     * @return ArrayItem[][]
+     * @return ArrayItem[]
      */
-    private function getArrayItemsWithDuplicatedKey(Array_ $array): array
+    private function resolveDuplicateKeysArrayItems(Array_ $array): array
     {
         $arrayItemsByKeys = [];
 
@@ -104,28 +110,41 @@ private function getArrayItemsWithDuplicatedKey(Array_ $array): array
     }
 
     /**
-     * @param ArrayItem[][] $arrayItemsByKeys
-     * @return ArrayItem[][]
+     * @param array<mixed, ArrayItem[]> $arrayItemsByKeys
+     * @return array<ArrayItem>
      */
     private function filterItemsWithSameKey(array $arrayItemsByKeys): array
     {
-        $result = [];
+        $duplicatedArrayItems = [];
+
         foreach ($arrayItemsByKeys as $arrayItems) {
             if (count($arrayItems) <= 1) {
                 continue;
             }
 
             $currentArrayItem = current($arrayItems);
+
             /** @var Expr $currentArrayItemKey */
             $currentArrayItemKey = $currentArrayItem->key;
 
             if ($this->multiInstanceofChecker->isInstanceOf($currentArrayItemKey, self::ALLOWED_KEY_DUPLICATES)) {
                 continue;
             }
 
-            $result[] = $arrayItems;
+            // keep last one
+            array_pop($arrayItems);
+
+            $duplicatedArrayItems = array_merge($duplicatedArrayItems, $arrayItems);
         }
 
-        return $result;
+        return $duplicatedArrayItems;
+    }
+
+    /**
+     * @param ArrayItem[] $duplicatedKeysArrayItems
+     */
+    private function isArrayItemDuplicated(array $duplicatedKeysArrayItems, ArrayItem $arrayItem): bool
+    {
+        return in_array($arrayItem, $duplicatedKeysArrayItems, true);
     }
 }