Skip to content

Commit ca0d9e7

Browse files
committed
Merge remote-tracking branch 'origin/3.1.x' into 4.0.x
2 parents f4bb5a7 + c52de18 commit ca0d9e7

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

UPGRADE-3.1.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ UPGRADE FROM 3.0 to 3.1
44
Configuration
55
-------------
66

7+
The `doctrine.orm.controller_resolver.auto_mapping` only accepts `false`
8+
as value since 3.0 and supplying the value explicitly is now marked as
9+
deprecated.
10+
711
The `doctrine.orm.entity_managers.some_em.enable_native_lazy_objects`
812
configuration option is deprecated and will be removed in DoctrineBundle 4.0,
913
as native lazy objects are now always enabled.

src/DependencyInjection/Configuration.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,11 @@ private function addOrmSection(ArrayNodeDefinition $node): void
412412
->ifTrue(static fn ($v) => $v !== false)
413413
->thenInvalid('The setting "controller_resolver.auto_mapping" can no longer be enabled and must be set to false')
414414
->end()
415+
->setDeprecated(
416+
'doctrine/doctrine-bundle',
417+
'3.1',
418+
'The "%node%" option is deprecated and will be removed in DoctrineBundle 4.0, as it only accepts `false` since 3.0.',
419+
)
415420
->info('Set to true to enable using route placeholders as lookup criteria when the primary key doesn\'t match the argument name')
416421
->end()
417422
->booleanNode('evict_cache')

0 commit comments

Comments
 (0)