attempt to fix #6973

vimeo · Nov 23, 2021 · 505c6e7 · 505c6e7
1 parent b42c281
commit 505c6e7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/MethodComparator.php b/src/Psalm/Internal/Analyzer/MethodComparator.php
@@ -980,9 +980,7 @@ private static function compareMethodDocblockReturnTypes(
                 $implementer_called_class_name
             );
 
-            if (isset(
-                $implementer_called_class_storage->template_extended_params[$implementer_classlike_storage->name]
-            )) {
+            if ($implementer_called_class_storage->template_extended_params) {
                 self::transformTemplates(
                     $implementer_called_class_storage->template_extended_params,
                     $implementer_classlike_storage->name,

diff --git a/tests/ReturnTypeTest.php b/tests/ReturnTypeTest.php
@@ -1032,7 +1032,35 @@ public function __construct() {
                             $this->value = 123;
                         }
                     }'
-            ]
+            ],
+            'returnTypeOfAbstractMethodFromTemplatedTraitAndImplementationFromNonTemplatedTrait' => [
+                '<?php
+                    trait ImplementorTrait {
+                        /** @var int */
+                        private $value;
+
+                        public function getValue(): int {
+                            return $this->value;
+                        }
+                    }
+
+                    /** @psalm-template T */
+                    trait GuideTrait {
+                        /** @psalm-return T */
+                        abstract public function getValue();
+                    }
+
+                    class Test {
+                        use ImplementorTrait;
+
+                        /** @template-use GuideTrait<int> */
+                        use GuideTrait;
+
+                        public function __construct() {
+                            $this->value = 123;
+                        }
+                    }'
+            ],
         ];
     }