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

Do better inference for array_map return type

Browse Source
This commit is contained in:
Brown 2020-01-30 17:43:13 -05:00
parent 9405314222
commit b46f219c51
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -2328,8 +2328,6 @@ class CallAnalyzer
return;
}
$i = 0;
foreach ($closure_params as $i => $closure_param) {
if (!isset($array_arg_types[$i])) {
continue;

48
src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php
View File

@ -114,6 +114,7 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$call_map = CallMap::getCallMap();
$mapping_return_type = null;
$closure_param_type = null;
$codebase = $statements_source->getCodebase();
@ -171,6 +172,15 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$part_match_found = true;
$params = $codebase->methods->getMethodParams(
$mapping_function_id_part,
$statements_source
);
if (isset($params[0]->type)) {
$closure_param_type = $params[0]->type;
}
$self_class = 'self';
$return_type = $codebase->methods->getMethodReturnType(
@ -217,6 +227,10 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$mapping_function_id_part
);
if (isset($function_storage->params[0]->type)) {
$closure_param_type = $function_storage->params[0]->type;
}
$return_type = $function_storage->return_type ?: Type::getMixed();
if ($mapping_return_type) {
@ -235,6 +249,40 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$mapping_return_type = Type::getMixed();
}
}
if ($mapping_return_type
&& $closure_param_type
&& $mapping_return_type->hasTemplate()
&& $array_arg_type
) {
$mapping_return_type = clone $mapping_return_type;
$template_types = [];
foreach ($closure_param_type->getTemplateTypes() as $template_type) {
$template_types[$template_type->param_name] = [
($template_type->defining_class) => [$template_type->as]
];
}
$template_result = new \Psalm\Internal\Type\TemplateResult(
$template_types,
[]
);
\Psalm\Internal\Type\UnionTemplateHandler::replaceTemplateTypesWithStandins(
$closure_param_type,
$template_result,
$codebase,
$array_arg_type->value,
$context->self,
$context->calling_function_id
);
$mapping_return_type->replaceTemplateTypesWithArgTypes(
$template_result->generic_params
);
}
}
}