Skip to content

[HttpKernel] Allow tagged controllers in ControllerResolver #53985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Feb 26, 2024
Merged

[HttpKernel] Allow tagged controllers in ControllerResolver #53985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...mfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public function process(ContainerBuilder $container)

$parameterBag = $container->getParameterBag();
$controllers = [];
$controllerClasses = [];

$publicAliases = [];
foreach ($container->getAliases() as $id => $alias) {
Expand Down Expand Up @@ -74,6 +75,8 @@ public function process(ContainerBuilder $container)
throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
}

$controllerClasses[] = $class;

// get regular public methods
$methods = [];
$arguments = [];
Expand Down Expand Up @@ -227,5 +230,10 @@ public function process(ContainerBuilder $container)
}

$container->setAlias('argument_resolver.controller_locator', (string) $controllerLocatorRef);

if ($container->hasDefinition('controller_resolver')) {
$container->getDefinition('controller_resolver')
->addMethodCall('allowControllers', [array_unique($controllerClasses)]);
}
}
}
24 changes: 24 additions & 0 deletions ...onent/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,30 @@ public function testTaggedIteratorAndTaggedLocatorAttributes()
$this->assertTrue($argLocator->has('foo'));
$this->assertSame('bar', $argLocator->get('foo'));
}

public function testTaggedControllersAreRegisteredInControllerResolver()
{
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
$controllerResolver = $container->register('controller_resolver');

$container->register('foo', RegisterTestController::class)
->addTag('controller.service_arguments')
;

// duplicates should be removed
$container->register('bar', RegisterTestController::class)
->addTag('controller.service_arguments')
;

// services with no tag should be ignored
$container->register('baz', ControllerDummy::class);

$pass = new RegisterControllerArgumentLocatorsPass();
$pass->process($container);

$this->assertSame([['allowControllers', [[RegisterTestController::class]]]], $controllerResolver->getMethodCalls());
}
}

class RegisterTestController
Expand Down