Try to fix

vimeo · Apr 28, 2024 · d135a6f · d135a6f
1 parent c0a9d04
commit d135a6f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php b/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php
@@ -443,15 +443,18 @@ private static function replaceConditional(
                 ) {
                     $matching_if_types[] = $candidate_atomic_type;
                 } elseif (!UnionTypeComparator::isContainedBy(
-                    $codebase,
-                    $conditional_type,
-                    new Union([$candidate_atomic_type]),
-                    false,
-                    false,
-                    null,
-                    false,
-                    false,
-                )) {
+                        $codebase,
+                        $conditional_type,
+                        new Union([$candidate_atomic_type]),
+                        false,
+                        false,
+                        null,
+                        false,
+                        false,
+                )
+                    && ($candidate_atomic_type->getKey() !== 'string'
+                        || $conditional_type->getKey() !== 'string')
+                ) {
                     $matching_else_types[] = $candidate_atomic_type;
                 }
             }