Merge pull request #9092 from b2pweb/fix-8951-promoted-property-with-…

…templace Handle template type on promoted property
vimeo · Jan 10, 2023 · 4e64745 · 4e64745
2 parents 9366c5e + e5f297d
commit 4e64745
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
@@ -592,11 +592,15 @@ public function start(PhpParser\Node\FunctionLike $stmt, bool $fake_method = fal
                 $var_comment_readonly = false;
                 $var_comment_allow_private_mutation = false;
                 if ($doc_comment) {
+                    $template_types = ($this->existing_function_template_types ?: [])
+                        + ($classlike_storage->template_types ?: [])
+                    ;
+
                     $var_comments = CommentAnalyzer::getTypeFromComment(
                         $doc_comment,
                         $this->file_scanner,
                         $this->aliases,
-                        $this->existing_function_template_types ?: [],
+                        $template_types,
                         $this->type_aliases,
                     );
 

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -4029,6 +4029,28 @@ function foobar(DoesNotExist $baz): void {}
                     $baz = new DoesNotExist();
                     foobar($baz);',
             ],
+            'promoted property with template' => [
+                'code' => '<?php
+                    /**
+                     * @template T
+                     */
+                    class A {
+                        public function __construct(
+                            /** @var T */
+                            public mixed $t
+                        ) {}
+                    }
+
+                    $a = new A(5);
+                    $t = $a->t;
+                ',
+                'assertions' => [
+                    '$a' => 'A<int>',
+                    '$t' => 'int',
+                ],
+                'ignored_issues' => [],
+                'php_version' => '8.0',
+            ],
         ];
     }