Another try

vimeo · Apr 29, 2024 · eabe01e · eabe01e
1 parent a184f15
commit eabe01e
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php b/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php
@@ -442,23 +442,21 @@ private static function replaceConditional(
                         || $conditional_type->getId() !== 'float')
                 ) {
                     $matching_if_types[] = $candidate_atomic_type;
-                } elseif (!UnionTypeComparator::isContainedBy(
-                    $codebase,
-                    $conditional_type,
-                    new Union([$candidate_atomic_type]),
-                    false,
-                    false,
-                    null,
-                    false,
-                    false,
-                ) && null === Type::intersectUnionTypes(
-                    new Union([$candidate_atomic_type]),
-                    $conditional_type,
-                    $codebase,
-                    false,
-                    false,
-                )) {
-                    $matching_else_types[] = $candidate_atomic_type;
+                } else {
+                    $intersection = Type::intersectUnionTypes(
+                        new Union([$candidate_atomic_type]),
+                        $conditional_type,
+                        $codebase,
+                        false,
+                        false,
+                    );
+
+                    if (null === $intersection) {
+                        $matching_else_types[] = $candidate_atomic_type;
+                    } else {
+                        $matching_if_types[] = $candidate_atomic_type;
+                        $matching_else_types[] = $candidate_atomic_type;
+                    }
                 }
             }