Fix #2439 - fix templating of class-string<T>::returnsStatic

vimeo · Dec 9, 2019 · e3d108e · e3d108e
1 parent 69e6624
commit e3d108e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
@@ -891,7 +891,8 @@ function (PhpParser\Node\Arg $arg) {
                                 $lhs_type_part->param_name,
                                 $lhs_type_part->as_type
                                     ? new Type\Union([$lhs_type_part->as_type])
-                                    : Type::getObject()
+                                    : Type::getObject(),
+                                $lhs_type_part->defining_class
                             );
                         } else {
                             $static_type = $fq_class_name;

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -2131,6 +2131,41 @@ function __construct(array $arr) {
                      */
                     function copyMapUsingProperty(Map $map): Map {
                         return new Map($map->arr);
+                    }',
+            ],
+            'mapStaticClassTemplatedFromClassString' => [
+                '<?php
+                    class Base {
+                        /** @return static */
+                        public static function factory(): self {
+                            return new self();
+                        }
+                    }
+
+                    /**
+                     * @template T of Base
+                     * @param class-string<T> $t
+                     * @return T
+                     */
+                    function f(string $t) {
+                        return $t::factory();
+                    }
+
+                    /** @template T of Base */
+                    class C {
+                        /** @var class-string<T> */
+                        private string $t;
+
+                        /** @param class-string<T> $t */
+                        public function __construct($t) {
+                            $this->t = $t;
+                        }
+
+                        /** @return T */
+                        public function f(): Base {
+                            $t = $this->t;
+                            return $t::factory();
+                        }
                     }'
             ],
         ];