Use isAlwaysTerminating of finalScopeResult and update test

herndlm · herndlm · commit 8f2ab217bcee · 2024-11-06T19:21:33.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -1414,8 +1414,10 @@ private function processStmtNode(
 
 			if ($alwaysIterates) {
 				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
+			} elseif ($isIterableAtLeastOnce->yes()) {
+				$isAlwaysTerminating = $finalScopeResult->isAlwaysTerminating();
 			} else {
-				$isAlwaysTerminating = false; // $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable
+				$isAlwaysTerminating = false;
 			}
 
 			return new StatementResult(
diff --git a/tests/PHPStan/Analyser/StatementResultTest.php b/tests/PHPStan/Analyser/StatementResultTest.php
@@ -243,7 +243,7 @@ public function dataIsAlwaysTerminating(): array
 			],
 			[
 				'for ($i = 0; $i < 10; $i++) { return; }',
-				false, // will be true with range types
+				true,
 			],
 			[
 				'for ($i = 0; $i < 0; $i++) { return; }',

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public function dataIsAlwaysTerminating(): array`
`243`	`243`	`],`
`244`	`244`	`[`
`245`	`245`	`'for ($i = 0; $i < 10; $i++) { return; }',`
`246`		`- false, // will be true with range types`
	`246`	`+ true,`
`247`	`247`	`],`
`248`	`248`	`[`
`249`	`249`	`'for ($i = 0; $i < 0; $i++) { return; }',`