danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Revert to from_docbblock status of outer loop

Browse Source
This commit is contained in:
Matthew Brown 2017-12-04 00:13:46 -05:00
parent 0134d7bf5c
commit 8abd77c70f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Psalm/Checker/Statements/Block/LoopChecker.php
View File

@ -164,8 +164,9 @@ class LoopChecker
// set the vars to whatever the while/foreach loop expects them to be
if (!isset($pre_loop_context->vars_in_scope[$var_id])
|| $type->getId() !== $pre_loop_context->vars_in_scope[$var_id]->getId()
|| $type->from_docblock !== $pre_loop_context->vars_in_scope[$var_id]->from_docblock
) {
$inner_context->vars_in_scope[$var_id] = $pre_loop_context->vars_in_scope[$var_id];
$inner_context->vars_in_scope[$var_id] = clone $pre_loop_context->vars_in_scope[$var_id];
$has_changes = true;
}
} elseif (isset($pre_outer_context->vars_in_scope[$var_id])) {
@ -203,7 +204,7 @@ class LoopChecker
foreach ($asserted_var_ids as $var_id) {
if (!isset($inner_context->vars_in_scope[$var_id])) {
$inner_context->vars_in_scope[$var_id] = $pre_loop_context->vars_in_scope[$var_id];
$inner_context->vars_in_scope[$var_id] = clone $pre_loop_context->vars_in_scope[$var_id];
}
}