make immutable, add namespace in test

phpstan · Dec 21, 2024 · 66596b4 · 66596b4
1 parent 211a0fb
commit 66596b4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 29 deletions.
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -314,17 +314,19 @@ public function processNodes(
 				continue;
 			}
 
-			$unreachableStatementNode = null;
-			foreach ($nextStmts as $nextStmt) {
-				if ($unreachableStatementNode instanceof UnreachableStatementNode) {
-					$unreachableStatementNode->addNextStatement($nextStmt);
+			$unreachableStatement = null;
+			$nextStatements = [];
+
+			foreach ($nextStmts as $key => $nextStmt) {
+				if ($key === 0) {
+					$unreachableStatement = $nextStmt;
 					continue;
 				}
 
-				$unreachableStatementNode = new UnreachableStatementNode($nextStmt);
+				$nextStatements[] = $nextStmt;
 			}
 
-			$nodeCallback($unreachableStatementNode, $scope);
+			$nodeCallback(new UnreachableStatementNode($unreachableStatement, $nextStatements), $scope);
 		}
 	}
 
@@ -417,17 +419,19 @@ public function processStmtNodes(
 				continue;
 			}
 
-			$unreachableStatementNode = null;
-			foreach ($nextStmts as $nextStmt) {
-				if ($unreachableStatementNode instanceof UnreachableStatementNode) {
-					$unreachableStatementNode->addNextStatement($nextStmt);
+			$unreachableStatement = null;
+			$nextStatements = [];
+
+			foreach ($nextStmts as $key => $nextStmt) {
+				if ($key === 0) {
+					$unreachableStatement = $nextStmt;
 					continue;
 				}
 
-				$unreachableStatementNode = new UnreachableStatementNode($nextStmt);
+				$nextStatements[] = $nextStmt;
 			}
 
-			$nodeCallback($unreachableStatementNode, $scope);
+			$nodeCallback(new UnreachableStatementNode($unreachableStatement, $nextStatements), $scope);
 		}
 
 		$statementResult = new StatementResult($scope, $hasYield, $alreadyTerminated, $exitPoints, $throwPoints, $impurePoints);

diff --git a/src/Node/UnreachableStatementNode.php b/src/Node/UnreachableStatementNode.php
@@ -10,12 +10,12 @@
 final class UnreachableStatementNode extends Stmt implements VirtualNode
 {
 
-	/** @var Stmt[] */
-	private array $nextStatements = [];
-
-	public function __construct(private Stmt $originalStatement)
+	/** @param Stmt[] $nextStatements */
+	public function __construct(private Stmt $originalStatement, private array $nextStatements = [])
 	{
 		parent::__construct($originalStatement->getAttributes());
+
+		$this->nextStatements = $nextStatements;
 	}
 
 	public function getOriginalStatement(): Stmt
@@ -36,11 +36,6 @@ public function getSubNodeNames(): array
 		return [];
 	}
 
-	public function addNextStatement(Stmt $stmt): void
-	{
-		$this->nextStatements[] = $stmt;
-	}
-
 	/**
 	 * @return Stmt[]
 	 */

diff --git a/tests/PHPStan/Rules/DeadCode/data/multiple_unreachable.php b/tests/PHPStan/Rules/DeadCode/data/multiple_unreachable.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MultipleUnreachable;
+
 /**
  * @param 'foo' $foo
  */

diff --git a/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php b/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php
@@ -105,10 +105,6 @@ public function testRule(): void
 				'Dead catch - Exception is never thrown in the try block.',
 				398,
 			],
-			[
-				'Dead catch - Exception is never thrown in the try block.',
-				407,
-			],
 			[
 				'Dead catch - Exception is never thrown in the try block.',
 				432,
@@ -217,10 +213,6 @@ public function testRuleWithoutReportingUncheckedException(): void
 				'Dead catch - Exception is never thrown in the try block.',
 				398,
 			],
-			[
-				'Dead catch - Exception is never thrown in the try block.',
-				407,
-			],
 			[
 				'Dead catch - Exception is never thrown in the try block.',
 				432,