merged branch drak/eventsubscriber_notice (PR #3900)

Commits ------- 57dd914 [EventDispatcher] Fixed E_NOTICES with multiple eventnames per subscriber with mixed priorities Discussion ---------- [EventDispatcher] Fixed E_NOTICES with multiple eventnames per subscriber Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - This fixes a case that was not covered by the existing tests.
symfony · Apr 12, 2012 · 3e410b8 · 3e410b8
2 parents c2aa255 + 0f40d22
commit 3e410b8
Show file tree

Hide file tree

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

diff --git a/tests/Symfony/Tests/Component/EventDispatcher/EventDispatcherTest.php b/tests/Symfony/Tests/Component/EventDispatcher/EventDispatcherTest.php
@@ -241,6 +241,9 @@ 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'),
+            );
     }
 }