Wire the EntityArgumentResolver

DependencyInjection/Configuration.php

@@ -109,6 +109,15 @@ public function getConfigTreeBuilder()
                         ->scalarNode('safe')->info('Deprecated. Please use the "w" option instead.')->end()
                     ->end()
                 ->end()
+                ->arrayNode('controller_resolver')
+                    ->canBeDisabled()
+                    ->children()
+                        ->booleanNode('auto_mapping')
+                            ->defaultTrue()
+                            ->info('Set to false to disable using route placeholders as lookup criteria when the object id doesn\'t match the argument name')
+                        ->end()
+                    ->end()
+                ->end()
             ->end();
 
         return $treeBuilder;

DependencyInjection/DoctrineMongoDBExtension.php

@@ -16,6 +16,8 @@
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use InvalidArgumentException;
+use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
+use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
 use Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber;
 use Symfony\Component\Cache\Adapter\ApcuAdapter;
@@ -30,6 +32,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 use function array_keys;
@@ -142,6 +145,40 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $this->loadMessengerServices($container);
+
+        // available in Symfony 6.2 and higher
+        if (! class_exists(EntityValueResolver::class)) {
+            $container->removeDefinition('doctrine_mongodb.odm.entity_value_resolver');
+            $container->removeDefinition('doctrine_mongodb.odm.entity_value_resolver.expression_language');
+        } else {
+            if (! class_exists(ExpressionLanguage::class)) {
+                $container->removeDefinition('doctrine_mongodb.odm.entity_value_resolver.expression_language');
+            }
+
+            $controllerResolverDefaults = [];
+
+            if (! $config['controller_resolver']['enabled']) {
+                $controllerResolverDefaults['disabled'] = true;
+            }
+
+            if (! $config['controller_resolver']['auto_mapping']) {
+                $controllerResolverDefaults['mapping'] = [];
+            }
+
+            if ($controllerResolverDefaults) {
+                $container->getDefinition('doctrine_mongodb.odm.entity_value_resolver')->setArgument(2, (new Definition(MapEntity::class))->setArguments([
+                    null,
+                    null,
+                    null,
+                    $controllerResolverDefaults['mapping'] ?? null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    $controllerResolverDefaults['disabled'] ?? false,
+                ]));
+            }
+        }
     }
 
     /**

Resources/config/mongodb.xml

@@ -208,5 +208,13 @@
         <service id="doctrine_mongodb.odm.symfony.fixtures.loader" class="Doctrine\Bundle\MongoDBBundle\Loader\SymfonyFixturesLoader" public="false">
             <argument type="service" id="service_container" />
         </service>
+
+        <service id="doctrine_mongodb.odm.entity_value_resolver" class="Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver">
+            <argument type="service" id="doctrine_mongodb" />
+            <argument type="service" id="doctrine_mongodb.odm.entity_value_resolver.expression_language" on-invalid="ignore" />
+            <tag name="controller.argument_value_resolver" priority="110" />
+        </service>
+
+        <service id="doctrine_mongodb.odm.entity_value_resolver.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" />
     </services>
 </container>

Tests/DependencyInjection/ConfigurationTest.php

@@ -49,6 +49,10 @@ public function testDefaults(): void
             'persistent_collection_dir'      => '%kernel.cache_dir%/doctrine/odm/mongodb/PersistentCollections',
             'persistent_collection_namespace' => 'PersistentCollections',
             'types'                          => [],
+            'controller_resolver'            => [
+                'enabled'      => true,
+                'auto_mapping' => true,
+            ],
         ];
 
         $this->assertEquals($defaults, $options);
@@ -203,6 +207,10 @@ public function testFullConfiguration(array $config): void
             ],
             'resolve_target_documents' => ['Foo\BarInterface' => 'Bar\FooClass'],
             'types' => [],
+            'controller_resolver' => [
+                'enabled'      => true,
+                'auto_mapping' => true,
+            ],
         ];
 
         $this->assertEquals($expected, $options);

Tests/DependencyInjection/DoctrineMongoDBExtensionTest.php

@@ -7,6 +7,7 @@
 use Doctrine\Bundle\MongoDBBundle\DependencyInjection\DoctrineMongoDBExtension;
 use Doctrine\Bundle\MongoDBBundle\Tests\DependencyInjection\Fixtures\Bundles\DocumentListenerBundle\EventListener\TestAttributeListener;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Container;
@@ -347,4 +348,29 @@ private function assertDICDefinitionMethodCall(Definition $definition, string $m
 
         $this->fail("Method '" . $methodName . "' is expected to be called once, definition does not contain a call though.");
     }
+
+    /** @requires function \Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver::__construct */
+    public function testControllerResolver(): void
+    {
+        $container = $this->getContainer();
+        $extension = new DoctrineMongoDBExtension();
+        $extension->load(self::buildConfiguration(), $container);
+
+        $controllerResolver = $container->getDefinition('doctrine_mongodb.odm.entity_value_resolver');
+
+        $this->assertEquals([new Reference('doctrine_mongodb'), new Reference('doctrine_mongodb.odm.entity_value_resolver.expression_language', $container::IGNORE_ON_INVALID_REFERENCE)], $controllerResolver->getArguments());
+
+        $container = $this->getContainer();
+
+        $extension->load(self::buildConfiguration([
+            'controller_resolver' => [
+                'enabled' => false,
+                'auto_mapping' => false,
+            ],
+        ]), $container);
+
+        $container->setDefinition('controller_resolver_defaults', $container->getDefinition('doctrine_mongodb.odm.entity_value_resolver')->getArgument(2))->setPublic(true);
+        $container->compile();
+        $this->assertEquals(new MapEntity(null, null, null, [], null, null, null, null, true), $container->get('controller_resolver_defaults'));
+    }
 }