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

vimeo · Feb 8, 2020 · 5f4d797 · 5f4d797
1 parent b439a57
commit 5f4d797
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
@@ -389,7 +389,7 @@ protected static function checkFunctionArguments(
             return;
         }
 
-        if ($method_id === 'array_map' && count($args) === 2) {
+        if ($method_id === 'array_map') {
             $args = array_reverse($args, true);
         }
 
@@ -453,26 +453,29 @@ protected static function checkFunctionArguments(
                     && $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,24 +550,23 @@ protected static function checkFunctionArguments(
                     $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
                                 )
                             ])
                         ])
                     ]);
 
-                    $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,

diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -1290,6 +1290,13 @@ function takesString(string $string): void {}
                     takesString($a[0]);
                     array_map("takesString", $a);',
             ],
+            'arrayMapExplicitZip' => [
+                '<?php
+                    $as = ["key"];
+                    $bs = ["value"];
+
+                    return array_map(fn ($a, $b) => [$a => $b], $as, $bs);'
+            ],
         ];
     }