Fix #4310 - prevent literal class check on union

vimeo · Oct 12, 2020 · dfa8854 · dfa8854
1 parent 042cc06
commit dfa8854
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -851,7 +851,7 @@ public static function verifyType(
             foreach ($param_type->getAtomicTypes() as $param_type_part) {
                 if ($param_type_part instanceof TClassString
                     && $input_expr instanceof PhpParser\Node\Scalar\String_
-                    && !$param_type->getLiteralStrings()
+                    && $param_type->isSingle()
                 ) {
                     if (ClassLikeAnalyzer::checkFullyQualifiedClassLikeName(
                         $statements_analyzer,

diff --git a/tests/Template/ConditionalReturnTypeTest.php b/tests/Template/ConditionalReturnTypeTest.php
@@ -621,6 +621,39 @@ public function get_liste_tdm_by_cod_s(bool $id_only = false): array {
                         }
                     }'
             ],
+            'stringOrClassStringT' => [
+                '<?php
+                    class A {}
+
+                    /**
+                     * @template T
+                     * @param string|class-string<T> $name
+                     * @return ($name is class-string ? T : mixed)
+                     */
+                    function get(string $name) {
+                        return;
+                    }
+
+                    $lowercase_a = "a";
+
+                    /** @var class-string $class_string */
+                    $class_string = "b";
+
+                    /** @psalm-suppress MixedAssignment */
+                    $expect_mixed = get($lowercase_a);
+                    $expect_object = get($class_string);
+
+                    $expect_a_object = get(A::class);
+
+                    /** @psalm-suppress MixedAssignment */
+                    $expect_mixed_from_literal = get("LiteralDirect");',
+                [
+                    '$expect_mixed' => 'mixed',
+                    '$expect_object' => 'object',
+                    '$expect_a_object' => 'A',
+                    '$expect_mixed_from_literal' => 'mixed',
+                ]
+            ],
         ];
     }
 }