Fixed HasOffsetValueType accessory missing main type

staabm · web-flow · commit 252390ffd16a · 2025-08-04T16:41:28.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -181,6 +181,7 @@
 use PHPStan\Type\Generic\TemplateTypeVarianceMap;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IntersectionType;
+use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
@@ -1250,6 +1251,19 @@ private function processStmtNode(
 			$exprType = $scope->getType($stmt->expr);
 			$isIterableAtLeastOnce = $exprType->isIterableAtLeastOnce();
 			if ($exprType->isIterable()->no() || $isIterableAtLeastOnce->maybe()) {
+				$foreachType = $this->getForeachIterateeType();
+				if (
+					!$foreachType->isSuperTypeOf($exprType)->yes()
+					&& $finalScope->getType($stmt->expr)->equals($foreachType)
+				) {
+					// restore iteratee type, in case the type was narrowed while entering the foreach
+					$finalScope = $finalScope->assignExpression(
+						$stmt->expr,
+						$exprType,
+						$scope->getNativeType($stmt->expr),
+					);
+				}
+
 				$finalScope = $finalScope->mergeWith($scope->filterByTruthyValue(new BooleanOr(
 					new BinaryOp\Identical(
 						$stmt->expr,
@@ -6313,11 +6327,32 @@ private function processVarAnnotation(MutatingScope $scope, array $variableNames
 		return $scope;
 	}
 
+	private function getForeachIterateeType(): Type
+	{
+		return new IterableType(new MixedType(), new MixedType());
+	}
+
 	private function enterForeach(MutatingScope $scope, MutatingScope $originalScope, Foreach_ $stmt): MutatingScope
 	{
 		if ($stmt->expr instanceof Variable && is_string($stmt->expr->name)) {
 			$scope = $this->processVarAnnotation($scope, [$stmt->expr->name], $stmt);
 		}
+
+		// narrow the iteratee type to those supported by foreach
+		$foreachType = $this->getForeachIterateeType();
+		$scope = $scope->specifyExpressionType(
+			$stmt->expr,
+			TypeCombinator::intersect(
+				$scope->getType($stmt->expr),
+				$foreachType,
+			),
+			TypeCombinator::intersect(
+				$scope->getNativeType($stmt->expr),
+				$foreachType,
+			),
+			TrinaryLogic::createYes(),
+		);
+
 		$iterateeType = $originalScope->getType($stmt->expr);
 		if (
 			($stmt->valueVar instanceof Variable && is_string($stmt->valueVar->name))
diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/src/Analyser/ResultCache/ResultCacheManager.php
@@ -1131,7 +1131,7 @@ private function getComposerLocks(): array
 	}
 
 	/**
-	 * @return array<string, string>
+	 * @return array<string, array<mixed>>
 	 */
 	private function getComposerInstalled(): array
 	{
@@ -1149,6 +1149,10 @@ private function getComposerInstalled(): array
 			}
 
 			$installed = require $filePath;
+			if (!is_array($installed)) {
+				throw new ShouldNotHappenException();
+			}
+
 			$rootName = $installed['root']['name'];
 			unset($installed['root']);
 			unset($installed['versions'][$rootName]);
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -169,7 +169,14 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
-		return new self($this->isExplicitMixed);
+		$types = [
+			new ArrayType(new MixedType(), new MixedType()),
+			new ObjectType(ArrayAccess::class),
+		];
+		if (!$offsetType->isInteger()->no()) {
+			$types[] = new StringType();
+		}
+		return TypeCombinator::union(...$types);
 	}
 
 	public function unsetOffset(Type $offsetType): Type
diff --git a/tests/PHPStan/Analyser/nsrt/bug-13270a.php b/tests/PHPStan/Analyser/nsrt/bug-13270a.php
@@ -0,0 +1,54 @@
+<?php // lint >= 8.0
+
+declare(strict_types = 1);
+
+namespace Bug13270a;
+
+use function PHPStan\Testing\assertType;
+
+final class HelloWorld
+{
+	/**
+	 * @param array<mixed> $data
+	 */
+	public function test(array $data): void
+	{
+		foreach($data as $k => $v) {
+			assertType('non-empty-array<mixed>', $data);
+			$data[$k]['a'] = true;
+			assertType("non-empty-array<(non-empty-array&hasOffsetValue('a', true))|(ArrayAccess&hasOffsetValue('a', true))>", $data);
+			foreach($data[$k] as $val) {
+			}
+		}
+	}
+
+	public function doFoo(
+		mixed $mixed,
+		mixed $mixed2,
+		mixed $mixed3,
+		mixed $mixed4,
+		int $i,
+		int $i2,
+		string|int $stringOrInt
+	): void
+	{
+		$mixed[$i]['a'] = true;
+		assertType('mixed', $mixed);
+
+		$mixed2[$stringOrInt]['a'] = true;
+		assertType('mixed', $mixed2);
+
+		$mixed3[$i][$stringOrInt] = true;
+		assertType('mixed', $mixed3);
+
+		$mixed4['a'][$stringOrInt] = true;
+		assertType('mixed', $mixed4);
+
+		$null = null;
+		$null[$i]['a'] = true;
+		assertType('non-empty-array<int, array{a: true}>', $null);
+
+		$i2['a'] = true;
+		assertType('*ERROR*', $i2);
+	}
+}
diff --git a/tests/PHPStan/Analyser/nsrt/bug-13270b.php b/tests/PHPStan/Analyser/nsrt/bug-13270b.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace Bug13270b;
+
+use function PHPStan\Testing\assertType;
+
+class Test
+{
+	/**
+	 * @param mixed[] $data
+	 * @return mixed[]
+	 */
+	public function parseData(array $data): array
+	{
+		if (isset($data['price'])) {
+			assertType('mixed~null', $data['price']);
+			if (!array_key_exists('priceWithVat', $data['price'])) {
+				$data['price']['priceWithVat'] = null;
+			}
+			assertType("(non-empty-array&hasOffsetValue('priceWithVat', mixed))|(ArrayAccess&hasOffsetValue('priceWithVat', null))", $data['price']);
+			if (!array_key_exists('priceWithoutVat', $data['price'])) {
+				$data['price']['priceWithoutVat'] = null;
+			}
+		}
+		return $data;
+	}
+}
diff --git a/tests/PHPStan/Analyser/nsrt/bug-13312.php b/tests/PHPStan/Analyser/nsrt/bug-13312.php
@@ -0,0 +1,45 @@
+<?php // lint >= 8.0
+
+namespace Bug13312;
+
+use function PHPStan\Testing\assertType;
+
+function fooArr(array $arr): void {
+	assertType('array', $arr);
+	foreach ($arr as $v) {
+		assertType('non-empty-array', $arr);
+	}
+	assertType('array', $arr);
+
+	for ($i = 0; $i < count($arr); ++$i) {
+		assertType('non-empty-array', $arr);
+	}
+	assertType('array', $arr);
+}
+
+/** @param list<mixed> $arr */
+function foo(array $arr): void {
+	assertType('list<mixed>', $arr);
+	foreach ($arr as $v) {
+		assertType('non-empty-list<mixed>', $arr);
+	}
+	assertType('list<mixed>', $arr);
+
+	for ($i = 0; $i < count($arr); ++$i) {
+		assertType('non-empty-list<mixed>', $arr);
+	}
+	assertType('list<mixed>', $arr);
+}
+
+
+function fooBar(mixed $mixed): void {
+	assertType('mixed', $mixed);
+	foreach ($mixed as $v) {
+		assertType('iterable', $mixed); // could be non-empty-array|Traversable
+	}
+	assertType('mixed', $mixed);
+
+	foreach ($mixed as $v) {}
+
+	assertType('mixed', $mixed);
+}
diff --git a/tests/PHPStan/Analyser/nsrt/composer-array-bug.php b/tests/PHPStan/Analyser/nsrt/composer-array-bug.php
@@ -16,25 +16,28 @@ class Foo
 	public function doFoo(): void
 	{
 		if (!empty($this->config['authors'])) {
+			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
+				assertType("iterable", $this->config['authors']);
+
 				if (!is_array($author)) {
 					$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					continue;
 				}
-				assertType("mixed", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
 					if (isset($author[$authorData]) && !is_string($author[$authorData])) {
 						$this->errors[] = 'authors.'.$key.'.'.$authorData.' : invalid value, must be a string';
 						unset($this->config['authors'][$key][$authorData]);
 					}
 				}
 				if (isset($author['homepage'])) {
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]['homepage']);
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 				}
 				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
 					unset($this->config['authors'][$key]['email']);
@@ -44,8 +47,8 @@ public function doFoo(): void
 				}
 			}
 
-			assertType("non-empty-array&hasOffsetValue('authors', mixed)", $this->config);
-			assertType("mixed", $this->config['authors']);
+			assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
+			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 
 			if (empty($this->config['authors'])) {
 				unset($this->config['authors']);
@@ -54,7 +57,7 @@ public function doFoo(): void
 				assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
 			}
 
-			assertType('array', $this->config);
+			assertType("non-empty-array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
 		}
 	}
 
diff --git a/tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php b/tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php
@@ -15,10 +15,10 @@ public function doFoo()
 		if (!empty($this->config['authors'])) {
 			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
-				assertType("mixed", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 				if (!is_array($author)) {
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					continue;
 				}
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
@@ -33,13 +33,13 @@ public function doFoo()
 					unset($this->config['authors'][$key]['email']);
 				}
 				if (empty($this->config['authors'][$key])) {
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed", $this->config['authors']);
+					assertType("iterable", $this->config['authors']);
 				}
-				assertType("mixed", $this->config['authors']);
+				assertType("iterable", $this->config['authors']);
 			}
-			assertType("mixed", $this->config['authors']);
+			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 		}
 	}
 
diff --git a/tests/PHPStan/Rules/Arrays/IterableInForeachRuleTest.php b/tests/PHPStan/Rules/Arrays/IterableInForeachRuleTest.php
@@ -139,4 +139,10 @@ public function testMixed(bool $checkExplicitMixed, bool $checkImplicitMixed, ar
 		$this->analyse([__DIR__ . '/data/foreach-mixed.php'], $errors);
 	}
 
+	#[RequiresPhp('>= 8.0')]
+	public function testBug13312(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13312.php'], []);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1131,7 +1131,7 @@ private function getComposerLocks(): array`
`1131`	`1131`	`}`
`1132`	`1132`
`1133`	`1133`	`/**`
`1134`		`- * @return array<string, string>`
	`1134`	`+ * @return array<string, array<mixed>>`
`1135`	`1135`	`*/`
`1136`	`1136`	`private function getComposerInstalled(): array`
`1137`	`1137`	`{`
`@@ -1149,6 +1149,10 @@ private function getComposerInstalled(): array`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`	`1151`	`$installed = require $filePath;`
	`1152`	`+ if (!is_array($installed)) {`
	`1153`	`+ throw new ShouldNotHappenException();`
	`1154`	`+ }`
	`1155`	`+`
`1152`	`1156`	`$rootName = $installed['root']['name'];`
`1153`	`1157`	`unset($installed['root']);`
`1154`	`1158`	`unset($installed['versions'][$rootName]);`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,14 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni`
`169`	`169`
`170`	`170`	`public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type`
`171`	`171`	`{`
`172`		`- return new self($this->isExplicitMixed);`
	`172`	`+ $types = [`
	`173`	`+ new ArrayType(new MixedType(), new MixedType()),`
	`174`	`+ new ObjectType(ArrayAccess::class),`
	`175`	`+ ];`
	`176`	`+ if (!$offsetType->isInteger()->no()) {`
	`177`	`+ $types[] = new StringType();`
	`178`	`+ }`
	`179`	`+ return TypeCombinator::union(...$types);`
`173`	`180`	`}`
`174`	`181`
`175`	`182`	`public function unsetOffset(Type $offsetType): Type`
Original file line number	Diff line number	Diff line change
`@@ -16,25 +16,28 @@ class Foo`
`16`	`16`	`public function doFoo(): void`
`17`	`17`	`{`
`18`	`18`	`if (!empty($this->config['authors'])) {`
	`19`	`+ assertType("mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null)", $this->config['authors']);`
`19`	`20`	`foreach ($this->config['authors'] as $key => $author) {`
	`21`	`+ assertType("iterable", $this->config['authors']);`
	`22`	`+`
`20`	`23`	`if (!is_array($author)) {`
`21`	`24`	`$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';`
`22`		`- assertType("mixed", $this->config['authors']);`
	`25`	`+ assertType("iterable", $this->config['authors']);`
`23`	`26`	`unset($this->config['authors'][$key]);`
`24`		`- assertType("mixed", $this->config['authors']);`
	`27`	`+ assertType("iterable", $this->config['authors']);`
`25`	`28`	`continue;`
`26`	`29`	`}`
`27`		`- assertType("mixed", $this->config['authors']);`
	`30`	`+ assertType("iterable", $this->config['authors']);`
`28`	`31`	`foreach (['homepage', 'email', 'name', 'role'] as $authorData) {`
`29`	`32`	`if (isset($author[$authorData]) && !is_string($author[$authorData])) {`
`30`	`33`	`$this->errors[] = 'authors.'.$key.'.'.$authorData.' : invalid value, must be a string';`
`31`	`34`	`unset($this->config['authors'][$key][$authorData]);`
`32`	`35`	`}`
`33`	`36`	`}`
`34`	`37`	`if (isset($author['homepage'])) {`
`35`		`- assertType("mixed", $this->config['authors']);`
	`38`	`+ assertType("iterable", $this->config['authors']);`
`36`	`39`	`unset($this->config['authors'][$key]['homepage']);`
`37`		`- assertType("mixed", $this->config['authors']);`
	`40`	`+ assertType("iterable", $this->config['authors']);`
`38`	`41`	`}`
`39`	`42`	`if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {`
`40`	`43`	`unset($this->config['authors'][$key]['email']);`
`@@ -44,8 +47,8 @@ public function doFoo(): void`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`
`47`		`- assertType("non-empty-array&hasOffsetValue('authors', mixed)", $this->config);`
`48`		`- assertType("mixed", $this->config['authors']);`
	`50`	`+ assertType("non-empty-array&hasOffsetValue('authors', mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null))", $this->config);`
	`51`	`+ assertType("mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null)", $this->config['authors']);`
`49`	`52`
`50`	`53`	`if (empty($this->config['authors'])) {`
`51`	`54`	`unset($this->config['authors']);`
`@@ -54,7 +57,7 @@ public function doFoo(): void`
`54`	`57`	`assertType("non-empty-array&hasOffsetValue('authors', mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null))", $this->config);`
`55`	`58`	`}`
`56`	`59`
`57`		`- assertType('array', $this->config);`
	`60`	`+ assertType("non-empty-array&hasOffsetValue('authors', mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null))", $this->config);`
`58`	`61`	`}`
`59`	`62`	`}`
`60`	`63`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public function doFoo()`
`15`	`15`	`if (!empty($this->config['authors'])) {`
`16`	`16`	`assertType("mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null)", $this->config['authors']);`
`17`	`17`	`foreach ($this->config['authors'] as $key => $author) {`
`18`		`- assertType("mixed", $this->config['authors']);`
	`18`	`+ assertType("iterable", $this->config['authors']);`
