Merge remote-tracking branch 'origin/2.17.x' into 3.0.x

Author: greg0ire

composer.json

@@ -49,12 +49,11 @@
         "phpstan/phpstan": "2.1.1",
         "phpstan/phpstan-phpunit": "2.0.3",
         "phpstan/phpstan-strict-rules": "^2",
-        "phpunit/phpunit": "^9.6.22",
+        "phpunit/phpunit": "^10.5.53",
         "psr/log": "^3.0",
         "symfony/doctrine-messenger": "^6.4 || ^7.0",
         "symfony/expression-language": "^6.4 || ^7.0",
         "symfony/messenger": "^6.4 || ^7.0",
-        "symfony/phpunit-bridge": "^7.2",
         "symfony/property-info": "^6.4 || ^7.0",
         "symfony/security-bundle": "^6.4 || ^7.0",
         "symfony/stopwatch": "^6.4 || ^7.0",

phpunit.xml.dist

@@ -2,21 +2,23 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          colors="true"
          bootstrap="tests/bootstrap.php"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         failOnDeprecation="true"
 >
     <testsuites>
         <testsuite name="DoctrineBundle for the Symfony Framework">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <php>
+        <env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
+    </php>
+
+    <source restrictDeprecations="true" ignoreSuppressionOfDeprecations="true">
         <include>
             <directory>src</directory>
         </include>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
+    </source>
 </phpunit>

tests/DependencyInjection/AbstractDoctrineExtensionTestCase.php

@@ -17,6 +17,8 @@
 use Generator;
 use InvalidArgumentException;
 use PDO;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
 use Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator;
@@ -203,7 +205,7 @@ public function testDbalLoadDisableTypeComments(): void
         $this->assertCount(0, $calls);
     }
 
-    /** @group legacy */
+    #[WithoutErrorHandler]
     public function testDbalSchemaManagerFactory(): void
     {
         $container = $this->loadContainer('dbal_schema_manager_factory');
@@ -623,10 +625,8 @@ public function testSetTypedFieldMapper(): void
         $this->assertDICDefinitionMethodCallOnce($definition, 'setTypedFieldMapper', [0 => new Reference('doctrine.orm.typed_field_mapper.default')]);
     }
 
-    /**
-     * @dataProvider cacheConfigProvider
-     * @group legacy
-     */
+    #[DataProvider('cacheConfigProvider')]
+    #[WithoutErrorHandler]
     public function testCacheConfig(string|null $expectedClass, string $entityManagerName, string|null $cacheGetter): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -990,7 +990,7 @@ public function testDbalSchemaFilterNewConfig(): void
         }
     }
 
-    /** @group legacy */
+    #[WithoutErrorHandler]
     public function testWellKnownSchemaFilterDefaultTables(): void
     {
         $container = $this->getContainer([]);
@@ -1013,7 +1013,7 @@ public function testWellKnownSchemaFilterDefaultTables(): void
         $this->assertTrue($filter->__invoke('anything_else'));
     }
 
-    /** @group legacy */
+    #[WithoutErrorHandler]
     public function testWellKnownSchemaFilterOverriddenTables(): void
     {
         $container = $this->getContainer([]);
@@ -1251,7 +1251,6 @@ public function testDisableSchemaValidation(): void
         $this->assertFalse($collectorDefinition->getArguments()[1]);
     }
 
-    /** @group legacy */
     public function testNativeLazyObjectsWithoutConfig(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -1276,7 +1275,6 @@ public function testNativeLazyObjectsWithConfigTrue(): void
         $this->assertTrue($entityManager->getConfiguration()->isNativeLazyObjectsEnabled());
     }
 
-    /** @group legacy */
     public function testNativeLazyObjectsWithConfigFalse(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {

tests/DependencyInjection/Compiler/EntityListenerPassTest.php

@@ -12,6 +12,7 @@
 use stdClass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+use function class_exists;
 use function interface_exists;
 
 class EntityListenerPassTest extends TestCase
@@ -59,6 +60,13 @@ public function testEntityListenersAreRegistered(string|null $event, string|null
     /** @return iterable<array{0: ?string, 1: ?string, 2: ?string}> */
     public static function provideEvents(): iterable
     {
+        if (! class_exists(Events::class)) {
+            // If ORM is not available, return fake data to make the data provider valid
+            yield 'Without ORM' => [null, null, null];
+
+            return;
+        }
+
         yield 'With event and matching method' => [Events::prePersist, null, null];
         yield 'Without event' => [null, null, null];
         yield 'With event and custom method' => [Events::postLoad, 'postLoadHandler', 'postLoadHandler'];

tests/DependencyInjection/DoctrineExtensionTest.php

@@ -30,6 +30,8 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use InvalidArgumentException;
 use LogicException;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\WithoutErrorHandler;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
@@ -58,10 +60,10 @@
 class DoctrineExtensionTest extends TestCase
 {
     /**
-     * https://github.com/doctrine/orm/pull/7953 needed, otherwise ORM classes we define services for trigger deprecations
-     *
-     * @group legacy
+     * https://github.com/doctrine/orm/pull/7953 needed, otherwise ORM classes
+     * we define services for trigger deprecations
      */
+    #[WithoutErrorHandler]
     public function testAutowiringAlias(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -585,7 +587,7 @@ public function testSingleEntityManagerWithDefaultSecondLevelCacheConfiguration(
         $this->assertEquals('%doctrine.orm.second_level_cache.default_cache_factory.class%', $slcDefinition->getClass());
     }
 
-    /** @group legacy */
+    #[WithoutErrorHandler]
     public function testSingleEntityManagerWithCustomSecondLevelCacheConfiguration(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -870,7 +872,7 @@ public function testMessengerIntegrationWithoutDoctrineTransport(): void
         $this->assertNotContains('messenger.transport_factory', $container->findTags());
     }
 
-    /** @group legacy */
+    #[WithoutErrorHandler]
     public function testInvalidCacheConfiguration(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -917,12 +919,9 @@ public function testCacheConfiguration(string $expectedAliasName, string $expect
         $this->assertEquals($expectedTarget, (string) $alias);
     }
 
-    /**
-     * @param array{type: ?string, pool?: string, id?: string} $cacheConfig
-     *
-     * @dataProvider legacyCacheConfigurationProvider
-     * @group legacy
-     */
+    /** @param array{type: ?string, pool?: string, id?: string} $cacheConfig */
+    #[DataProvider('legacyCacheConfigurationProvider')]
+    #[WithoutErrorHandler]
     public function testLegacyCacheConfiguration(string $expectedAliasName, string $expectedAliasTarget, string $cacheName, array $cacheConfig): void
     {
         $this->testCacheConfiguration($expectedAliasName, $expectedAliasTarget, $cacheName, $cacheConfig);