[HttpKernel] allow using public aliases to reference controllers
This commit is contained in:
parent
fb732df025
commit
94bc1f7d3b
@ -141,7 +141,7 @@ trait MicroKernelTrait
|
|||||||
AbstractConfigurator::$valuePreProcessor = $valuePreProcessor;
|
AbstractConfigurator::$valuePreProcessor = $valuePreProcessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
$container->setAlias(static::class, 'kernel');
|
$container->setAlias(static::class, 'kernel')->setPublic(true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
5.1.0
|
||||||
|
-----
|
||||||
|
|
||||||
|
* allowed using public aliases to reference controllers
|
||||||
|
|
||||||
5.0.0
|
5.0.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
@ -53,6 +53,13 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
|
|||||||
$parameterBag = $container->getParameterBag();
|
$parameterBag = $container->getParameterBag();
|
||||||
$controllers = [];
|
$controllers = [];
|
||||||
|
|
||||||
|
$publicAliases = [];
|
||||||
|
foreach ($container->getAliases() as $id => $alias) {
|
||||||
|
if ($alias->isPublic()) {
|
||||||
|
$publicAliases[(string) $alias][] = $id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
|
foreach ($container->findTaggedServiceIds($this->controllerTag, true) as $id => $tags) {
|
||||||
$def = $container->getDefinition($id);
|
$def = $container->getDefinition($id);
|
||||||
$def->setPublic(true);
|
$def->setPublic(true);
|
||||||
@ -182,6 +189,10 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface
|
|||||||
// register the maps as a per-method service-locators
|
// register the maps as a per-method service-locators
|
||||||
if ($args) {
|
if ($args) {
|
||||||
$controllers[$id.'::'.$r->name] = ServiceLocatorTagPass::register($container, $args);
|
$controllers[$id.'::'.$r->name] = ServiceLocatorTagPass::register($container, $args);
|
||||||
|
|
||||||
|
foreach ($publicAliases[$id] ?? [] as $alias) {
|
||||||
|
$controllers[$alias.'::'.$r->name] = clone $controllers[$id.'::'.$r->name];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,11 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
|
|||||||
// any methods listed for call-at-instantiation cannot be actions
|
// any methods listed for call-at-instantiation cannot be actions
|
||||||
$reason = false;
|
$reason = false;
|
||||||
list($id, $action) = explode('::', $controller);
|
list($id, $action) = explode('::', $controller);
|
||||||
|
|
||||||
|
if ($container->hasAlias($id)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$controllerDef = $container->getDefinition($id);
|
$controllerDef = $container->getDefinition($id);
|
||||||
foreach ($controllerDef->getMethodCalls() as list($method)) {
|
foreach ($controllerDef->getMethodCalls() as list($method)) {
|
||||||
if (0 === strcasecmp($action, $method)) {
|
if (0 === strcasecmp($action, $method)) {
|
||||||
|
@ -379,6 +379,23 @@ class RegisterControllerArgumentLocatorsPassTest extends TestCase
|
|||||||
|
|
||||||
$this->assertInstanceOf(Reference::class, $locatorArgument);
|
$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
|
class RegisterTestController
|
||||||
|
Reference in New Issue
Block a user