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

Author: greg0ire

composer.json

@@ -66,7 +66,7 @@
         "symfony/var-exporter": "^6.4.1 || ^7.0.1",
         "symfony/web-profiler-bundle": "^6.4 || ^7.0",
         "symfony/yaml": "^6.4 || ^7.0",
-        "twig/twig": "^2.13 || ^3.0.4"
+        "twig/twig": "^2.14.7 || ^3.0.4"
     },
     "conflict": {
         "doctrine/annotations": ">=3.0",

tests/Builder/BundleConfigurationBuilder.php

@@ -4,6 +4,10 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\Tests\Builder;
 
+use Doctrine\Bundle\DoctrineBundle\Tests\DeprecationFreeConfig;
+
+use function array_merge_recursive;
+
 class BundleConfigurationBuilder
 {
     /** @var array<string, mixed> */
@@ -71,9 +75,12 @@ public function addConnection(array $config): self
     }
 
     /** @param array<string, mixed> $config */
-    public function addEntityManager(array $config): self
+    public function addEntityManager(array $config, bool $withMinimalOrmConfig = true): self
     {
         $this->configuration['orm'] = $config;
+        if ($withMinimalOrmConfig) {
+            $this->configuration = array_merge_recursive(DeprecationFreeConfig::get(), $this->configuration);
+        }
 
         return $this;
     }

tests/CacheSchemaSubscriberTest.php

@@ -6,7 +6,6 @@
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\CacheSchemaSubscriberPass;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
-use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\DependencyInjection\Alias;
@@ -16,11 +15,8 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 use function interface_exists;
-use function method_exists;
 use function sys_get_temp_dir;
 
-use const PHP_VERSION_ID;
-
 class CacheSchemaSubscriberTest extends TestCase
 {
     public function testSchemaSubscriberWiring(): void
@@ -68,15 +64,8 @@ public function testSchemaSubscriberWiring(): void
         $extension = new DoctrineExtension();
         $container->registerExtension($extension);
         $extension->load([
-            [
-                'dbal' => [],
-                'orm' => [
-                    'controller_resolver' => ['auto_mapping' => false],
-                    /* @phpstan-ignore function.alreadyNarrowedType */
-                ] + (method_exists(Configuration::class, 'enableNativeLazyObjects') ? [
-                    'enable_native_lazy_objects' => PHP_VERSION_ID >= 80400,
-                ] : ['enable_lazy_ghost_objects' => true]),
-            ],
+            DeprecationFreeConfig::get(),
+            ['dbal' => []],
         ], $container);
 
         $container->setAlias('test_subscriber_alias', new Alias('doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', true));

tests/Command/ImportMappingDoctrineCommandTest.php

@@ -8,7 +8,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 use InvalidArgumentException;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -68,7 +68,7 @@ protected function tearDown(): void
         unset($this->kernel, $this->commandTester);
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testExecuteXmlWithBundle(): void
     {
         $this->commandTester->execute(['name' => 'ImportMappingTestFooBundle']);
@@ -82,7 +82,7 @@ public function testExecuteXmlWithBundle(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testExecuteAnnotationsWithBundle(): void
     {
         $this->commandTester->execute([
@@ -99,15 +99,15 @@ public function testExecuteAnnotationsWithBundle(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testExecuteThrowsExceptionWithNamespaceAndNoPath(): void
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('The --path option is required');
         $this->commandTester->execute(['name' => 'Some\Namespace']);
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testExecuteXmlWithNamespace(): void
     {
         $this->commandTester->execute([
@@ -124,7 +124,7 @@ public function testExecuteXmlWithNamespace(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testExecuteAnnotationsWithNamespace(): void
     {
         $this->commandTester->execute([

tests/ConnectionFactoryTest.php

@@ -11,7 +11,7 @@
 use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use InvalidArgumentException;
-use PHPUnit\Framework\Attributes\WithoutErrorHandler;
+use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 
 use function array_intersect_key;
 use function method_exists;
@@ -66,7 +66,7 @@ public function testDefaultCollationMySql(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testCollateMapsToCollationForMySql(): void
     {
         $factory = new ConnectionFactory([]);
@@ -90,7 +90,7 @@ public function testCollateMapsToCollationForMySql(): void
         );
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testConnectionOverrideOptions(): void
     {
         $params = [
@@ -175,7 +175,7 @@ public function testItThrowsWhenPassingMappingTypesTwice(): void
         (new ConnectionFactory())->createConnection(['driver' => 'pdo_sqlite'], null, [], []);
     }
 
-    #[WithoutErrorHandler]
+    #[IgnoreDeprecations]
     public function testPassingMappingTypesAsFourthArgumentIsDeprecatedWithDbal4(): void
     {
         if (method_exists(Connection::class, 'getEventManager')) {