[DependencyInjection] #[Autowire] attribute should have precedence over bindings

HypeMC · HypeMC · commit 57f4b253cebb · 2023-11-30T16:28:16.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -14,6 +14,7 @@
 use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\DependencyInjection\Attribute\Target;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -185,6 +186,9 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
                 if (\array_key_exists($parameter->name, $arguments) && '' !== $arguments[$parameter->name]) {
                     continue;
                 }
+                if ($parameter->getAttributes(Autowire::class, \ReflectionAttribute::IS_INSTANCEOF)) {
+                    continue;
+                }
 
                 $typeHint = ltrim(ProxyHelper::exportType($parameter) ?? '', '?');
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -47,6 +47,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithDefaultPriorityMethod;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithoutIndex;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\LocatorConsumerWithServiceSubscriber;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\StaticMethodTag;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedConsumerWithExclude;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService1;
@@ -1085,6 +1086,34 @@ public function testTaggedIteratorAndLocatorWithExclude()
         $this->assertTrue($locator->has(AutoconfiguredService2::class));
         $this->assertFalse($locator->has(TaggedConsumerWithExclude::class));
     }
+
+    public function testAutowireAttributeHasPriorityOverBindings()
+    {
+        $container = new ContainerBuilder();
+        $container->register(FooTagClass::class)
+            ->setPublic(true)
+            ->addTag('foo_bar', ['key' => 'tagged_service'])
+        ;
+        $container->register(LocatorConsumerWithServiceSubscriber::class)
+            ->setPublic(true)
+            ->setAutowired(true)
+            ->addTag('container.service_subscriber')
+        ;
+        $container->register('subscribed_service', \stdClass::class)
+            ->setPublic(true)
+        ;
+
+        $container->compile();
+
+        /** @var LocatorConsumerWithServiceSubscriber $s */
+        $s = $container->get(LocatorConsumerWithServiceSubscriber::class);
+
+        self::assertInstanceOf(ContainerInterface::class, $subscriberLocator = $s->getContainer());
+        self::assertTrue($subscriberLocator->has('subscribed_service'));
+        self::assertNotSame($subscriberLocator, $taggedLocator = $s->getLocator());
+        self::assertInstanceOf(ContainerInterface::class, $taggedLocator);
+        self::assertTrue($taggedLocator->has('tagged_service'));
+    }
 }
 
 class ServiceSubscriberStub implements ServiceSubscriberInterface
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithServiceSubscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithServiceSubscriber.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\Attribute\TaggedLocator;
+use Symfony\Contracts\Service\Attribute\Required;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
+
+final class LocatorConsumerWithServiceSubscriber implements ServiceSubscriberInterface
+{
+    private ?ContainerInterface $container = null;
+
+    public function __construct(
+        #[TaggedLocator('foo_bar', indexAttribute: 'key')]
+        private ContainerInterface $locator,
+    ) {
+    }
+
+    public function getLocator(): ContainerInterface
+    {
+        return $this->locator;
+    }
+
+    public function getContainer(): ?ContainerInterface
+    {
+        return $this->container;
+    }
+
+    #[Required]
+    public function setContainer(ContainerInterface $container): void
+    {
+        $this->container = $container;
+    }
+
+    public static function getSubscribedServices(): array
+    {
+        return [
+            'subscribed_service',
+        ];
+    }
+}
