Introduce Type->getConstantArrayKeys()

staabm · staabm · commit aed6fc35e866 · 2025-07-27T17:37:47.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4229,29 +4229,41 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 
 		$scope = $this;
 		if ($expr instanceof Expr\ArrayDimFetch && $expr->dim !== null) {
-			$dimType = $scope->getType($expr->dim)->toArrayKey();
-			if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
+			$dimTypes = $scope->getType($expr->dim)->getConstantArrayKeys();
+
+			if ($dimTypes !== []) {
 				$exprVarType = $scope->getType($expr->var);
 				if (!$exprVarType instanceof MixedType && !$exprVarType->isArray()->no()) {
+					$hasOffsets = [];
+					$containsInteger = false;
+					foreach($dimTypes as $dimType) {
+						$hasOffsets[] = new HasOffsetValueType($dimType, $type);
+
+						if ($dimType instanceof ConstantIntegerType) {
+							$containsInteger = true;
+						}
+					}
+
 					$types = [
 						new ArrayType(new MixedType(), new MixedType()),
 						new ObjectType(ArrayAccess::class),
 						new NullType(),
 					];
-					if ($dimType instanceof ConstantIntegerType) {
+					if ($containsInteger) {
 						$types[] = new StringType();
 					}
 
 					$scope = $scope->specifyExpressionType(
 						$expr->var,
 						TypeCombinator::intersect(
 							TypeCombinator::intersect($exprVarType, TypeCombinator::union(...$types)),
-							new HasOffsetValueType($dimType, $type),
+							...$hasOffsets,
 						),
 						$scope->getNativeType($expr->var),
 						$certainty,
 					);
 				}
+
 			}
 		}
 
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -70,6 +70,11 @@ public function getConstantArrays(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryLowercaseStringType.php b/src/Type/Accessory/AccessoryLowercaseStringType.php
@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -65,6 +65,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -67,6 +67,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/AccessoryUppercaseStringType.php b/src/Type/Accessory/AccessoryUppercaseStringType.php
@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -75,6 +75,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -78,6 +78,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/HasPropertyType.php b/src/Type/Accessory/HasPropertyType.php
@@ -51,6 +51,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -69,6 +69,11 @@ public function getConstantArrays(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -67,6 +67,11 @@ public function getConstantArrays(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/BooleanType.php b/src/Type/BooleanType.php
@@ -46,6 +46,11 @@ public function getConstantStrings(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantScalarTypes(): array
 	{
 		return [new ConstantBooleanType(true), new ConstantBooleanType(false)];
diff --git a/src/Type/CallableType.php b/src/Type/CallableType.php
@@ -124,6 +124,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/ClosureType.php b/src/Type/ClosureType.php
@@ -358,6 +358,11 @@ public function getConstant(string $constantName): ClassConstantReflection
 		return $this->objectType->getConstant($constantName);
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/FloatType.php b/src/Type/FloatType.php
@@ -57,6 +57,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/IntegerRangeType.php b/src/Type/IntegerRangeType.php
@@ -693,6 +693,11 @@ public function exponentiate(Type $exponent): Type
 		return parent::exponentiate($exponent);
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return $this->getFiniteTypes();
+	}
+
 	/**
 	 * @return list<ConstantIntegerType>
 	 */
diff --git a/src/Type/IntegerType.php b/src/Type/IntegerType.php
@@ -47,6 +47,11 @@ public function describe(VerbosityLevel $level): string
 		return 'int';
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -176,6 +176,18 @@ public function getConstantArrays(): array
 		return $constantArrays;
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		$arrayKeys = [];
+		foreach ($this->types as $type) {
+			foreach ($type->getConstantArrayKeys() as $string) {
+				$arrayKeys[] = $string;
+			}
+		}
+
+		return $arrayKeys;
+	}
+
 	public function getConstantStrings(): array
 	{
 		$strings = [];
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -71,6 +71,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -88,6 +88,11 @@ public function getConstantArrays(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/NonexistentParentClassType.php b/src/Type/NonexistentParentClassType.php
@@ -112,6 +112,11 @@ public function getConstant(string $constantName): ClassConstantReflection
 		throw new ShouldNotHappenException();
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/NullType.php b/src/Type/NullType.php
@@ -51,6 +51,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -917,6 +917,11 @@ public function getTemplateType(string $ancestorClassName, string $templateTypeN
 		return $type;
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/ResourceType.php b/src/Type/ResourceType.php
@@ -45,6 +45,11 @@ public function describe(VerbosityLevel $level): string
 		return 'resource';
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -123,6 +123,11 @@ public function getConstantArrays(): array
 		return $this->getStaticObjectType()->getConstantArrays();
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return $this->getStaticObjectType()->getConstantArrayKeys();
+	}
+
 	public function getConstantStrings(): array
 	{
 		return $this->getStaticObjectType()->getConstantStrings();
diff --git a/src/Type/StrictMixedType.php b/src/Type/StrictMixedType.php
@@ -46,6 +46,11 @@ public function getObjectClassReflections(): array
 		return [];
 	}
 
+	public function getConstantArrayKeys(): array
+	{
+		return [];
+	}
+
 	public function getConstantStrings(): array
 	{
 		return [];
diff --git a/src/Type/StringType.php b/src/Type/StringType.php
diff --git a/src/Type/Traits/ConstantScalarTypeTrait.php b/src/Type/Traits/ConstantScalarTypeTrait.php
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
diff --git a/src/Type/Traits/NonObjectTypeTrait.php b/src/Type/Traits/NonObjectTypeTrait.php
diff --git a/src/Type/Traits/ObjectTypeTrait.php b/src/Type/Traits/ObjectTypeTrait.php
diff --git a/src/Type/Type.php b/src/Type/Type.php
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
diff --git a/test5.php b/test5.php

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,11 @@ public function getConstantArrays(): array`
`70`	`70`	`return [];`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ public function getConstantArrayKeys(): array`
	`74`	`+ {`
	`75`	`+ return [];`
	`76`	`+ }`
	`77`	`+`
`73`	`78`	`public function getConstantStrings(): array`
`74`	`79`	`{`
`75`	`80`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ public function getObjectClassReflections(): array`
`64`	`64`	`return [];`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ public function getConstantArrayKeys(): array`
	`68`	`+ {`
	`69`	`+ return [];`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`public function getConstantStrings(): array`
`68`	`73`	`{`
`69`	`74`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,11 @@ public function getObjectClassReflections(): array`
`65`	`65`	`return [];`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public function getConstantArrayKeys(): array`
	`69`	`+ {`
	`70`	`+ return [];`
	`71`	`+ }`
	`72`	`+`
`68`	`73`	`public function getConstantStrings(): array`
`69`	`74`	`{`
`70`	`75`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,11 @@ public function getObjectClassReflections(): array`
`67`	`67`	`return [];`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ public function getConstantArrayKeys(): array`
	`71`	`+ {`
	`72`	`+ return [];`
	`73`	`+ }`
	`74`	`+`
`70`	`75`	`public function getConstantStrings(): array`
`71`	`76`	`{`
`72`	`77`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,11 @@ public function getObjectClassReflections(): array`
`75`	`75`	`return [];`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ public function getConstantArrayKeys(): array`
	`79`	`+ {`
	`80`	`+ return [];`
	`81`	`+ }`
	`82`	`+`
`78`	`83`	`public function getConstantStrings(): array`
`79`	`84`	`{`
`80`	`85`	`return [];`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,11 @@ public function getObjectClassReflections(): array`
`78`	`78`	`return [];`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ public function getConstantArrayKeys(): array`
	`82`	`+ {`
	`83`	`+ return [];`
	`84`	`+ }`
	`85`	`+`
`81`	`86`	`public function getConstantStrings(): array`
`82`	`87`	`{`
`83`	`88`	`return [];`