fix: class-string with template contains non-object type

Author: vincent4vx

src/Psalm/Internal/Type/TypeParser.php

@@ -458,6 +458,7 @@ private static function getGenericParamClass(
         Union &$as,
         string $defining_class,
         bool $from_docblock = false,
+        bool $allow_skip_invalid_type = false,
     ): TTemplateParamClass {
         if ($as->hasMixed()) {
             return new TTemplateParamClass(
@@ -469,6 +470,8 @@ private static function getGenericParamClass(
             );
         }
 
+        $last_invalid_type = null;
+
         foreach ($as->getAtomicTypes() as $t) {
             if ($t instanceof TObject) {
                 return new TTemplateParamClass(
@@ -518,6 +521,11 @@ private static function getGenericParamClass(
             }
 
             if (!$t instanceof TNamedObject) {
+                if ($allow_skip_invalid_type) {
+                    $last_invalid_type = $t;
+                    continue;
+                }
+
                 throw new TypeParseTreeException(
                     'Invalid templated classname \'' . $t->getId() . '\'',
                 );
@@ -532,6 +540,12 @@ private static function getGenericParamClass(
             );
         }
 
+        if ($last_invalid_type !== null) {
+            throw new TypeParseTreeException(
+                'Invalid templated classname \'' . $t->getId() . '\'',
+            );
+        }
+
         throw new LogicException('Should never get here');
     }
 
@@ -766,6 +780,7 @@ private static function getTypeFromGenericTree(
                     $template_type_map[$class_name][$first_class],
                     $first_class,
                     $from_docblock,
+                    true,
                 );
             }
 

tests/ClassLikeStringTest.php

@@ -911,6 +911,26 @@ function test(string $class): string {
                         return $class;
                     }
 
+                    $r = test(A::class);',
+                'assertions' => [
+                    '$r' => 'class-string<A>',
+                ],
+            ],
+            'classStringOfUnionTypeArrayOrObject' => [
+                'code' => '<?php
+
+                    class A {}
+
+                    /**
+                     * @template T as array|object
+                     *
+                     * @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>',
@@ -1052,6 +1072,17 @@ function foo(string $s) : string {
                     }',
                 'error_message' => 'InvalidReturnStatement',
             ],
+            'genericTypeWithoutAnyValidType' => [
+                'code' => '<?php
+                    /**
+                     * @param class-string<T> $s
+                     * @template T as string|bool
+                     */
+                    function foo(string $s) : string {
+                        return $s;
+                    }',
+                'error_message' => 'InvalidDocblock',
+            ],
         ];
     }
 }