Merge pull request doctrine#12161 from greg0ire/proper-attribute

greg0ire · web-flow · commit 2ca63df90cae · 2025-09-12T08:23:02.000+02:00
Switch to IgnoreDeprecations
diff --git a/composer.json b/composer.json
@@ -43,7 +43,7 @@
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "2.1.22",
         "phpstan/phpstan-deprecation-rules": "^2",
-        "phpunit/phpunit": "^10.4.0 || ^11.5",
+        "phpunit/phpunit": "^10.5.0 || ^11.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.13.2",
         "symfony/cache": "^5.4 || ^6.2 || ^7.0"
diff --git a/tests/Tests/ORM/ConfigurationTest.php b/tests/Tests/ORM/ConfigurationTest.php
@@ -18,8 +18,8 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Tests\Models\DDC753\DDC753CustomRepository;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhp;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Cache\CacheItemPoolInterface;
 
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->configuration = new Configuration();
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testSetGetProxyDir(): void
     {
         self::assertNull($this->configuration->getProxyDir()); // defaults
@@ -48,7 +48,7 @@ public function testSetGetProxyDir(): void
         self::assertSame(__DIR__, $this->configuration->getProxyDir());
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testSetGetAutoGenerateProxyClasses(): void
     {
         self::assertSame(ProxyFactory::AUTOGENERATE_ALWAYS, $this->configuration->getAutoGenerateProxyClasses()); // defaults
@@ -63,7 +63,7 @@ public function testSetGetAutoGenerateProxyClasses(): void
         self::assertSame(ProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS, $this->configuration->getAutoGenerateProxyClasses());
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testSetGetProxyNamespace(): void
     {
         self::assertNull($this->configuration->getProxyNamespace()); // defaults
@@ -222,7 +222,7 @@ public function testSetGetTypedFieldMapper(): void
     }
 
     #[RequiresPhp('8.4')]
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testDisablingNativeLazyObjectsIsDeprecated(): void
     {
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');
diff --git a/tests/Tests/ORM/Functional/ParserResultSerializationTest.php b/tests/Tests/ORM/Functional/ParserResultSerializationTest.php
@@ -14,7 +14,7 @@
 use Doctrine\Tests\OrmFunctionalTestCase;
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use ReflectionMethod;
 use Symfony\Component\VarExporter\Instantiator;
 use Symfony\Component\VarExporter\VarExporter;
@@ -35,7 +35,7 @@ protected function setUp(): void
 
     /** @param Closure(ParserResult): ParserResult $toSerializedAndBack */
     #[DataProvider('provideToSerializedAndBack')]
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testSerializeParserResultForQueryWithSqlWalker(Closure $toSerializedAndBack): void
     {
         $query = $this->_em
diff --git a/tests/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -54,7 +54,7 @@
 use LogicException;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group as TestGroup;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use ReflectionClass;
 use stdClass;
 
@@ -1126,7 +1126,7 @@ public function testItAddingLifecycleCallbackOnEmbeddedClassIsIllegal(): void
         $metadata->addLifecycleCallback('foo', 'bar');
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testGettingAnFQCNForNullIsDeprecated(): void
     {
         $metadata = new ClassMetadata(self::class);
@@ -1165,7 +1165,7 @@ public function testClassNameMappingDiscriminatorValue(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testDiscriminatorMapWithSameClassMultipleTimesDeprecated(): void
     {
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/issues/3519');
diff --git a/tests/Tests/ORM/Mapping/TableMappingTest.php b/tests/Tests/ORM/Mapping/TableMappingTest.php
@@ -6,22 +6,22 @@
 
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\ORM\Mapping\Table;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 
 final class TableMappingTest extends TestCase
 {
     use VerifyDeprecations;
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testDeprecationOnIndexesPropertyIsTriggered(): void
     {
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/11357');
 
         new Table(indexes: []);
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testDeprecationOnUniqueConstraintsPropertyIsTriggered(): void
     {
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/11357');
diff --git a/tests/Tests/ORM/ORMSetupTest.php b/tests/Tests/ORM/ORMSetupTest.php
@@ -11,9 +11,9 @@
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\ORMSetup;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\Attributes\RequiresSetting;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
@@ -28,7 +28,7 @@ class ORMSetupTest extends TestCase
 {
     use VerifyDeprecations;
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testAttributeConfiguration(): void
     {
         if (PHP_VERSION_ID >= 80400) {
@@ -51,7 +51,7 @@ public function testAttributeConfig(): void
         self::assertInstanceOf(AttributeDriver::class, $config->getMetadataDriverImpl());
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testXMLConfiguration(): void
     {
         if (PHP_VERSION_ID >= 80400) {
@@ -104,7 +104,7 @@ public function testCacheNamespaceShouldBeGeneratedForApcu(): void
     }
 
     #[Group('DDC-1350')]
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testConfigureProxyDir(): void
     {
         $config = ORMSetup::createAttributeMetadataConfiguration([], true, '/foo');
diff --git a/tests/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Tests/ORM/Proxy/ProxyFactoryTest.php
@@ -21,8 +21,8 @@
 use Doctrine\Tests\Models\ECommerce\ECommerceFeature;
 use Doctrine\Tests\OrmTestCase;
 use PHPUnit\Framework\Attributes\Group;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhp;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use ReflectionClass;
 use ReflectionProperty;
 use stdClass;
@@ -247,7 +247,7 @@ public function testProxyFactoryAcceptsNullProxyArgsWhenNativeLazyObjectsAreEnab
     }
 
     #[RequiresPhp('8.4')]
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testProxyFactoryTriggersDeprecationWhenNativeLazyObjectsAreDisabled(): void
     {
         $this->emMock->getConfiguration()->enableNativeLazyObjects(false);
diff --git a/tests/Tests/Proxy/AutoloaderTest.php b/tests/Tests/Proxy/AutoloaderTest.php
@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\Proxy\Autoloader;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 
 use function class_exists;
@@ -32,7 +32,7 @@ public static function dataResolveFile(): iterable
 
     /** @param class-string $className */
     #[DataProvider('dataResolveFile')]
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testResolveFile(
         string $proxyDir,
         string $proxyNamespace,
@@ -43,7 +43,7 @@ public function testResolveFile(
         self::assertEquals($expectedProxyFile, $actualProxyFile);
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testAutoload(): void
     {
         if (file_exists(sys_get_temp_dir() . '/AutoloaderTestClass.php')) {

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`	`use Doctrine\Persistence\Mapping\Driver\MappingDriver;`
`19`	`19`	`use Doctrine\Tests\Models\DDC753\DDC753CustomRepository;`
`20`	`20`	`use PHPUnit\Framework\Attributes\Group;`
	`21`	`+use PHPUnit\Framework\Attributes\IgnoreDeprecations;`
`21`	`22`	`use PHPUnit\Framework\Attributes\RequiresPhp;`
`22`		`-use PHPUnit\Framework\Attributes\WithoutErrorHandler;`
`23`	`23`	`use PHPUnit\Framework\TestCase;`
`24`	`24`	`use Psr\Cache\CacheItemPoolInterface;`
`25`	`25`
`@@ -39,7 +39,7 @@ protected function setUp(): void`
`39`	`39`	`$this->configuration = new Configuration();`
`40`	`40`	`}`
`41`	`41`
`42`		`- #[WithoutErrorHandler]`
	`42`	`+ #[IgnoreDeprecations]`
`43`	`43`	`public function testSetGetProxyDir(): void`
`44`	`44`	`{`
`45`	`45`	`self::assertNull($this->configuration->getProxyDir()); // defaults`
`@@ -48,7 +48,7 @@ public function testSetGetProxyDir(): void`
`48`	`48`	`self::assertSame(__DIR__, $this->configuration->getProxyDir());`
`49`	`49`	`}`
`50`	`50`
`51`		`- #[WithoutErrorHandler]`
	`51`	`+ #[IgnoreDeprecations]`
`52`	`52`	`public function testSetGetAutoGenerateProxyClasses(): void`
`53`	`53`	`{`
`54`	`54`	`self::assertSame(ProxyFactory::AUTOGENERATE_ALWAYS, $this->configuration->getAutoGenerateProxyClasses()); // defaults`
`@@ -63,7 +63,7 @@ public function testSetGetAutoGenerateProxyClasses(): void`
`63`	`63`	`self::assertSame(ProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS, $this->configuration->getAutoGenerateProxyClasses());`
`64`	`64`	`}`
`65`	`65`
`66`		`- #[WithoutErrorHandler]`
	`66`	`+ #[IgnoreDeprecations]`
`67`	`67`	`public function testSetGetProxyNamespace(): void`
`68`	`68`	`{`
`69`	`69`	`self::assertNull($this->configuration->getProxyNamespace()); // defaults`
`@@ -222,7 +222,7 @@ public function testSetGetTypedFieldMapper(): void`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`#[RequiresPhp('8.4')]`
`225`		`- #[WithoutErrorHandler]`
	`225`	`+ #[IgnoreDeprecations]`
`226`	`226`	`public function testDisablingNativeLazyObjectsIsDeprecated(): void`
`227`	`227`	`{`
`228`	`228`	`$this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/12005');`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`use LogicException;`
`55`	`55`	`use PHPUnit\Framework\Attributes\DataProvider;`
`56`	`56`	`use PHPUnit\Framework\Attributes\Group as TestGroup;`
`57`		`-use PHPUnit\Framework\Attributes\WithoutErrorHandler;`
	`57`	`+use PHPUnit\Framework\Attributes\IgnoreDeprecations;`
`58`	`58`	`use ReflectionClass;`
`59`	`59`	`use stdClass;`
`60`	`60`
`@@ -1126,7 +1126,7 @@ public function testItAddingLifecycleCallbackOnEmbeddedClassIsIllegal(): void`
`1126`	`1126`	`$metadata->addLifecycleCallback('foo', 'bar');`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`		`- #[WithoutErrorHandler]`
	`1129`	`+ #[IgnoreDeprecations]`
`1130`	`1130`	`public function testGettingAnFQCNForNullIsDeprecated(): void`
`1131`	`1131`	`{`
`1132`	`1132`	`$metadata = new ClassMetadata(self::class);`
`@@ -1165,7 +1165,7 @@ public function testClassNameMappingDiscriminatorValue(): void`
`1165`	`1165`	`);`
`1166`	`1166`	`}`
`1167`	`1167`
`1168`		`- #[WithoutErrorHandler]`
	`1168`	`+ #[IgnoreDeprecations]`
`1169`	`1169`	`public function testDiscriminatorMapWithSameClassMultipleTimesDeprecated(): void`
`1170`	`1170`	`{`
`1171`	`1171`	`$this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/issues/3519');`
Original file line number	Diff line number	Diff line change
`@@ -6,22 +6,22 @@`
`6`	`6`
`7`	`7`	`use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;`
`8`	`8`	`use Doctrine\ORM\Mapping\Table;`
`9`		`-use PHPUnit\Framework\Attributes\WithoutErrorHandler;`
	`9`	`+use PHPUnit\Framework\Attributes\IgnoreDeprecations;`
`10`	`10`	`use PHPUnit\Framework\TestCase;`
`11`	`11`
`12`	`12`	`final class TableMappingTest extends TestCase`
`13`	`13`	`{`
`14`	`14`	`use VerifyDeprecations;`
`15`	`15`
`16`		`- #[WithoutErrorHandler]`
	`16`	`+ #[IgnoreDeprecations]`
`17`	`17`	`public function testDeprecationOnIndexesPropertyIsTriggered(): void`
`18`	`18`	`{`
`19`	`19`	`$this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/11357');`
`20`	`20`
`21`	`21`	`new Table(indexes: []);`
`22`	`22`	`}`
`23`	`23`
`24`		`- #[WithoutErrorHandler]`
	`24`	`+ #[IgnoreDeprecations]`
`25`	`25`	`public function testDeprecationOnUniqueConstraintsPropertyIsTriggered(): void`
`26`	`26`	`{`
`27`	`27`	`$this->expectDeprecationWithIdentifier('https://github.com/doctrine/orm/pull/11357');`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`use Doctrine\ORM\Mapping\Driver\XmlDriver;`
`12`	`12`	`use Doctrine\ORM\ORMSetup;`
`13`	`13`	`use PHPUnit\Framework\Attributes\Group;`
	`14`	`+use PHPUnit\Framework\Attributes\IgnoreDeprecations;`
`14`	`15`	`use PHPUnit\Framework\Attributes\RequiresPhpExtension;`
`15`	`16`	`use PHPUnit\Framework\Attributes\RequiresSetting;`
`16`		`-use PHPUnit\Framework\Attributes\WithoutErrorHandler;`
`17`	`17`	`use PHPUnit\Framework\TestCase;`
`18`	`18`	`use ReflectionProperty;`
`19`	`19`	`use Symfony\Component\Cache\Adapter\AbstractAdapter;`
`@@ -28,7 +28,7 @@ class ORMSetupTest extends TestCase`
`28`	`28`	`{`
`29`	`29`	`use VerifyDeprecations;`
`30`	`30`
`31`		`- #[WithoutErrorHandler]`
	`31`	`+ #[IgnoreDeprecations]`
`32`	`32`	`public function testAttributeConfiguration(): void`
`33`	`33`	`{`
`34`	`34`	`if (PHP_VERSION_ID >= 80400) {`
`@@ -51,7 +51,7 @@ public function testAttributeConfig(): void`
`51`	`51`	`self::assertInstanceOf(AttributeDriver::class, $config->getMetadataDriverImpl());`
`52`	`52`	`}`
`53`	`53`
`54`		`- #[WithoutErrorHandler]`
	`54`	`+ #[IgnoreDeprecations]`
`55`	`55`	`public function testXMLConfiguration(): void`
`56`	`56`	`{`
`57`	`57`	`if (PHP_VERSION_ID >= 80400) {`
`@@ -104,7 +104,7 @@ public function testCacheNamespaceShouldBeGeneratedForApcu(): void`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#[Group('DDC-1350')]`
`107`		`- #[WithoutErrorHandler]`
	`107`	`+ #[IgnoreDeprecations]`
`108`	`108`	`public function testConfigureProxyDir(): void`
`109`	`109`	`{`
`110`	`110`	`$config = ORMSetup::createAttributeMetadataConfiguration([], true, '/foo');`