Merge branch '5.3' into 5.4

* 5.3:
  cs fix
  [Security][Validator] Add missing translations for Indonesian (id)
  [Notifier] fix typo firebase
  Add trailing Line return if last line is non empty
  Report mismatches between trans-unit id and source text via status script
  Do not add namespace argument to NullAdapter in CachePoolPass
  [FrameworkBundle] Update cache:clear help
  Fix ExecutionContextInterface::setParameter phpdoc example
  Don't pass null to preg_replace()
  Don't pass null to strpos()
  Remove preloading of unused class
  [Messenger] Separate unit tests from integration tests
  Fix ServiceLocator indexing when service is decorated
  always close open stopwatch section after handling kernel.request events

Author: chalasr

Compiler/PassConfig.php

@@ -62,10 +62,10 @@ public function __construct()
             new AutowireRequiredMethodsPass(),
             new AutowireRequiredPropertiesPass(),
             new ResolveBindingsPass(),
-            new DecoratorServicePass(),
             new CheckDefinitionValidityPass(),
             new AutowirePass(false),
             new ServiceLocatorTagPass(),
+            new DecoratorServicePass(),
             new ResolveTaggedIteratorArgumentPass(),
             new ResolveServiceSubscribersPass(),
             new ResolveReferencesToAliasesPass(),

Tests/Compiler/ServiceLocatorTagPassTest.php

@@ -13,8 +13,11 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
@@ -143,4 +146,56 @@ public function testBindingsAreCopied()
         $this->assertSame(['foo'], array_keys($locator->getBindings()));
         $this->assertInstanceOf(BoundArgument::class, $locator->getBindings()['foo']);
     }
+
+    public function testIndexedByServiceIdWithDecoration()
+    {
+        $container = new ContainerBuilder();
+
+        $locator = new Definition(Locator::class);
+        $locator->setPublic(true);
+        $locator->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('test_tag', null, null, true)));
+
+        $container->setDefinition(Locator::class, $locator);
+
+        $service = new Definition(Service::class);
+        $service->setPublic(true);
+        $service->addTag('test_tag');
+
+        $container->setDefinition(Service::class, $service);
+
+        $decorated = new Definition(Decorated::class);
+        $decorated->setPublic(true);
+        $decorated->setDecoratedService(Service::class);
+
+        $container->setDefinition(Decorated::class, $decorated);
+
+        $container->compile();
+
+        /** @var ServiceLocator $locator */
+        $locator = $container->get(Locator::class)->locator;
+        static::assertTrue($locator->has(Service::class));
+        static::assertFalse($locator->has(Decorated::class));
+        static::assertInstanceOf(Decorated::class, $locator->get(Service::class));
+    }
+}
+
+class Locator
+{
+    /**
+     * @var ServiceLocator
+     */
+    public $locator;
+
+    public function __construct(ServiceLocator $locator)
+    {
+        $this->locator = $locator;
+    }
+}
+
+class Service
+{
+}
+
+class DecoratedService
+{
 }