Add scope parameter to InternalThrowPoint::createFromPublic instead of replaceScope

Move the scope replacement into createFromPublic() as an optional parameter,
removing the separate replaceScope() method as suggested in code review.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: phpstan-bot

src/Analyser/ExprHandler/NewHandler.php

@@ -190,7 +190,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 						$constructorResult = $node;
 					}, StatementContext::createTopLevel());
 					if ($constructorResult !== null) {
-						$throwPoints = array_map(static fn (ThrowPoint $point): InternalThrowPoint => InternalThrowPoint::createFromPublic($point)->replaceScope($scope), $constructorResult->getStatementResult()->getThrowPoints());
+						$throwPoints = array_map(static fn (ThrowPoint $point): InternalThrowPoint => InternalThrowPoint::createFromPublic($point, $scope), $constructorResult->getStatementResult()->getThrowPoints());
 						$impurePoints = $constructorResult->getImpurePoints();
 					}
 				} else {

src/Analyser/InternalThrowPoint.php

@@ -50,11 +50,13 @@ public static function createImplicit(MutatingScope $scope, Node $node): self
 		return new self($scope, new ObjectType(Throwable::class), $node, explicit: false, canContainAnyThrowable: true);
 	}
 
-	public static function createFromPublic(ThrowPoint $throwPoint): self
+	public static function createFromPublic(ThrowPoint $throwPoint, ?MutatingScope $scope = null): self
 	{
-		$scope = $throwPoint->getScope();
-		if (!$scope instanceof MutatingScope) {
-			throw new ShouldNotHappenException();
+		if ($scope === null) {
+			$scope = $throwPoint->getScope();
+			if (!$scope instanceof MutatingScope) {
+				throw new ShouldNotHappenException();
+			}
 		}
 
 		return new self($scope, $throwPoint->getType(), $throwPoint->getNode(), $throwPoint->isExplicit(), $throwPoint->canContainAnyThrowable());
@@ -88,11 +90,6 @@ public function canContainAnyThrowable(): bool
 		return $this->canContainAnyThrowable;
 	}
 
-	public function replaceScope(MutatingScope $scope): self
-	{
-		return new self($scope, $this->type, $this->node, $this->explicit, $this->canContainAnyThrowable);
-	}
-
 	public function subtractCatchType(Type $catchType): self
 	{
 		return new self($this->scope, TypeCombinator::remove($this->type, $catchType), $this->node, $this->explicit, $this->canContainAnyThrowable);