From 22d53b2c5ad03929628fb4a928b01135585b7179 Mon Sep 17 00:00:00 2001
From: David Maicher <mail@dmaicher.de>
Date: Wed, 7 Dec 2022 13:07:11 +0100
Subject: [PATCH] fix issue with controller_resolver option (#1589)

---
 DependencyInjection/Configuration.php               | 3 ++-
 Tests/DependencyInjection/DoctrineExtensionTest.php | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 40cdedc9b..ed01a011a 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -406,7 +406,7 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                         })
                         ->then(static function ($v) {
                             $v = (array) $v;
-                            // Key that should not be rewritten to the connection config
+                            // Key that should not be rewritten to the entity-manager config
                             $excludedKeys  = [
                                 'default_entity_manager' => true,
                                 'auto_generate_proxy_classes' => true,
@@ -414,6 +414,7 @@ private function addOrmSection(ArrayNodeDefinition $node): void
                                 'proxy_namespace' => true,
                                 'resolve_target_entities' => true,
                                 'resolve_target_entity' => true,
+                                'controller_resolver' => true,
                             ];
                             $entityManager = [];
                             foreach ($v as $key => $value) {
diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
index 921b3ebdc..a1d4ff0e0 100644
--- a/Tests/DependencyInjection/DoctrineExtensionTest.php
+++ b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -1567,12 +1567,19 @@ public function testDefinitionsToLogQueriesLoggingFalse(): void
 
     /**
      * @requires function \Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver::__construct
+     * @testWith [true]
+     *           [false]
      */
-    public function testControllerResolver(): void
+    public function testControllerResolver(bool $simpleEntityManagerConfig): void
     {
         $container = $this->getContainer();
         $extension = new DoctrineExtension();
         $config    = BundleConfigurationBuilder::createBuilderWithBaseValues()->build();
+
+        if ($simpleEntityManagerConfig) {
+            $config['orm'] = [];
+        }
+
         $extension->load([$config], $container);
 
         $controllerResolver = $container->getDefinition('doctrine.orm.entity_value_resolver');