Update ConstantArrayType.php

staabm · staabm · commit dc6e2c09cddf · 2025-09-05T12:24:05.000+02:00
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -582,8 +582,11 @@ public function findTypeAndMethodNames(): array
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		$allowedArrayKeys = AllowedArrayKeysTypes::getType();
-		$offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
+		$offsetArrayKeyType = $offsetType->toArrayKey();
+		if ($offsetArrayKeyType instanceof ErrorType) {
+			$allowedArrayKeys = AllowedArrayKeysTypes::getType();
+			$offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
+		}
 
 		return $this->recursiveHasOffsetValueType($offsetArrayKeyType);
 	}

Original file line number	Diff line number	Diff line change
`@@ -582,8 +582,11 @@ public function findTypeAndMethodNames(): array`
`582`	`582`
`583`	`583`	`public function hasOffsetValueType(Type $offsetType): TrinaryLogic`
`584`	`584`	`{`
`585`		`- $allowedArrayKeys = AllowedArrayKeysTypes::getType();`
`586`		`- $offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();`
	`585`	`+ $offsetArrayKeyType = $offsetType->toArrayKey();`
	`586`	`+ if ($offsetArrayKeyType instanceof ErrorType) {`
	`587`	`+ $allowedArrayKeys = AllowedArrayKeysTypes::getType();`
	`588`	`+ $offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();`
	`589`	`+ }`
`587`	`590`
`588`	`591`	`return $this->recursiveHasOffsetValueType($offsetArrayKeyType);`
`589`	`592`	`}`