Optimize

vimeo · Aug 17, 2022 · 979091d · 979091d
1 parent 0220da0
commit 979091d
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ClassTemplateParamCollector.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ClassTemplateParamCollector.php
@@ -109,6 +109,23 @@ public static function collect(
                 }
             }
 
+            $template_result = null;
+            if ($class_storage !== $static_class_storage && $static_class_storage->template_types) {
+                $templates = self::collect(
+                    $codebase,
+                    $static_class_storage,
+                    $static_class_storage,
+                    null,
+                    $lhs_type_part
+                );
+                if ($templates === null) {
+                    throw new AssertionError("Could not collect templates!");
+                }
+                $template_result = new TemplateResult(
+                    $static_class_storage->template_types,
+                    $templates
+                );
+            }
             foreach ($template_types as $type_name => $_) {
                 if (isset($class_template_params[$type_name])) {
                     continue;
@@ -123,7 +140,8 @@ public static function collect(
                         $codebase,
                         $input_type_extends,
                         $static_class_storage,
-                        $lhs_type_part
+                        $lhs_type_part,
+                        $template_result
                     );
 
                     $class_template_params[$type_name][$class_storage->name]
@@ -173,19 +191,6 @@ private static function resolveTemplateParam(
         TGenericObject $lhs_type_part,
         ?TemplateResult $template_result = null
     ): ?Union {
-        if ($template_result === null && $static_class_storage->template_types) {
-            $templates = self::collect(
-                $codebase,
-                $static_class_storage,
-                $static_class_storage,
-                null,
-                $lhs_type_part
-            );
-            if ($templates === null) {
-                throw new AssertionError("Could not collect templates!");
-            }
-            $template_result = new TemplateResult($static_class_storage->template_types, $templates);
-        }
         $output_type_extends = null;
         foreach ($input_type_extends->getAtomicTypes() as $type_extends_atomic) {
             if ($type_extends_atomic instanceof TTemplateParam) {