remove phpunit bridge

composer.json

@@ -97,7 +97,6 @@
         "symfony/maker-bundle": "^1.24",
         "symfony/mercure-bundle": "*",
         "symfony/messenger": "^6.4 || ^7.0",
-        "symfony/phpunit-bridge": "^6.4.1 || ^7.0",
         "symfony/routing": "^6.4 || ^7.0",
         "symfony/security-bundle": "^6.4 || ^7.0",
         "symfony/security-core": "^6.4 || ^7.0",

phpunit.xml.dist

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" backupGlobals="false" bootstrap="tests/Fixtures/app/bootstrap.php" colors="true" cacheDirectory=".phpunit.cache">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    backupGlobals="false"
+    bootstrap="tests/Fixtures/app/bootstrap.php"
+    colors="true"
+    cacheDirectory=".phpunit.cache">
   <php>
     <ini name="error_reporting" value="-1"/>
     <ini name="memory_limit" value="-1"/>
@@ -24,7 +28,7 @@
     </exclude>
   </groups>
 
-  <source ignoreIndirectDeprecations="true">
+  <source ignoreSuppressionOfDeprecations="true" ignoreIndirectDeprecations="true">
     <include>
       <directory>.</directory>
     </include>

src/Doctrine/Odm/Tests/State/CollectionProviderTest.php

@@ -29,14 +29,12 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * @group mongodb
  */
 class CollectionProviderTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     private ObjectProphecy $managerRegistryProphecy;

src/Doctrine/Odm/Tests/State/ItemProviderTest.php

@@ -32,14 +32,12 @@
 use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * @group mongodb
  */
 class ItemProviderTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     public function testGetItemSingleIdentifier(): void

src/Elasticsearch/Tests/Metadata/Resource/Factory/ElasticsearchProviderResourceMetadataCollectionFactoryTest.php

@@ -25,11 +25,9 @@
 use Elasticsearch\Namespaces\CatNamespace;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 class ElasticsearchProviderResourceMetadataCollectionFactoryTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     public function testConstruct(): void

src/GraphQl/Subscription/SubscriptionManager.php

@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\GraphQl\Subscription;
 
-use ApiPlatform\GraphQl\Resolver\Stage\SerializeStageInterface;
 use ApiPlatform\GraphQl\Resolver\Util\IdentifierTrait;
 use ApiPlatform\Metadata\GraphQl\Operation;
 use ApiPlatform\Metadata\GraphQl\Subscription;

src/Metadata/Tests/Resource/Factory/UriTemplateResourceMetadataCollectionFactoryTest.php

@@ -35,14 +35,12 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * @author Antoine Bluchet <soyuka@gmail.com>
  */
 class UriTemplateResourceMetadataCollectionFactoryTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     public function testCreate(): void

src/Metadata/Tests/Util/IriHelperTest.php

