Merge pull request #10194 from MidnightDesign/issue-8582

Allow class-string<T> where T is a union
vimeo · Sep 28, 2023 · d7236ef · d7236ef
2 parents a70b2c0 + 3b775f4
commit d7236ef
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -462,12 +462,6 @@ private static function getGenericParamClass(
             );
         }
 
-        if (!$as->isSingle()) {
-            throw new TypeParseTreeException(
-                'Invalid templated classname \'' . $as . '\'',
-            );
-        }
-
         foreach ($as->getAtomicTypes() as $t) {
             if ($t instanceof TObject) {
                 return new TTemplateParamClass(

diff --git a/tests/ClassLikeStringTest.php b/tests/ClassLikeStringTest.php
@@ -879,6 +879,27 @@ class TypeTwo {}
                     $foo->baz = TypeTwo::class;
                     $foo->baz = TypeTwo::class;',
             ],
+            'classStringOfUnionTypeParameter' => [
+                'code' => '<?php
+
+                    class A {}
+                    class B {}
+
+                    /**
+                     * @template T as A|B
+                     *
+                     * @param class-string<T> $class
+                     * @return class-string<T>
+                     */
+                    function test(string $class): string {
+                        return $class;
+                    }
+
+                    $r = test(A::class);',
+                'assertions' => [
+                    '$r' => 'class-string<A>',
+                ],
+            ],
         ];
     }