no need to union AccessoryTypes because classified by `$innerType->de…

…scribe(VerbosityLevel::cache())` and they should be same (except HasOffsetValueType)
phpstan · Dec 17, 2022 · 8e5b564 · 8e5b564
1 parent fa878ab
commit 8e5b564
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -513,14 +513,7 @@ private static function processArrayAccessoryTypes(array $arrayTypes): array
 						break;
 					}
 					if ($innerType instanceof HasOffsetValueType) {
-						$key = sprintf('hasOffsetValue(%s)', $innerType->getOffsetType()->describe(VerbosityLevel::cache()));
-						$type = isset($accessoryTypes[$key][$i])
-							? new HasOffsetValueType(
-								$innerType->getOffsetType(),
-								self::union($innerType->getValueType(), $accessoryTypes[$key][$i]->getValueType()),
-							)
-							: $innerType;
-						$accessoryTypes[$key][$i] = $type;
+						$accessoryTypes[sprintf('hasOffsetValue(%s)', $innerType->getOffsetType()->describe(VerbosityLevel::cache()))][$i] = $innerType;
 						continue;
 					}
 					if (!($innerType instanceof AccessoryType) && !($innerType instanceof CallableType)) {
@@ -558,7 +551,12 @@ private static function processArrayAccessoryTypes(array $arrayTypes): array
 				continue;
 			}
 
-			$commonAccessoryTypes[] = self::union(...$accessoryType);
+			if ($accessoryType[0] instanceof HasOffsetValueType) {
+				$commonAccessoryTypes[] = TypeCombinator::union(...$accessoryType);
+				continue;
+			}
+
+			$commonAccessoryTypes[] = $accessoryType[0];
 		}
 
 		return $commonAccessoryTypes;