[EarlyReturn] Handle multiple statements in else in ChangeIfElseValue…

…AssignToEarlyReturnRector (#4580)

Co-authored-by: Jiří Bok <jiri.bok@nice.com>

packages/BetterPhpDocParser/PhpDocParser/ConstExprClassNameDecorator.php

@@ -5,7 +5,6 @@
 namespace Rector\BetterPhpDocParser\PhpDocParser;
 
 use PhpParser\Node as PhpNode;
-use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
 use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;

rules-tests/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector/Fixture/else_with_multiple_statements.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector\Fixture;
+
+class ElseWithMultipleStatementsFixture
+{
+    public function generateNumber(int $bonus, int $multiplier): int
+    {
+        if (mt_rand(0, 1) === 1) {
+            $number = 10;
+        } else {
+            $bonus *= $multiplier;
+            $number = 20 + $bonus;
+        }
+
+        return $number;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector\Fixture;
+
+class ElseWithMultipleStatementsFixture
+{
+    public function generateNumber(int $bonus, int $multiplier): int
+    {
+        if (mt_rand(0, 1) === 1) {
+            return 10;
+        }
+        $bonus *= $multiplier;
+
+        return 20 + $bonus;
+    }
+}
+
+?>

rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php

@@ -127,6 +127,10 @@ public function refactor(Node $node): ?StmtsAwareInterface
             $if->else = null;
             $stmt->expr = $assign->expr;
 
+            $lastStmt = array_pop($node->stmts);
+            $elseStmtsExceptLast = array_slice($elseStmts, 0, -1);
+            $node->stmts = [...$node->stmts, ...$elseStmtsExceptLast, $lastStmt];
+
             return $node;
         }