clean up

rectorphp · Jul 20, 2024 · b429662 · b429662
1 parent f937ddd
commit b429662
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/rules/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector.php b/rules/CodeQuality/Rector/Foreach_/UnusedForeachValueToArrayKeysRector.php
@@ -96,6 +96,10 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
+            if (! $this->isArrayType($stmt->expr)) {
+                continue;
+            }
+
             // special case of nested array items
             if ($stmt->valueVar instanceof Array_) {
                 $valueArray = $this->refactorArrayForeachValue($stmt->valueVar, $stmt);
@@ -113,23 +117,19 @@ public function refactor(Node $node): ?Node
                 continue;
             }
 
-            if ($stmt->valueVar instanceof Variable) {
-                if ($this->isVariableUsedInForeach($stmt->valueVar, $stmt)) {
-                    continue;
-                }
+            if (! $stmt->valueVar instanceof Variable) {
+                continue;
+            }
 
-                if ($this->stmtsManipulator->isVariableUsedInNextStmt(
-                    $stmts,
-                    $key + 1,
-                    (string) $this->getName($stmt->valueVar)
-                )) {
-                    continue;
-                }
-            } else {
+            if ($this->isVariableUsedInForeach($stmt->valueVar, $stmt)) {
                 continue;
             }
 
-            if (! $this->isArrayType($stmt->expr)) {
+            if ($this->stmtsManipulator->isVariableUsedInNextStmt(
+                $stmts,
+                $key + 1,
+                (string) $this->getName($stmt->valueVar)
+            )) {
                 continue;
             }