bug #11475 [EventDispatcher] don't count empty listeners (xabbuh)

fabpot · fabpot · commit 24cd42555c39 · 2014-07-27T10:29:33.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [EventDispatcher] don't count empty listeners | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #11444 | License | MIT | Doc PR | When event listeners for certain events are removed from the event dispatcher, empty arrays are not being removed. Therefore, counting on empty arrays leads to wrong results of the hasListeners() method. Thanks to @mlindenb for discovering this an proposing a solution. Commits ------- fdbb04a [EventDispatcher] don't count empty listeners
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -74,7 +74,7 @@ public function getListeners($eventName = null)
             }
         }
 
-        return $this->sorted;
+        return array_filter($this->sorted);
     }
 
     /**
diff --git a/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
@@ -23,6 +23,9 @@ class EventDispatcherTest extends \PHPUnit_Framework_TestCase
     const preBar = 'pre.bar';
     const postBar = 'post.bar';
 
+    /**
+     * @var \Symfony\Component\EventDispatcher\EventDispatcher
+     */
     private $dispatcher;
 
     private $listener;
@@ -261,6 +264,28 @@ public function testWorkaroundForPhpBug62976()
         $dispatcher->removeListener('bug.62976', function () {});
         $this->assertTrue($dispatcher->hasListeners('bug.62976'));
     }
+
+    public function testHasListenersWhenAddedCallbackListenerIsRemoved()
+    {
+        $listener = function () {};
+        $this->dispatcher->addListener('foo', $listener);
+        $this->dispatcher->removeListener('foo', $listener);
+        $this->assertFalse($this->dispatcher->hasListeners());
+    }
+
+    public function testGetListenersWhenAddedCallbackListenerIsRemoved()
+    {
+        $listener = function () {};
+        $this->dispatcher->addListener('foo', $listener);
+        $this->dispatcher->removeListener('foo', $listener);
+        $this->assertSame(array(), $this->dispatcher->getListeners());
+    }
+
+    public function testHasListenersWithoutEventsReturnsFalseAfterHasListenersWithEventHasBeenCalled()
+    {
+        $this->assertFalse($this->dispatcher->hasListeners('foo'));
+        $this->assertFalse($this->dispatcher->hasListeners());
+    }
 }
 
 class CallableClass

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function getListeners($eventName = null)`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- return $this->sorted;`
	`77`	`+ return array_filter($this->sorted);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`/**`