[DeadCode] Reduce loop on RemoveDuplicatedCaseInSwitchRector (#5238)

rectorphp · Nov 10, 2023 · eac58be · eac58be
1 parent b0d4b15
commit eac58be
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/rules/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector.php b/rules/DeadCode/Rector/Switch_/RemoveDuplicatedCaseInSwitchRector.php
@@ -104,12 +104,17 @@ private function resolveInsertedByKeys(Switch_ $switch): array
         $totalKeys = count($switch->cases);
         $insertByKeys = [];
         $appendKey = 0;
+        /** @var Case_|null $previousCase */
+        $previousCase = null;
 
         foreach ($switch->cases as $key => $case) {
-            if ($case->stmts === []) {
-                continue;
+            if ($previousCase instanceof Case_ && $this->areSwitchStmtsEqualsAndWithBreak($case, $previousCase)) {
+                $previousCase->stmts = [];
+                $this->hasChanged = true;
             }
 
+            $previousCase = $case;
+
             for ($jumpToKey = $key + 2; $jumpToKey < $totalKeys; ++$jumpToKey) {
                 if (! isset($switch->cases[$jumpToKey])) {
                     continue;
@@ -143,23 +148,16 @@ private function insertCaseByKeys(Switch_ $switch, array $insertByKeys): void
             $nextKey = $key + 1;
 
             array_splice($switch->cases, $nextKey, 0, $insertByKey);
-        }
 
-        /** @var Case_|null $previousCase */
-        $previousCase = null;
-        foreach ($switch->cases as $case) {
-            if ($previousCase instanceof Case_ && $this->areSwitchStmtsEqualsAndWithBreak($case, $previousCase)) {
-                $previousCase->stmts = [];
-                $this->hasChanged = true;
-            }
+            $switch->cases[$key]->stmts = [];
 
-            $previousCase = $case;
+            $this->hasChanged = true;
         }
     }
 
-    private function areSwitchStmtsEqualsAndWithBreak(Case_ $currentCase, Case_ $nextCase): bool
+    private function areSwitchStmtsEqualsAndWithBreak(Case_ $currentCase, Case_ $nextOrPrevCase): bool
     {
-        if (! $this->nodeComparator->areNodesEqual($currentCase->stmts, $nextCase->stmts)) {
+        if (! $this->nodeComparator->areNodesEqual($currentCase->stmts, $nextOrPrevCase->stmts)) {
             return false;
         }