[EventDispatcher] Moves the logic of addSubscriberService to the compiler pass

Nicofuma · Nicofuma · commit f13cbb982873 · 2014-09-29T16:11:50.000+02:00
diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -144,7 +144,7 @@ public function addSubscriberService($serviceId, $class)
                 $this->listenerIds[$eventName][] = array($serviceId, $params, 0);
             } elseif (is_string($params[0])) {
                 $this->listenerIds[$eventName][] = array($serviceId, $params[0], isset($params[1]) ? $params[1] : 0);
-            } else {
+            } elseif (is_array($params[0])) {
                 foreach ($params as $listener) {
                     $this->listenerIds[$eventName][] = array($serviceId, $listener[0], isset($listener[1]) ? $listener[1] : 0);
                 }
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -100,7 +100,17 @@ public function process(ContainerBuilder $container)
                 throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
             }
 
-            $definition->addMethodCall('addSubscriberService', array($id, $class));
+            foreach ($class::getSubscribedEvents() as $eventName => $params) {
+                if (is_string($params)) {
+                    $definition->addMethodCall('addListenerService', array($eventName, array($id, $params), 0));
+                } elseif (is_string($params[0])) {
+                    $definition->addMethodCall('addListenerService', array($eventName, array($id, $params[0]), isset($params[1]) ? $params[1] : 0));
+                } elseif (is_array($params[0])) {
+                    foreach ($params as $listener) {
+                        $definition->addMethodCall('addListenerService', array($eventName, array($id, $listener[0]), isset($listener[1]) ? $listener[1] : 0));
+                    }
+                }
+            }
         }
     }
 }
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -138,5 +138,6 @@ class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubsc
 {
     public static function getSubscribedEvents()
     {
+        return array();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function addSubscriberService($serviceId, $class)`
`144`	`144`	`$this->listenerIds[$eventName][] = array($serviceId, $params, 0);`
`145`	`145`	`} elseif (is_string($params[0])) {`
`146`	`146`	`$this->listenerIds[$eventName][] = array($serviceId, $params[0], isset($params[1]) ? $params[1] : 0);`
`147`		`- } else {`
	`147`	`+ } elseif (is_array($params[0])) {`
`148`	`148`	`foreach ($params as $listener) {`
`149`	`149`	`$this->listenerIds[$eventName][] = array($serviceId, $listener[0], isset($listener[1]) ? $listener[1] : 0);`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,17 @@ public function process(ContainerBuilder $container)`
`100`	`100`	`throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));`
`101`	`101`	`}`
`102`	`102`
`103`		`- $definition->addMethodCall('addSubscriberService', array($id, $class));`
	`103`	`+ foreach ($class::getSubscribedEvents() as $eventName => $params) {`
	`104`	`+ if (is_string($params)) {`
	`105`	`+ $definition->addMethodCall('addListenerService', array($eventName, array($id, $params), 0));`
	`106`	`+ } elseif (is_string($params[0])) {`
	`107`	`+ $definition->addMethodCall('addListenerService', array($eventName, array($id, $params[0]), isset($params[1]) ? $params[1] : 0));`
	`108`	`+ } elseif (is_array($params[0])) {`
	`109`	`+ foreach ($params as $listener) {`
	`110`	`+ $definition->addMethodCall('addListenerService', array($eventName, array($id, $listener[0]), isset($listener[1]) ? $listener[1] : 0));`
	`111`	`+ }`
	`112`	`+ }`
	`113`	`+ }`
`104`	`114`	`}`
`105`	`115`	`}`
`106`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,6 @@ class SubscriberService implements \Symfony\Component\EventDispatcher\EventSubsc`
`138`	`138`	`{`
`139`	`139`	`public static function getSubscribedEvents()`
`140`	`140`	`{`
	`141`	`+ return array();`
`141`	`142`	`}`
`142`	`143`	`}`