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

Fix #361 by terminating analysis if loop statements have issues

Browse Source
This commit is contained in:
Matthew Brown 2017-12-10 16:22:45 -05:00
parent 31ce716647
commit a413e0496a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Psalm/Checker/Statements/Block/IfChecker.php
View File

@ -231,7 +231,7 @@ class IfChecker
$pre_assignment_else_redefined_vars = $temp_else_context->getRedefinedVars($context->vars_in_scope);
// check the if
self::analyzeIfBlock(
if (self::analyzeIfBlock(
$statements_checker,
$stmt,
$if_scope,
@ -240,34 +240,40 @@ class IfChecker
$context,
$pre_assignment_else_redefined_vars,
$loop_scope
);
) === false) {
return false;
}
// check the elseifs
foreach ($stmt->elseifs as $elseif) {
$elseif_context = clone $original_context;
self::analyzeElseIfBlock(
if (self::analyzeElseIfBlock(
$statements_checker,
$elseif,
$if_scope,
$elseif_context,
$context,
$loop_scope
);
) === false) {
return false;
}
}
// check the else
if ($stmt->else) {
$else_context = clone $original_context;
self::analyzeElseBlock(
if (self::analyzeElseBlock(
$statements_checker,
$stmt->else,
$if_scope,
$else_context,
$context,
$loop_scope
);
) === false) {
return false;
}
} else {
$if_scope->final_actions[] = ScopeChecker::ACTION_NONE;
}