Merge pull request #2017 from dpfaffenbauer/issues/controller-overwrites

[Frontend] fix controller overwriting
coreshop · Jun 10, 2022 · 388e25c · 388e25c
2 parents 293a0ea + c2b2408
commit 388e25c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...Bundle/FrontendBundle/DependencyInjection/CompilerPass/RegisterFrontendControllerPass.php b/...Bundle/FrontendBundle/DependencyInjection/CompilerPass/RegisterFrontendControllerPass.php
@@ -37,7 +37,7 @@ public function process(ContainerBuilder $container): void
 
         foreach ($controllers as $key => $value) {
             $controllerKey = sprintf('coreshop.frontend.controller.%s', $key);
-            $serviceName = sprintf('CoreShop\\Bundle\\FrontendBundle\\Controller\\.%sController', $key);
+            $serviceName = sprintf('CoreShop\\Bundle\\FrontendBundle\\Controller\\%sController', ucfirst($key));
             $controllerClass = (string)$container->getParameter($controllerKey);
 
             if ($container->hasDefinition($controllerClass)) {
@@ -65,7 +65,7 @@ public function process(ContainerBuilder $container): void
                         new Reference(ShopperContextInterface::class),
                     ]);
 
-                break;
+                    break;
                 case 'checkout':
                     $controllerDefinition->setArguments([
                         new Reference('coreshop.checkout_manager.factory'),
@@ -96,10 +96,13 @@ public function process(ContainerBuilder $container): void
             }
 
             $controllerDefinition->addTag('controller.service_arguments');
+
+            $container->setDefinition($serviceName, $controllerDefinition)->setPublic(true);
+            $container->setAlias($controllerKey, $serviceName)->setPublic(true);
 
-            $container->setDefinition($controllerClass, $controllerDefinition);
-            $container->setAlias($controllerKey, $controllerClass)->setPublic(true);
-            $container->setAlias($serviceName, $controllerClass)->setPublic(true);
+            if ($controllerClass !== $serviceName) {
+                $container->setAlias($controllerClass, $serviceName)->setPublic(true);
+            }
         }
     }
 }