Rework

Author: VincentLanglet

src/Analyser/ExprHandler/NewHandler.php

@@ -81,11 +81,9 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 	{
 		$parametersAcceptor = null;
 		$constructorReflection = null;
-		$className = null;
 		$classReflection = null;
 		$hasYield = false;
 		$throwPoints = [];
-		$deferConstructorThrowPoints = false;
 		$impurePoints = [];
 		$isAlwaysTerminating = false;
 		$normalizedExpr = $expr;
@@ -94,7 +92,6 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 
 			[$constructorReflection, $classReflection, $parametersAcceptor, $constructorImpurePoints] = $this->processConstructorReflection($className, $expr, $scope);
 			$impurePoints = array_merge($impurePoints, $constructorImpurePoints);
-			$deferConstructorThrowPoints = true;
 
 			if ($parametersAcceptor !== null) {
 				$normalizedExpr = ArgumentsNormalizer::reorderNewArguments($parametersAcceptor, $expr) ?? $expr;
@@ -139,19 +136,13 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 					}
 				} else {
 					$nodeScopeResolver->processStmtNode($expr->class, $scope, $storage, $nodeCallback, StatementContext::createTopLevel());
-					$declaringClass = $constructorReflection->getDeclaringClass();
-					$constructorThrowPoint = $this->getConstructorThrowPoint($constructorReflection, $parametersAcceptor, $classReflection, $expr, new Name\FullyQualified($declaringClass->getName()), $expr->getArgs(), $scope);
-					if ($constructorThrowPoint !== null) {
-						$throwPoints[] = $constructorThrowPoint;
-					}
-
 					if (!$constructorReflection->hasSideEffects()->no()) {
 						$certain = $constructorReflection->isPure()->no();
 						$impurePoints[] = new ImpurePoint(
 							$scope,
 							$expr,
 							'new',
-							sprintf('instantiation of class %s', $declaringClass->getDisplayName()),
+							sprintf('instantiation of class %s', $constructorReflection->getDeclaringClass()->getDisplayName()),
 							$certain,
 						);
 					}
@@ -181,9 +172,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			if ($className !== null) {
 				[$constructorReflection, $classReflection, $parametersAcceptor, $constructorImpurePoints] = $this->processConstructorReflection($className, $expr, $scope);
 				$impurePoints = array_merge($impurePoints, $constructorImpurePoints);
-				$deferConstructorThrowPoints = true;
 			} else {
-				$throwPoints[] = InternalThrowPoint::createImplicit($scope, $expr);
 				$impurePoints[] = new ImpurePoint(
 					$scope,
 					$expr,
@@ -205,15 +194,14 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 		$impurePoints = array_merge($impurePoints, $argsResult->getImpurePoints());
 		$isAlwaysTerminating = $isAlwaysTerminating || $argsResult->isAlwaysTerminating();
 
-		if ($deferConstructorThrowPoints && $className !== null) {
-			if ($constructorReflection !== null && $parametersAcceptor !== null && $classReflection !== null) {
-				$constructorThrowPoint = $this->getConstructorThrowPoint($constructorReflection, $parametersAcceptor, $classReflection, $expr, new Name\FullyQualified($className), $expr->getArgs(), $scope);
-				if ($constructorThrowPoint !== null) {
-					$throwPoints[] = $constructorThrowPoint;
-				}
-			} elseif ($classReflection === null) {
-				$throwPoints[] = InternalThrowPoint::createImplicit($scope, $expr);
+		if ($constructorReflection !== null && $parametersAcceptor !== null) {
+			$className ??= $constructorReflection->getDeclaringClass()->getName();
+			$constructorThrowPoint = $this->getConstructorThrowPoint($constructorReflection, $parametersAcceptor, $expr, new Name\FullyQualified($className), $expr->getArgs(), $scope);
+			if ($constructorThrowPoint !== null) {
+				$throwPoints[] = $constructorThrowPoint;
 			}
+		} elseif ($classReflection === null) {
+			$throwPoints[] = InternalThrowPoint::createImplicit($scope, $expr);
 		}
 
 		return new ExpressionResult(
@@ -275,7 +263,7 @@ private function processConstructorReflection(string $className, New_ $expr, Mut
 	/**
 	 * @param list<Node\Arg> $args
 	 */
-	private function getConstructorThrowPoint(MethodReflection $constructorReflection, ParametersAcceptor $parametersAcceptor, ClassReflection $classReflection, New_ $new, Name $className, array $args, MutatingScope $scope): ?InternalThrowPoint
+	private function getConstructorThrowPoint(MethodReflection $constructorReflection, ParametersAcceptor $parametersAcceptor, New_ $new, Name $className, array $args, MutatingScope $scope): ?InternalThrowPoint
 	{
 		$methodCall = new StaticCall($className, $constructorReflection->getName(), $args);
 		$normalizedMethodCall = ArgumentsNormalizer::reorderStaticCallArguments($parametersAcceptor, $methodCall);
@@ -300,7 +288,7 @@ private function getConstructorThrowPoint(MethodReflection $constructorReflectio
 				return InternalThrowPoint::createExplicit($scope, $throwType, $new, true);
 			}
 		} elseif ($this->implicitThrows) {
-			if (!$classReflection->is(Throwable::class)) {
+			if (!$constructorReflection->getDeclaringClass()->is(Throwable::class)) {
 				return InternalThrowPoint::createImplicit($scope, $methodCall);
 			}
 		}

src/Analyser/InternalScopeFactory.php

@@ -15,7 +15,7 @@ interface InternalScopeFactory
 	 * @param array<string, ExpressionTypeHolder> $expressionTypes
 	 * @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
 	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
-	 * @param list<string> $inClosureBindScopeClasses
+	 * @param list<non-empty-string> $inClosureBindScopeClasses
 	 * @param array<string, true> $currentlyAssignedExpressions
 	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
 	 * @param list<array{FunctionReflection|MethodReflection|null, ParameterReflection|null}> $inFunctionCallsStack

src/Analyser/MutatingScope.php

@@ -162,7 +162,7 @@ class MutatingScope implements Scope, NodeCallbackInvoker
 	 * @param callable(Node $node, Scope $scope): void|null $nodeCallback
 	 * @param array<string, ExpressionTypeHolder> $expressionTypes
 	 * @param array<string, ConditionalExpressionHolder[]> $conditionalExpressions
-	 * @param list<string> $inClosureBindScopeClasses
+	 * @param list<non-empty-string> $inClosureBindScopeClasses
 	 * @param array<string, true> $currentlyAssignedExpressions
 	 * @param array<string, true> $currentlyAllowedUndefinedExpressions
 	 * @param array<string, ExpressionTypeHolder> $nativeExpressionTypes
@@ -1820,7 +1820,7 @@ public function enterNamespace(string $namespaceName): self
 	}
 
 	/**
-	 * @param list<string> $scopeClasses
+	 * @param list<non-empty-string> $scopeClasses
 	 */
 	public function enterClosureBind(?Type $thisType, ?Type $nativeThisType, array $scopeClasses): self
 	{

src/Analyser/Scope.php

@@ -173,6 +173,8 @@ public function getScopeNativeType(Expr $expr): Type;
 	 * (they should already be fully qualified by the PHP parser's name resolver).
 	 *
 	 * Inside a Closure::bind() context, `self`/`static` resolve to the bound class.
+	 *
+	 * @return non-empty-string
 	 */
 	public function resolveName(Name $name): string;