Resolve static type in method @throws

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -3127,7 +3127,7 @@ public function enterClassMethod(
 				$this->getParameterAttributes($classMethod),
 				$this->transformStaticType($this->getFunctionType($classMethod->returnType, false, false)),
 				$phpDocReturnType !== null ? $this->transformStaticType(TemplateTypeHelper::toArgument($phpDocReturnType)) : null,
-				$throwType,
+				$throwType !== null ? $this->transformStaticType(TemplateTypeHelper::toArgument($throwType)) : null,
 				$deprecatedDescription,
 				$isDeprecated,
 				$isInternal,
@@ -3214,7 +3214,7 @@ public function enterPropertyHook(
 				$this->getParameterAttributes($hook),
 				$realReturnType,
 				$phpDocReturnType,
-				$throwType,
+				$throwType !== null ? $this->transformStaticType(TemplateTypeHelper::toArgument($throwType)) : null,
 				$deprecatedDescription,
 				$isDeprecated,
 				false,

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

@@ -125,13 +125,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

@@ -120,13 +120,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,
 		);
 	}
 

tests/PHPStan/Rules/Exceptions/Bug11900Test.php

@@ -0,0 +1,41 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Exceptions;
+
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+use PHPUnit\Framework\Attributes\RequiresPhp;
+
+/**
+ * @extends RuleTestCase<MissingCheckedExceptionInMethodThrowsRule>
+ */
+class Bug11900Test extends RuleTestCase
+{
+
+	protected function getRule(): Rule
+	{
+		return new MissingCheckedExceptionInMethodThrowsRule(
+			new MissingCheckedExceptionInThrowsCheck(new DefaultExceptionTypeResolver(
+				self::createReflectionProvider(),
+				[],
+				[],
+				[],
+				[],
+			)),
+		);
+	}
+
+	#[RequiresPhp('>= 8.4')]
+	public function testRule(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11900.php'], []);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/bug-11900.neon',
+		];
+	}
+
+}

tests/PHPStan/Rules/Exceptions/bug-11900.neon

@@ -0,0 +1,6 @@
+parameters:
+    exceptions:
+        implicitThrows: false
+        check:
+            missingCheckedExceptionInThrows: true
+            tooWideThrowType: true

tests/PHPStan/Rules/Exceptions/data/bug-11900.php

@@ -0,0 +1,50 @@
+<?php // lint >= 8.4
+
+namespace Bug11900;
+
+use Exception;
+use Throwable;
+
+abstract class ADataException extends Exception
+{
+	/**
+	 * @return void
+	 * @throws static
+	 */
+	public function throw1(): void
+	{
+		throw $this;
+	}
+
+	/**
+	 * @return void
+	 * @throws static
+	 */
+	public static function throw2(): void
+	{
+		throw new static();
+	}
+}
+
+final class TestDataException extends ADataException
+{
+}
+
+class TestPhpStan
+{
+	/**
+	 * @throws TestDataException
+	 */
+	public function validate(TestDataException $e): void
+	{
+		$e->throw1();
+	}
+
+	/**
+	 * @throws TestDataException
+	 */
+	public function validate2(): void
+	{
+		TestDataException::throw2();
+	}
+}