Allow process multiple UnreachableStatementNode on NodeScopeResolver::processNodes()

Author: samsonasik

src/Analyser/NodeScopeResolver.php

@@ -308,12 +308,10 @@ public function processNodes(
 			}
 
 			$alreadyTerminated = true;
-			$nextStmt = $this->getFirstUnreachableNode(array_slice($nodes, $i + 1), true);
-			if (!$nextStmt instanceof Node\Stmt) {
-				continue;
+			$nextStmts = $this->getNextUnreachableStatements(array_slice($nodes, $i + 1), true);
+			foreach ($nextStmts as $nextStmt) {
+				$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
 			}
-
-			$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
 		}
 	}
 
@@ -400,11 +398,10 @@ public function processStmtNodes(
 			}
 
 			$alreadyTerminated = true;
-			$nextStmt = $this->getFirstUnreachableNode(array_slice($stmts, $i + 1), $parentNode instanceof Node\Stmt\Namespace_);
-			if ($nextStmt === null) {
-				continue;
+			$nextStmts = $this->getNextUnreachableStatements(array_slice($stmts, $i + 1), $parentNode instanceof Node\Stmt\Namespace_);
+			foreach ($nextStmts as $nextStmt) {
+				$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
 			}
-			$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
 		}
 
 		$statementResult = new StatementResult($scope, $hasYield, $alreadyTerminated, $exitPoints, $throwPoints, $impurePoints);
@@ -6199,20 +6196,24 @@ private function getPhpDocReturnType(ResolvedPhpDocBlock $resolvedPhpDoc, Type $
 	/**
 	 * @template T of Node
 	 * @param array<T> $nodes
-	 * @return T|null
+	 * @return Node\Stmt[]
 	 */
-	private function getFirstUnreachableNode(array $nodes, bool $earlyBinding): ?Node
+	private function getNextUnreachableStatements(array $nodes, bool $earlyBinding): array
 	{
+		$stmts = [];
 		foreach ($nodes as $node) {
 			if ($node instanceof Node\Stmt\Nop) {
 				continue;
 			}
 			if ($earlyBinding && ($node instanceof Node\Stmt\Function_ || $node instanceof Node\Stmt\ClassLike || $node instanceof Node\Stmt\HaltCompiler)) {
 				continue;
 			}
-			return $node;
+			if (! $node instanceof Node\Stmt) {
+				continue;
+			}
+			$stmts[] = $node;
 		}
-		return null;
+		return $stmts;
 	}
 
 }

tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php

@@ -230,4 +230,23 @@ public function testBug11992(): void
 		$this->analyse([__DIR__ . '/data/bug-11992.php'], []);
 	}
 
+	public function testMultipleUnreachable(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/multiple_unreachable.php'], [
+			[
+				'Unreachable statement - code above always terminates.',
+				12,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				13,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				14,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/DeadCode/data/multiple_unreachable.php

@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @param 'foo' $foo
+ */
+function foo($foo)
+{
+    if ($foo === 'foo') {
+        return 1;
+    }
+
+    echo 'statement 1';
+    echo 'statement 2';
+    echo 'statement 3';
+}