WIP

Author: VincentLanglet

src/Analyser/NodeScopeResolver.php

@@ -1637,8 +1637,20 @@ private function processStmtNode(
 			} else {
 				$this->processExprNode($stmt, $stmt->cond, $bodyScope, $storage, $nodeCallback, ExpressionContext::createDeep());
 			}
-			foreach ($bodyScopeResult->getExitPointsByType(Break_::class) as $breakExitPoint) {
-				$finalScope = $breakExitPoint->getScope()->mergeWith($finalScope);
+
+			$breakExitPoints = $bodyScopeResult->getExitPointsByType(Break_::class);
+			if ($alwaysIterates && count($breakExitPoints) > 0) {
+				$breakScope = null;
+				foreach ($breakExitPoints as $breakExitPoint) {
+					$breakScope = $breakScope === null
+						? $breakExitPoint->getScope()
+						: $breakScope->mergeWith($breakExitPoint->getScope());
+				}
+				$finalScope = $breakScope;
+			} else {
+				foreach ($breakExitPoints as $breakExitPoint) {
+					$finalScope = $finalScope->mergeWith($breakExitPoint->getScope());
+				}
 			}
 
 			return new InternalStatementResult(
@@ -1749,8 +1761,19 @@ private function processStmtNode(
 				$finalScope = $finalScope->filterByFalseyValue($lastCondExpr);
 			}
 
-			foreach ($finalScopeResult->getExitPointsByType(Break_::class) as $breakExitPoint) {
-				$finalScope = $breakExitPoint->getScope()->mergeWith($finalScope);
+			$breakExitPoints = $finalScopeResult->getExitPointsByType(Break_::class);
+			if ($alwaysIterates->yes() && count($breakExitPoints) > 0) {
+				$breakScope = null;
+				foreach ($breakExitPoints as $breakExitPoint) {
+					$breakScope = $breakScope === null
+						? $breakExitPoint->getScope()
+						: $breakScope->mergeWith($breakExitPoint->getScope());
+				}
+				$finalScope = $breakScope;
+			} else {
+				foreach ($breakExitPoints as $breakExitPoint) {
+					$finalScope = $finalScope->mergeWith($breakExitPoint->getScope());
+				}
 			}
 
 			if ($isIterableAtLeastOnce->no() || $finalScopeResult->isAlwaysTerminating()) {

tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php

@@ -1284,16 +1284,7 @@ public function testBug11545(): void
 		$this->checkMaybeUndefinedVariables = true;
 		$this->polluteScopeWithAlwaysIterableForeach = true;
 
-		$this->analyse([__DIR__ . '/data/bug-11545.php'], [
-			[
-				'Variable $result might not be defined.',
-				24,
-			],
-			[
-				'Variable $result might not be defined.',
-				36,
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/bug-11545.php'], []);
 	}
 
 	public function testBug10245(): void