Try to support all the for end loop scenarios :)

Author: herndlm

src/Analyser/NodeScopeResolver.php

@@ -1314,7 +1314,6 @@ private function processStmtNode(
 			}
 
 			$bodyScope = $initScope;
-			$alwaysIterates = $stmt->cond === [] && $context->isTopLevel();
 			$isIterableAtLeastOnce = TrinaryLogic::createYes();
 			$lastCondExpr = $stmt->cond[count($stmt->cond) - 1] ?? null;
 			foreach ($stmt->cond as $condExpr) {
@@ -1385,7 +1384,10 @@ private function processStmtNode(
 				$loopScope = $this->processExprNode($stmt, $loopExpr, $loopScope, $nodeCallback, ExpressionContext::createTopLevel())->getScope();
 			}
 			$finalScope = $finalScope->generalizeWith($loopScope);
+
+			$alwaysIterates = TrinaryLogic::createFromBoolean($context->isTopLevel());
 			if ($lastCondExpr !== null) {
+				$alwaysIterates = $alwaysIterates->and($finalScope->getType($lastCondExpr)->toBoolean()->isTrue());
 				$finalScope = $finalScope->filterByFalseyValue($lastCondExpr);
 			}
 
@@ -1412,7 +1414,7 @@ private function processStmtNode(
 				}
 			}
 
-			if ($alwaysIterates) {
+			if ($alwaysIterates->yes()) {
 				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
 			} elseif ($isIterableAtLeastOnce->yes()) {
 				$isAlwaysTerminating = $finalScopeResult->isAlwaysTerminating();

tests/PHPStan/Analyser/StatementResultTest.php

@@ -273,6 +273,30 @@ public function dataIsAlwaysTerminating(): array
 				'for (;;) { for ($i = 0; $i< 5; $i++) { break 2; } }',
 				false,
 			],
+			[
+				'for ($i = 0; $i < 5;) { }',
+				true,
+			],
+			[
+				'for ($i = 0; $i < 5; $i--) { }',
+				true,
+			],
+			[
+				'for (; 0, 1;) { }',
+				true,
+			],
+			[
+				'for (; 1, 0;) { }',
+				false,
+			],
+			[
+				'for (; "", "a";) { }',
+				true,
+			],
+			[
+				'for (; "a", "";) { }',
+				false,
+			],
 			[
 				'do { } while (doFoo());',
 				false,

tests/PHPStan/Rules/Variables/data/defined-variables-anonymous-function-use.php

@@ -14,7 +14,7 @@ function () use (&$errorHandler) {
 	$onlyInIf = 1;
 }
 
-for ($forI = 0; $forI < 10, $anotherVariableFromForCond = 1; $forI++, $forJ = $forI) {
+for ($forI = 0; $anotherVariableFromForCond = 1, $forI < 10; $forI++, $forJ = $forI) {
 
 }
 

tests/PHPStan/Rules/Variables/data/defined-variables.php

@@ -243,7 +243,7 @@ function () {
 
 	}
 
-	for ($forI = 0; $forI < 10, $forK = 5; $forI++, $forK++, $forJ = $forI) {
+	for ($forI = 0; $forK = 5, $forI < 10; $forI++, $forK++, $forJ = $forI) {
 		echo $forI;
 	}
 
@@ -322,7 +322,7 @@ function () {
 	include($fileB='includeB.php');
 	echo $fileB;
 
-	for ($forLoopVariableInit = 0; $forLoopVariableInit < 5; $forLoopVariableInit = $forLoopVariable, $anotherForLoopVariable = 1) {
+	for ($forLoopVariableInit = 0; $forLoopVariableInit < 5 && rand(0, 1); $forLoopVariableInit = $forLoopVariable, $anotherForLoopVariable = 1) {
 		$forLoopVariable = 2;
 	}
 	echo $anotherForLoopVariable;
@@ -357,7 +357,7 @@ function () {
 
 	}
 
-	for (; $forVariableUsedAndThenDefined && $forVariableUsedAndThenDefined = 1;) {
+	for (; $forVariableUsedAndThenDefined && $forVariableUsedAndThenDefined = 1 && rand(0, 1);) {
 
 	}