diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
index f0308e327acd..be74a7ad6c29 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -141,7 +141,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
AbstractConfigurator::$valuePreProcessor = $valuePreProcessor;
}
- $container->setAlias(static::class, 'kernel');
+ $container->setAlias(static::class, 'kernel')->setPublic(true);
});
}
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
index adcbe66f66a4..17b712202350 100644
--- a/src/Symfony/Component/HttpKernel/CHANGELOG.md
+++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+5.1.0
+-----
+
+ * allowed using public aliases to reference controllers
+
5.0.0
-----
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
index 475b5d756a3d..f7ddb870f181 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -53,6 +53,13 @@ public function process(ContainerBuilder $container)
$parameterBag = $container->getParameterBag();
$controllers = [];
+ $publicAliases = [];
+ foreach ($container->getAliases() as $id => $alias) {
+ if ($alias->isPublic()) {
+ $publicAliases[(string) $alias][] = $id;
+ }
+ }
+
foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
$def = $container->getDefinition($id);
$def->setPublic(true);
@@ -182,6 +189,10 @@ public function process(ContainerBuilder $container)
// register the maps as a per-method service-locators
if ($args) {
$controllers[$id.'::'.$r->name] = ServiceLocatorTagPass::register($container, $args);
+
+ foreach ($publicAliases[$id] ?? [] as $alias) {
+ $controllers[$alias.'::'.$r->name] = clone $controllers[$id.'::'.$r->name];
+ }
}
}
}
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
index 596b6188f66c..71bb23bbf8c6 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
@@ -43,6 +43,11 @@ public function process(ContainerBuilder $container)
// any methods listed for call-at-instantiation cannot be actions
$reason = false;
list($id, $action) = explode('::', $controller);
+
+ if ($container->hasAlias($id)) {
+ continue;
+ }
+
$controllerDef = $container->getDefinition($id);
foreach ($controllerDef->getMethodCalls() as list($method)) {
if (0 === strcasecmp($action, $method)) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 074664303651..2cda6c4f56e1 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -379,6 +379,23 @@ public function testNotTaggedControllerServiceReceivesLocatorArgument()
$this->assertInstanceOf(Reference::class, $locatorArgument);
}
+
+ public function testAlias()
+ {
+ $container = new ContainerBuilder();
+ $resolver = $container->register('argument_resolver.service')->addArgument([]);
+
+ $container->register('foo', RegisterTestController::class)
+ ->addTag('controller.service_arguments');
+
+ $container->setAlias(RegisterTestController::class, 'foo')->setPublic(true);
+
+ $pass = new RegisterControllerArgumentLocatorsPass();
+ $pass->process($container);
+
+ $locator = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
+ $this->assertSame([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
+ }
}
class RegisterTestController
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy