Merge pull request #7325 from villfa/fix/7322

Fix analysis when __invoke() exists
vimeo · Jan 6, 2022 · 760badd · 760badd
2 parents 46bcb62 + b9d8dd9
commit 760badd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 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;
@@ -690,12 +691,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/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; };