Faster ArrayType::hasOffsetValueType()

Author: staabm

src/Type/ArrayType.php

@@ -268,8 +268,12 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		$allowedArrayKeys = AllowedArrayKeysTypes::getType();
-		$offsetType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
+		$offsetArrayKeyType = $offsetType->toArrayKey();
+		if ($offsetArrayKeyType instanceof ErrorType) {
+			$allowedArrayKeys = AllowedArrayKeysTypes::getType();
+			$offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
+		}
+		$offsetType = $offsetArrayKeyType;
 
 		if ($this->getKeyType()->isSuperTypeOf($offsetType)->no()
 			&& ($offsetType->isString()->no() || !$offsetType->isConstantScalarValue()->no())

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);
 	}