Remove controller resolver auto mapping configuration

Remove controller resolver auto mapping configuration as discussed in doctrine#1804.

Author: bobvandevijver

UPGRADE-3.1.md

@@ -0,0 +1,9 @@
+UPGRADE FROM 3.0 to 3.1
+=======================
+
+Configuration
+-------------
+
+### `doctrine.orm.controller_resolver.auto_mapping` option deprecated
+
+The `doctrine.orm.controller_resolver.auto_mapping` only accepted `false` as value since 3.0 and supplying the value explicitly is now marked as deprecated.

UPGRADE-4.0.md

@@ -0,0 +1,9 @@
+UPGRADE FROM 3.x to 4.0
+=======================
+
+Configuration
+-------------
+
+### `doctrine.orm.controller_resolver.auto_mapping` option has been removed
+
+The `doctrine.orm.controller_resolver.auto_mapping` only accepted `false` as value since 3.0 and is now removed.

src/DependencyInjection/Configuration.php

@@ -523,8 +523,12 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                             ->canBeDisabled()
                             ->children()
                                 ->booleanNode('auto_mapping')
-                                    ->defaultNull()
-                                    ->info('Set to false to disable using route placeholders as lookup criteria when the primary key doesn\'t match the argument name')
+                                    ->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()
+                                    ->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')

src/DependencyInjection/DoctrineExtension.php

@@ -505,19 +505,6 @@ protected function ormLoad(array $config, ContainerBuilder $container)
             $controllerResolverDefaults['disabled'] = true;
         }
 
-        if ($config['controller_resolver']['auto_mapping'] === null) {
-            trigger_deprecation('doctrine/doctrine-bundle', '2.12', 'The default value of "doctrine.orm.controller_resolver.auto_mapping" will be changed from `true` to `false`. Explicitly configure `true` to keep existing behaviour.');
-            $config['controller_resolver']['auto_mapping'] = true;
-        }
-
-        if ($config['controller_resolver']['auto_mapping'] === true) {
-            trigger_deprecation('doctrine/doctrine-bundle', '2.13', 'Enabling the controller resolver automapping feature has been deprecated. Symfony Mapped Route Parameters should be used as replacement.');
-        }
-
-        if (! $config['controller_resolver']['auto_mapping']) {
-            $controllerResolverDefaults['mapping'] = [];
-        }
-
         if ($config['controller_resolver']['evict_cache']) {
             $controllerResolverDefaults['evict_cache'] = true;
         }
@@ -527,7 +514,7 @@ protected function ormLoad(array $config, ContainerBuilder $container)
             null,
             null,
             null,
-            $controllerResolverDefaults['mapping'] ?? null,
+            null,
             null,
             null,
             null,

tests/DependencyInjection/DoctrineExtensionTest.php

@@ -1499,7 +1499,6 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void
             $config['orm'] = [];
         }
 
-        $config['orm']['controller_resolver']     = ['auto_mapping' => true];
         $config['orm']['resolve_target_entities'] = ['Throwable' => 'stdClass'];
 
         $extension->load([$config], $container);
@@ -1527,14 +1526,13 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void
 
         $config['orm']['controller_resolver'] = [
             'enabled' => false,
-            'auto_mapping' => false,
             'evict_cache' => true,
         ];
         $extension->load([$config], $container);
 
         $container->setDefinition('controller_resolver_defaults', $container->getDefinition('doctrine.orm.entity_value_resolver')->getArgument(2))->setPublic(true);
         $container->compile();
-        $this->assertEquals(new MapEntity(null, null, null, [], null, null, null, true, true), $container->get('controller_resolver_defaults'));
+        $this->assertEquals(new MapEntity(null, null, null, null, null, null, null, true, true), $container->get('controller_resolver_defaults'));
     }
 
     // phpcs:enable

tests/baseline-ignore

@@ -1,3 +1 @@
-%"doctrine.orm.controller_resolver.auto_mapping" will be changed from `true` to `false`.%
-%Enabling the controller resolver automapping feature has been deprecated.%
 %Not setting "doctrine.orm.enable_native_lazy_objects" to true is deprecated.%