symfony · derrabus · Jan 10, 2021
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Contracts\Service\Attribute\TagInterface;
+
+final class AttributeAutoconfigurationPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (80000 > \PHP_VERSION_ID || !interface_exists(TagInterface::class)) {
+            return;
+        }
+
+        foreach ($container->getDefinitions() as $definition) {
+            if (!$definition->isAutoconfigured()) {
+                continue;
+            }
+
+            if (!$class = $container->getParameterBag()->resolveValue($definition->getClass())) {
+                continue;
+            }
+
+            try {
+                $reflector = new \ReflectionClass($class);
+            } catch (\ReflectionException $e) {
+                continue;
+            }
+
+            foreach ($reflector->getAttributes(TagInterface::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+                /** @var TagInterface $tag */
+                $tag = $attribute->newInstance();
+                $definition->addTag($tag->getName(), $tag->getAttributes());
+            }
+        }
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -42,6 +42,7 @@ public function __construct()
         $this->beforeOptimizationPasses = [
             100 => [
                 new ResolveClassPass(),
+                new AttributeAutoconfigurationPass(),
                 new ResolveInstanceofConditionalsPass(),
                 new RegisterEnvVarProcessorsPass(),
             ],

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -24,6 +25,10 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedForDefaultPriorityClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooTagClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService1;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService2;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\TaggedService3;
+use Symfony\Contracts\Service\Attribute\TagInterface;
 use Symfony\Contracts\Service\ServiceProviderInterface;
 use Symfony\Contracts\Service\ServiceSubscriberInterface;
 
@@ -506,6 +511,45 @@ public function testTaggedServiceLocatorWithDefaultIndex()
         ];
         $this->assertSame($expected, ['baz' => $serviceLocator->get('baz')]);
     }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testTagsViaAttribute()
+    {
+        if (!\interface_exists(TagInterface::class)) {
+            self::markTestSkipped('This test requires symfony/service-contracts 2.4 or newer.');
+        }
+
+        $container = new ContainerBuilder();
+        $container->register('one', TaggedService1::class)
+            ->setPublic(true)
+            ->setAutoconfigured(true);
+        $container->register('two', TaggedService2::class)
+            ->setPublic(true)
+            ->setAutoconfigured(true);
+        $container->register('three', TaggedService3::class)
+            ->setPublic(true)
+            ->setAutoconfigured(true);
+
+        $collector = new TagCollector();
+        $container->addCompilerPass($collector);
+
+        $container->compile();
+
+        self::assertSame([
+            'one' => [
+                ['foo' => 'bar', 'priority' => 0],
+                ['bar' => 'baz', 'priority' => 0],
+            ],
+            'two' => [
+                ['someAttribute' => 'prio 100', 'priority' => 100],
+            ],
+            'three' => [
+                ['someAttribute' => 'custom_tag_class'],
+            ],
+        ], $collector->collectedTags);
+    }
 }
 
 class ServiceSubscriberStub implements ServiceSubscriberInterface
@@ -566,3 +610,13 @@ public function setSunshine($type)
     {
     }
 }
