Fix #2751 - allow static methods to inherit class templates

vimeo · Feb 5, 2020 · 50fc50f · 50fc50f
1 parent bbdb125
commit 50fc50f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Visitor/ReflectorVisitor.php b/src/Psalm/Internal/Visitor/ReflectorVisitor.php
@@ -2379,9 +2379,7 @@ function (FunctionLikeParameter $p) {
             );
         }
 
-        $class_template_types = !$stmt instanceof PhpParser\Node\Stmt\ClassMethod || !$stmt->isStatic()
-            ? $this->class_template_types
-            : [];
+        $class_template_types = $this->class_template_types;
 
         foreach ($docblock_info->params_out as $docblock_param_out) {
             $param_name = substr($docblock_param_out['name'], 1);

diff --git a/tests/Template/ClassTemplateExtendsTest.php b/tests/Template/ClassTemplateExtendsTest.php
@@ -2857,6 +2857,37 @@ protected function doView() {
                         }
                     }'
             ],
+            'allowStaticMethodClassTemplates' => [
+                '<?php
+                    namespace A;
+
+                    class DeliveryTimeAggregated {}
+
+                    /**
+                     * @template T of object
+                     */
+                    interface ReplayMessageInterface
+                    {
+                        /**
+                         * @return class-string<T>
+                         */
+                        public static function messageName(): string;
+                    }
+
+                    /**
+                     * @template-implements ReplayMessageInterface<DeliveryTimeAggregated>
+                     */
+                    class ReplayDeliveryTimeAggregated implements ReplayMessageInterface
+                    {
+                        /**
+                         * @return class-string<DeliveryTimeAggregated>
+                         */
+                        public static function messageName(): string
+                        {
+                            return DeliveryTimeAggregated::class;
+                        }
+                    }'
+            ],
         ];
     }