Fix condition on literal-string

vimeo · Apr 28, 2024 · c0a9d04 · c0a9d04
1 parent c631102
commit c0a9d04
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php b/src/Psalm/Internal/Type/Comparator/ScalarTypeComparator.php
@@ -74,7 +74,10 @@ public static function isContainedBy(
         }
 
         if ($container_type_part instanceof TNonEmptyString
-            && get_class($input_type_part) === TString::class
+            && (
+                get_class($input_type_part) === TString::class
+                || get_class($input_type_part) === TNonspecificLiteralString::class
+            )
         ) {
             if ($atomic_comparison_result) {
                 $atomic_comparison_result->type_coerced = true;

diff --git a/tests/Template/ConditionalReturnTypeTest.php b/tests/Template/ConditionalReturnTypeTest.php
@@ -979,6 +979,34 @@ function getSomething(string $string)
                 ],
                 'ignored_issues' => [],
             ],
+            'literalStringIsNotNonEmpty' => [
+                'code' => '<?php
+                    /**
+                     * @param literal-string $string
+                     * @psalm-return ($string is non-empty-string ? string : int)
+                     */
+                    function getSomething(string $string)
+                    {
+                        if (!$string) {
+                            return 1;
+                        }
+
+                        return "";
+                    }
+
+                    /** @var literal-string $literalString */
+                    $literalString;
+                    $something = getSomething($literalString);
+                    /** @var non-empty-literal-string $nonEmptyliteralString */
+                    $nonEmptyliteralString;
+                    $something2 = getSomething($nonEmptyliteralString);
+                ',
+                'assertions' => [
+                    '$something' => 'int|string',
+                    '$something2' => 'string',
+                ],
+                'ignored_issues' => [],
+            ],
         ];
     }
 }