Encapsed non-literal non-empty/falsy strings always return generic st…

…ring Fix #10944
vimeo · May 5, 2024 · 979cfc8 · 979cfc8
1 parent 0e09a19
commit 979cfc8
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php
@@ -76,7 +76,9 @@ public static function analyze(
 
                 if (!$casted_part_type->allLiterals()) {
                     $all_literals = false;
-                } elseif (!$non_falsy) {
+                }
+
+                if (!$non_falsy) {
                     // Check if all literals are nonempty
                     $possibly_non_empty = true;
                     $non_falsy = true;
@@ -98,9 +100,16 @@ public static function analyze(
                             && !$atomic_literal instanceof TNonEmptyNonspecificLiteralString
                             && !($atomic_literal instanceof TLiteralString && $atomic_literal->value !== "")
                         ) {
-                            $possibly_non_empty = false;
-                            $non_falsy = false;
-                            break;
+                            if (!$atomic_literal instanceof TNonFalsyString) {
+                                $non_falsy = false;
+                            }
+
+                            if (!$atomic_literal instanceof TNonEmptyString) {
+                                $possibly_non_empty = false;
+                                $non_falsy = false;
+
+                                break;
+                            }
                         }
                     }
 

diff --git a/tests/BinaryOperationTest.php b/tests/BinaryOperationTest.php
@@ -834,6 +834,42 @@ function foo(string $s1): string {
                     $interpolated = "hello {$foo} bar";',
                 'assertions' => ['$interpolated===' => "non-falsy-string"],
             ],
+            'encapsedStringWithoutLiterals1' => [
+                'code' => '<?php
+                    /**
+                     * @var non-falsy-string $a
+                     * @var non-falsy-string $b
+                     */
+                    $interpolated = "{$a}{$b}";',
+                'assertions' => ['$interpolated===' => "non-falsy-string"],
+            ],
+            'encapsedStringWithoutLiterals2' => [
+                'code' => '<?php
+                    /**
+                     * @var string $a
+                     * @var non-empty-string $b
+                     */
+                    $interpolated = "{$a}{$b}";',
+                'assertions' => ['$interpolated===' => "non-empty-string"],
+            ],
+            'encapsedStringWithoutLiterals3' => [
+                'code' => '<?php
+                    /**
+                     * @var non-empty-string $a
+                     * @var non-falsy-string $b
+                     */
+                    $interpolated = "{$a}{$b}";',
+                'assertions' => ['$interpolated===' => "non-falsy-string"],
+            ],
+            'encapsedStringWithoutLiterals4' => [
+                'code' => '<?php
+                    /**
+                     * @var string $a
+                     * @var non-falsy-string $b
+                     */
+                    $interpolated = "{$a}{$b}";',
+                'assertions' => ['$interpolated===' => "non-falsy-string"],
+            ],
             'encapsedStringIsInferredAsLiteral' => [
                 'code' => '<?php
                     $int = 1;