Commit7d2eb5a

authored and

committed

[HttpKernel] Allow tagged controllers in ControllerResolver

1 parentd352e98 commit7d2eb5aCopy full SHA for 7d2eb5a

File tree

+32

-0

lines changed

+32

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public function process(ContainerBuilder $container)`
`45`	`45`
`46`	`46`	`$parameterBag =$container->getParameterBag();`
`47`	`47`	`$controllers = [];`
	`48`	`+$controllerClasses = [];`
`48`	`49`
`49`	`50`	`$publicAliases = [];`
`50`	`51`	`foreach ($container->getAliases()as$id =>$alias) {`
`@@ -74,6 +75,8 @@ public function process(ContainerBuilder $container)`
`74`	`75`	`thrownewInvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.',$class,$id));`
`75`	`76`	`}`
`76`	`77`
	`78`	`+$controllerClasses[] =$class;`
	`79`	`+`
`77`	`80`	`// get regular public methods`
`78`	`81`	`$methods = [];`
`79`	`82`	`$arguments = [];`
`@@ -227,5 +230,10 @@ public function process(ContainerBuilder $container)`
`227`	`230`	`}`
`228`	`231`
`229`	`232`	`$container->setAlias('argument_resolver.controller_locator', (string)$controllerLocatorRef);`
	`233`	`+`
	`234`	`+if ($container->hasDefinition('controller_resolver')) {`
	`235`	`+$container->getDefinition('controller_resolver')`
	`236`	`+ ->addMethodCall('allowControllers', [array_unique($controllerClasses)]);`
	`237`	`+ }`
`230`	`238`	`}`
`231`	`239`	`}`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -557,6 +557,30 @@ public function testTaggedIteratorAndTaggedLocatorAttributes()`
`557`	`557`	`$this->assertTrue($argLocator->has('foo'));`
`558`	`558`	`$this->assertSame('bar',$argLocator->get('foo'));`
`559`	`559`	`}`
	`560`	`+`
	`561`	`+publicfunctiontestTaggedControllersAreRegisteredInControllerResolver()`
	`562`	`+ {`
	`563`	`+$container =newContainerBuilder();`
	`564`	`+$container->register('argument_resolver.service')->addArgument([]);`
	`565`	`+$controllerResolver =$container->register('controller_resolver');`
	`566`	`+`
	`567`	`+$container->register('foo', RegisterTestController::class)`
	`568`	`+ ->addTag('controller.service_arguments')`
	`569`	`+ ;`
	`570`	`+`
	`571`	`+// duplicates should be removed`
	`572`	`+$container->register('bar', RegisterTestController::class)`
	`573`	`+ ->addTag('controller.service_arguments')`
	`574`	`+ ;`
	`575`	`+`
	`576`	`+// services with no tag should be ignored`
	`577`	`+$container->register('baz', ControllerDummy::class);`
	`578`	`+`
	`579`	`+$pass =newRegisterControllerArgumentLocatorsPass();`
	`580`	`+$pass->process($container);`
	`581`	`+`
	`582`	`+$this->assertSame([['allowControllers', [[RegisterTestController::class]]]],$controllerResolver->getMethodCalls());`
	`583`	`+ }`
`560`	`584`	`}`
`561`	`585`
`562`	`586`	`class RegisterTestController`

Comments

(0)