Fix psalm issues in CallableTypeComparator

vimeo · Jan 18, 2022 · 5fb1df8 · 5fb1df8
1 parent 7e623ed
commit 5fb1df8
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Type/Comparator/CallableTypeComparator.php b/src/Psalm/Internal/Type/Comparator/CallableTypeComparator.php
@@ -391,7 +391,9 @@ public static function getCallableFromAtomic(
                 $template_result = null;
 
                 if ($input_type_part instanceof Atomic\TGenericObject) {
-                    $invokable_storage = $codebase->methods->getClassLikeStorageForMethod($declaring_method_id);
+                    $invokable_storage = $codebase->methods->getClassLikeStorageForMethod(
+                        $declaring_method_id ?? $invoke_id
+                    );
                     $type_params = [];
 
                     foreach ($invokable_storage->template_types ?? [] as $template => $for_class) {
@@ -402,16 +404,18 @@ public static function getCallableFromAtomic(
                         }
                     }
 
-                    $input_with_templates = new Atomic\TGenericObject($input_type_part->value, $type_params);
-                    $template_result = new TemplateResult($invokable_storage->template_types ?? [], []);
+                    if (!empty($type_params)) {
+                        $input_with_templates = new Atomic\TGenericObject($input_type_part->value, $type_params);
+                        $template_result = new TemplateResult($invokable_storage->template_types ?? [], []);
 
-                    TemplateStandinTypeReplacer::replace(
-                        new Type\Union([$input_with_templates]),
-                        $template_result,
-                        $codebase,
-                        null,
-                        new Type\Union([$input_type_part])
-                    );
+                        TemplateStandinTypeReplacer::replace(
+                            new Type\Union([$input_with_templates]),
+                            $template_result,
+                            $codebase,
+                            null,
+                            new Type\Union([$input_type_part])
+                        );
+                    }
                 }
 
                 if ($declaring_method_id) {