Merge pull request doctrine#2051 from doctrine/2.16.x

Merge 2.16.x up into 2.17.x

Author: greg0ire

phpunit.xml.dist

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="tests/bootstrap.php"
          colors="true"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          displayDetailsOnTestsThatTriggerDeprecations="true"

tests/Command/Proxy/InfoDoctrineCommandTest.php

@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 
 use function interface_exists;
+use function restore_exception_handler;
 
 class InfoDoctrineCommandTest extends TestCase
 {
@@ -38,5 +39,7 @@ public function testExecute(): void
             'Found 3 mapped entities',
             $commandTester->getDisplay(),
         );
+
+        restore_exception_handler();
     }
 }

tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php

@@ -23,6 +23,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 
 use function interface_exists;
+use function restore_exception_handler;
 
 class CacheCompatibilityPassTest extends TestCase
 {
@@ -82,6 +83,8 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
         })->boot();
 
         $this->addToAssertionCount(1);
+
+        restore_exception_handler();
     }
 
     #[DoesNotPerformAssertions]
@@ -108,6 +111,8 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                 });
             }
         })->boot();
+
+        restore_exception_handler();
     }
 
     #[IgnoreDeprecations]
@@ -132,6 +137,8 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                 });
             }
         })->boot();
+
+        restore_exception_handler();
     }
 }
 

tests/RegistryTest.php

@@ -21,6 +21,7 @@
 
 use function assert;
 use function interface_exists;
+use function restore_exception_handler;
 
 use const PHP_VERSION_ID;
 
@@ -153,7 +154,7 @@ public function testReset(): void
         $registry->reset();
     }
 
-    /** @requires PHP < 8.4 */
+    #[RequiresPhp('8.4')]
     public function testResetLazyObject(): void
     {
         if (! interface_exists(EntityManagerInterface::class) || ! interface_exists(LazyObjectInterface::class)) {
@@ -209,5 +210,7 @@ public function testIdentityMapsStayConsistentAfterReset(): void
         $this->assertFalse($repository->getEntityManager()->getUnitOfWork()->isEntityScheduled($entity));
 
         $entityManager->flush();
+
+        restore_exception_handler();
     }
 }

tests/Repository/ServiceEntityRepositoryTest.php

@@ -8,9 +8,13 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ManagerRegistry;
 use LogicException;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
+use PHPUnit\Framework\Attributes\RequiresMethod;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarExporter\LazyGhostTrait;
 use Symfony\Component\VarExporter\LazyObjectInterface;
+use Symfony\Component\VarExporter\ProxyHelper;
 
 use function interface_exists;
 
@@ -37,10 +41,9 @@ public function testConstructorThrowsExceptionWhenNoManagerFound(): void
         $repo->getClassName();
     }
 
-    /**
-     * @requires function \Symfony\Component\VarExporter\ProxyHelper::generateLazyGhost
-     * @requires PHP < 8.4
-     */
+    #[IgnoreDeprecations]
+    #[RequiresMethod(ProxyHelper::class, 'generateLazyGhost')]
+    #[RequiresPhp('8.4')]
     public function testConstructInitializesWhenImplementingLazyObjectInterface(): void
     {
         $registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();

tests/UrlOverrideTest.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
 use function array_intersect_key;
+use function restore_exception_handler;
 
 class UrlOverrideTest extends TestCase
 {
@@ -30,6 +31,8 @@ public function testConnectionConfiguration(array $config, array $expectedParams
                 $expectedParams,
             ),
         );
+
+        restore_exception_handler();
     }
 
     /** @return array<string, array{0: array<string, (bool|string|null)>, 1:  array<string, (bool|string|null)>}> */