Allow using param as connection atribute in *.event_subscriber and *.event_listener tags

Author: wbloszyk

DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

@@ -77,7 +77,9 @@ private function addTaggedServices(ContainerBuilder $container): array
         $managerDefs = [];
         foreach ($taggedServices as $taggedSubscriber) {
             [$tagName, $id, $tag] = $taggedSubscriber;
-            $connections = isset($tag['connection']) ? [$tag['connection']] : array_keys($this->connections);
+            $connections = isset($tag['connection'])
+                ? [$container->getParameterBag()->resolveValue($tag['connection'])]
+                : array_keys($this->connections);
             if ($listenerTag === $tagName && !isset($tag['event'])) {
                 throw new InvalidArgumentException(sprintf('Doctrine event listener "%s" must specify the "event" attribute.', $id));
             }

Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

@@ -114,6 +114,8 @@ public function testProcessEventListenersWithMultipleConnections()
     {
         $container = $this->createBuilder(true);
 
+        $container->setParameter('connection_param', 'second');
+
         $container
             ->register('a', 'stdClass')
             ->addTag('doctrine.event_listener', [
@@ -137,6 +139,14 @@ public function testProcessEventListenersWithMultipleConnections()
             ])
         ;
 
+        $container
+            ->register('d', 'stdClass')
+            ->addTag('doctrine.event_listener', [
+                'event' => 'onFlush',
+                'connection' => '%connection_param%',
+            ])
+        ;
+
         $this->process($container);
 
         $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
@@ -167,6 +177,7 @@ public function testProcessEventListenersWithMultipleConnections()
             [
                 [['onFlush'], 'a'],
                 [['onFlush'], 'c'],
+                [['onFlush'], 'd'],
             ],
             $secondEventManagerDef->getArgument(1)
         );
@@ -178,6 +189,7 @@ public function testProcessEventListenersWithMultipleConnections()
             [
                 'a' => new ServiceClosureArgument(new Reference('a')),
                 'c' => new ServiceClosureArgument(new Reference('c')),
+                'd' => new ServiceClosureArgument(new Reference('d')),
             ],
             $serviceLocatorDef->getArgument(0)
         );
@@ -187,6 +199,8 @@ public function testProcessEventSubscribersWithMultipleConnections()
     {
         $container = $this->createBuilder(true);
 
+        $container->setParameter('connection_param', 'second');
+
         $container
             ->register('a', 'stdClass')
             ->addTag('doctrine.event_subscriber', [
@@ -210,6 +224,14 @@ public function testProcessEventSubscribersWithMultipleConnections()
             ])
         ;
 
+        $container
+            ->register('d', 'stdClass')
+            ->addTag('doctrine.event_subscriber', [
+                'event' => 'onFlush',
+                'connection' => '%connection_param%',
+            ])
+        ;
+
         $this->process($container);
 
         $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
@@ -240,6 +262,7 @@ public function testProcessEventSubscribersWithMultipleConnections()
             [
                 'a',
                 'c',
+                'd',
             ],
             $eventManagerDef->getArgument(1)
         );
@@ -250,6 +273,7 @@ public function testProcessEventSubscribersWithMultipleConnections()
             [
                 'a' => new ServiceClosureArgument(new Reference('a')),
                 'c' => new ServiceClosureArgument(new Reference('c')),
+                'd' => new ServiceClosureArgument(new Reference('d')),
             ],
             $serviceLocatorDef->getArgument(0)
         );