[Php56] Handle jump not Expression stmt next initialized on AddDefaultValueForUndefinedVariableRector

rules-tests/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector/Fixture/initialized_jump_next.php.inc

@@ -0,0 +1,52 @@
+<?php
+
+namespace Rector\Tests\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector\Fixture;
+
+class InitializedJumpNext
+{
+    public function run()
+    {
+        if (rand(0, 1)) {
+            echo $a;
+        }
+
+        $a = null;
+
+        if (rand(0, 1)) {
+            $a = 5;
+        } else if (rand(0,1)) {
+            unset($a);
+        }
+
+        echo $a;
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector\Fixture;
+
+class InitializedJumpNext
+{
+    public function run()
+    {
+        $a = null;
+        if (rand(0, 1)) {
+            echo $a;
+        }
+
+        $a = null;
+
+        if (rand(0, 1)) {
+            $a = 5;
+        } else if (rand(0,1)) {
+            unset($a);
+        }
+
+        echo $a;
+    }
+}
+
+?>

rules/Php56/Rector/FunctionLike/AddDefaultValueForUndefinedVariableRector.php

@@ -113,6 +113,25 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
+    /**
+     * @param Stmt[] $stmts
+     * @return Expression[]
+     */
+    private function collectEarlyExpressionStmts(array $stmts): array
+    {
+        $expressionStmts = [];
+
+        foreach ($stmts as $stmt) {
+            if (! $stmt instanceof Expression) {
+                break;
+            }
+
+            $expressionStmts[] = $stmt;
+        }
+
+        return $expressionStmts;
+    }
+
     /**
      * @param string[] $undefinedVariableNames
      * @param Stmt[] $stmts
@@ -121,6 +140,7 @@ public function refactor(Node $node): ?Node
     private function collectVariablesInitiation(array $undefinedVariableNames, array $stmts): array
     {
         $variablesInitiation = [];
+        $expressionStmts = $this->collectEarlyExpressionStmts($stmts);
 
         foreach ($undefinedVariableNames as $undefinedVariableName) {
             $value = $this->isArray($undefinedVariableName, $stmts)
@@ -130,8 +150,8 @@ private function collectVariablesInitiation(array $undefinedVariableNames, array
             $assign = new Assign(new Variable($undefinedVariableName), $value);
             $expresssion = new Expression($assign);
 
-            foreach ($stmts as $stmt) {
-                if ($this->nodeComparator->areNodesEqual($expresssion, $stmt)) {
+            foreach ($expressionStmts as $expressionStmt) {
+                if ($this->nodeComparator->areNodesEqual($expresssion, $expressionStmt)) {
                     continue 2;
                 }
             }