Commitde33b25

committed

[DependencyInjection] Process bindings in ServiceLocatorTagPass

1 parent0eebba6 commitde33b25Copy full SHA for de33b25

File tree

+17

-0

lines changed

src/Symfony/Component/DependencyInjection
- Compiler
  - ServiceLocatorTagPass.php
- Tests/Compiler
  - ServiceLocatorTagPassTest.php

+17

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,10 @@ protected function processValue($value, $isRoot = false)`
`39`	`39`	`returnself::register($this->container,$value->getValues());`
`40`	`40`	`}`
`41`	`41`
	`42`	`+if ($valueinstanceof Definition) {`
	`43`	`+$value->setBindings(parent::processValue($value->getBindings()));`
	`44`	`+ }`
	`45`	`+`
`42`	`46`	`if (!$valueinstanceof Definition \|\| !$value->hasTag('container.service_locator')) {`
`43`	`47`	`returnparent::processValue($value,$isRoot);`
`44`	`48`	`}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
`15`	`15`	`useSymfony\Component\DependencyInjection\Argument\BoundArgument;`
	`16`	`+useSymfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;`
`16`	`17`	`useSymfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;`
`17`	`18`	`useSymfony\Component\DependencyInjection\ContainerBuilder;`
`18`	`19`	`useSymfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
`@@ -143,4 +144,16 @@ public function testBindingsAreCopied()`
`143`	`144`	`$this->assertSame(['foo'],array_keys($locator->getBindings()));`
`144`	`145`	`$this->assertInstanceOf(BoundArgument::class,$locator->getBindings()['foo']);`
`145`	`146`	`}`
	`147`	`+`
	`148`	`+publicfunctiontestBindingsAreRegistered()`
	`149`	`+ {`
	`150`	`+$container =newContainerBuilder();`
	`151`	`+`
	`152`	`+$definition =$container->register('foo')`
	`153`	`+ ->setBindings(['foo' =>newServiceLocatorArgument()]);`
	`154`	`+`
	`155`	`+ (newServiceLocatorTagPass())->process($container);`
	`156`	`+`
	`157`	`+$this->assertInstanceOf(Reference::class,$definition->getBindings()['foo']->getValues()[0]);`
	`158`	`+ }`
`146`	`159`	`}`

Comments

(0)