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

Prevent if checking unless we’re in a top-level if

Browse Source
This commit is contained in:
Matthew Brown 2019-06-10 00:02:36 -04:00
parent 158a2150a7
commit e1255db32a
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Psalm/Internal/Visitor/ReflectorVisitor.php
View File

@ -438,24 +438,26 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
} elseif ($node instanceof PhpParser\Node\Stmt\If_) {
$this->skip_if_descendants = false;
if ($node->cond instanceof PhpParser\Node\Expr\BooleanNot) {
if ($node->cond->expr instanceof PhpParser\Node\Expr\FuncCall
&& $node->cond->expr->name instanceof PhpParser\Node\Name
&& ($node->cond->expr->name->parts === ['function_exists']
|| $node->cond->expr->name->parts === ['class_exists']
|| $node->cond->expr->name->parts === ['interface_exists']
if (!$this->fq_classlike_names && !$this->functionlike_storages) {
if ($node->cond instanceof PhpParser\Node\Expr\BooleanNot) {
if ($node->cond->expr instanceof PhpParser\Node\Expr\FuncCall
&& $node->cond->expr->name instanceof PhpParser\Node\Name
&& ($node->cond->expr->name->parts === ['function_exists']
|| $node->cond->expr->name->parts === ['class_exists']
|| $node->cond->expr->name->parts === ['interface_exists']
)
) {
$this->not_exists_cond_expr = $node->cond->expr;
}
} elseif ($node->cond instanceof PhpParser\Node\Expr\FuncCall
&& $node->cond->name instanceof PhpParser\Node\Name
&& ($node->cond->name->parts === ['function_exists']
|| $node->cond->name->parts === ['class_exists']
|| $node->cond->name->parts === ['interface_exists']
)
) {
$this->not_exists_cond_expr = $node->cond->expr;
$this->exists_cond_expr = $node->cond;
}
} elseif ($node->cond instanceof PhpParser\Node\Expr\FuncCall
&& $node->cond->name instanceof PhpParser\Node\Name
&& ($node->cond->name->parts === ['function_exists']
|| $node->cond->name->parts === ['class_exists']
|| $node->cond->name->parts === ['interface_exists']
)
) {
$this->exists_cond_expr = $node->cond;
}
if ($this->exists_cond_expr && !$this->enterConditional($this->exists_cond_expr)) {