Merge pull request #11421 from danog/fix_11420

Fix #11420

Author: danog

psalm.xml.dist

@@ -5,7 +5,6 @@
     name="Psalm for Psalm"
     errorLevel="1"
     noCache="true"
-    forceJit="true"
     throwExceptionOnError="0"
     findUnusedCode="true"
     ensureArrayStringOffsetsExist="true"

src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php

@@ -922,7 +922,7 @@ private static function handleCallableObject(
         $result->existent_method_ids[$method_id] = true;
         $result->has_valid_method_call_type = true;
 
-        if ($lhs_type_part_callable !== null) {
+        if ($lhs_type_part_callable !== null && !$stmt->isFirstClassCallable()) {
             $result->return_type = $lhs_type_part_callable->return_type ?? Type::getMixed();
             $callableArgumentCount = count($lhs_type_part_callable->params ?? []);
             $providedArgumentsCount = count($stmt->getArgs());

tests/CallableTest.php

@@ -967,6 +967,27 @@ function appHandler3(int $param1, int $param2): array
                 'ignored_issues' => [],
                 'php_version' => '8.1',
             ],
+            'firstClassCallableFromObject' => [
+                'code' => '<?php
+
+                function onKernelController(callable $controller): void
+                {
+                    if (\is_array($controller)) {
+                        $controller = $controller[0];
+                    } else {
+                        try {
+                            $reflection = new \ReflectionFunction($controller(...));
+                            $controller = $reflection->getClosureThis();
+                        } catch (\ReflectionException) {
+                            return;
+                        }
+                    }
+                }
+                ',
+                'assertions' => [],
+                'ignored_issues' => [],
+                'php_version' => '8.1',
+            ],
             'inferTypeWhenClosureParamIsOmitted' => [
                 'code' => '<?php
                     /**