Support for endless loops

src/Analyser/NodeScopeResolver.php

@@ -1193,10 +1193,8 @@ private function processStmtNode(
 
 			if ($alwaysIterates) {
 				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
-			} elseif ($isIterableAtLeastOnce) {
-				$isAlwaysTerminating = $finalScopeResult->isAlwaysTerminating();
 			} else {
-				$isAlwaysTerminating = false;
+				$isAlwaysTerminating = $isIterableAtLeastOnce && $finalScopeResult->isAlwaysTerminating();
 			}
 			$condScope = $condResult->getFalseyScope();
 			if (!$isIterableAtLeastOnce) {
@@ -1313,6 +1311,7 @@ private function processStmtNode(
 			}
 
 			$bodyScope = $initScope;
+			$alwaysIterates = $stmt->cond === [] && $context->isTopLevel();
 			$isIterableAtLeastOnce = TrinaryLogic::createYes();
 			foreach ($stmt->cond as $condExpr) {
 				$condResult = $this->processExprNode($stmt, $condExpr, $bodyScope, static function (): void {
@@ -1410,10 +1409,16 @@ private function processStmtNode(
 				}
 			}
 
+			if ($alwaysIterates) {
+				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
+			} else {
+				$isAlwaysTerminating = false; // $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable
+			}
+
 			return new StatementResult(
 				$finalScope,
 				$finalScopeResult->hasYield() || $hasYield,
-				false/* $finalScopeResult->isAlwaysTerminating() && $isAlwaysIterable*/,
+				$isAlwaysTerminating,
 				$finalScopeResult->getExitPointsForOuterLoop(),
 				array_merge($throwPoints, $finalScopeResult->getThrowPoints()),
 				array_merge($impurePoints, $finalScopeResult->getImpurePoints()),

tests/PHPStan/Analyser/StatementResultTest.php

@@ -173,6 +173,18 @@ public function dataIsAlwaysTerminating(): array
 				'while (true) { break; }',
 				false,
 			],
+			[
+				'for (;;) { }',
+				true,
+			],
+			[
+				'for (;;) { return; }',
+				true,
+			],
+			[
+				'for (;;) { break; }',
+				false,
+			],
 			[
 				'do { } while (doFoo());',
 				false,

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -107,12 +107,12 @@ public function testStrictComparison(): void
 					140,
 				],
 				[
-					'Strict comparison using !== between StrictComparison\Foo|null and 1 will always evaluate to true.',
-					154,
+					'Strict comparison using === between non-empty-array and null will always evaluate to false.',
+					150,
 				],
 				[
-					'Strict comparison using === between non-empty-array and null will always evaluate to false.',
-					164,
+					'Strict comparison using !== between StrictComparison\Foo|null and 1 will always evaluate to true.',
+					161,
 				],
 				[
 					'Strict comparison using !== between StrictComparison\Node|null and false will always evaluate to true.',
@@ -333,7 +333,7 @@ public function testStrictComparisonWithoutAlwaysTrue(): void
 				],
 				[
 					'Strict comparison using === between non-empty-array and null will always evaluate to false.',
-					164,
+					150,
 				],
 				[
 					'Strict comparison using === between 1 and 2 will always evaluate to false.',

tests/PHPStan/Rules/Comparison/data/strict-comparison.php

@@ -146,6 +146,13 @@ public function whileWithTypeChange()
 
 	public function forWithTypeChange()
 	{
+		for (; $val = $this->returnArray();) {
+			if ($val === null) {
+
+			}
+			$val = null;
+		}
+
 		$foo = null;
 		for (;;) {
 			if ($foo !== null) {
@@ -159,13 +166,6 @@ public function forWithTypeChange()
 				$foo = new self();
 			}
 		}
-
-		for (; $val = $this->returnArray();) {
-			if ($val === null) {
-
-			}
-			$val = null;
-		}
 	}
 
 	private function returnArray(): array

tests/PHPStan/Rules/Missing/MissingReturnRuleTest.php

@@ -325,4 +325,10 @@ public function testBug9309(): void
 		$this->analyse([__DIR__ . '/data/bug-9309.php'], []);
 	}
 
+	public function testBug8463(): void
+	{
+		$this->checkExplicitMixedMissingReturn = true;
+		$this->analyse([__DIR__ . '/data/bug-8463.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Missing/data/bug-8463.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Bug8463;
+
+function f1() : int
+{
+	while(true)
+	{
+		if(rand() === rand())
+		{
+			return 1;
+		}
+	}
+}
+
+
+function f2() : int
+{
+	for(;;)
+	{
+		if(rand() === rand())
+		{
+			return 1;
+		}
+	}
+}