Skip to content

Commit 71af1dd

Browse files
committed
iterate
1 parent 1f5f330 commit 71af1dd

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/Autocomplete/tests/Fixtures/Kernel.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,14 @@ protected function configureContainer(ContainerConfigurator $c): void
129129
if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
130130
if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
131131
$doctrineConfig['orm']['auto_generate_proxy_classes'] = true;
132-
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
133132

134133
if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
135134
$doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
136135
}
136+
137+
if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) {
138+
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
139+
}
137140
}
138141
if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
139142
$doctrineConfig['orm']['enable_native_lazy_objects'] = true;

src/LiveComponent/tests/Fixtures/Kernel.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ protected function configureContainer(ContainerConfigurator $c): void
187187
if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
188188
$doctrineConfig['orm']['auto_generate_proxy_classes'] = true;
189189

190-
if (class_exists(AssociationMapping::class)) {
191-
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
192-
}
193-
194190
if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
195191
$doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
196192
}

src/Turbo/tests/app/Kernel.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
use Composer\InstalledVersions;
1818
use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
1919
use Doctrine\ORM\EntityManagerInterface;
20+
use Doctrine\ORM\Mapping\AssociationMapping;
2021
use Symfony\Bundle\DebugBundle\DebugBundle;
2122
use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
2223
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -100,16 +101,15 @@ protected function configureContainer(ContainerConfigurator $container): void
100101
if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
101102
if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
102103
$doctrineConfig['orm']['auto_generate_proxy_classes'] = true;
103-
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
104-
105-
if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
106-
$doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
107-
}
108104

109105
// https://github.com/doctrine/DoctrineBundle/pull/1661
110106
if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
111107
$doctrineConfig['orm']['report_fields_where_declared'] = true;
112108
}
109+
110+
if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) {
111+
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
112+
}
113113
}
114114

115115
if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {

0 commit comments

Comments
 (0)