Clean up repetitive recursive call and flag on ArrayKeyFirstLastRector (#6889)

samsonasik · web-flow · commit 3be6fd7636ee · 2025-05-08T22:18:12.000Z
diff --git a/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php b/rules/Php73/Rector/FuncCall/ArrayKeyFirstLastRector.php
@@ -95,7 +95,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?StmtsAwareInterface
     {
-        return $this->processArrayKeyFirstLast($node, false);
+        return $this->processArrayKeyFirstLast($node);
     }
 
     public function provideMinPhpVersion(): int
@@ -110,7 +110,6 @@ public function providePolyfillPackage(): string
 
     private function processArrayKeyFirstLast(
         StmtsAwareInterface $stmtsAware,
-        bool $hasChanged,
         int $jumpToKey = 0
     ): ?StmtsAwareInterface {
         if ($stmtsAware->stmts === null) {
@@ -154,12 +153,7 @@ private function processArrayKeyFirstLast(
             $this->changeNextKeyCall($stmtsAware, $key + 2, $resetOrEndFuncCall, $keyFuncCall->name);
 
             unset($stmtsAware->stmts[$key]);
-            $hasChanged = true;
 
-            return $this->processArrayKeyFirstLast($stmtsAware, $hasChanged, $key + 2);
-        }
-
-        if ($hasChanged) {
             return $stmtsAware;
         }
 
@@ -181,7 +175,6 @@ private function changeNextKeyCall(
             if ($stmtsAware->stmts[$nextKey] instanceof Expression && ! $this->shouldSkip($stmtsAware->stmts[$nextKey])) {
                 $this->processArrayKeyFirstLast(
                     $stmtsAware,
-                    true,
                     $nextKey
                 );
                 break;
