Skip finite unsealed-tail keys that overlap explicit array shape keys

Explicit keys own their slot — the unsealed extras describe entries at
keys NOT in the explicit set. When the tail key type has finite values
(e.g. int<0, 5>), expansion via setOffsetValueType used to merge the
tail value into matching explicit keys, making infinite-range tails
(handled via makeUnsealed) and finite-range tails behave inconsistently.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: ondrejmirtes

src/PhpDoc/TypeNodeResolver.php

@@ -1099,12 +1099,16 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 		$builder = ConstantArrayTypeBuilder::createEmpty();
 		$builder->disableArrayDegradation();
 
+		$explicitKeyValues = [];
 		foreach ($typeNode->items as $itemNode) {
 			if ($itemNode->valueType instanceof CallableTypeNode) {
 				$builder->disableClosureDegradation();
 			}
 
 			$offsetType = $this->resolveArrayShapeOffsetType($itemNode, $nameScope);
+			if ($offsetType instanceof ConstantIntegerType || $offsetType instanceof ConstantStringType) {
+				$explicitKeyValues[] = $offsetType->getValue();
+			}
 			$builder->setOffsetValueType($offsetType, $this->resolve($itemNode->valueType, $nameScope), $itemNode->optional);
 		}
 
@@ -1138,6 +1142,14 @@ private function resolveArrayShapeNode(ArrayShapeNode $typeNode, NameScope $name
 				$unsealedValueType = $this->resolve($typeNode->unsealedType->valueType, $nameScope);
 				if (count($unsealedKeyFiniteTypes) > 0) {
 					foreach ($unsealedKeyFiniteTypes as $unsealedKeyFiniteType) {
+						// Explicit keys own their slot — the unsealed extras
+						// describe entries at keys NOT in the explicit set.
+						if (
+							($unsealedKeyFiniteType instanceof ConstantIntegerType || $unsealedKeyFiniteType instanceof ConstantStringType)
+							&& in_array($unsealedKeyFiniteType->getValue(), $explicitKeyValues, true)
+						) {
+							continue;
+						}
 						$builder->setOffsetValueType($unsealedKeyFiniteType, $unsealedValueType, true);
 					}
 				} else {

tests/PHPStan/Analyser/nsrt/unsealed-array-shapes.php

@@ -80,7 +80,7 @@ public function edgeCases(array $a, array $b, array $c): void
 	{
 		assertType('array<string, UnsealedArrayShapes\Foo>', $a);
 		assertType('array{a: int, b?: string, c?: string}', $b);
-		assertType('array{a: int, b: float|string, c?: string}', $c);
+		assertType('array{a: int, b: float, c?: string}', $c);
 	}
 
 	/**
@@ -454,6 +454,7 @@ class ConsistentKeyFetchWhenOverlappingWithUnsealedExtraKeys
 	 */
 	public function startDay(array $array): void
 	{
+		assertType('array{1: string, 2: string, ...<int, int>}', $array);
 		assertType('string', $array[1]);
 	}
 
@@ -462,6 +463,7 @@ public function startDay(array $array): void
 	 */
 	public function startDay2(array $array): void
 	{
+		assertType('array{1: string, 2: string, ...<int<0, max>, int>}', $array);
 		assertType('string', $array[1]);
 	}
 
@@ -470,6 +472,7 @@ public function startDay2(array $array): void
 	 */
 	public function startDay3(array $array): void
 	{
+		assertType('array{1: string, 2: string, 0?: int, 3?: int, 4?: int, 5?: int}', $array);
 		assertType('string', $array[1]);
 	}