Generalise init vars inside for loops

Ref #3085
vimeo · Jul 3, 2020 · 44d7f51 · 44d7f51
1 parent 3d0a8c4
commit 44d7f51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/ForAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/ForAnalyzer.php
@@ -44,6 +44,10 @@ public static function analyze(
                 && \is_string($init->var->name)
                 && ($init_var_type = $statements_analyzer->node_data->getType($init->expr))
             ) {
+                if ($init_var_type->isSingleIntLiteral()) {
+                    $context->vars_in_scope['$' . $init->var->name] = Type::getInt();
+                }
+
                 $init_var_types[$init->var->name] = $init_var_type;
             }
         }

diff --git a/tests/Loop/ForTest.php b/tests/Loop/ForTest.php
@@ -117,6 +117,14 @@ function test(Node $head) {
 
                     echo $i * $j;'
             ],
+            'reconcileOuterVars' => [
+                '<?php
+                    for ($i = 0; $i < 2; $i++) {
+                        if ($i === 0) {
+                            continue;
+                        }
+                    }'
+            ],
         ];
     }