Merge branch '4.4' into 5.4

* 4.4:
  [FrameworkBundle] fix tests
  [FrameworkBundle] fix wiring of annotations.cached_reader
  Fix BC break

Author: nicolas-grekas

Compiler/DecoratorServicePass.php

@@ -51,6 +51,10 @@ public function process(ContainerBuilder $container)
         }
         $decoratingDefinitions = [];
 
+        $tagsToKeep = $container->hasParameter('container.behavior_describing_tags')
+            ? $container->getParameter('container.behavior_describing_tags')
+            : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber'];
+
         foreach ($definitions as [$id, $definition]) {
             $decoratedService = $definition->getDecoratedService();
             [$inner, $renamedId] = $decoratedService;
@@ -101,8 +105,8 @@ public function process(ContainerBuilder $container)
                 $decoratingTags = $decoratingDefinition->getTags();
                 $resetTags = [];
 
-                // container.service_locator and container.service_subscriber have special logic and they must not be transferred out to decorators
-                foreach (['container.service_locator', 'container.service_subscriber'] as $containerTag) {
+                // Behavior-describing tags must not be transferred out to decorators
+                foreach ($tagsToKeep as $containerTag) {
                     if (isset($decoratingTags[$containerTag])) {
                         $resetTags[$containerTag] = $decoratingTags[$containerTag];
                         unset($decoratingTags[$containerTag]);

Compiler/InlineServiceDefinitionsPass.php

@@ -163,7 +163,7 @@ protected function processValue($value, bool $isRoot = false)
      */
     private function isInlineableDefinition(string $id, Definition $definition): bool
     {
-        if ($definition->hasErrors() || $definition->isDeprecated() || $definition->isLazy() || $definition->isSynthetic()) {
+        if ($definition->hasErrors() || $definition->isDeprecated() || $definition->isLazy() || $definition->isSynthetic() || $definition->hasTag('container.do_not_inline')) {
             return false;
         }
 

Tests/Compiler/InlineServiceDefinitionsPassTest.php

@@ -323,6 +323,34 @@ public function testProcessDoesNotSetLazyArgumentValuesAfterInlining()
         $this->assertSame('inline', (string) $values[0]);
     }
 
+    public function testDoNotInline()
+    {
+        $container = new ContainerBuilder();
+        $container->register('decorated1', 'decorated1')->addTag('container.do_not_inline');
+        $container->register('decorated2', 'decorated2')->addTag('container.do_not_inline');
+        $container->setAlias('alias2', 'decorated2');
+
+        $container
+            ->register('s1', 's1')
+            ->setDecoratedService('decorated1')
+            ->setPublic(true)
+            ->setProperties(['inner' => new Reference('s1.inner')]);
+
+        $container
+            ->register('s2', 's2')
+            ->setDecoratedService('alias2')
+            ->setPublic(true)
+            ->setProperties(['inner' => new Reference('s2.inner')]);
+
+        $container->compile();
+
+        $this->assertFalse($container->hasAlias('alias2'));
+        $this->assertEquals(new Reference('decorated2'), $container->getDefinition('s2')->getProperties()['inner']);
+        $this->assertEquals(new Reference('s1.inner'), $container->getDefinition('s1')->getProperties()['inner']);
+        $this->assertSame('decorated2', $container->getDefinition('decorated2')->getClass());
+        $this->assertSame('decorated1', $container->getDefinition('s1.inner')->getClass());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         (new InlineServiceDefinitionsPass(new AnalyzeServiceReferencesPass()))->process($container);