[CodeQuality] Skip ArrayKeysAndInArrayToArrayKeyExistsRector on keys …

…variable used (#57)
rectorphp · May 17, 2021 · 2bc6ba8 · 2bc6ba8
1 parent 367879e
commit 2bc6ba8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/.../Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/skip_keys_used.php.inc b/.../Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector/Fixture/skip_keys_used.php.inc
@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector\Fixture;
+
+class SkipKeysUsed
+{
+    public function run($packageName, $values)
+    {
+        $keys = array_keys($values);
+
+        foreach($keys as $field) {
+            if ($field === 'foo') {
+                return false;
+            }
+        }
+
+        return in_array($packageName, $keys, true);
+    }
+}
diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php
@@ -69,7 +69,7 @@ public function refactor(Node $node): ?Node
         $arrayVariable = $node->args[1]->value;
 
         /** @var Assign|Node|null $previousAssignArraysKeysFuncCall */
-        $previousAssignArraysKeysFuncCall = $this->betterNodeFinder->findFirstPrevious($node, function (Node $node) use (
+        $previousAssignArraysKeysFuncCall = $this->betterNodeFinder->findFirstPreviousOfNode($node, function (Node $node) use (
             $arrayVariable
         ): bool {
             // breaking out of scope
@@ -78,7 +78,9 @@ public function refactor(Node $node): ?Node
             }
 
             if (! $node instanceof Assign) {
-                return false;
+                return ! (bool) $this->betterNodeFinder->find($node, function (Node $n) use ($arrayVariable) {
+                    return $this->nodeComparator->areNodesEqual($arrayVariable, $n);
+                });
             }
 
             if (! $this->nodeComparator->areNodesEqual($arrayVariable, $node->var)) {