Merge remote-tracking branch 'origin/2.1.x' into 2.2.x

Author: ondrejmirtes

phpstan-baseline.neon

@@ -66,6 +66,12 @@ parameters:
 			count: 2
 			path: src/Analyser/MutatingScope.php
 
+		-
+			rawMessage: Doing instanceof PHPStan\Type\IntersectionType is error-prone and deprecated.
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Analyser/MutatingScope.php
+
 		-
 			rawMessage: 'Parameter #2 $node of method PHPStan\BetterReflection\SourceLocator\Ast\Strategy\NodeToReflection::__invoke() expects PhpParser\Node\Expr\ArrowFunction|PhpParser\Node\Expr\Closure|PhpParser\Node\Expr\FuncCall|PhpParser\Node\Stmt\Class_|PhpParser\Node\Stmt\Const_|PhpParser\Node\Stmt\Enum_|PhpParser\Node\Stmt\Function_|PhpParser\Node\Stmt\Interface_|PhpParser\Node\Stmt\Trait_, PhpParser\Node\Stmt\ClassLike given.'
 			identifier: argument.type

src/Analyser/MutatingScope.php

@@ -141,6 +141,8 @@ class MutatingScope implements Scope, NodeCallbackInvoker, CollectedDataEmitter
 	public const KEEP_VOID_ATTRIBUTE_NAME = 'keepVoid';
 	private const CONTAINS_SUPER_GLOBAL_ATTRIBUTE_NAME = 'containsSuperGlobal';
 
+	private const COMPLEX_UNION_TYPE_MEMBER_LIMIT = 8;
+
 	/** @var Type[] */
 	private array $resolvedTypes = [];
 
@@ -2745,10 +2747,12 @@ public function specifyExpressionType(Expr $expr, Type $type, Type $nativeType,
 					}
 
 					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
-						$varType = TypeCombinator::intersect(
-							$varType,
-							new HasOffsetValueType($dimType, $type),
-						);
+						if (!$this->isComplexUnionType($varType)) {
+							$varType = TypeCombinator::intersect(
+								$varType,
+								new HasOffsetValueType($dimType, $type),
+							);
+						}
 					}
 
 					$scope = $scope->specifyExpressionType(
@@ -3073,9 +3077,36 @@ private function setExpressionCertainty(Expr $expr, TrinaryLogic $certainty): se
 		);
 	}
 
+	/**
+	 * Returns true when the type is a large union with non-trivial
+	 * (IntersectionType) members — a sign of HasOffsetValueType
+	 * combinatorial growth from array|object offset access patterns.
+	 * Operating on such types is expensive and should be skipped.
+	 */
+	private function isComplexUnionType(Type $type): bool
+	{
+		if (!$type instanceof UnionType) {
+			return false;
+		}
+		$types = $type->getTypes();
+		if (count($types) <= self::COMPLEX_UNION_TYPE_MEMBER_LIMIT) {
+			return false;
+		}
+		foreach ($types as $member) {
+			if ($member instanceof IntersectionType) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public function addTypeToExpression(Expr $expr, Type $type): self
 	{
 		$originalExprType = $this->getType($expr);
+		if ($this->isComplexUnionType($originalExprType)) {
+			return $this;
+		}
+
 		$nativeType = $this->getNativeType($expr);
 
 		if ($originalExprType->equals($nativeType)) {
@@ -3102,6 +3133,10 @@ public function removeTypeFromExpression(Expr $expr, Type $typeToRemove): self
 			return $this;
 		}
 
+		if ($this->isComplexUnionType($exprType)) {
+			return $this;
+		}
+
 		return $this->specifyExpressionType(
 			$expr,
 			TypeCombinator::remove($exprType, $typeToRemove),