Merge branch '6.0' into 6.1

* 6.0: (22 commits)
  [Messenger] Use :memory: for SQLite tests
  [Mailer] Stream timeout not detected due to checking only string result of function fgets
  don not set http_version instead of setting it to null
  [DependencyInjection] don't move locator tag for service subscriber
  Fix search scope when performing fallback mapping driver detection
  Fix the notification email theme for asynchronously dispatched emails
  Update the CI setup to use the new output file
  Update actions in the CI to move away from the deprecated runtime
  Use 6.3 for new features
  [HttpFoundation] Check IPv6 is valid before comparing it
  Run tests with UTC to avoid daylight saving time messing with assertions
  Bump Symfony version to 6.0.16
  Update VERSION for 6.0.15
  Update CHANGELOG for 6.0.15
  Bump Symfony version to 5.4.16
  Update VERSION for 5.4.15
  Update CHANGELOG for 5.4.15
  Bump Symfony version to 4.4.49
  Update VERSION for 4.4.48
  Update CONTRIBUTORS for 4.4.48
  ...

Author: nicolas-grekas

Compiler/DecoratorServicePass.php

@@ -42,7 +42,7 @@ public function process(ContainerBuilder $container)
 
         $tagsToKeep = $container->hasParameter('container.behavior_describing_tags')
             ? $container->getParameter('container.behavior_describing_tags')
-            : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber'];
+            : ['container.do_not_inline', 'container.service_locator', 'container.service_subscriber', 'container.service_subscriber.locator'];
 
         foreach ($definitions as [$id, $definition]) {
             $decoratedService = $definition->getDecoratedService();

Compiler/ResolveInstanceofConditionalsPass.php

@@ -129,7 +129,7 @@ private function processDefinition(ContainerBuilder $container, string $id, Defi
                 foreach ($instanceofTags[$i] as $k => $v) {
                     if (null === $definition->getDecoratedService() || \in_array($k, $tagsToKeep, true)) {
                         foreach ($v as $v) {
-                            if ($definition->hasTag($k) && \in_array($v, $definition->getTag($k))) {
+                            if ($definition->hasTag($k) && (!$v || \in_array($v, $definition->getTag($k)))) {
                                 continue;
                             }
                             $definition->addTag($k, $v);

Tests/Compiler/DecoratorServicePassTest.php

@@ -248,7 +248,7 @@ public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
         $container = new ContainerBuilder();
         $container
             ->register('foo')
-            ->setTags(['container.service_subscriber' => [], 'bar' => ['attr' => 'baz']])
+            ->setTags(['container.service_subscriber' => [], 'container.service_subscriber.locator' => [], 'bar' => ['attr' => 'baz']])
         ;
         $container
             ->register('baz')
@@ -258,7 +258,7 @@ public function testProcessLeavesServiceSubscriberTagOnOriginalDefinition()
 
         $this->process($container);
 
-        $this->assertEquals(['container.service_subscriber' => []], $container->getDefinition('baz.inner')->getTags());
+        $this->assertEquals(['container.service_subscriber' => [], 'container.service_subscriber.locator' => []], $container->getDefinition('baz.inner')->getTags());
         $this->assertEquals(['bar' => ['attr' => 'baz'], 'foobar' => ['attr' => 'bar']], $container->getDefinition('baz')->getTags());
     }
 

Tests/Compiler/IntegrationTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -152,19 +153,41 @@ public function testProcessInlinesWhenThereAreMultipleReferencesButFromTheSameDe
         $this->assertFalse($container->hasDefinition('c'), 'Service C was not inlined.');
     }
 
-    public function testCanDecorateServiceSubscriber()
+    public function testCanDecorateServiceSubscriberUsingBinding()
     {
         $container = new ContainerBuilder();
         $container->register(ServiceSubscriberStub::class)
             ->addTag('container.service_subscriber')
             ->setPublic(true);
 
         $container->register(DecoratedServiceSubscriber::class)
+            ->setProperty('inner', new Reference(DecoratedServiceSubscriber::class.'.inner'))
             ->setDecoratedService(ServiceSubscriberStub::class);
 
         $container->compile();
 
         $this->assertInstanceOf(DecoratedServiceSubscriber::class, $container->get(ServiceSubscriberStub::class));
+        $this->assertInstanceOf(ServiceSubscriberStub::class, $container->get(ServiceSubscriberStub::class)->inner);
+        $this->assertInstanceOf(ServiceLocator::class, $container->get(ServiceSubscriberStub::class)->inner->container);
+    }
+
+    public function testCanDecorateServiceSubscriberReplacingArgument()
+    {
+        $container = new ContainerBuilder();
+        $container->register(ServiceSubscriberStub::class)
+            ->setArguments([new Reference(ContainerInterface::class)])
+            ->addTag('container.service_subscriber')
+            ->setPublic(true);
+
+        $container->register(DecoratedServiceSubscriber::class)
+            ->setProperty('inner', new Reference(DecoratedServiceSubscriber::class.'.inner'))
+            ->setDecoratedService(ServiceSubscriberStub::class);
+
+        $container->compile();
+
+        $this->assertInstanceOf(DecoratedServiceSubscriber::class, $container->get(ServiceSubscriberStub::class));
+        $this->assertInstanceOf(ServiceSubscriberStub::class, $container->get(ServiceSubscriberStub::class)->inner);
+        $this->assertInstanceOf(ServiceLocator::class, $container->get(ServiceSubscriberStub::class)->inner->container);
     }
 
     public function testCanDecorateServiceLocator()
@@ -826,6 +849,7 @@ static function (ChildDefinition $definition, CustomAutoconfiguration $attribute
                 $definition->addTag('app.custom_tag', get_object_vars($attribute) + ['class' => $reflector->getName()]);
             }
         );
+        $container->registerForAutoconfiguration(TaggedService1::class)->addTag('app.custom_tag');
 
         $container->register('one', TaggedService1::class)
             ->setPublic(true)
@@ -1043,6 +1067,13 @@ public function testTaggedIteratorAndLocatorWithExclude()
 
 class ServiceSubscriberStub implements ServiceSubscriberInterface
 {
+    public $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
     public static function getSubscribedServices(): array
     {
         return [];
@@ -1051,6 +1082,7 @@ public static function getSubscribedServices(): array
 
 class DecoratedServiceSubscriber
 {
+    public $inner;
 }
 
 class DecoratedServiceLocator implements ServiceProviderInterface