NodeScopeResolver: faster produceArrayDimFetchAssignValueToWrite()

staabm · ondrejmirtes · commit 89dbdf975be2 · 2026-01-31T11:22:12.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -6604,7 +6604,7 @@ private function produceArrayDimFetchAssignValueToWrite(array $dimFetchStack, ar
 			$offsetValueType = array_pop($offsetValueTypeStack);
 			if (
 				!$offsetValueType instanceof MixedType
-				&& !$offsetValueType->isConstantArray()->yes()
+				&& !$offsetValueType->isArray()->yes()
 			) {
 				$types = [
 					new ArrayType(new MixedType(), new MixedType()),
diff --git a/tests/PHPStan/Analyser/nsrt/bug-13270b-php8.php b/tests/PHPStan/Analyser/nsrt/bug-13270b-php8.php
@@ -19,7 +19,7 @@ public function parseData(array $data): array
 			if (!array_key_exists('priceWithVat', $data['price'])) {
 				$data['price']['priceWithVat'] = null;
 			}
-			assertType("non-empty-array&hasOffsetValue('priceWithVat', mixed)", $data['price']);
+			assertType("non-empty-array&hasOffset('priceWithVat')", $data['price']);
 			if (!array_key_exists('priceWithoutVat', $data['price'])) {
 				$data['price']['priceWithoutVat'] = null;
 			}
diff --git a/tests/PHPStan/Analyser/nsrt/superglobals.php b/tests/PHPStan/Analyser/nsrt/superglobals.php
@@ -32,7 +32,7 @@ public function canBePartlyOverwritten(): void
 	{
 		$GLOBALS['foo'] = 'foo';
 		assertType("non-empty-array&hasOffsetValue('foo', 'foo')", $GLOBALS);
-		assertNativeType("non-empty-array&hasOffsetValue('foo', 'foo')", $GLOBALS);
+		assertNativeType("non-empty-array<mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS);
 	}
 
 	public function canBeNarrowed(): void

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function parseData(array $data): array`
`19`	`19`	`if (!array_key_exists('priceWithVat', $data['price'])) {`
`20`	`20`	`$data['price']['priceWithVat'] = null;`
`21`	`21`	`}`
`22`		`- assertType("non-empty-array&hasOffsetValue('priceWithVat', mixed)", $data['price']);`
	`22`	`+ assertType("non-empty-array&hasOffset('priceWithVat')", $data['price']);`
`23`	`23`	`if (!array_key_exists('priceWithoutVat', $data['price'])) {`
`24`	`24`	`$data['price']['priceWithoutVat'] = null;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function canBePartlyOverwritten(): void`
`32`	`32`	`{`
`33`	`33`	`$GLOBALS['foo'] = 'foo';`
`34`	`34`	`assertType("non-empty-array&hasOffsetValue('foo', 'foo')", $GLOBALS);`
`35`		`- assertNativeType("non-empty-array&hasOffsetValue('foo', 'foo')", $GLOBALS);`
	`35`	`+ assertNativeType("non-empty-array<mixed>&hasOffsetValue('foo', 'foo')", $GLOBALS);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function canBeNarrowed(): void`