danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-12 09:19:40 +01:00
Code Issues Projects Releases Wiki Activity

Fix while loop unset issue

Browse Source
This commit is contained in:
Matthew Brown 2016-10-02 10:26:13 -04:00
parent 91ea6844ba
commit ff17dcf1ee
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Checker/StatementsChecker.php
View File

@ -2030,6 +2030,7 @@ class StatementsChecker
continue; continue;
} }
if (isset($while_context->vars_in_scope[$var])) {
if ($while_context->vars_in_scope[$var]->isMixed()) { if ($while_context->vars_in_scope[$var]->isMixed()) {
$context->vars_in_scope[$var] = $while_context->vars_in_scope[$var]; $context->vars_in_scope[$var] = $while_context->vars_in_scope[$var];
} }
@ -2038,6 +2039,7 @@ class StatementsChecker
$context->vars_in_scope[$var] = Type::combineUnionTypes($while_context->vars_in_scope[$var], $type); $context->vars_in_scope[$var] = Type::combineUnionTypes($while_context->vars_in_scope[$var], $type);
} }
} }
}
$context->vars_possibly_in_scope = array_merge($context->vars_possibly_in_scope, $while_context->vars_possibly_in_scope); $context->vars_possibly_in_scope = array_merge($context->vars_possibly_in_scope, $while_context->vars_possibly_in_scope);
} }