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

Allow multiple args passed to array_map

Browse Source
This commit is contained in:
Brown 2020-07-01 19:11:49 -04:00
parent 70ab4c18f4
commit 4d73b2501b
1 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$mapping_function_ids,
$context,
$function_call_arg,
$array_arg
\array_slice($call_args, 1)
);
}
@ -295,13 +295,14 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
/**
* @param non-empty-array<string> $mapping_function_ids
* @param array<PhpParser\Node\Arg> $array_args
*/
private static function getReturnTypeFromMappingIds(
\Psalm\Internal\Analyzer\StatementsAnalyzer $statements_source,
array $mapping_function_ids,
Context $context,
PhpParser\Node\Arg $function_call_arg,
PhpParser\Node\Arg $array_arg
array $array_args
) : Type\Union {
$mapping_return_type = null;
@ -313,6 +314,24 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$function_id_return_type = null;
foreach ($mapping_function_id_parts as $mapping_function_id_part) {
$fake_args = [];
foreach ($array_args as $array_arg) {
$fake_args[] = new PhpParser\Node\Arg(
new PhpParser\Node\Expr\ArrayDimFetch(
$array_arg->value,
new PhpParser\Node\Expr\Variable(
'__fake_offset_var__',
$array_arg->value->getAttributes()
),
$array_arg->value->getAttributes()
),
false,
false,
$array_arg->getAttributes()
);
}
if (strpos($mapping_function_id_part, '::') !== false) {
$is_instance = false;
@ -334,21 +353,7 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$callable_method_name,
$function_call_arg->getAttributes()
),
[
new PhpParser\Node\Arg(
new PhpParser\Node\Expr\ArrayDimFetch(
$array_arg->value,
new PhpParser\Node\Expr\Variable(
'__fake_offset_var__',
$array_arg->value->getAttributes()
),
$array_arg->value->getAttributes()
),
false,
false,
$array_arg->getAttributes()
)
],
$fake_args,
$function_call_arg->getAttributes()
);
@ -363,10 +368,8 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$context
);
unset(
$context->vars_in_scope['$__fake_offset_var__'],
$context->vars_in_scope['$__method_call_var__']
);
unset($context->vars_in_scope['$__fake_offset_var__']);
unset($context->vars_in_scope['$__method_call_var__']);
} else {
$fake_method_call = new PhpParser\Node\Expr\StaticCall(
new PhpParser\Node\Name\FullyQualified(
@ -377,21 +380,7 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$callable_method_name,
$function_call_arg->getAttributes()
),
[
new PhpParser\Node\Arg(
new PhpParser\Node\Expr\ArrayDimFetch(
$array_arg->value,
new PhpParser\Node\Expr\Variable(
'__fake_offset_var__',
$array_arg->value->getAttributes()
),
$array_arg->value->getAttributes()
),
false,
false,
$array_arg->getAttributes()
)
],
$fake_args,
$function_call_arg->getAttributes()
);
@ -413,21 +402,7 @@ class ArrayMapReturnTypeProvider implements \Psalm\Plugin\Hook\FunctionReturnTyp
$mapping_function_id_part,
$function_call_arg->getAttributes()
),
[
new PhpParser\Node\Arg(
new PhpParser\Node\Expr\ArrayDimFetch(
$array_arg->value,
new PhpParser\Node\Expr\Variable(
'__fake_offset_var__',
$array_arg->value->getAttributes()
),
$array_arg->value->getAttributes()
),
false,
false,
$array_arg->getAttributes()
)
],
$fake_args,
$function_call_arg->getAttributes()
);