danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

use safer check for ending statments

Browse Source
This commit is contained in:
Matthew Brown 2016-06-29 18:30:27 -04:00
parent 382fcb3a07
commit d59739d9c7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CodeInspector/StatementsChecker.php
View File

@ -282,7 +282,9 @@ class StatementsChecker
$reconcilable_if_types = $negatable_if_types = $this->_type_checker->getTypeAssertions($stmt->cond, true);
}
$has_leaving_statments = ScopeChecker::doesLeaveBlock($stmt->stmts, true, true);
$has_ending_statments = ScopeChecker::doesReturnOrThrow($stmt->stmts);
$has_leaving_statments = $has_ending_statments || ScopeChecker::doesLeaveBlock($stmt->stmts, true, true);
// we only need to negate the if types if there are throw/return/break/continue or else/elseif blocks
$need_to_negate_if_types = $has_leaving_statments || $stmt->elseifs || $stmt->else;
@ -348,8 +350,6 @@ class StatementsChecker
$context->update($old_if_context, $if_context, $has_leaving_statments, $updated_vars);
}
$has_ending_statments = ScopeChecker::doesReturnOrThrow($stmt->stmts);
if (!$has_ending_statments) {
$vars = array_diff_key($if_context->vars_possibly_in_scope, $context->vars_possibly_in_scope);