+
+final class TagCollector implements CompilerPassInterface
+{
+    public $collectedTags;
+
+    public function process(ContainerBuilder $container): void
+    {
+        $this->collectedTags = $container->findTaggedServiceIds('app.custom_tag');
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomTag.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Attribute/CustomTag.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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\Attribute;
+
+use Symfony\Contracts\Service\Attribute\TagInterface;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class CustomTag implements TagInterface
+{
+    public function getName(): string
+    {
+        return 'app.custom_tag';
+    }
+
+    public function getAttributes(): array
+    {
+        return ['someAttribute' => 'custom_tag_class'];
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService1.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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 Symfony\Contracts\Service\Attribute\Tag;
+
+#[Tag(name: 'app.custom_tag', attributes: ['foo' => 'bar'])]
+#[Tag(name: 'app.custom_tag', attributes: ['bar' => 'baz'])]
+final class TaggedService1
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService2.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService2.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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 Symfony\Contracts\Service\Attribute\Tag;
+
+#[Tag(name: 'app.custom_tag', priority: 100, attributes: ['someAttribute' => 'prio 100'])]
+final class TaggedService2
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService3.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/TaggedService3.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * 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 Symfony\Component\DependencyInjection\Tests\Fixtures\Attribute\CustomTag;
+
+#[CustomTag]
+final class TaggedService3
+{
+}
diff --git a/src/Symfony/Component/EventDispatcher/Attribute/EventListener.php b/src/Symfony/Component/EventDispatcher/Attribute/EventListener.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\EventDispatcher\Attribute;
+
+use Symfony\Contracts\Service\Attribute\TagInterface;
+
+/**
+ * Service tag to autoconfigure event listeners.
+ *
+ * @author Alexander M. Turek <[email protected]>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
+class EventListener implements TagInterface
+{
+    public function __construct(
+        private ?string $event = null,
+        private ?string $method = null,
+        private int $priority = 0
+    ) {
+    }
+
+    public function getName(): string
+    {
+        return 'kernel.event_listener';
+    }
+
+    public function getAttributes(): array
+    {
+        return [
+            'event' => $this->event,
+            'method' => $this->method,
+            'priority' => $this->priority,
+        ];
+    }
+}
diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.3.0
+-----
+
+ * Added the `EventListener` service tag attribute for PHP 8.
+
 5.1.0
 -----
 

diff --git a/...Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/...Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -13,12 +13,17 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
+use Symfony\Component\DependencyInjection\Compiler\AttributeAutoconfigurationPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\DependencyInjection\AddEventAliasesPass;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\EventDispatcher\Tests\Fixtures\CustomEvent;
+use Symfony\Component\EventDispatcher\Tests\Fixtures\TaggedInvokableListener;
+use Symfony\Component\EventDispatcher\Tests\Fixtures\TaggedMultiListener;
+use Symfony\Contracts\Service\Attribute\TagInterface;
 
 class RegisterListenersPassTest extends TestCase
 {
@@ -231,6 +236,82 @@ public function testInvokableEventListener()
         $this->assertEquals($expectedCalls, $definition->getMethodCalls());
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testTaggedInvokableEventListener()
+    {
+        if (!\interface_exists(TagInterface::class)) {
+            self::markTestSkipped('This test requires symfony/service-contracts 2.4 or newer.');
+        }
+
+        $container = new ContainerBuilder();
+        $container->register('foo', TaggedInvokableListener::class)->setAutoconfigured(true);
+        $container->register('event_dispatcher', \stdClass::class);
+
+        (new AttributeAutoconfigurationPass())->process($container);
+        (new RegisterListenersPass())->process($container);
+
+        $definition = $container->getDefinition('event_dispatcher');
+        $expectedCalls = [
+            [
+                'addListener',
+                [
+                    CustomEvent::class,
+                    [new ServiceClosureArgument(new Reference('foo')), '__invoke'],
+                    0,
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedCalls, $definition->getMethodCalls());
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testTaggedMultiEventListener()
+    {
+        if (!\interface_exists(TagInterface::class)) {
+            self::markTestSkipped('This test requires symfony/service-contracts 2.4 or newer.');
+        }
+
+        $container = new ContainerBuilder();
+        $container->register('foo', TaggedMultiListener::class)->setAutoconfigured(true);
+        $container->register('event_dispatcher', \stdClass::class);
+
+        (new AttributeAutoconfigurationPass())->process($container);
+        (new RegisterListenersPass())->process($container);
+
+        $definition = $container->getDefinition('event_dispatcher');
+        $expectedCalls = [
+            [
+                'addListener',
+                [
+                    CustomEvent::class,
+                    [new ServiceClosureArgument(new Reference('foo')), 'onCustomEvent'],
+                    0,
+                ],
+            ],
+            [
+                'addListener',
+                [
+                    'foo',
+                    [new ServiceClosureArgument(new Reference('foo')), 'onFoo'],
+                    42,
+                ],
+            ],
+            [
+                'addListener',
+                [
+                    'bar',
+                    [new ServiceClosureArgument(new Reference('foo')), 'onBarEvent'],
+                    0,
+                ],
+            ],
+        ];
+        $this->assertEquals($expectedCalls, $definition->getMethodCalls());
+    }
+
     public function testAliasedEventListener()
     {
         $container = new ContainerBuilder();
@@ -416,10 +497,6 @@ final class AliasedEvent
 {
 }
 
-final class CustomEvent
-{
-}
-
 final class TypedListener
 {
     public function __invoke(AliasedEvent $event): void