Commitee44903

committed

[HttpKernel] Fix services are no longer injected into __invoke controllers method

1 parent1403112 commitee44903Copy full SHA for ee44903

File tree

+10

-11

lines changed

+10

-11

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,13 @@ class RegisterControllerArgumentLocatorsPass implements CompilerPassInterface`
`33`	`33`	`{`
`34`	`34`	`private$resolverServiceId;`
`35`	`35`	`private$controllerTag;`
	`36`	`+private$controllerLocator;`
`36`	`37`
`37`		`-publicfunction__construct(string$resolverServiceId ='argument_resolver.service',string$controllerTag ='controller.service_arguments')`
	`38`	`+publicfunction__construct(string$resolverServiceId ='argument_resolver.service',string$controllerTag ='controller.service_arguments',string$controllerLocator ='argument_resolver.controller_locator')`
`38`	`39`	`{`
`39`	`40`	`$this->resolverServiceId =$resolverServiceId;`
`40`	`41`	`$this->controllerTag =$controllerTag;`
	`42`	`+$this->controllerLocator =$controllerLocator;`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`publicfunctionprocess(ContainerBuilder$container)`
`@@ -179,6 +181,8 @@ public function process(ContainerBuilder $container)`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`$container->getDefinition($this->resolverServiceId)`
`182`		`- ->replaceArgument(0, ServiceLocatorTagPass::register($container,$controllers));`
	`184`	`+ ->replaceArgument(0,$controllerLocatorRef = ServiceLocatorTagPass::register($container,$controllers));`
	`185`	`+`
	`186`	`+$container->setAlias($this->controllerLocator, (string)$controllerLocatorRef);`
`183`	`187`	`}`
`184`	`188`	`}`

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,16 @@`
`21`	`21`	`*/`
`22`	`22`	`class RemoveEmptyControllerArgumentLocatorsPassimplements CompilerPassInterface`
`23`	`23`	`{`
`24`		`-private$resolverServiceId;`
	`24`	`+private$controllerLocator;`
`25`	`25`
`26`		`-publicfunction__construct(string$resolverServiceId ='argument_resolver.service')`
	`26`	`+publicfunction__construct(string$controllerLocator ='argument_resolver.controller_locator')`
`27`	`27`	`{`
`28`		`-$this->resolverServiceId =$resolverServiceId;`
	`28`	`+$this->controllerLocator =$controllerLocator;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`publicfunctionprocess(ContainerBuilder$container)`
`32`	`32`	`{`
`33`		`-if (false ===$container->hasDefinition($this->resolverServiceId)) {`
`34`		`-return;`
`35`		`- }`
`36`		`-`
`37`		`-$serviceResolver =$container->getDefinition($this->resolverServiceId);`
`38`		`-$controllerLocator =$container->getDefinition((string)$serviceResolver->getArgument(0));`
	`33`	`+$controllerLocator =$container->findDefinition($this->controllerLocator);`
`39`	`34`	`$controllers =$controllerLocator->getArgument(0);`
`40`	`35`
`41`	`36`	`foreach ($controllersas$controller =>$argumentRef) {`

Comments

(0)