add addNextStatement() and getNextStatements() method

Author: samsonasik

src/Analyser/NodeScopeResolver.php

@@ -309,8 +309,15 @@ public function processNodes(
 
 			$alreadyTerminated = true;
 			$nextStmts = $this->getNextUnreachableStatements(array_slice($nodes, $i + 1), true);
+			$unreachableStatementNode = null;
 			foreach ($nextStmts as $nextStmt) {
-				$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
+				if ($unreachableStatementNode instanceof UnreachableStatementNode) {
+					$unreachableStatementNode->addNextStatement($nextStmt);
+					continue;
+				}
+
+				$unreachableStatementNode = new UnreachableStatementNode($nextStmt);
+				$nodeCallback($unreachableStatementNode, $scope);
 			}
 		}
 	}
@@ -399,8 +406,16 @@ public function processStmtNodes(
 
 			$alreadyTerminated = true;
 			$nextStmts = $this->getNextUnreachableStatements(array_slice($stmts, $i + 1), $parentNode instanceof Node\Stmt\Namespace_);
+
+			$unreachableStatementNode = null;
 			foreach ($nextStmts as $nextStmt) {
-				$nodeCallback(new UnreachableStatementNode($nextStmt), $scope);
+				if ($unreachableStatementNode instanceof UnreachableStatementNode) {
+					$unreachableStatementNode->addNextStatement($nextStmt);
+					continue;
+				}
+
+				$unreachableStatementNode = new UnreachableStatementNode($nextStmt);
+				$nodeCallback($unreachableStatementNode, $scope);
 			}
 		}
 

src/Node/UnreachableStatementNode.php

@@ -9,6 +9,10 @@
  */
 final class UnreachableStatementNode extends Stmt implements VirtualNode
 {
+	/**
+	 * @var Stmt[]
+	 */
+	private array $nextStatements = [];
 
 	public function __construct(private Stmt $originalStatement)
 	{
@@ -33,4 +37,17 @@ public function getSubNodeNames(): array
 		return [];
 	}
 
+	public function addNextStatement(Stmt $stmt): void
+	{
+		$this->nextStatements[] = $stmt;
+	}
+
+	/**
+	 * @return Stmt[]
+	 */
+	public function getNextStatements(): array
+	{
+		return $this->nextStatements;
+	}
+
 }

tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php

@@ -238,14 +238,6 @@ public function testMultipleUnreachable(): void
 				'Unreachable statement - code above always terminates.',
 				12,
 			],
-			[
-				'Unreachable statement - code above always terminates.',
-				13,
-			],
-			[
-				'Unreachable statement - code above always terminates.',
-				14,
-			],
 		]);
 	}