Fix #2952 - always be cloning

vimeo · Mar 9, 2020 · 0cfe565 · 0cfe565
1 parent 2a72990
commit 0cfe565
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/ExpressionAnalyzer.php
@@ -1305,7 +1305,7 @@ private static function fleshOutAtomicType(
         if ($return_type instanceof Type\Atomic\TClassString
             && $return_type->as_type
         ) {
-            $new_as_type = $return_type->as_type;
+            $new_as_type = clone $return_type->as_type;
 
             self::fleshOutAtomicType(
                 $codebase,

diff --git a/tests/ClassStringTest.php b/tests/ClassStringTest.php
@@ -695,6 +695,39 @@ public static function r() : string
                         }
                     }'
             ],
+            'traitClassStringClone' => [
+                '<?php
+                    trait Factory
+                    {
+                        /** @return class-string<static> */
+                        public static function getFactoryClass()
+                        {
+                            return static::class;
+                        }
+                    }
+
+                    class A
+                    {
+                        use Factory;
+
+                        public static function factory(): self
+                        {
+                            $class = static::getFactoryClass();
+                            return new $class;
+                        }
+                    }
+
+                    class B
+                    {
+                        use Factory;
+
+                        public static function factory(): self
+                        {
+                            $class = static::getFactoryClass();
+                            return new $class;
+                        }
+                    }'
+            ],
         ];
     }