Fix foreach scope when iterating non-array and polluteScopeWithAlwaysIterableForeach is true

ondrejmirtes · ondrejmirtes · commit 853a1e693eb1 · 2023-08-21T13:28:39.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -911,7 +911,15 @@ private function processStmtNode(
 				$finalScope = $scope;
 			} elseif ($isIterableAtLeastOnce->maybe()) {
 				if ($this->polluteScopeWithAlwaysIterableForeach) {
-					$finalScope = $finalScope->mergeWith($scope->filterByFalseyValue($arrayComparisonExpr));
+					$finalScope = $finalScope->mergeWith($scope->filterByTruthyValue(new BooleanOr(
+						new BinaryOp\Identical(
+							$stmt->expr,
+							new Array_([]),
+						),
+						new FuncCall(new Name\FullyQualified('is_object'), [
+							new Arg($stmt->expr),
+						]),
+					)));
 				} else {
 					$finalScope = $finalScope->mergeWith($scope);
 				}
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -272,6 +272,7 @@ public function dataFileAsserts(): iterable
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-801.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-1209.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9784.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-2980.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-3986.php');
 
diff --git a/tests/PHPStan/Analyser/data/bug-9784.php b/tests/PHPStan/Analyser/data/bug-9784.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Bug9784;
+
+use Iterator;
+use stdClass;
+use function PHPStan\Testing\assertType;
+
+final class DemoFile
+{
+	private function complementArticleData(Iterator $articles): void
+	{
+		$result = [
+			'artikel' => $articles,
+			'farben' => null,
+			'artikel_ids' => [],
+		];
+
+		// collect article ids
+		foreach ($result['artikel'] as $article) {
+			$result['artikel_ids'][] = 1;
+		}
+
+		assertType('array{artikel: Iterator, farben: null, artikel_ids: list<1>}', $result);
+		assertType('list<1>', $result['artikel_ids']);
+
+		if ($result['artikel_ids'] !== []) {
+			$result['farben'] = new stdClass();
+		}
+
+		// $result['farben'] might be also null
+		assertType('stdClass|null', $result['farben']);
+		if ($result['farben'] instanceof stdClass) {
+			echo '123';
+		}
+	}
+}
diff --git a/tests/PHPStan/Analyser/data/dependent-variables-type-guard-same-as-type.php b/tests/PHPStan/Analyser/data/dependent-variables-type-guard-same-as-type.php
@@ -30,7 +30,7 @@ public function doFoo(): void
 				assertType('int<1, max>', $itemsCounter);
 			}
 
-			assertType('Generator&iterable', $associationData);
+			assertType('Generator', $associationData);
 
 			assertType('int<0, max>', $itemsCounter);
 		}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function doFoo(): void`
`30`	`30`	`assertType('int<1, max>', $itemsCounter);`
`31`	`31`	`}`
`32`	`32`
`33`		`- assertType('Generator&iterable', $associationData);`
	`33`	`+ assertType('Generator', $associationData);`
`34`	`34`
`35`	`35`	`assertType('int<0, max>', $itemsCounter);`
`36`	`36`	`}`