Merge branch '5.2' into 5.3

* 5.2:
  Remove notice about reverted behavior
  [PhpUnitBridge] fix PHP version check
  keep container.service_subscriber tag on the decorated definition

Author: nicolas-grekas

Compiler/DecoratorServicePass.php

@@ -97,10 +97,12 @@ public function process(ContainerBuilder $container)
                 $decoratingTags = $decoratingDefinition->getTags();
                 $resetTags = [];
 
-                if (isset($decoratingTags['container.service_locator'])) {
-                    // container.service_locator has special logic and it must not be transferred out to decorators
-                    $resetTags = ['container.service_locator' => $decoratingTags['container.service_locator']];
-                    unset($decoratingTags['container.service_locator']);
+                // 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) {
+                    if (isset($decoratingTags[$containerTag])) {
+                        $resetTags[$containerTag] = $decoratingTags[$containerTag];
+                        unset($decoratingTags[$containerTag]);
+                    }
                 }
 
                 $definition->setTags(array_merge($decoratingTags, $definition->getTags()));

Tests/Compiler/DecoratorServicePassTest.php

@@ -242,6 +242,25 @@ public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
         $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
     }
 
+    public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo')
+            ->setTags(['container.service_subscriber' => [], 'bar' => ['attr' => 'baz']])
+        ;
+        $container
+            ->register('baz')
+            ->setTags(['foobar' => ['attr' => 'bar']])
+            ->setDecoratedService('foo')
+        ;
+
+        $this->process($container);
+
+        $this->assertEquals(['container.service_subscriber' => []], $container->getDefinition('baz.inner')->getTags());
+        $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
+    }
+
     public function testGenericInnerReference()
     {
         $container = new ContainerBuilder();