Merge pull request #10594 from edsrzf/encapsed-string-condition-order

Switch condition order
vimeo · Jan 25, 2024 · c0e8d32 · c0e8d32
2 parents e72ad06 + 68a1d1e
commit c0e8d32
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/EncapsulatedStringAnalyzer.php
@@ -46,9 +46,12 @@ public static function analyze(
                 return false;
             }
 
-            $part_type = $statements_analyzer->node_data->getType($part);
-
-            if ($part_type !== null) {
+            if ($part instanceof EncapsedStringPart) {
+                if ($literal_string !== null) {
+                    $literal_string .= $part->value;
+                }
+                $non_empty = $non_empty || $part->value !== "";
+            } elseif ($part_type = $statements_analyzer->node_data->getType($part)) {
                 $casted_part_type = CastAnalyzer::castStringAttempt(
                     $statements_analyzer,
                     $context,
@@ -110,11 +113,6 @@ public static function analyze(
                         }
                     }
                 }
-            } elseif ($part instanceof EncapsedStringPart) {
-                if ($literal_string !== null) {
-                    $literal_string .= $part->value;
-                }
-                $non_empty = $non_empty || $part->value !== "";
             } else {
                 $all_literals = false;
                 $literal_string = null;