[DoctrineBridge] skip subscriber if listener already defined

alli83 · nicolas-grekas · commit 3d4ca5f7cc59 · 2023-05-03T14:02:58.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -75,7 +75,7 @@ private function addTaggedServices(ContainerBuilder $container): array
         $listenerTag = $this->tagPrefix.'.event_listener';
         $subscriberTag = $this->tagPrefix.'.event_subscriber';
         $listenerRefs = [];
-        $taggedServices = $this->findAndSortTags([$subscriberTag, $listenerTag], $container);
+        $taggedServices = $this->findAndSortTags($subscriberTag, $listenerTag, $container);
 
         $managerDefs = [];
         foreach ($taggedServices as $taggedSubscriber) {
@@ -144,24 +144,23 @@ private function getEventManagerDef(ContainerBuilder $container, string $name):
      * @see https://bugs.php.net/53710
      * @see https://bugs.php.net/60926
      */
-    private function findAndSortTags(array $tagNames, ContainerBuilder $container): array
+    private function findAndSortTags(string $subscriberTag, string $listenerTag, ContainerBuilder $container): array
     {
         $sortedTags = [];
+        $taggedIds = [$listenerTag => $container->findTaggedServiceIds($listenerTag, true)];
+        $taggedIds[$subscriberTag] = array_diff_key($container->findTaggedServiceIds($subscriberTag, true), $taggedIds[$listenerTag]);
 
-        foreach ($tagNames as $tagName) {
-            foreach ($container->findTaggedServiceIds($tagName, true) as $serviceId => $tags) {
+        foreach ($taggedIds as $tagName => $serviceIds) {
+            foreach ($serviceIds as $serviceId => $tags) {
                 foreach ($tags as $attributes) {
                     $priority = $attributes['priority'] ?? 0;
                     $sortedTags[$priority][] = [$tagName, $serviceId, $attributes];
                 }
             }
         }
 
-        if ($sortedTags) {
-            krsort($sortedTags);
-            $sortedTags = array_merge(...$sortedTags);
-        }
+        krsort($sortedTags);
 
-        return $sortedTags;
+        return array_merge(...$sortedTags);
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
@@ -454,6 +454,44 @@ public function testProcessEventSubscribersAndListenersWithPriorities()
         );
     }
 
+    public function testSubscribersAreSkippedIfListenerDefinedForSameDefinition()
+    {
+        $container = $this->createBuilder();
+
+        $container
+            ->register('a', 'stdClass')
+            ->setPublic(false)
+            ->addTag('doctrine.event_listener', [
+                'event' => 'bar',
+                'priority' => 3,
+            ])
+        ;
+        $container
+            ->register('b', 'stdClass')
+            ->setPublic(false)
+            ->addTag('doctrine.event_listener', [
+                'event' => 'bar',
+            ])
+            ->addTag('doctrine.event_listener', [
+                'event' => 'foo',
+                'priority' => -5,
+            ])
+            ->addTag('doctrine.event_subscriber')
+        ;
+        $this->process($container);
+
+        $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
+
+        $this->assertEquals(
+            [
+                [['bar'], 'a'],
+                [['bar'], 'b'],
+                [['foo'], 'b'],
+            ],
+            $eventManagerDef->getArgument(1)
+        );
+    }
+
     public function testProcessNoTaggedServices()
     {
         $container = $this->createBuilder(true);
