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

If the statement contains an or, do not make assumptions

Browse Source
This commit is contained in:
Matthew Brown 2016-04-03 14:50:57 -04:00
parent e542b876f8
commit 78123ada52
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/StatementsChecker.php
View File

@ -198,7 +198,7 @@ class StatementsChecker
$negated_if_types = $negated_types; $negated_if_types = $negated_types;
// if the if has an or as the main component, we cannot safely reason about it // if the if has an or as the main component, we cannot safely reason about it
if ($stmt->cond instanceof PhpParser\Node\Expr\BinaryOp\BooleanOr) { if ($stmt->cond instanceof PhpParser\Node\Expr\BinaryOp && self::_containsBooleanOr($stmt->cond)) {
$if_vars = array_merge([], $vars_in_scope); $if_vars = array_merge([], $vars_in_scope);
$if_vars_possibly_in_scope = array_merge([], $vars_possibly_in_scope); $if_vars_possibly_in_scope = array_merge([], $vars_possibly_in_scope);
} }
@ -2411,6 +2411,20 @@ class StatementsChecker
return $result_types; return $result_types;
} }
protected static function _containsBooleanOr(PhpParser\Node\Expr\BinaryOp $stmt)
{
if ($stmt instanceof PhpParser\Node\Expr\BinaryOp\BooleanOr) {
return true;
}
if (($stmt->left instanceof PhpParser\Node\Expr\BinaryOp && self::_containsBooleanOr($stmt->left)) ||
($stmt->right instanceof PhpParser\Node\Expr\BinaryOp && self::_containsBooleanOr($stmt->right))) {
return true;
}
return false;
}
protected static function _negateTypes(array $types) protected static function _negateTypes(array $types)
{ {
return array_map(function ($type) { return array_map(function ($type) {