Merge pull request #7321 from weirdan/dont-crash-on-array_map-first-c…

…lass-callable
vimeo · Jan 6, 2022 · 46bcb62 · 46bcb62
2 parents 18ab5a0 + fe036d4
commit 46bcb62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php
@@ -125,6 +125,10 @@ private static function registerClassMapFunctionCall(
             }
         }
 
+        if ($node->isFirstClassCallable()) {
+            return;
+        }
+
         if ($function_id === 'define') {
             $first_arg_value = isset($node->getArgs()[0]) ? $node->getArgs()[0]->value : null;
             $second_arg_value = isset($node->getArgs()[1]) ? $node->getArgs()[1]->value : null;

diff --git a/tests/ClosureTest.php b/tests/ClosureTest.php
@@ -729,6 +729,12 @@ public static function __callStatic(string $name, array $args): mixed {
                 [],
                 '8.1'
             ],
+            'FirstClassCallable:array_map' => [
+                '<?php call_user_func(array_map(...), intval(...), ["1"]);',
+                'assertions' => [],
+                [],
+                '8.1',
+            ],
         ];
     }
 
@@ -1171,9 +1177,8 @@ public static function __callStatic(string $name, array $args): mixed {
                 'error_message' => 'MixedAssignment',
                 [],
                 false,
-                '8.1'
+                '8.1',
             ],
-
         ];
     }
 }