Improve

vimeo · Apr 29, 2024 · 69ecec6 · 69ecec6
1 parent 91cfbff
commit 69ecec6
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php b/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php
@@ -9,6 +9,7 @@
 use Psalm\Type\Atomic;
 use Psalm\Type\Atomic\TClassString;
 use Psalm\Type\Atomic\TConditional;
+use Psalm\Type\Atomic\TFloat;
 use Psalm\Type\Atomic\TInt;
 use Psalm\Type\Atomic\TIterable;
 use Psalm\Type\Atomic\TKeyOf;
@@ -451,12 +452,17 @@ private static function replaceConditional(
                     null,
                     false,
                     false,
-                ) && null === Type::intersectUnionTypes(
-                    new Union([$candidate_atomic_type]),
-                    $conditional_type,
-                    $codebase,
                 )) {
-                    $matching_else_types[] = $candidate_atomic_type;
+                    $intersection = Type::intersectUnionTypes(
+                        new Union([$candidate_atomic_type]),
+                        $conditional_type,
+                        $codebase,
+                    );
+                    if (null === $intersection
+                        || ($candidate_atomic_type instanceof TFloat
+                            && $intersection->getKey() === 'int')) {
+                        $matching_else_types[] = $candidate_atomic_type;
+                    }
                 }
             }