[EventDispatcher] added a way to set the priority for event subscribers

Author: fabpot

EventDispatcher.php

@@ -127,10 +127,14 @@ public function removeListener($eventName, $listener)
     /**
      * @see EventDispatcherInterface::addSubscriber
      */
-    public function addSubscriber(EventSubscriberInterface $subscriber, $priority = 0)
+    public function addSubscriber(EventSubscriberInterface $subscriber)
     {
-        foreach ($subscriber->getSubscribedEvents() as $eventName => $method) {
-            $this->addListener($eventName, array($subscriber, $method), $priority);
+        foreach ($subscriber->getSubscribedEvents() as $eventName => $params) {
+            if (is_string($params)) {
+                $this->addListener($eventName, array($subscriber, $params));
+            } else {
+                $this->addListener($eventName, array($subscriber, $params[0]), $params[1]);
+            }
         }
     }
 

EventDispatcherInterface.php

@@ -52,11 +52,10 @@ function addListener($eventName, $listener, $priority = 0);
      * interested in and added as a listener for these events.
      *
      * @param EventSubscriberInterface $subscriber The subscriber.
-     * @param integer $priority The higher this value, the earlier an event
-     *                          listener will be triggered in the chain.
-     *                          Defaults to 0.
+     *
+     * @api
      */
-    function addSubscriber(EventSubscriberInterface $subscriber, $priority = 0);
+    function addSubscriber(EventSubscriberInterface $subscriber);
 
     /**
      * Removes an event listener from the specified events.

EventSubscriberInterface.php

@@ -39,6 +39,16 @@ interface EventSubscriberInterface
     /**
      * Returns an array of event names this subscriber wants to listen to.
      *
+     * The array keys are event names and the value can be:
+     *
+     *  * The method name to call (priority defaults to 0)
+     *  * An array composed of the method name to call and the priority
+     *
+     * For instance:
+     *
+     *  * array('eventName' => 'methodName')
+     *  * array('eventName' => array('methodName', $priority))
+     *
      * @return array The event names to listen to
      */
     static function getSubscribedEvents();