fix usage of callable with array_map (#5373)

vimeo · Mar 12, 2021 · 90fd1c5 · 90fd1c5
1 parent 57234ab
commit 90fd1c5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php b/src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php
@@ -98,7 +98,8 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
                 $generic_key_type = Type::getInt();
             }
 
-            if ($closure_types = $function_call_type->getClosureTypes()) {
+            if ($function_call_type->hasCallableType()) {
+                $closure_types = $function_call_type->getClosureTypes() ?: $function_call_type->getCallableTypes();
                 $closure_atomic_type = \reset($closure_types);
 
                 $closure_return_type = $closure_atomic_type->return_type ?: Type::getMixed();

diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
@@ -633,7 +633,7 @@ public function hasCallableType(): bool
     /**
      * @return array<string, Atomic\TCallable>
      */
-    private function getCallableTypes(): array
+    public function getCallableTypes(): array
     {
         return array_filter(
             $this->types,

diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
@@ -534,6 +534,25 @@ function () use ($a): void {
                         }
                     }'
             ],
+            'CallableWithArrayMap' => [
+                '<?php
+                    /**
+                     * @psalm-template T
+                     * @param class-string<T> $className
+                     * @return callable(...mixed):T
+                     */
+                    function maker(string $className) {
+                       return function(...$args) use ($className) {
+                          /** @psalm-suppress MixedMethodCall */
+                          return new $className(...$args);
+                       };
+                    }
+                    $maker = maker(stdClass::class);
+                    $result = array_map($maker, ["abc"]);',
+                'assertions' => [
+                    '$result' => 'array{stdClass}'
+                ],
+            ],
         ];
     }