diff --git a/composer.json b/composer.json index 3432e2df..fb5e86fa 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,7 @@ }, "require-dev": { "doctrine/dbal": "^3.8|^4.0", - "doctrine/doctrine-bundle": "^2.12", + "doctrine/doctrine-bundle": "^2.18.1|^3.0", "doctrine/orm": "^2.14|^3.0", "doctrine/persistence": "^3.1|^4.0", "matthiasnoback/symfony-dependency-injection-test": "^5.1|^6.0", diff --git a/tests/symfony/config/config.yml b/tests/symfony/config/config.yml index 29590825..df3aefa3 100644 --- a/tests/symfony/config/config.yml +++ b/tests/symfony/config/config.yml @@ -101,8 +101,6 @@ doctrine: url: '%env(resolve:DATABASE_URL)%' orm: - enable_lazy_ghost_objects: true - auto_generate_proxy_classes: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware auto_mapping: true controller_resolver: diff --git a/tests/symfony/functional/AppKernel.php b/tests/symfony/functional/AppKernel.php index ccc8d735..35888fb4 100644 --- a/tests/symfony/functional/AppKernel.php +++ b/tests/symfony/functional/AppKernel.php @@ -4,6 +4,8 @@ namespace Webauthn\Tests\Bundle\Functional; +use Composer\InstalledVersions; +use Composer\Semver\VersionParser; use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; use Symfony\Bundle\MonologBundle\MonologBundle; @@ -38,5 +40,22 @@ public function registerBundles(): iterable public function registerContainerConfiguration(LoaderInterface $loader): void { $loader->load(__DIR__ . '/../config/config.yml'); + + $loader->load(function ($container) { + $isDoctrineBundle2 = InstalledVersions::satisfies( + new VersionParser(), + 'doctrine/doctrine-bundle', + '^2.0' + ); + + if ($isDoctrineBundle2) { + $container->loadFromExtension('doctrine', [ + 'orm' => [ + 'enable_lazy_ghost_objects' => true, + 'auto_generate_proxy_classes' => true, + ], + ]); + } + }); } }