Merge branch '4.x' into upstream-master

vimeo · Jan 7, 2022 · 762ef8d · 762ef8d
2 parents 3fb3db3 + 760badd
commit 762ef8d
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -52,6 +52,7 @@
 use Psalm\Type\Atomic\TMixed;
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TNull;
+use Psalm\Type\Atomic\TObjectWithProperties;
 use Psalm\Type\Atomic\TString;
 use Psalm\Type\Atomic\TTemplateParam;
 use Psalm\Type\Reconciler;
@@ -688,12 +689,11 @@ private static function getAnalyzeNamedExpression(
                     );
                 } elseif ($var_type_part instanceof TCallableObject
                     || $var_type_part instanceof TCallableString
+                    || ($var_type_part instanceof TNamedObject && $var_type_part->value === 'Closure')
+                    || ($var_type_part instanceof TObjectWithProperties && isset($var_type_part->methods['__invoke']))
                 ) {
                     // this is fine
                     $has_valid_function_call_type = true;
-                } elseif (($var_type_part instanceof TNamedObject && $var_type_part->value === 'Closure')) {
-                    // this is fine
-                    $has_valid_function_call_type = true;
                 } elseif ($var_type_part instanceof TString
                     || $var_type_part instanceof TArray
                     || $var_type_part instanceof TList

diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ExpressionScanner.php
@@ -128,6 +128,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/src/Psalm/Type/Atomic/TKeyedArray.php b/src/Psalm/Type/Atomic/TKeyedArray.php
@@ -429,7 +429,7 @@ public function getList(): TNonEmptyList
      */
     private function escapeAndQuote($name)
     {
-        if (is_string($name) && preg_match('/[^a-zA-Z0-9_]/', $name)) {
+        if (is_string($name) && ($name === '' || preg_match('/[^a-zA-Z0-9_]/', $name))) {
             $name = '\'' . str_replace("\n", '\n', addslashes($name)) . '\'';
         }
 

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -1944,6 +1944,33 @@ function assertString(A $arg): bool {return $arg->b !== null;}
                     function requiresString(string $_str): void {}
                 ',
             ],
+            'assertWithEmptyStringOnKeyedArray' => [
+                '<?php
+                    class A
+                    {
+                        function test(): void
+                        {
+                            $a = ["" => ""];
+
+                            /** @var array<string, mixed> $b */
+                            $b = [];
+
+                            $this->assertSame($a, $b);
+                        }
+
+                        /**
+                         * @template T
+                         * @param T      $expected
+                         * @param mixed $actual
+                         * @psalm-assert =T $actual
+                         */
+                        public function assertSame($expected, $actual): void
+                        {
+                            return;
+                        }
+                    }
+                ',
+            ],
         ];
     }
 

diff --git a/tests/CallableTest.php b/tests/CallableTest.php
@@ -316,6 +316,15 @@ function foo(callable $c): void {
                     $c2 = new C();
                     $c2();',
             ],
+            'invokeMethodExists' => [
+                '<?php
+                    function call(object $obj): void {
+                        if (!method_exists($obj, "__invoke")) {
+                            return;
+                        }
+                        $obj();
+                    }',
+            ],
             'correctParamType' => [
                 '<?php
                     $take_string = function(string $s): string { return $s; };

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',
             ],
-
         ];
     }
 }