Merge in-foreach scope even for non-iterable expr

phpstan · Dec 6, 2023 · 942afbf · 942afbf
1 parent d27d57a
commit 942afbf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -927,10 +927,9 @@ private function processStmtNode(
 				$finalScope = $breakExitPoint->getScope()->mergeWith($finalScope);
 			}
 
-			$isIterableAtLeastOnce = $scope->getType($stmt->expr)->isIterableAtLeastOnce();
-			if ($isIterableAtLeastOnce->no() || $finalScopeResult->isAlwaysTerminating()) {
-				$finalScope = $scope;
-			} elseif ($isIterableAtLeastOnce->maybe()) {
+			$exprType = $scope->getType($stmt->expr);
+			$isIterableAtLeastOnce = $exprType->isIterableAtLeastOnce();
+			if ($exprType->isIterable()->no() || $isIterableAtLeastOnce->maybe()) {
 				if ($this->polluteScopeWithAlwaysIterableForeach) {
 					$finalScope = $finalScope->mergeWith($scope->filterByTruthyValue(new BooleanOr(
 						new BinaryOp\Identical(
@@ -944,6 +943,8 @@ private function processStmtNode(
 				} else {
 					$finalScope = $finalScope->mergeWith($scope);
 				}
+			} elseif ($isIterableAtLeastOnce->no() || $finalScopeResult->isAlwaysTerminating()) {
+				$finalScope = $scope;
 			} elseif (!$this->polluteScopeWithAlwaysIterableForeach) {
 				$finalScope = $scope->processAlwaysIterableForeachScopeWithoutPollute($finalScope);
 				// get types from finalScope, but don't create new variables

diff --git a/tests/PHPStan/Analyser/data/foreach-partially-non-iterable.php b/tests/PHPStan/Analyser/data/foreach-partially-non-iterable.php
@@ -19,3 +19,17 @@ public function doFoo($a): void
 	}
 
 }
+
+class Bar
+{
+
+	public function sayHello(\stdClass $s): void
+	{
+		$a = null;
+		foreach ($s as $k => $v) {
+			$a .= 'test';
+		}
+		assertType('(literal-string&non-falsy-string)|null', $a);
+	}
+
+}