While loop's condition with a return is not reported as always true

phpstan · Sep 22, 2021 · ac7a60a · ac7a60a
1 parent 43c192b
commit ac7a60a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -900,13 +900,12 @@ private function processStmtNode(
 			$isIterableAtLeastOnce = $beforeCondBooleanType instanceof ConstantBooleanType && $beforeCondBooleanType->getValue();
 			$alwaysIterates = $condBooleanType instanceof ConstantBooleanType && $condBooleanType->getValue();
 			$neverIterates = $condBooleanType instanceof ConstantBooleanType && !$condBooleanType->getValue();
-			$breakCount = count($finalScopeResult->getExitPointsByType(Break_::class));
-			if ($breakCount === 0) {
+			if (count($finalScopeResult->getExitPoints()) === 0) {
 				$nodeCallback(new BreaklessWhileLoopNode($stmt), $bodyScopeMaybeRan);
 			}
 
 			if ($alwaysIterates) {
-				$isAlwaysTerminating = $breakCount === 0;
+				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
 			} elseif ($isIterableAtLeastOnce) {
 				$isAlwaysTerminating = $finalScopeResult->isAlwaysTerminating();
 			} else {

diff --git a/tests/PHPStan/Rules/Comparison/data/while-loop-true.php b/tests/PHPStan/Rules/Comparison/data/while-loop-true.php
@@ -51,4 +51,13 @@ public function doBar4(): void
 		}
 	}
 
+	public function doBar5(): void
+	{
+		while (true) {
+			if (rand(0, 1)) {
+				return;
+			}
+		}
+	}
+
 }