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 the clever methods when evaluating expression

Browse Source
This commit is contained in:
Matthew Brown 2016-06-28 15:36:35 -04:00
parent 35e08f5cd2
commit 4bd0e7c90f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CodeInspector/StatementsChecker.php
View File

@ -1437,7 +1437,7 @@ class StatementsChecker
// ignore deeply-nested string concatenation
}
else if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BooleanAnd) {
$left_type_assertions = $this->_type_checker->getTypeAssertions($stmt->left, true);
$left_type_assertions = $this->_type_checker->getReconcilableTypeAssertions($stmt->left);
if ($this->_checkExpression($stmt->left, $context) === false) {
return false;
@ -1468,7 +1468,7 @@ class StatementsChecker
$context->vars_possibly_in_scope = array_merge($op_context->vars_possibly_in_scope, $context->vars_possibly_in_scope);
}
else if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BooleanOr) {
$left_type_assertions = $this->_type_checker->getTypeAssertions($stmt->left, true);
$left_type_assertions = $this->_type_checker->getNegatableTypeAssertions($stmt->left);
$negated_type_assertions = TypeChecker::negateTypes($left_type_assertions);