`19`	`19`	`if (!is_array($author)) {`
`20`	`20`	`unset($this->config['authors'][$key]);`
`21`		`- assertType("mixed", $this->config['authors']);`
	`21`	`+ assertType("iterable", $this->config['authors']);`
`22`	`22`	`continue;`
`23`	`23`	`}`
`24`	`24`	`foreach (['homepage', 'email', 'name', 'role'] as $authorData) {`
`@@ -33,13 +33,13 @@ public function doFoo()`
`33`	`33`	`unset($this->config['authors'][$key]['email']);`
`34`	`34`	`}`
`35`	`35`	`if (empty($this->config['authors'][$key])) {`
`36`		`- assertType("mixed", $this->config['authors']);`
	`36`	`+ assertType("iterable", $this->config['authors']);`
`37`	`37`	`unset($this->config['authors'][$key]);`
`38`		`- assertType("mixed", $this->config['authors']);`
	`38`	`+ assertType("iterable", $this->config['authors']);`
`39`	`39`	`}`
`40`		`- assertType("mixed", $this->config['authors']);`
	`40`	`+ assertType("iterable", $this->config['authors']);`
`41`	`41`	`}`
`42`		`- assertType("mixed", $this->config['authors']);`
	`42`	`+ assertType("mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null)", $this->config['authors']);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -139,4 +139,10 @@ public function testMixed(bool $checkExplicitMixed, bool $checkImplicitMixed, ar`
`139`	`139`	`$this->analyse([__DIR__ . '/data/foreach-mixed.php'], $errors);`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ #[RequiresPhp('>= 8.0')]`
	`143`	`+ public function testBug13312(): void`
	`144`	`+ {`
	`145`	`+ $this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13312.php'], []);`
	`146`	`+ }`
	`147`	`+`
`142`	`148`	`}`