danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-03 18:17:55 +01:00
Code Issues Projects Releases Wiki Activity

Callable type expansion for more readable error message

Browse Source
This commit is contained in:
andrew 2023-04-06 15:29:59 +03:00
parent 0456ef82a5
commit 7fba401fdd
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php
View File

@ -243,8 +243,9 @@ class ArgumentsAnalyzer
$context->inside_call = $was_inside_call;
if ($high_order_callable_info) {
if ($high_order_callable_info && $high_order_template_result) {
HighOrderFunctionArgHandler::enhanceCallableArgType(
$context,
$arg->value,
$statements_analyzer,
$high_order_callable_info,

21
src/Psalm/Internal/Analyzer/Statements/Expression/Call/HighOrderFunctionArgHandler.php
View File

@ -12,6 +12,7 @@ use Psalm\Internal\MethodIdentifier;
use Psalm\Internal\Type\TemplateInferredTypeReplacer;
use Psalm\Internal\Type\TemplateResult;
use Psalm\Internal\Type\TemplateStandinTypeReplacer;
use Psalm\Internal\Type\TypeExpander;
use Psalm\Storage\FunctionLikeParameter;
use Psalm\Type;
use Psalm\Type\Atomic\TCallable;
@ -73,19 +74,33 @@ final class HighOrderFunctionArgHandler
}
public static function enhanceCallableArgType(
Context $context,
PhpParser\Node\Expr $arg_expr,
StatementsAnalyzer $statements_analyzer,
HighOrderFunctionArgInfo $high_order_callable_info,
?TemplateResult $high_order_template_result
TemplateResult $high_order_template_result
): void {
if ($high_order_callable_info->getType() === HighOrderFunctionArgInfo::TYPE_CALLABLE) {
return;
}
$statements_analyzer->node_data->setType($arg_expr, TemplateInferredTypeReplacer::replace(
$replaced = TemplateInferredTypeReplacer::replace(
$high_order_callable_info->getFunctionType(),
$high_order_template_result ?? new TemplateResult([], []),
$high_order_template_result,
$statements_analyzer->getCodebase(),
);
$statements_analyzer->node_data->setType($arg_expr, TypeExpander::expandUnion(
$statements_analyzer->getCodebase(),
$replaced,
$context->self,
$context->self,
$context->parent,
true,
true,
false,
false,
true,
));
}