Merge pull request #9738 from klimick/fix-invalid-cast-for-templated-…

…class-string Fix invalid cast for templated class-string
vimeo · May 4, 2023 · f8895ed · f8895ed
2 parents 32bd8f6 + 57b3876
commit f8895ed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/Comparator/ClassLikeStringComparator.php b/src/Psalm/Internal/Type/Comparator/ClassLikeStringComparator.php
@@ -80,13 +80,24 @@ public static function isContainedBy(
                     : $input_type_part->value,
             );
 
-        return AtomicTypeComparator::isContainedBy(
+        $isContainedBy = AtomicTypeComparator::isContainedBy(
             $codebase,
             $fake_input_object,
             $fake_container_object,
             $allow_interface_equality,
             false,
             $atomic_comparison_result,
         );
+
+        if ($atomic_comparison_result
+            && $atomic_comparison_result->replacement_atomic_type instanceof TNamedObject
+        ) {
+            $atomic_comparison_result->replacement_atomic_type = new TClassString(
+                'object',
+                $atomic_comparison_result->replacement_atomic_type,
+            );
+        }
+
+        return $isContainedBy;
     }
 }
diff --git a/tests/FunctionCallTest.php b/tests/FunctionCallTest.php
@@ -17,6 +17,19 @@ class FunctionCallTest extends TestCase
     public function providerValidCodeParse(): iterable
     {
         return [
+            'callFunctionWithTemplateClassStringWillNotFail' => [
+                'code' => '<?php
+                    /** @param class-string<SplFixedArray<string>> $classString */
+                    function acceptTemplatedClassString(string $classString): void
+                    {
+                    }
+
+                    /** @param class-string<SplFixedArray<string>> $classString */
+                    function app(string $classString): void
+                    {
+                        acceptTemplatedClassString($classString);
+                    }',
+            ],
             'inferGenericListFromTuple' => [
                 'code' => '<?php
                     /**