Merge branch '3.2.x' into feat/improve-phpstan-level-6

Author: shakaran

docs/en/configuration.rst

@@ -772,7 +772,7 @@ You can easily define `doctrine filters`_ in your configuration file:
 ``myParameter: myValue``
     Bind the value ``myValue`` to the parameter ``myParameter`` (Optional)
 
-.. _doctrine filters: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/filters.html
+.. _doctrine filters: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/filters.html
 
 .. _`reference-dbal-configuration`:
 
@@ -985,4 +985,4 @@ For example, to inject a connection with the name ``purchase_logs`` use this:
             $this->connection = $purchaseLogsConnection;
         }
 
-.. _DBAL documentation: https://www.doctrine-project.org/projects/doctrine-dbal/en/2.10/index.html
+.. _DBAL documentation: https://www.doctrine-project.org/projects/doctrine-dbal/en/current/index.html

src/DependencyInjection/Configuration.php

@@ -418,6 +418,19 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                         ->arrayNode('controller_resolver')
                             ->canBeDisabled()
                             ->children()
+                                ->booleanNode('auto_mapping')
+                                    ->defaultFalse()
+                                    ->validate()
+                                        ->ifTrue(static fn ($v) => $v !== false)
+                                        ->thenInvalid('The setting "controller_resolver.auto_mapping" can no longer be enabled and must be set to false')
+                                    ->end()
+                                    ->setDeprecated(
+                                        'doctrine/doctrine-bundle',
+                                        '3.1',
+                                        'The "%path%.%node%" option is deprecated and will be removed in DoctrineBundle 4.0, as it only accepts `false` since 3.0.',
+                                    )
+                                    ->info('Set to true to enable using route placeholders as lookup criteria when the primary key doesn\'t match the argument name')
+                                ->end()
                                 ->booleanNode('evict_cache')
                                     ->info('Set to true to fetch the entity from the database instead of using the cache, if any')
                                     ->defaultFalse()