Skip to content

Commit dff1c51

Browse files
committed
Remove deprecated controller_resolver configuration and update Doctrine ORM settings
1 parent d81980e commit dff1c51

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

‎src/Autocomplete/tests/Fixtures/Kernel.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,19 @@ protected function configureContainer(ContainerConfigurator $c): void
124124
'alias' => 'Test',
125125
],
126126
],
127-
'controller_resolver' => [
128-
'auto_mapping' => false,
129-
],
130127
],
131128
];
132129

133130
if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
134131
if (version_compare($doctrineBundleVersion, '3.0.0', '<')) {
135132
$doctrineConfig['orm']['auto_generate_proxy_classes'] = true;
136133

134+
// https://github.com/doctrine/DoctrineBundle/pull/1661
135+
// https://github.com/doctrine/DoctrineBundle/pull/1962
136+
if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
137+
$doctrineConfig['orm']['report_fields_where_declared'] = true;
138+
}
139+
137140
if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) {
138141
$doctrineConfig['orm']['controller_resolver']['auto_mapping'] = true;
139142
}

‎src/LiveComponent/tests/Fixtures/Kernel.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@ protected function configureContainer(ContainerConfigurator $c): void
180180
'alias' => 'XML',
181181
],
182182
],
183-
'controller_resolver' => [
184-
'auto_mapping' => false,
185-
],
186183
],
187184
];
188185

@@ -201,12 +198,6 @@ protected function configureContainer(ContainerConfigurator $c): void
201198
}
202199
}
203200

204-
// https://github.com/doctrine/DoctrineBundle/pull/1661
205-
if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
206-
$doctrineConfig['orm']['validate_xml_mapping'] = true;
207-
$doctrineConfig['dbal']['schema_manager_factory'] = 'doctrine.dbal.default_schema_manager_factory';
208-
}
209-
210201
if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=') && version_compare($doctrineBundleVersion, '4.0.0', '<')) {
211202
$doctrineConfig['orm']['enable_native_lazy_objects'] = true;
212203
}

0 commit comments

Comments
 (0)