Try

vimeo · Apr 29, 2024 · 7d78bc8 · 7d78bc8
1 parent 69ecec6
commit 7d78bc8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php b/src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php
@@ -452,17 +452,14 @@ private static function replaceConditional(
  null,
  false,
  false,
+ ) && null === Type::intersectUnionTypes(
+ new Union([$candidate_atomic_type]),
+ $conditional_type,
+ $codebase,
+ false,
+ false
  )) {
- $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;
- }
+ $matching_else_types[] = $candidate_atomic_type;
  }
  }
 

diff --git a/src/Psalm/Type.php b/src/Psalm/Type.php
@@ -33,8 +33,10 @@
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Atomic\TNever;
 use Psalm\Type\Atomic\TNonEmptyLowercaseString;
+use Psalm\Type\Atomic\TNonEmptyNonspecificLiteralString;
 use Psalm\Type\Atomic\TNonEmptyString;
 use Psalm\Type\Atomic\TNonFalsyString;
+use Psalm\Type\Atomic\TNonspecificLiteralString;
 use Psalm\Type\Atomic\TNull;
 use Psalm\Type\Atomic\TNumeric;
 use Psalm\Type\Atomic\TNumericString;
@@ -909,6 +911,14 @@ private static function intersectAtomicTypes(
  $intersection_atomic = $type_1_atomic;
  $wider_type = $type_2_atomic;
  $intersection_performed = true;
+ } elseif (
+ ($type_1_atomic instanceof TNonspecificLiteralString
+ && $type_2_atomic instanceof TNonEmptyString)
+ || ($type_1_atomic instanceof TNonEmptyString
+ && $type_2_atomic instanceof TNonspecificLiteralString)
+ ) {
+ $intersection_atomic = new TNonEmptyNonspecificLiteralString();
+ $intersection_performed = true;
  }
 
  if ($intersection_atomic