Merge remote-tracking branch 'origin/2.17.x' into 3.0.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/RegistryTest.php

@@ -16,6 +16,7 @@
 
 use function assert;
 use function interface_exists;
+use function restore_exception_handler;
 
 class RegistryTest extends TestCase
 {
@@ -146,5 +147,7 @@ public function testIdentityMapsStayConsistentAfterReset(): void
         $this->assertFalse($repository->getEntityManager()->getUnitOfWork()->isEntityScheduled($entity));
 
         $entityManager->flush();
+
+        restore_exception_handler();
     }
 }