merged 2.0

symfony · Apr 12, 2012 · 085ec3b · 085ec3b
2 parents 68d2bb6 + 69f86e4
commit 085ec3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/EventDispatcher.php b/EventDispatcher.php
@@ -123,7 +123,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
             if (is_string($params)) {
                 $this->addListener($eventName, array($subscriber, $params));
             } elseif (is_string($params[0])) {
-                $this->addListener($eventName, array($subscriber, $params[0]), $params[1]);
+                $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);
             } else {
                 foreach ($params as $listener) {
                     $this->addListener($eventName, array($subscriber, $listener[0]), isset($listener[1]) ? $listener[1] : 0);

diff --git a/Tests/EventDispatcherTest.php b/Tests/EventDispatcherTest.php
@@ -278,7 +278,10 @@ class TestEventSubscriberWithPriorities implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return array('pre.foo' => array('preFoo', 10));
+        return array(
+            'pre.foo' => array('preFoo', 10),
+            'post.foo' => array('postFoo'),
+            );
     }
 }