Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

phpstan-baseline.neon

@@ -1326,7 +1326,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ArrayType is error\-prone and deprecated\. Use Type\:\:isArray\(\) or Type\:\:getArrays\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 3
+			count: 4
 			path: src/Type/IntersectionType.php
 
 		-
@@ -1347,6 +1347,12 @@ parameters:
 			count: 3
 			path: src/Type/IntersectionType.php
 
+		-
+			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantStringType is error\-prone and deprecated\. Use Type\:\:getConstantStrings\(\) instead\.$#'
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Type/IntersectionType.php
+
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\IntersectionType is error\-prone and deprecated\.$#'
 			identifier: phpstanApi.instanceofType

src/Analyser/NodeScopeResolver.php

@@ -5072,7 +5072,30 @@ private function processAssignVar(
 			$offsetNativeValueType = $varNativeType;
 
 			$valueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetTypes, $offsetValueType, $valueToWrite);
-			$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
+
+			$nativeValueToWrite = $valueToWrite;
+			if (!$offsetValueType->equals($offsetNativeValueType) || !$valueToWrite->equals($nativeValueToWrite)) {
+				$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
+			} else {
+				foreach ($offsetTypes as $i => $offsetType) {
+					$offsetNativeType = $offsetNativeTypes[$i];
+					if ($offsetType === null) {
+						if ($offsetNativeType !== null) {
+							throw new ShouldNotHappenException();
+						}
+
+						continue;
+					} elseif ($offsetNativeType === null) {
+						throw new ShouldNotHappenException();
+					}
+					if ($offsetType->equals($offsetNativeType)) {
+						continue;
+					}
+
+					$nativeValueToWrite = $this->produceArrayDimFetchAssignValueToWrite($offsetNativeTypes, $offsetNativeValueType, $nativeValueToWrite);
+					break;
+				}
+			}
 
 			if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {
 				if ($var instanceof Variable && is_string($var->name)) {

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -127,6 +127,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 
 				if (count($this->keyTypes) > self::ARRAY_COUNT_LIMIT) {
 					$this->degradeToGeneralArray = true;
+					$this->oversized = true;
 				}
 
 				return;
@@ -193,6 +194,7 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $opt
 
 				if (count($this->keyTypes) > self::ARRAY_COUNT_LIMIT) {
 					$this->degradeToGeneralArray = true;
+					$this->oversized = true;
 				}
 
 				return;

src/Type/IntersectionType.php

@@ -30,6 +30,7 @@
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
+use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
@@ -743,6 +744,30 @@ public function getOffsetValueType(Type $offsetType): Type
 
 	public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $unionValues = true): Type
 	{
+		if ($this->isOversizedArray()->yes()) {
+			return $this->intersectTypes(static function (Type $type) use ($offsetType, $valueType, $unionValues): Type {
+				// avoid new HasOffsetValueType being intersected with oversized array
+				if (!$type instanceof ArrayType) {
+					return $type->setOffsetValueType($offsetType, $valueType, $unionValues);
+				}
+
+				if (!$offsetType instanceof ConstantStringType && !$offsetType instanceof ConstantIntegerType) {
+					return $type->setOffsetValueType($offsetType, $valueType, $unionValues);
+				}
+
+				if (!$offsetType->isSuperTypeOf($type->getKeyType())->yes()) {
+					return $type->setOffsetValueType($offsetType, $valueType, $unionValues);
+				}
+
+				return TypeCombinator::intersect(
+					new ArrayType(
+						TypeCombinator::union($type->getKeyType(), $offsetType),
+						TypeCombinator::union($type->getItemType(), $valueType),
+					),
+					new NonEmptyArrayType(),
+				);
+			});
+		}
 		return $this->intersectTypes(static fn (Type $type): Type => $type->setOffsetValueType($offsetType, $valueType, $unionValues));
 	}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1338,6 +1338,12 @@ public function testBug10538(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug10847(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-10847.php');
+		$this->assertNoErrors($errors);
+	}
+
 	public function testBug10772(): void
 	{
 		if (PHP_VERSION_ID < 80100) {