danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2772 - add support for multiple array_map function param inference

Browse Source
This commit is contained in:
Matthew Brown 2020-02-08 12:17:57 -05:00
parent b439a573ce
commit 5f4d797fe1
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,7 +389,7 @@ class CallAnalyzer
return;
}
if ($method_id === 'array_map' && count($args) === 2) {
if ($method_id === 'array_map') {
$args = array_reverse($args, true);
}
@ -453,26 +453,29 @@ class CallAnalyzer
&& $param->type
&& !$arg->value->getDocComment()
) {
if (count($args) === 2
&& (($argument_offset === 1 && $method_id === 'array_filter')
|| ($argument_offset === 0 && $method_id === 'array_map'))
if (($argument_offset === 1 && $method_id === 'array_filter' && count($args) === 2)
|| ($argument_offset === 0 && $method_id === 'array_map' && count($args) >= 2)
) {
$function_like_params = [];
foreach ($template_result->generic_params as $template_name => $_) {
$function_like_params[] = new \Psalm\Storage\FunctionLikeParameter(
'function',
false,
new Type\Union([
new Type\Atomic\TTemplateParam(
$template_name,
Type::getMixed(),
$method_id
)
])
);
}
$replaced_type = new Type\Union([
new Type\Atomic\TCallable(
'callable',
[
new \Psalm\Storage\FunctionLikeParameter(
'function',
false,
new Type\Union([
new Type\Atomic\TTemplateParam(
'ArrayValue',
Type::getMixed(),
$method_id
)
])
)
]
array_reverse($function_like_params)
)
]);
} else {
@ -547,16 +550,15 @@ class CallAnalyzer
$context->inside_call = false;
}
if (count($args) === 2
&& (($argument_offset === 0 && $method_id === 'array_filter')
|| ($argument_offset === 1 && $method_id === 'array_map'))
if (($argument_offset === 0 && $method_id === 'array_filter' && count($args) === 2)
|| ($argument_offset > 0 && $method_id === 'array_map' && count($args) >= 2)
) {
$generic_param_type = new Type\Union([
new Type\Atomic\TArray([
Type::getArrayKey(),
new Type\Union([
new Type\Atomic\TTemplateParam(
'ArrayValue',
'ArrayValue' . $argument_offset,
Type::getMixed(),
$method_id
)
@ -564,7 +566,7 @@ class CallAnalyzer
])
]);
$template_types = ['ArrayValue' => [$method_id => [Type::getMixed()]]];
$template_types = ['ArrayValue' . $argument_offset => [$method_id => [Type::getMixed()]]];
$replace_template_result = new \Psalm\Internal\Type\TemplateResult(
$template_types,

7
tests/ArrayFunctionCallTest.php
View File

@ -1290,6 +1290,13 @@ class ArrayFunctionCallTest extends TestCase
takesString($a[0]);
array_map("takesString", $a);',
],
'arrayMapExplicitZip' => [
'<?php
$as = ["key"];
$bs = ["value"];
return array_map(fn ($a, $b) => [$a => $b], $as, $bs);'
],
];
}