@@ -17,15 +17,12 @@
 use ApiPlatform\Metadata\UrlGeneratorInterface;
 use ApiPlatform\Metadata\Util\IriHelper;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
 class IriHelperTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public function testHelpers(): void
     {
         $parsed = [

src/OpenApi/Tests/Factory/OpenApiFactoryTest.php

@@ -64,13 +64,11 @@
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\PropertyInfo\Type;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 
 class OpenApiFactoryTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     private const OPERATION_FORMATS = [

src/Serializer/Tests/AbstractItemNormalizerTest.php

@@ -42,7 +42,6 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyInfo\Type;
@@ -59,7 +58,6 @@
  */
 class AbstractItemNormalizerTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     /**

src/Serializer/Tests/ItemNormalizerTest.php

@@ -31,7 +31,6 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
@@ -43,7 +42,6 @@
  */
 class ItemNormalizerTest extends TestCase
 {
-    use ExpectDeprecationTrait;
     use ProphecyTrait;
 
     /**

src/Symfony/Bundle/Resources/config/graphql.xml

@@ -237,10 +237,9 @@
         <service id="api_platform.graphql.subscription.subscription_manager" class="ApiPlatform\GraphQl\Subscription\SubscriptionManager">
             <argument type="service" id="api_platform.graphql.cache.subscription" />
             <argument type="service" id="api_platform.graphql.subscription.subscription_identifier_generator" />
-            <argument type="service" id="api_platform.graphql.resolver.stage.serialize" on-invalid="ignore" />
+            <argument type="service" id="api_platform.graphql.state_processor.normalize" on-invalid="ignore" />
             <argument type="service" id="api_platform.symfony.iri_converter" />
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
-            <argument type="service" id="api_platform.graphql.state_processor.normalize" on-invalid="ignore" />
         </service>
 
         <!-- Serializer -->

src/Symfony/Bundle/Test/ApiTestCase.php

@@ -14,7 +14,6 @@
 namespace ApiPlatform\Symfony\Bundle\Test;
 
 use ApiPlatform\Metadata\IriConverterInterface;
-use PHPUnit\Framework\Attributes\BeforeClass;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
@@ -29,12 +28,6 @@ abstract class ApiTestCase extends KernelTestCase
 {
     use ApiTestAssertionsTrait;
 
-    #[BeforeClass]
-    public static function before(): void
-    {
-        static::bootKernel();
-    }
-
     /**
      * {@inheritdoc}
      */

tests/Fixtures/app/AppKernel.php

@@ -34,6 +34,7 @@
 use Symfony\Component\ErrorHandler\ErrorRenderer\ErrorRendererInterface;
 use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
 use Symfony\Component\HttpFoundation\Session\SessionFactory;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\PasswordHasher\Hasher\NativePasswordHasher;
 use Symfony\Component\Security\Core\Authorization\Strategy\AccessDecisionStrategyInterface;
@@ -68,6 +69,13 @@ public function registerBundles(): array
             new WebProfilerBundle(),
             new FrameworkBundle(),
             new MakerBundle(),
+            new class extends Bundle
+            {
+                public function shutdown(): void
+                {
+                    restore_exception_handler();
+                }
+            }
         ];
 
         if (null === ($_ENV['APP_PHPUNIT'] ?? null)) {
@@ -90,14 +98,14 @@ public function getProjectDir(): string
 
     protected function configureRoutes($routes): void
     {
-        $routes->import(__DIR__."/config/routing_{$this->getEnvironment()}.yml");
+        $routes->import(__DIR__ . "/config/routing_{$this->getEnvironment()}.yml");
     }
 
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void
     {
         $c->setParameter('kernel.project_dir', __DIR__);
 
-        $loader->load(__DIR__."/config/config_{$this->getEnvironment()}.yml");
+        $loader->load(__DIR__ . "/config/config_{$this->getEnvironment()}.yml");
 
         $c->getDefinition(DoctrineContext::class)->setArgument('$passwordHasher', class_exists(NativePasswordHasher::class) ? 'security.user_password_encoder' : 'security.user_password_hasher');
 
@@ -260,7 +268,7 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
         ]);
 
         // TODO: remove this check and move this config in config_common.yml when dropping support for DoctrineBundle <2.10
-        if (defined(ConnectionFactory::class.'::DEFAULT_SCHEME_MAP')) {
+        if (defined(ConnectionFactory::class . '::DEFAULT_SCHEME_MAP')) {
             $c->prependExtensionConfig('doctrine', [
                 'orm' => [
                     'report_fields_where_declared' => true,
@@ -270,7 +278,7 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
             ]);
         }
 
-        $loader->load(__DIR__.'/config/config_swagger.php');
+        $loader->load(__DIR__ . '/config/config_swagger.php');
 
         if ('mongodb' === $this->environment) {
             $c->prependExtensionConfig('api_platform', [
@@ -291,7 +299,8 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
 
     protected function build(ContainerBuilder $container): void
     {
-        $container->addCompilerPass(new class() implements CompilerPassInterface {
+        $container->addCompilerPass(new class() implements CompilerPassInterface
+        {
             public function process(ContainerBuilder $container): void
             {
                 if ($container->hasDefinition(TailCursorDoctrineODMCommand::class)) { // @phpstan-ignore-line

tests/Fixtures/app/bootstrap.php

@@ -13,22 +13,12 @@
 
 date_default_timezone_set('UTC');
 
-// PHPUnit's autoloader
-if (!file_exists($phpUnitAutoloaderPath = __DIR__.'/../../../vendor/bin/.phpunit/phpunit/vendor/autoload.php')) {
-    exit('PHPUnit is not installed. Please run ./vendor/bin/simple-phpunit to install it');
-}
-
 // Increase default max nesting level allowed by XDebug for the Symfony container
 $xdebugMaxNestingLevel = ini_get('xdebug.max_nesting_level');
 if (false !== $xdebugMaxNestingLevel && $xdebugMaxNestingLevel <= 512) {
     ini_set('xdebug.max_nesting_level', 512);
 }
 
-$phpunitLoader = require $phpUnitAutoloaderPath;
-// Don't register the PHPUnit autoloader before the normal autoloader to prevent weird issues
-$phpunitLoader->unregister();
-$phpunitLoader->register();
-
 $loader = require __DIR__.'/../../../vendor/autoload.php';
 require __DIR__.'/AppKernel.php';
 

tests/JsonSchema/Command/JsonSchemaGenerateCommandTest.php

@@ -15,8 +15,8 @@
 
 use ApiPlatform\Tests\Fixtures\TestBundle\Document\Dummy as DocumentDummy;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\Dummy;
-use ApiPlatform\Tests\KernelTestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**

tests/OpenApi/Command/OpenApiCommandTest.php

@@ -14,8 +14,8 @@
 namespace ApiPlatform\Tests\OpenApi\Command;
 
 use ApiPlatform\OpenApi\OpenApi;
-use ApiPlatform\Tests\KernelTestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\ApplicationTester;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;

tests/Symfony/Bundle/ArgumentResolver/PayloadArgumentResolverTest.php

@@ -23,9 +23,9 @@
 use ApiPlatform\Symfony\Bundle\ArgumentResolver\PayloadArgumentResolver;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\ResourceImplementation;
 use ApiPlatform\Tests\Fixtures\TestBundle\Entity\ResourceInterface;
-use ApiPlatform\Tests\KernelTestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 

tests/Symfony/Bundle/DependencyInjection/Compiler/GraphQlResolverPassTest.php

@@ -15,7 +15,6 @@
 
 use ApiPlatform\Symfony\Bundle\DependencyInjection\Compiler\GraphQlResolverPass;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -25,8 +24,6 @@
  */
 class GraphQlResolverPassTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public function testProcess(): void
     {
         $filterPass = new GraphQlResolverPass();

tests/Symfony/Bundle/DependencyInjection/ConfigurationTest.php

@@ -17,7 +17,6 @@
 use ApiPlatform\Symfony\Bundle\DependencyInjection\Configuration;
 use Doctrine\ORM\OptimisticLockException;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
@@ -32,8 +31,6 @@
  */
 class ConfigurationTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     private Configuration $configuration;
 
     private Processor $processor;

tests/Symfony/Bundle/Test/ApiTestCaseTest.php

@@ -27,12 +27,9 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Tools\SchemaTool;
 use PHPUnit\Framework\ExpectationFailedException;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 class ApiTestCaseTest extends ApiTestCase
 {
-    use ExpectDeprecationTrait;
-
     public static function providerFormats(): iterable
     {
         yield 'jsonapi' => ['jsonapi', 'application/vnd.api+json'];

tests/Symfony/Bundle/Twig/ApiPlatformProfilerPanelTest.php

@@ -19,15 +19,13 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Persistence\ManagerRegistry;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**
  * @author Anthony GRASSIOT <antograssiot@free.fr>
  */
 class ApiPlatformProfilerPanelTest extends WebTestCase
 {
-    use ExpectDeprecationTrait;
     private EntityManagerInterface $manager;
     private SchemaTool $schemaTool;
     private string $env;