[7.0] Remove remaining deprecated code paths

Author: nicolas-grekas

DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

@@ -22,7 +22,7 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Registers event listeners and subscribers to the available doctrine connections.
+ * Registers event listeners to the available doctrine connections.
  *
  * @author Jeremy Mikola <[email protected]>
  * @author Alexander <[email protected]>
@@ -44,7 +44,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
     /**
      * @param string $managerTemplate sprintf() template for generating the event
      *                                manager's service ID for a connection name
-     * @param string $tagPrefix       Tag prefix for listeners and subscribers
+     * @param string $tagPrefix       Tag prefix for listeners
      */
     public function __construct(string $connectionsParameter, string $managerTemplate, string $tagPrefix)
     {
@@ -72,18 +72,13 @@ public function process(ContainerBuilder $container): void
 
     private function addTaggedServices(ContainerBuilder $container): array
     {
-        $listenerTag = $this->tagPrefix.'.event_listener';
-        $subscriberTag = $this->tagPrefix.'.event_subscriber';
         $listenerRefs = [];
-        $taggedServices = $this->findAndSortTags($subscriberTag, $listenerTag, $container);
-
         $managerDefs = [];
-        foreach ($taggedServices as $taggedSubscriber) {
-            [$tagName, $id, $tag] = $taggedSubscriber;
+        foreach ($this->findAndSortTags($container) as [$id, $tag]) {
             $connections = isset($tag['connection'])
                 ? [$container->getParameterBag()->resolveValue($tag['connection'])]
                 : array_keys($this->connections);
-            if ($listenerTag === $tagName && !isset($tag['event'])) {
+            if (!isset($tag['event'])) {
                 throw new InvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.', $id));
             }
             foreach ($connections as $con) {
@@ -105,19 +100,10 @@ private function addTaggedServices(ContainerBuilder $container): array
                 if (ContainerAwareEventManager::class === $managerClass) {
                     $refs = $managerDef->getArguments()[1] ?? [];
                     $listenerRefs[$con][$id] = new Reference($id);
-                    if ($subscriberTag === $tagName) {
-                        trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Registering "%s" as a Doctrine subscriber is deprecated. Register it as a listener instead, using e.g. the #[AsDoctrineListener] attribute.', $id);
-                        $refs[] = $id;
-                    } else {
-                        $refs[] = [[$tag['event']], $id];
-                    }
+                    $refs[] = [[$tag['event']], $id];
                     $managerDef->setArgument(1, $refs);
                 } else {
-                    if ($subscriberTag === $tagName) {
-                        $managerDef->addMethodCall('addEventSubscriber', [new Reference($id)]);
-                    } else {
-                        $managerDef->addMethodCall('addEventListener', [[$tag['event']], new Reference($id)]);
-                    }
+                    $managerDef->addMethodCall('addEventListener', [[$tag['event']], new Reference($id)]);
                 }
             }
         }
@@ -144,21 +130,14 @@ private function getEventManagerDef(ContainerBuilder $container, string $name):
      * @see https://bugs.php.net/53710
      * @see https://bugs.php.net/60926
      */
-    private function findAndSortTags(string $subscriberTag, string $listenerTag, ContainerBuilder $container): array
+    private function findAndSortTags(ContainerBuilder $container): array
     {
         $sortedTags = [];
-        $taggedIds = [
-            $subscriberTag => $container->findTaggedServiceIds($subscriberTag, true),
-            $listenerTag => $container->findTaggedServiceIds($listenerTag, true),
-        ];
-        $taggedIds[$subscriberTag] = array_diff_key($taggedIds[$subscriberTag], $taggedIds[$listenerTag]);
-
-        foreach ($taggedIds as $tagName => $serviceIds) {
-            foreach ($serviceIds as $serviceId => $tags) {
-                foreach ($tags as $attributes) {
-                    $priority = $attributes['priority'] ?? 0;
-                    $sortedTags[$priority][] = [$tagName, $serviceId, $attributes];
-                }
+
+        foreach ($container->findTaggedServiceIds($this->tagPrefix.'.event_listener', true) as $serviceId => $tags) {
+            foreach ($tags as $attributes) {
+                $priority = $attributes['priority'] ?? 0;
+                $sortedTags[$priority][] = [$serviceId, $attributes];
             }
         }