Fix #2546 properly

vimeo · Jan 4, 2020 · ba6d0df · ba6d0df
1 parent fb48db9
commit ba6d0df
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Block/ForAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Block/ForAnalyzer.php
@@ -140,7 +140,9 @@ public static function analyze(
 
         if ($context->collect_references) {
             foreach ($for_context->unreferenced_vars as $var_id => $locations) {
-                if (isset($context->unreferenced_vars[$var_id])) {
+                if (isset($loop_scope->referenced_var_ids[$var_id])) {
+                    $statements_analyzer->registerVariableUses($locations);
+                } elseif (isset($context->unreferenced_vars[$var_id])) {
                     $context->unreferenced_vars[$var_id] += $locations;
                 } else {
                     $context->unreferenced_vars[$var_id] = $locations;

diff --git a/tests/UnusedVariableTest.php b/tests/UnusedVariableTest.php
@@ -1379,6 +1379,19 @@ function test(): string {
                         break;
                     }'
             ],
+            'usedForVariable' => [
+                '<?php
+                    $a = 0;
+                    for ($i = 0; $i < 1000; $i++) {
+                        if (rand(0, 1)) {
+                            $a = $a + $i;
+                            continue;
+                        }
+                        break;
+                    }
+
+                    echo $a;'
+            ],
         ];
     }