Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Type/IntersectionType.php

@@ -97,6 +97,14 @@ class IntersectionType implements CompoundType
 
 	private ?TrinaryLogic $isConstantScalarValue = null;
 
+	private ?TrinaryLogic $isCallable = null;
+
+	/** @var array<string, Type> */
+	private array $cachedGetOffsetValueType = [];
+
+	/** @var array<string, TrinaryLogic> */
+	private array $cachedHasOffsetValueType = [];
+
 	/**
 	 * @api
 	 * @param list<Type> $types
@@ -910,6 +918,15 @@ public function isOffsetAccessLegal(): TrinaryLogic
 	}
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
+	{
+		$cacheKey = $offsetType->describe(VerbosityLevel::cache());
+		if (isset($this->cachedHasOffsetValueType[$cacheKey])) {
+			return $this->cachedHasOffsetValueType[$cacheKey];
+		}
+		return $this->cachedHasOffsetValueType[$cacheKey] = $this->doHasOffsetValueType($offsetType);
+	}
+
+	private function doHasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
 		if ($this->isList()->yes()) {
 			$arrayKeyOffsetType = $offsetType->toArrayKey();
@@ -964,6 +981,15 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	}
 
 	public function getOffsetValueType(Type $offsetType): Type
+	{
+		$cacheKey = $offsetType->describe(VerbosityLevel::cache());
+		if (isset($this->cachedGetOffsetValueType[$cacheKey])) {
+			return $this->cachedGetOffsetValueType[$cacheKey];
+		}
+		return $this->cachedGetOffsetValueType[$cacheKey] = $this->doGetOffsetValueType($offsetType);
+	}
+
+	private function doGetOffsetValueType(Type $offsetType): Type
 	{
 		$result = $this->intersectTypes(static fn (Type $type): Type => $type->getOffsetValueType($offsetType));
 		if ($this->isOversizedArray()->yes()) {
@@ -1181,7 +1207,7 @@ public function getEnumCaseObject(): ?EnumCaseObjectType
 
 	public function isCallable(): TrinaryLogic
 	{
-		return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isCallable());
+		return $this->isCallable ??= $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isCallable());
 	}
 
 	public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array