partly revert

Author: staabm

src/Type/Constant/ConstantArrayType.php

@@ -693,7 +693,7 @@ public function getOffsetValueType(Type $offsetType): Type
 
 	public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $unionValues = true): Type
 	{
-		if ($offsetType !== null && $valueType->isConstantScalarValue()->yes()) {
+		if ($offsetType !== null) {
 			if ($offsetType instanceof IntegerRangeType) {
 				$constantScalars = $offsetType->getFiniteTypes();
 			} else {
@@ -720,24 +720,22 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
-		if ($valueType->isConstantScalarValue()->yes()) {
-			if ($offsetType instanceof IntegerRangeType) {
-				$constantScalars = $offsetType->getFiniteTypes();
-			} else {
-				$constantScalars = $offsetType->getConstantScalarTypes();
-			}
-
-			$constantScalarsCount = count($constantScalars);
-			if ($constantScalarsCount > 1 && $constantScalarsCount < ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT) {
-				$arrays = [];
-				foreach ($constantScalars as $constantScalar) {
-					$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);
-					$builder->setOffsetValueType($constantScalar, $valueType);
-					$arrays[] = $builder->getArray();
-				}
+		if ($offsetType instanceof IntegerRangeType) {
+			$constantScalars = $offsetType->getFiniteTypes();
+		} else {
+			$constantScalars = $offsetType->getConstantScalarTypes();
+		}
 
-				return TypeCombinator::union(...$arrays);
+		$constantScalarsCount = count($constantScalars);
+		if ($constantScalarsCount > 1 && $constantScalarsCount < ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT) {
+			$arrays = [];
+			foreach ($constantScalars as $constantScalar) {
+				$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);
+				$builder->setOffsetValueType($constantScalar, $valueType);
+				$arrays[] = $builder->getArray();
 			}
+
+			return TypeCombinator::union(...$arrays);
 		}
 
 		$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);