Fix wrong results in RemoveAlwaysElseRector (#4527)

rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/Fixture/nested_if_with_else_and_non_terminating_elseif.php.inc

@@ -0,0 +1,49 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithElseAndNonTerminatingElseIf
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            } elseif ($cond3) {
+                echo 'Not returning';
+            } else {
+                return 'bar';
+            }
+        } else {
+            foo();
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithElseAndNonTerminatingElseIf
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            }
+            if ($cond3) {
+                echo 'Not returning';
+            }
+            else {
+                return 'bar';
+            }
+        } else {
+            foo();
+        }
+    }
+}
+
+?>

rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/Fixture/nested_if_with_non_terminating_else.php.inc

@@ -0,0 +1,42 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithNonTerminatingElse
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            } else {
+                echo 'Not returning';
+            }
+        } else {
+            foo();
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithNonTerminatingElse
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            }
+            echo 'Not returning';
+        } else {
+            foo();
+        }
+    }
+}
+
+?>

rules-tests/EarlyReturn/Rector/If_/RemoveAlwaysElseRector/Fixture/nested_if_with_terminating_elseif_and_else.php.inc

@@ -0,0 +1,48 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithTerminatingElseIfAndElse
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            } elseif ($cond3) {
+                return 'bar';
+            } else {
+                return 'baz';
+            }
+        } else {
+            foo();
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\RemoveAlwaysElseRector\Fixture;
+
+class NestedIfWithTerminatingElseIfAndElse
+{
+    public function run()
+    {
+        if ($cond1) {
+            if ($cond2) {
+                return 'foo';
+            }
+            if ($cond3) {
+                return 'bar';
+            }
+            else {
+                return 'baz';
+            }
+        }
+        foo();
+    }
+}
+
+?>

rules/EarlyReturn/Rector/If_/RemoveAlwaysElseRector.php

@@ -128,12 +128,22 @@ private function getStatementsElseIfs(If_ $if): array
         return $statements;
     }
 
-    private function doesLastStatementBreakFlow(If_ | ElseIf_ $node): bool
+    private function doesLastStatementBreakFlow(If_ | ElseIf_ | Else_ $node): bool
     {
         $lastStmt = end($node->stmts);
 
         if ($lastStmt instanceof If_ && $lastStmt->else instanceof Else_) {
-            return $this->doesLastStatementBreakFlow($lastStmt);
+            if ($this->doesLastStatementBreakFlow($lastStmt) || $this->doesLastStatementBreakFlow($lastStmt->else)) {
+                return true;
+            }
+
+            foreach ($lastStmt->elseifs as $elseIf) {
+                if ($this->doesLastStatementBreakFlow($elseIf)) {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         return ! ($lastStmt instanceof Return_