merged branch drak/eventsubscriber_notice (PR symfony#3900)

fabpot · fabpot · commit 3bd2e01ea700 · 2012-04-12T12:25:57.000+02:00
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.
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'),
+            );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber)`
`117`	`117`	`if (is_string($params)) {`
`118`	`118`	`$this->addListener($eventName, array($subscriber, $params));`
`119`	`119`	`} else {`
`120`		`- $this->addListener($eventName, array($subscriber, $params[0]), $params[1]);`
	`120`	`+ $this->addListener($eventName, array($subscriber, $params[0]), isset($params[1]) ? $params[1] : 0);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,9 @@ class TestEventSubscriberWithPriorities implements EventSubscriberInterface`
`241`	`241`	`{`
`242`	`242`	`public static function getSubscribedEvents()`
`243`	`243`	`{`
`244`		`- return array('pre.foo' => array('preFoo', 10));`
	`244`	`+ return array(`
	`245`	`+ 'pre.foo' => array('preFoo', 10),`
	`246`	`+ 'post.foo' => array('postFoo'),`
	`247`	`+ );`
`245`	`248`	`}`
`246`	`249`	`}`