From 16efeacc55caf7a265646c30fbc47c1c3db7e25e Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Sat, 21 Jun 2025 10:58:46 +0200 Subject: [PATCH] [Tests] Configure `doctrine.orm.enable_native_lazy_objects` to fix deprecation in PHP 8.4+ Fix https://github.com/symfony/ux/actions/runs/15787680645/job/44507502967?pr=2712 --- src/Autocomplete/tests/Fixtures/Kernel.php | 13 ++++++++++--- src/LiveComponent/tests/Fixtures/Kernel.php | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Autocomplete/tests/Fixtures/Kernel.php b/src/Autocomplete/tests/Fixtures/Kernel.php index de2877b0a2a..7fc8adcf64c 100644 --- a/src/Autocomplete/tests/Fixtures/Kernel.php +++ b/src/Autocomplete/tests/Fixtures/Kernel.php @@ -11,6 +11,7 @@ namespace Symfony\UX\Autocomplete\Tests\Fixtures; +use Composer\InstalledVersions; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; use Doctrine\ORM\Mapping\AssociationMapping; use Fixtures\Form\CategoryWithCallbackAsCustomValue; @@ -104,7 +105,7 @@ protected function configureContainer(ContainerConfigurator $c): void 'auto_refresh_proxies' => false, ]); - $config = [ + $doctrineConfig = [ 'dbal' => ['url' => '%env(resolve:DATABASE_URL)%'], 'orm' => [ 'auto_generate_proxy_classes' => true, @@ -122,11 +123,17 @@ protected function configureContainer(ContainerConfigurator $c): void ]; if (class_exists(AssociationMapping::class)) { // Doctrine ORM >= 3.0 - $config['orm']['controller_resolver'] = [ + $doctrineConfig['orm']['controller_resolver'] = [ 'auto_mapping' => true, ]; } - $c->extension('doctrine', $config); + if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) { + if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) { + $doctrineConfig['orm']['enable_native_lazy_objects'] = true; + } + } + + $c->extension('doctrine', $doctrineConfig); $c->extension('security', [ 'password_hashers' => [ diff --git a/src/LiveComponent/tests/Fixtures/Kernel.php b/src/LiveComponent/tests/Fixtures/Kernel.php index 508dd24274b..4b0cd90d143 100644 --- a/src/LiveComponent/tests/Fixtures/Kernel.php +++ b/src/LiveComponent/tests/Fixtures/Kernel.php @@ -186,6 +186,9 @@ protected function configureContainer(ContainerConfigurator $c): void if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) { $doctrineConfig['orm']['controller_resolver']['auto_mapping'] = false; } + if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) { + $doctrineConfig['orm']['enable_native_lazy_objects'] = true; + } } $c->extension('doctrine', $doctrineConfig);