Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/ExprHandler/NewHandler.php

@@ -131,7 +131,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 						$constructorResult = $node;
 					}, StatementContext::createTopLevel());
 					if ($constructorResult !== null) {
-						$throwPoints = array_map(static fn (ThrowPoint $point) => InternalThrowPoint::createFromPublic($point), $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

@@ -3,7 +3,6 @@
 namespace PHPStan\Analyser;
 
 use PhpParser\Node;
-use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -50,13 +49,8 @@ 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): self
 	{
-		$scope = $throwPoint->getScope();
-		if (!$scope instanceof MutatingScope) {
-			throw new ShouldNotHappenException();
-		}
-
 		return new self($scope, $throwPoint->getType(), $throwPoint->getNode(), $throwPoint->isExplicit(), $throwPoint->canContainAnyThrowable());
 	}
 

tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php

@@ -1444,6 +1444,16 @@ public function testBug12373(): void
 		$this->analyse([__DIR__ . '/data/bug-12373.php'], []);
 	}
 
+	public function testBug13920(): void
+	{
+		$this->cliArgumentsVariablesRegistered = true;
+		$this->polluteScopeWithLoopInitialAssignments = true;
+		$this->checkMaybeUndefinedVariables = true;
+		$this->polluteScopeWithAlwaysIterableForeach = true;
+
+		$this->analyse([__DIR__ . '/data/bug-13920.php'], []);
+	}
+
 	public function testBug14117(): void
 	{
 		$this->cliArgumentsVariablesRegistered = true;

tests/PHPStan/Rules/Variables/data/bug-13920.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace Bug13920;
+
+class TestOutput {
+	public function __construct() {}
+}
+
+final class MyTest
+{
+	public function testRun(): void
+	{
+		$savedArgv = $_SERVER['argv'];
+
+		try {
+			$output = new class() extends TestOutput {
+				public function __construct()
+				{
+					parent::__construct();
+				}
+			};
+		} finally {
+			$_SERVER['argv'] = $savedArgv;
+		}
+	}
+}