Improve

Author: VincentLanglet

src/Analyser/NodeScopeResolver.php

@@ -197,6 +197,7 @@
 use PHPStan\Type\TypeTraverser;
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
+use PHPStan\Type\VerbosityLevel;
 use ReflectionProperty;
 use Throwable;
 use Traversable;
@@ -4260,18 +4261,6 @@ private function getMethodThrowPoint(MethodReflection $methodReflection, Paramet
 
 		if ($throwType !== null) {
 			if (!$throwType->isVoid()->yes()) {
-				if ($throwType instanceof StaticType) {
-					$classReflections = $scope->getType($methodCall->var)->getObjectClassReflections();
-					if (count($classReflections) > 0) {
-						$types = [];
-						foreach ($classReflections as $classReflection) {
-							$types[] = $throwType->changeBaseClass($classReflection);
-						}
-
-						$throwType = TypeCombinator::union(...$types);
-					}
-				}
-
 				return ThrowPoint::createExplicit($scope, $throwType, $methodCall, true);
 			}
 		} elseif ($this->implicitThrows) {
@@ -4345,25 +4334,6 @@ private function getStaticMethodThrowPoint(MethodReflection $methodReflection, P
 		if ($methodReflection->getThrowType() !== null) {
 			$throwType = $methodReflection->getThrowType();
 			if (!$throwType->isVoid()->yes()) {
-				if ($throwType instanceof StaticType) {
-					if ($methodCall->class instanceof Name) {
-						if ($this->reflectionProvider->hasClass($methodCall->class->name)) {
-							$throwType = $throwType->changeBaseClass($this->reflectionProvider->getClass($methodCall->class->name));
-						}
-					} else {
-						$classReflections = $scope->getType($methodCall->class)->getObjectClassReflections();
-
-						if (count($classReflections) > 0) {
-							$types = [];
-							foreach ($classReflections as $classReflection) {
-								$types[] = $throwType->changeBaseClass($classReflection);
-							}
-
-							$throwType = TypeCombinator::union(...$types);
-						}
-					}
-				}
-
 				return ThrowPoint::createExplicit($scope, $throwType, $methodCall, true);
 			}
 		} elseif ($this->implicitThrows) {

src/Reflection/Dummy/ChangedTypeMethodReflection.php

@@ -26,6 +26,7 @@ public function __construct(
 		private array $variants,
 		private ?array $namedArgumentsVariants,
 		private ?Type $selfOutType,
+		private ?Type $throwType,
 	)
 	{
 	}
@@ -122,7 +123,7 @@ public function isBuiltin(): TrinaryLogic
 
 	public function getThrowType(): ?Type
 	{
-		return $this->reflection->getThrowType();
+		return $this->throwType;
 	}
 
 	public function hasSideEffects(): TrinaryLogic

src/Reflection/Type/CallbackUnresolvedMethodPrototypeReflection.php

@@ -13,6 +13,8 @@
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\VerbosityLevel;
+
 use function array_map;
 
 final class CallbackUnresolvedMethodPrototypeReflection implements UnresolvedMethodPrototypeReflection
@@ -125,13 +127,18 @@ private function transformMethodWithStaticType(ClassReflection $declaringClass,
 		$namedArgumentVariants = $namedArgumentVariants !== null
 			? array_map($variantFn, $namedArgumentVariants)
 			: null;
+		$throwType = $method->getThrowType();
+		$throwType = $throwType !== null
+			? $this->transformStaticType($throwType)
+			: null;
 
 		return new ChangedTypeMethodReflection(
 			$declaringClass,
 			$method,
 			$variants,
 			$namedArgumentVariants,
 			$selfOutType,
+			$throwType
 		);
 	}
 

src/Reflection/Type/CalledOnTypeUnresolvedMethodPrototypeReflection.php

@@ -15,6 +15,8 @@
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
+use PHPStan\Type\VerbosityLevel;
+
 use function array_map;
 use function count;
 
@@ -120,13 +122,18 @@ private function transformMethodWithStaticType(ClassReflection $declaringClass,
 		$namedArgumentsVariants = $namedArgumentsVariants !== null
 			? array_map($variantFn, $namedArgumentsVariants)
 			: null;
+		$throwType = $method->getThrowType();
+		$throwType = $throwType !== null
+			? $this->transformStaticType($throwType)
+			: null;
 
 		return new ChangedTypeMethodReflection(
 			$declaringClass,
 			$method,
 			$variants,
 			$namedArgumentsVariants,
 			$selfOutType,
+			$throwType
 		);
 	}