Allow decoration of service locators

malarzm · malarzm · commit 37e99ccc432b · 2019-12-13T13:29:06.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -52,14 +52,14 @@ public function __construct()
             new ValidateEnvPlaceholdersPass(),
             new ResolveChildDefinitionsPass(),
             new RegisterServiceSubscribersPass(),
+            new ResolveBindingsPass(),
+            new ServiceLocatorTagPass(),
+            new CheckDefinitionValidityPass(),
             new DecoratorServicePass(),
             new ResolveParameterPlaceHoldersPass(false),
             new ResolveFactoryClassPass(),
             new ResolveNamedArgumentsPass(),
             new AutowireRequiredMethodsPass(),
-            new ResolveBindingsPass(),
-            new ServiceLocatorTagPass(),
-            new CheckDefinitionValidityPass(),
             new AutowirePass(false),
             new ResolveTaggedIteratorArgumentPass(),
             new ResolveServiceSubscribersPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -24,6 +24,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\BarTagClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooTagClass;
+use Symfony\Contracts\Service\ServiceProviderInterface;
 
 /**
  * This class tests the integration of the different compiler passes.
@@ -145,16 +146,24 @@ public function testCanDecorateServiceSubscriber()
     public function testCanDecorateServiceLocator()
     {
         $container = new ContainerBuilder();
+
+        $container->register('foo', 'stdClass')->setPublic(true);
+
         $container->register(ServiceLocator::class)
             ->addTag('container.service_locator')
+            ->setArguments([[new Reference('foo')]])
         ;
 
         $container->register(DecoratedServiceLocator::class)
-            ->setDecoratedService(ServiceLocator::class);
+            ->setDecoratedService(ServiceLocator::class)
+            ->setPublic(true)
+            ->setArguments([new Reference(DecoratedServiceLocator::class.'.inner')])
+        ;
 
         $container->compile();
 
         $this->assertInstanceOf(DecoratedServiceLocator::class, $container->get(DecoratedServiceLocator::class));
+        $this->assertSame($container->get('foo'), $container->get(DecoratedServiceLocator::class)->get('foo'));
     }
 
     /**
@@ -431,8 +440,32 @@ class DecoratedServiceSubscriber
 {
 }
 
-class DecoratedServiceLocator
+class DecoratedServiceLocator implements ServiceProviderInterface
 {
+    /**
+     * @var ServiceLocator
+     */
+    private $locator;
+
+    public function __construct(ServiceLocator $locator)
+    {
+        $this->locator = $locator;
+    }
+
+    public function get($id)
+    {
+        return $this->locator->get($id);
+    }
+
+    public function has($id): bool
+    {
+        return $this->locator->has($id);
+    }
+
+    public function getProvidedServices(): array
+    {
+        return $this->locator->getProvidedServices();
+    }
 }
 
 class IntegrationTestStub extends IntegrationTestStubParent
