InternalStatementExitPoint

Author: ondrejmirtes

src/Analyser/InternalStatementExitPoint.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use PhpParser\Node\Stmt;
+
+final class InternalStatementExitPoint
+{
+
+	public function __construct(private Stmt $statement, private MutatingScope $scope)
+	{
+	}
+
+	public function toPublic(): StatementExitPoint
+	{
+		return new StatementExitPoint($this->statement, $this->scope);
+	}
+
+	public function getStatement(): Stmt
+	{
+		return $this->statement;
+	}
+
+	public function getScope(): MutatingScope
+	{
+		return $this->scope;
+	}
+
+}

src/Analyser/InternalStatementResult.php

@@ -10,7 +10,7 @@ final class InternalStatementResult
 {
 
 	/**
-	 * @param StatementExitPoint[] $exitPoints
+	 * @param InternalStatementExitPoint[] $exitPoints
 	 * @param InternalThrowPoint[] $throwPoints
 	 * @param ImpurePoint[] $impurePoints
 	 * @param InternalEndStatementResult[] $endStatements
@@ -33,7 +33,7 @@ public function toPublic(): StatementResult
 			$this->scope,
 			$this->hasYield,
 			$this->isAlwaysTerminating,
-			$this->exitPoints,
+			array_map(static fn ($exitPoint) => $exitPoint->toPublic(), $this->exitPoints),
 			array_map(static fn ($throwPoint) => $throwPoint->toPublic(), $this->throwPoints),
 			$this->impurePoints,
 			array_map(static fn ($endStatement) => $endStatement->toPublic(), $this->endStatements),
@@ -83,7 +83,7 @@ public function filterOutLoopExitPoints(): self
 	}
 
 	/**
-	 * @return StatementExitPoint[]
+	 * @return InternalStatementExitPoint[]
 	 */
 	public function getExitPoints(): array
 	{
@@ -92,7 +92,7 @@ public function getExitPoints(): array
 
 	/**
 	 * @param class-string<Stmt\Continue_>|class-string<Stmt\Break_> $stmtClass
-	 * @return list<StatementExitPoint>
+	 * @return list<InternalStatementExitPoint>
 	 */
 	public function getExitPointsByType(string $stmtClass): array
 	{
@@ -126,7 +126,7 @@ public function getExitPointsByType(string $stmtClass): array
 	}
 
 	/**
-	 * @return list<StatementExitPoint>
+	 * @return list<InternalStatementExitPoint>
 	 */
 	public function getExitPointsForOuterLoop(): array
 	{
@@ -158,7 +158,7 @@ public function getExitPointsForOuterLoop(): array
 				$newStatement = new Stmt\Break_($newNode);
 			}
 
-			$exitPoints[] = new StatementExitPoint($newStatement, $exitPoint->getScope());
+			$exitPoints[] = new InternalStatementExitPoint($newStatement, $exitPoint->getScope());
 		}
 
 		return $exitPoints;

src/Analyser/NodeScopeResolver.php

@@ -895,7 +895,7 @@ private function processStmtNode(
 			}
 
 			return new InternalStatementResult($scope, $hasYield, true, [
-				new StatementExitPoint($stmt, $scope),
+				new InternalStatementExitPoint($stmt, $scope),
 			], $overridingThrowPoints ?? $throwPoints, $impurePoints);
 		} elseif ($stmt instanceof Continue_ || $stmt instanceof Break_) {
 			if ($stmt->num !== null) {
@@ -911,7 +911,7 @@ private function processStmtNode(
 			}
 
 			return new InternalStatementResult($scope, $hasYield, true, [
-				new StatementExitPoint($stmt, $scope),
+				new InternalStatementExitPoint($stmt, $scope),
 			], $overridingThrowPoints ?? $throwPoints, $impurePoints);
 		} elseif ($stmt instanceof Node\Stmt\Expression) {
 			if ($stmt->expr instanceof Expr\Throw_) {
@@ -958,7 +958,7 @@ private function processStmtNode(
 
 			if ($earlyTerminationExpr !== null) {
 				return new InternalStatementResult($scope, $hasYield, true, [
-					new StatementExitPoint($stmt, $scope),
+					new InternalStatementExitPoint($stmt, $scope),
 				], $overridingThrowPoints ?? $throwPoints, $impurePoints);
 			}
 			return new InternalStatementResult($scope, $hasYield, $isAlwaysTerminating, [], $overridingThrowPoints ?? $throwPoints, $impurePoints);
@@ -1466,7 +1466,7 @@ private function processStmtNode(
 			}
 
 			$isIterableAtLeastOnce = $beforeCondBooleanType->isTrue()->yes();
-			$nodeCallback(new BreaklessWhileLoopNode($stmt, $finalScopeResult->getExitPoints()), $bodyScopeMaybeRan);
+			$nodeCallback(new BreaklessWhileLoopNode($stmt, $finalScopeResult->toPublic()->getExitPoints()), $bodyScopeMaybeRan);
 
 			if ($alwaysIterates) {
 				$isAlwaysTerminating = count($finalScopeResult->getExitPointsByType(Break_::class)) === 0;
@@ -1543,7 +1543,7 @@ private function processStmtNode(
 			$condBooleanType = ($this->treatPhpDocTypesAsCertain ? $bodyScope->getType($stmt->cond) : $bodyScope->getNativeType($stmt->cond))->toBoolean();
 			$alwaysIterates = $condBooleanType->isTrue()->yes() && $context->isTopLevel();
 
-			$nodeCallback(new DoWhileLoopConditionNode($stmt->cond, $bodyScopeResult->getExitPoints()), $bodyScope);
+			$nodeCallback(new DoWhileLoopConditionNode($stmt->cond, $bodyScopeResult->toPublic()->getExitPoints()), $bodyScope);
 
 			if ($alwaysIterates) {
 				$alwaysTerminating = count($bodyScopeResult->getExitPointsByType(Break_::class)) === 0;
@@ -1801,7 +1801,7 @@ private function processStmtNode(
 				$finallyScope = null;
 			}
 			foreach ($branchScopeResult->getExitPoints() as $exitPoint) {
-				$finallyExitPoints[] = $exitPoint;
+				$finallyExitPoints[] = $exitPoint->toPublic();
 				if ($exitPoint->getStatement() instanceof Node\Stmt\Expression && $exitPoint->getStatement()->expr instanceof Expr\Throw_) {
 					continue;
 				}
@@ -1954,7 +1954,7 @@ private function processStmtNode(
 					$finallyScope = $finallyScope->mergeWith($catchScopeForFinally);
 				}
 				foreach ($catchScopeResult->getExitPoints() as $exitPoint) {
-					$finallyExitPoints[] = $exitPoint;
+					$finallyExitPoints[] = $exitPoint->toPublic();
 					if ($exitPoint->getStatement() instanceof Node\Stmt\Expression && $exitPoint->getStatement()->expr instanceof Expr\Throw_) {
 						continue;
 					}
@@ -1994,7 +1994,7 @@ private function processStmtNode(
 				$finalScope = $finallyResult->isAlwaysTerminating() ? $finalScope : $finalScope->processFinallyScope($finallyScope, $originalFinallyScope);
 				if (count($finallyResult->getExitPoints()) > 0) {
 					$nodeCallback(new FinallyExitPointsNode(
-						$finallyResult->getExitPoints(),
+						$finallyResult->toPublic()->getExitPoints(),
 						$finallyExitPoints,
 					), $scope);
 				}

src/Analyser/StatementExitPoint.php

@@ -10,7 +10,7 @@
 final class StatementExitPoint
 {
 
-	public function __construct(private Stmt $statement, private MutatingScope $scope)
+	public function __construct(private Stmt $statement, private Scope $scope)
 	{
 	}
 
@@ -19,7 +19,7 @@ public function getStatement(): Stmt
 		return $this->statement;
 	}
 
-	public function getScope(): MutatingScope
+	public function getScope(): Scope
 	{
 		return $this->scope;
 	}