Skip to content

Commit 8bdfff0

Browse files
committed
minor #3059 Fix highest jobs with Doctrine ^3.0 (Kocal)
This PR was merged into the 2.x branch. Discussion ---------- Fix highest jobs with Doctrine ^3.0 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Docs? | no <!-- required for new features --> | Issues | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead --> | License | MIT https://github.com/symfony/ux/actions/runs/17307196066/job/49133018743?pr=3058#step:9:1421 <!-- 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 ------- d421cf1 Fix highest jobs with Doctrine ^3.0
2 parents bb9a7e8 + d421cf1 commit 8bdfff0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/LiveComponent/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"twig/twig": "^3.10.3"
3636
},
3737
"require-dev": {
38-
"doctrine/annotations": "^1.0",
38+
"doctrine/annotations": "^1.0|^2.0",
3939
"doctrine/collections": "^1.6.8|^2.0",
4040
"doctrine/doctrine-bundle": "^2.4.3",
41-
"doctrine/orm": "^2.9.4",
41+
"doctrine/orm": "^2.9.4|^3.0",
4242
"doctrine/persistence": "^2.5.2|^3.0",
4343
"phpdocumentor/reflection-docblock": "5.x-dev",
4444
"symfony/dependency-injection": "^5.4|^6.0|^7.0|^8.0",

src/Turbo/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"require-dev": {
4141
"doctrine/doctrine-bundle": "^2.4.3",
42-
"doctrine/orm": "^2.8 | 3.0",
42+
"doctrine/orm": "^2.8|^3.0",
4343
"phpstan/phpstan": "^2.1.17",
4444
"symfony/asset-mapper": "^6.4|^7.0|^8.0",
4545
"symfony/debug-bundle": "^5.4|^6.0|^7.0|^8.0",

src/Turbo/tests/app/Kernel.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ protected function configureContainer(ContainerConfigurator $container): void
106106
if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
107107
$doctrineConfig['orm']['report_fields_where_declared'] = true;
108108
}
109+
110+
if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
111+
$doctrineConfig['orm']['enable_native_lazy_objects'] = true;
112+
}
109113
}
110114

111115
$container

0 commit comments

Comments
 (0)