Revert unnecessary test changes

janedbal · janedbal · commit 1006e1632d53 · 2026-03-26T17:09:39.000+01:00
The validation happens in ContainerFactory::create(), not in
DefaultExceptionTypeResolver's constructor. Tests construct
DefaultExceptionTypeResolver directly, so they are unaffected.

Co-Authored-By: Claude Code
diff --git a/tests/PHPStan/Rules/Exceptions/ThrowsVoidFunctionWithExplicitThrowPointRuleTest.php b/tests/PHPStan/Rules/Exceptions/ThrowsVoidFunctionWithExplicitThrowPointRuleTest.php
@@ -5,7 +5,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
-use ThrowsVoidFunction\DifferentException;
 use ThrowsVoidFunction\MyException;
 
 /**
@@ -40,7 +39,7 @@ public static function dataRule(): array
 			],
 			[
 				false,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Function ThrowsVoidFunction\foo() throws exception ThrowsVoidFunction\MyException but the PHPDoc contains @throws void.',
@@ -55,7 +54,7 @@ public static function dataRule(): array
 			],
 			[
 				true,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Function ThrowsVoidFunction\foo() throws exception ThrowsVoidFunction\MyException but the PHPDoc contains @throws void.',
diff --git a/tests/PHPStan/Rules/Exceptions/ThrowsVoidMethodWithExplicitThrowPointRuleTest.php b/tests/PHPStan/Rules/Exceptions/ThrowsVoidMethodWithExplicitThrowPointRuleTest.php
@@ -6,7 +6,6 @@
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\RequiresPhp;
-use ThrowsVoidMethod\DifferentException;
 use ThrowsVoidMethod\MyException;
 use UnhandledMatchError;
 use ValueError;
@@ -43,7 +42,7 @@ public static function dataRule(): array
 			],
 			[
 				false,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Method ThrowsVoidMethod\Foo::doFoo() throws exception ThrowsVoidMethod\MyException but the PHPDoc contains @throws void.',
@@ -58,7 +57,7 @@ public static function dataRule(): array
 			],
 			[
 				true,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Method ThrowsVoidMethod\Foo::doFoo() throws exception ThrowsVoidMethod\MyException but the PHPDoc contains @throws void.',
diff --git a/tests/PHPStan/Rules/Exceptions/ThrowsVoidPropertyHookWithExplicitThrowPointRuleTest.php b/tests/PHPStan/Rules/Exceptions/ThrowsVoidPropertyHookWithExplicitThrowPointRuleTest.php
@@ -6,7 +6,6 @@
 use PHPStan\Testing\RuleTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\RequiresPhp;
-use ThrowsVoidPropertyHook\DifferentException;
 
 /**
  * @extends RuleTestCase<ThrowsVoidPropertyHookWithExplicitThrowPointRule>
@@ -40,7 +39,7 @@ public static function dataRule(): array
 			],
 			[
 				false,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
@@ -59,7 +58,7 @@ public static function dataRule(): array
 			],
 			[
 				true,
-				[DifferentException::class],
+				['DifferentException'],
 				[
 					[
 						'Get hook for property ThrowsVoidPropertyHook\Foo::$i throws exception ThrowsVoidPropertyHook\MyException but the PHPDoc contains @throws void.',
diff --git a/tests/PHPStan/Rules/Exceptions/data/throws-void-function.php b/tests/PHPStan/Rules/Exceptions/data/throws-void-function.php
@@ -14,8 +14,3 @@ function foo(): void
 {
 	throw new MyException();
 }
-
-class DifferentException extends \Exception
-{
-
-}
diff --git a/tests/PHPStan/Rules/Exceptions/data/throws-void-method.php b/tests/PHPStan/Rules/Exceptions/data/throws-void-method.php
@@ -20,8 +20,3 @@ public function doFoo(): void
 
 
 }
-
-class DifferentException extends \Exception
-{
-
-}
diff --git a/tests/PHPStan/Rules/Exceptions/data/throws-void-property-hook.php b/tests/PHPStan/Rules/Exceptions/data/throws-void-property-hook.php
@@ -27,8 +27,3 @@ class Foo
 	}
 
 }
-
-class DifferentException extends \Exception
-{
-
-}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use PHPStan\Rules\Rule;`
`6`	`6`	`use PHPStan\Testing\RuleTestCase;`
`7`	`7`	`use PHPUnit\Framework\Attributes\DataProvider;`
`8`		`-use ThrowsVoidFunction\DifferentException;`
`9`	`8`	`use ThrowsVoidFunction\MyException;`
`10`	`9`
`11`	`10`	`/**`
`@@ -40,7 +39,7 @@ public static function dataRule(): array`
`40`	`39`	`],`
`41`	`40`	`[`
`42`	`41`	`false,`
`43`		`- [DifferentException::class],`
	`42`	`+ ['DifferentException'],`
`44`	`43`	`[`
`45`	`44`	`[`
`46`	`45`	`'Function ThrowsVoidFunction\foo() throws exception ThrowsVoidFunction\MyException but the PHPDoc contains @throws void.',`
`@@ -55,7 +54,7 @@ public static function dataRule(): array`
`55`	`54`	`],`
`56`	`55`	`[`
`57`	`56`	`true,`
`58`		`- [DifferentException::class],`
	`57`	`+ ['DifferentException'],`
`59`	`58`	`[`
`60`	`59`	`[`
`61`	`60`	`'Function ThrowsVoidFunction\foo() throws exception ThrowsVoidFunction\MyException but the PHPDoc contains @throws void.',`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use PHPStan\Testing\RuleTestCase;`
`7`	`7`	`use PHPUnit\Framework\Attributes\DataProvider;`
`8`	`8`	`use PHPUnit\Framework\Attributes\RequiresPhp;`
`9`		`-use ThrowsVoidMethod\DifferentException;`
`10`	`9`	`use ThrowsVoidMethod\MyException;`
`11`	`10`	`use UnhandledMatchError;`
`12`	`11`	`use ValueError;`
`@@ -43,7 +42,7 @@ public static function dataRule(): array`
`43`	`42`	`],`
`44`	`43`	`[`
`45`	`44`	`false,`
`46`		`- [DifferentException::class],`
	`45`	`+ ['DifferentException'],`
`47`	`46`	`[`
`48`	`47`	`[`
`49`	`48`	`'Method ThrowsVoidMethod\Foo::doFoo() throws exception ThrowsVoidMethod\MyException but the PHPDoc contains @throws void.',`
`@@ -58,7 +57,7 @@ public static function dataRule(): array`
`58`	`57`	`],`
`59`	`58`	`[`
`60`	`59`	`true,`
`61`		`- [DifferentException::class],`
	`60`	`+ ['DifferentException'],`
`62`	`61`	`[`
`63`	`62`	`[`
`64`	`63`	`'Method ThrowsVoidMethod\Foo::doFoo() throws exception ThrowsVoidMethod\MyException but the PHPDoc contains @throws void.',`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,3 @@ function foo(): void`
`14`	`14`	`{`
`15`	`15`	`throw new MyException();`
`16`	`16`	`}`
`17`		`-`
`18`		`-class DifferentException extends \Exception`
`19`		`-{`
`20`		`-`
`21`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,3 @@ public function doFoo(): void`
`20`	`20`
`21`	`21`
`22`	`22`	`}`
`23`		`-`
`24`		`-class DifferentException extends \Exception`
`25`		`-{`
`26`		`-`
`27`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,3 @@ class Foo`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`}`
`30`		`-`
`31`		`-class DifferentException extends \Exception`
`32`		`-{`
`33`		`-`
`34`		`-}`