Use Type->setExistingOffsetValueType() more

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5936,9 +5936,18 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 				}
 				$offsetValueType = TypeCombinator::intersect($offsetValueType, TypeCombinator::union(...$types));
 			}
-			$valueToWrite = $offsetValueType->setOffsetValueType($offsetType, $valueToWrite, $i === 0);
 
 			$arrayDimFetch = $dimFetchStack[$i] ?? null;
+			if (
+				$offsetType !== null
+				&& $arrayDimFetch !== null
+				&& $scope->hasExpressionType($arrayDimFetch)->yes()
+			) {
+				$valueToWrite = $offsetValueType->setExistingOffsetValueType($offsetType, $valueToWrite);
+			} else {
+				$valueToWrite = $offsetValueType->setOffsetValueType($offsetType, $valueToWrite, $i === 0);
+			}
+
 			if ($arrayDimFetch === null || !$offsetValueType->isList()->yes()) {
 				continue;
 			}

src/Type/Accessory/AccessoryArrayListType.php

@@ -151,13 +151,6 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 			return $this;
 		}
 
-		if (
-			$valueType->isArray()->yes()
-			&& IntegerRangeType::fromInterval(0, null)->isSuperTypeOf($offsetType)->yes()
-		) {
-			return $this;
-		}
-
 		return new ErrorType();
 	}
 

src/Type/Accessory/HasOffsetValueType.php

@@ -184,6 +184,10 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
+		if (!$offsetType->equals($this->offsetType)) {
+			return $this;
+		}
+
 		return new self($this->offsetType, $valueType);
 	}
 

src/Type/ArrayType.php

@@ -361,9 +361,30 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
-		return new self(
-			$this->keyType,
-			TypeCombinator::union($this->itemType, $valueType),
+		if ($offsetType instanceof ConstantStringType || $offsetType instanceof ConstantIntegerType) {
+			if ($offsetType->isSuperTypeOf($this->keyType)->yes()) {
+				$builder = ConstantArrayTypeBuilder::createEmpty();
+				$builder->setOffsetValueType($offsetType, $valueType);
+				return $builder->getArray();
+			}
+
+			return TypeCombinator::intersect(
+				new self(
+					TypeCombinator::union($this->keyType, $offsetType),
+					TypeCombinator::union($this->itemType, $valueType),
+				),
+				new HasOffsetValueType($offsetType, $valueType),
+				new NonEmptyArrayType(),
+			);
+		}
+
+
+		return TypeCombinator::intersect(
+			new self(
+				$this->keyType,
+				TypeCombinator::union($this->itemType, $valueType)
+			),
+			new NonEmptyArrayType(),
 		);
 	}
 

src/Type/Constant/ConstantArrayType.php

@@ -695,11 +695,17 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
 	{
 		$offsetType = $offsetType->toArrayKey();
 		$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);
+		$unionValues = $offsetType instanceof UnionType && count($offsetType->getTypes()) > 1;
 		foreach ($this->keyTypes as $keyType) {
 			if ($offsetType->isSuperTypeOf($keyType)->no()) {
 				continue;
 			}
 
+			if ($unionValues) {
+				$builder->setOffsetValueType($keyType, TypeCombinator::union($this->getOffsetValueType($keyType), $valueType));
+				continue;
+			}
+
 			$builder->setOffsetValueType($keyType, $valueType);
 		}
 

src/Type/IntersectionType.php

@@ -802,9 +802,6 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 		}
 
 		$result = $this->intersectTypes(static fn (Type $type): Type => $type->setOffsetValueType($offsetType, $valueType, $unionValues));
-		if ($this->isList()->yes() && $valueType->isArray()->yes()) {
-			$result = TypeCombinator::intersect($result, new AccessoryArrayListType());
-		}
 
 		if (
 			$offsetType !== null
@@ -832,6 +829,10 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 			}
 		}
 
+		if ($this->isList()->yes() && $this->getIterableValueType()->isArray()->yes()) {
+			$result = TypeCombinator::intersect($result, new AccessoryArrayListType());
+		}
+
 		return $result;
 	}