Fix unreachable code after do-while loop

ondrejmirtes · ondrejmirtes · commit d484ea890dd0 · 2021-09-20T13:35:55.000+02:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -963,6 +963,9 @@ private function processStmtNode(
 
 			$bodyScopeResult = $this->processStmtNodes($stmt, $stmt->stmts, $bodyScope, $nodeCallback)->filterOutLoopExitPoints();
 			$bodyScope = $bodyScopeResult->getScope();
+			foreach ($bodyScopeResult->getExitPointsByType(Continue_::class) as $continueExitPoint) {
+				$bodyScope = $bodyScope->mergeWith($continueExitPoint->getScope());
+			}
 			$condBooleanType = $bodyScope->getType($stmt->cond)->toBoolean();
 			$alwaysIterates = $condBooleanType instanceof ConstantBooleanType && $condBooleanType->getValue();
 
@@ -971,9 +974,6 @@ private function processStmtNode(
 			} else {
 				$alwaysTerminating = $bodyScopeResult->isAlwaysTerminating();
 			}
-			foreach ($bodyScopeResult->getExitPointsByType(Continue_::class) as $continueExitPoint) {
-				$bodyScope = $bodyScope->mergeWith($continueExitPoint->getScope());
-			}
 			$finalScope = $alwaysTerminating ? $finalScope : $bodyScope->mergeWith($finalScope);
 			if ($finalScope === null) {
 				$finalScope = $scope;
diff --git a/tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php b/tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php
@@ -116,4 +116,10 @@ public function testBug2913(): void
 		$this->analyse([__DIR__ . '/data/bug-2913.php'], []);
 	}
 
+	public function testBug4370(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-4370.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/DeadCode/data/bug-4370.php b/tests/PHPStan/Rules/DeadCode/data/bug-4370.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Bug4370;
+
+interface Lexer
+{
+	public function lex(): int;
+}
+
+/**
+ * This class creates coverage data for the json files in the resources directory
+ */
+final class P
+{
+	/**
+	 * The codes representing different JSON elements
+	 *
+	 * These come from the Seld\JsonLint\JsonParser class. The values are returned by the lexer when
+	 * the lex() method is called.
+	 */
+	private const JSON_OBJECT_START = 17;
+	private const JSON_OBJECT_END   = 18;
+
+	/**
+	 * Processes JSON object block that isn't needed for coverage data
+	 */
+	public function ignoreObjectBlock(Lexer $lexer): int
+	{
+		do {
+			$code = $lexer->lex();
+
+			// recursively ignore nested objects
+			if ($code !== self::JSON_OBJECT_START) {
+				continue;
+			}
+
+			$this->ignoreObjectBlock($lexer);
+		} while ($code !== self::JSON_OBJECT_END);
+
+		return $lexer->lex();
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -116,4 +116,10 @@ public function testBug2913(): void`
`116`	`116`	`$this->analyse([__DIR__ . '/data/bug-2913.php'], []);`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ public function testBug4370(): void`
	`120`	`+ {`
	`121`	`+ $this->treatPhpDocTypesAsCertain = true;`
	`122`	`+ $this->analyse([__DIR__ . '/data/bug-4370.php'], []);`
	`123`	`+ }`
	`124`	`+`
`119`	`125`	`}`