diff --git a/src/Autocomplete/composer.json b/src/Autocomplete/composer.json index 7ff7a7ecd8c..dafef28c349 100644 --- a/src/Autocomplete/composer.json +++ b/src/Autocomplete/composer.json @@ -33,7 +33,7 @@ }, "require-dev": { "doctrine/collections": "^1.6.8|^2.0", - "doctrine/doctrine-bundle": "^2.5.0", + "doctrine/doctrine-bundle": "^2.14", "doctrine/orm": "^2.9.4|^3.0", "fakerphp/faker": "^1.22", "mtdowling/jmespath.php": "^2.6", diff --git a/src/Autocomplete/tests/Fixtures/Kernel.php b/src/Autocomplete/tests/Fixtures/Kernel.php index 323ccf5b60f..25dbe28779d 100644 --- a/src/Autocomplete/tests/Fixtures/Kernel.php +++ b/src/Autocomplete/tests/Fixtures/Kernel.php @@ -114,6 +114,9 @@ protected function configureContainer(ContainerConfigurator $c): void 'dbal' => ['url' => '%env(resolve:DATABASE_URL)%'], 'orm' => [ 'auto_generate_proxy_classes' => true, + 'enable_lazy_ghost_objects' => true, + 'report_fields_where_declared' => true, + 'validate_xml_mapping' => true, 'auto_mapping' => true, 'mappings' => [ 'Test' => [ @@ -124,18 +127,13 @@ protected function configureContainer(ContainerConfigurator $c): void 'alias' => 'Test', ], ], + 'controller_resolver' => [ + 'auto_mapping' => false, + ], ], ]; - if (class_exists(AssociationMapping::class)) { - // Doctrine ORM >= 3.0 - $doctrineConfig['orm']['controller_resolver'] = [ - 'auto_mapping' => true, - ]; - } + if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) { - if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) { - $doctrineConfig['orm']['enable_lazy_ghost_objects'] = true; - } if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) { $doctrineConfig['orm']['enable_native_lazy_objects'] = true; } diff --git a/src/LiveComponent/composer.json b/src/LiveComponent/composer.json index 6478e91b5ad..31b3dd85d14 100644 --- a/src/LiveComponent/composer.json +++ b/src/LiveComponent/composer.json @@ -37,7 +37,7 @@ "require-dev": { "doctrine/annotations": "^1.0", "doctrine/collections": "^1.6.8|^2.0", - "doctrine/doctrine-bundle": "^2.4.3", + "doctrine/doctrine-bundle": "^2.14", "doctrine/orm": "^2.9.4", "doctrine/persistence": "^2.5.2|^3.0", "phpdocumentor/reflection-docblock": "5.x-dev", diff --git a/src/LiveComponent/tests/Fixtures/Kernel.php b/src/LiveComponent/tests/Fixtures/Kernel.php index 1d45f78dc0f..bff075256f6 100644 --- a/src/LiveComponent/tests/Fixtures/Kernel.php +++ b/src/LiveComponent/tests/Fixtures/Kernel.php @@ -151,6 +151,9 @@ protected function configureContainer(ContainerConfigurator $c): void ], 'orm' => [ 'auto_generate_proxy_classes' => true, + 'enable_lazy_ghost_objects' => true, + 'report_fields_where_declared' => true, + 'validate_xml_mapping' => true, 'auto_mapping' => true, 'mappings' => [ 'Default' => [ @@ -168,22 +171,13 @@ protected function configureContainer(ContainerConfigurator $c): void 'alias' => 'XML', ], ], + 'controller_resolver' => [ + 'auto_mapping' => false, + ], ], ]; if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) { - if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) { - $doctrineConfig['orm']['enable_lazy_ghost_objects'] = true; - } - // https://github.com/doctrine/DoctrineBundle/pull/1661 - if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) { - $doctrineConfig['orm']['report_fields_where_declared'] = true; - $doctrineConfig['orm']['validate_xml_mapping'] = true; - $doctrineConfig['dbal']['schema_manager_factory'] = 'doctrine.dbal.default_schema_manager_factory'; - } - 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; } diff --git a/src/Turbo/composer.json b/src/Turbo/composer.json index b61f92725e9..ac10ace36f9 100644 --- a/src/Turbo/composer.json +++ b/src/Turbo/composer.json @@ -38,7 +38,7 @@ "symfony/stimulus-bundle": "^2.9.1" }, "require-dev": { - "doctrine/doctrine-bundle": "^2.4.3", + "doctrine/doctrine-bundle": "^2.14", "doctrine/orm": "^2.8 | 3.0", "phpstan/phpstan": "^2.1.17", "symfony/asset-mapper": "^6.4|^7.0|^8.0",