From 0577c7b089916bde9243fee8cfd08fc14fad1eac Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 26 Mar 2017 17:08:59 +0200
Subject: [PATCH] [Bridge\Doctrine] Fix change breaking doctrine-bundle test
 suite

---
 ...egisterEventListenersAndSubscribersPass.php |  7 ++-----
 ...terEventListenersAndSubscribersPassTest.php | 18 +++++++++---------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index 1ec3ba323b788..cb4a4816db70a 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -109,15 +109,12 @@ private function addTaggedListeners(ContainerBuilder $container)
                     throw new RuntimeException(sprintf('The Doctrine connection "%s" referenced in service "%s" does not exist. Available connections names: %s', $con, $id, implode(', ', array_keys($this->connections))));
                 }
 
-                if ($lazy = isset($tag['lazy']) && $tag['lazy']) {
+                if ($lazy = !empty($tag['lazy'])) {
                     $taggedListenerDef->setPublic(true);
                 }
 
                 // we add one call per event per service so we have the correct order
-                $this->getEventManagerDef($container, $con)->addMethodCall('addEventListener', array(
-                    $tag['event'],
-                    $lazy ? $id : new Reference($id),
-                ));
+                $this->getEventManagerDef($container, $con)->addMethodCall('addEventListener', array(array($tag['event']), $lazy ? $id : new Reference($id)));
             }
         }
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
index 6e4eb202984ed..7e99a7d9356c2 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
@@ -90,11 +90,11 @@ public function testProcessEventListenersWithPriorities()
 
         $this->assertEquals(
             array(
-                array('addEventListener', array('foo_bar', new Reference('c'))),
-                array('addEventListener', array('foo_bar', new Reference('a'))),
-                array('addEventListener', array('bar', new Reference('a'))),
-                array('addEventListener', array('foo', new Reference('b'))),
-                array('addEventListener', array('foo', new Reference('a'))),
+                array('addEventListener', array(array('foo_bar'), new Reference('c'))),
+                array('addEventListener', array(array('foo_bar'), new Reference('a'))),
+                array('addEventListener', array(array('bar'), new Reference('a'))),
+                array('addEventListener', array(array('foo'), new Reference('b'))),
+                array('addEventListener', array(array('foo'), new Reference('a'))),
             ),
             $methodCalls
         );
@@ -138,16 +138,16 @@ public function testProcessEventListenersWithMultipleConnections()
 
         $this->assertEquals(
             array(
-                array('addEventListener', array('onFlush', new Reference('a'))),
-                array('addEventListener', array('onFlush', new Reference('b'))),
+                array('addEventListener', array(array('onFlush'), new Reference('a'))),
+                array('addEventListener', array(array('onFlush'), new Reference('b'))),
             ),
             $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls()
         );
 
         $this->assertEquals(
             array(
-                array('addEventListener', array('onFlush', new Reference('a'))),
-                array('addEventListener', array('onFlush', new Reference('c'))),
+                array('addEventListener', array(array('onFlush'), new Reference('a'))),
+                array('addEventListener', array(array('onFlush'), new Reference('c'))),
             ),
             $container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls()
         );