[EarlyReturn] Returns array of If_ on ChangeOrIfContinueToMultiContin…

…ueRector (#854)
rectorphp · Sep 9, 2021 · c9f333d · c9f333d
1 parent 70e4b3c
commit c9f333d
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php b/rules/EarlyReturn/Rector/If_/ChangeOrIfContinueToMultiContinueRector.php
@@ -79,8 +79,9 @@ public function getNodeTypes(): array
 
     /**
      * @param If_ $node
+     * @return null|If_[]
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node): ?array
     {
         if (! $this->ifManipulator->isIfWithOnly($node, Continue_::class)) {
             return null;
@@ -93,22 +94,23 @@ public function refactor(Node $node): ?Node
         return $this->processMultiIfContinue($node);
     }
 
-    private function processMultiIfContinue(If_ $if): If_
+    /**
+     * @return null|If_[]
+     */
+    private function processMultiIfContinue(If_ $if): ?array
     {
         $node = clone $if;
         /** @var Continue_ $continue */
         $continue = $if->stmts[0];
         $ifs = $this->createMultipleIfs($if->cond, $continue, []);
-        foreach ($ifs as $key => $if) {
-            if ($key === 0) {
-                $this->mirrorComments($if, $node);
-            }
 
-            $this->nodesToAddCollector->addNodeBeforeNode($if, $node);
+        // ensure ifs not removed by other rules
+        if ($ifs === []) {
+            return null;
         }
 
-        $this->removeNode($node);
-        return $node;
+        $this->mirrorComments($ifs[0], $node);
+        return $ifs;
     }
 
     /**