bug #48224 [DependencyInjection] Process bindings in ServiceLocatorTagPass (MatTheCat)

fabpot · fabpot · commit 0f670bb28438 · 2022-11-22T08:07:08.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] Process bindings in `ServiceLocatorTagPass` | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48192 | License | MIT | Doc PR | N/A Commits ------- 81d0858 [DependencyInjection] Process bindings in ServiceLocatorTagPass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -39,6 +39,10 @@ protected function processValue($value, $isRoot = false)
             return self::register($this->container, $value->getValues());
         }
 
+        if ($value instanceof Definition) {
+            $value->setBindings(parent::processValue($value->getBindings()));
+        }
+
         if (!$value instanceof Definition || !$value->hasTag('container.service_locator')) {
             return parent::processValue($value, $isRoot);
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
@@ -143,4 +144,16 @@ public function testBindingsAreCopied()
         $this->assertSame(['foo'], array_keys($locator->getBindings()));
         $this->assertInstanceOf(BoundArgument::class, $locator->getBindings()['foo']);
     }
+
+    public function testBindingsAreProcessed()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('foo')
+            ->setBindings(['foo' => new ServiceLocatorArgument()]);
+
+        (new ServiceLocatorTagPass())->process($container);
+
+        $this->assertInstanceOf(Reference::class, $definition->getBindings()['foo']->getValues()[0]);
+    }
 }

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