Skip to content

Commit b4f30b1

Browse files
committed
minor #3199 Remove deprecated controller_resolver configuration and update Doctrine ORM settings (Kocal)
This PR was merged into the 3.x branch. Discussion ---------- Remove deprecated controller_resolver configuration and update Doctrine ORM settings | Q | A | -------------- | --- | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md --> | Documentation? | no <!-- required for new features, or documentation updates --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead --> | License | MIT <!-- Replace this notice by a description of your feature/bugfix. This will help reviewers and should be a good start for the documentation. Additionally (see https://symfony.com/releases): - Always add tests and ensure they pass. - For new features, provide some code snippets to help understand usage. - Features and deprecations must be submitted against branch main. - Update/add documentation as required (we can help!) - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry - Never break backward compatibility (see https://symfony.com/bc). --> Commits ------- 52ef978 Remove deprecated controller_resolver configuration and update Doctrine ORM settings
2 parents d81980e + 52ef978 commit b4f30b1

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

.github/workflows/.utils.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ live_component_post_install() {
4545
return $?
4646
;;
4747
8.4)
48-
# Install PropertyInfo 7.3 (deprecate PropertyTypeExtractorInterface::getTypes) and TypeInfo 7.3 (new features and deprecations)
49-
composer require symfony/property-info:7.3.* symfony/type-info:7.3.*
48+
# Install PropertyInfo 7.4 (deprecate PropertyTypeExtractorInterface::getTypes from 7.3) and TypeInfo 7.4, but for Symfony 8 compatibility
49+
composer require symfony/property-info:7.4.* symfony/type-info:7.4.*
5050
return $?
5151
;;
5252
esac

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)