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

Always evaluate closures, even when passed as mixed call args

Browse Source
This commit is contained in:
Matt Brown 2018-05-08 18:11:10 -04:00
parent 53ff05783c
commit 6e259bed03
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Psalm/Checker/Statements/Expression/Call/MethodCallChecker.php
View File

@ -200,6 +200,16 @@ class MethodCallChecker extends \Psalm\Checker\Statements\Expression\CallChecker
// fall through
}
if (self::checkFunctionArguments(
$statements_checker,
$stmt->args,
null,
null,
$context
) === false) {
return false;
}
$return_type = Type::getMixed();
break;
}

7
src/Psalm/Checker/Statements/Expression/CallChecker.php
View File

@ -466,6 +466,13 @@ class CallChecker
}
}
} else {
// if it's a closure, we want to evaluate it anyway
if ($arg->value instanceof PhpParser\Node\Expr\Closure) {
if (ExpressionChecker::analyze($statements_checker, $arg->value, $context) === false) {
return false;
}
}
if ($arg->value instanceof PhpParser\Node\Expr\PropertyFetch
&& $arg->value->name instanceof PhpParser\Node\Identifier
) {

12
tests/ValueTest.php
View File

@ -220,6 +220,18 @@ class ValueTest extends TestCase
$a();
if ($i === 0) {}',
],
'incrementMixedCall' => [
'<?php
function foo($f) : void {
$i = 0;
$f->add(function() use (&$i) : void {
if (rand(0, 1)) $i++;
});
if ($i === 0) {}
}',
'assertions' => [],
'error_levels' => ['MissingParamType', 'MixedMethodCall'],
],
];
}