Merge pull request #87 from matej21/fix/removing_listeners

EventManager::removeEventListener: fixed emptying list of sorted events
Kdyby · Nov 28, 2015 · ab9fcb1 · ab9fcb1
2 parents 37a96e5 + 43b4279
commit ab9fcb1
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 2 deletions.
diff --git a/src/Kdyby/Events/EventManager.php b/src/Kdyby/Events/EventManager.php
@@ -222,10 +222,13 @@ public function removeEventListener($unsubscribe, $subscriber = NULL)
 				}
 				if (empty($this->listeners[$eventName])) {
 					unset($this->listeners[$eventName]);
+					// there are no listeners for this specific event, so no reason to call sort on next dispatch
+					$this->sorted[$eventName] = array();
+				} else {
+					// otherwise it needs to be sorted again
+					unset($this->sorted[$eventName]);
 				}
 
-				// there are no listeners for this specific event, so no reason to call sort on next dispatch
-				$this->sorted[$eventName] = array();
 			}
 		}
 	}

diff --git a/tests/KdybyTests/Events/EventManager.phpt b/tests/KdybyTests/Events/EventManager.phpt
@@ -79,6 +79,25 @@ class EventManagerTest extends Tester\TestCase
 
 
 
+	public function testRemovingSomeListeners()
+	{
+		$listener = new EventListenerMock();
+		$this->manager->addEventListener('onFoo', $listener);
+		$this->manager->addEventListener('onBar', $listener);
+		$listener2 = new EventListenerMock2();
+		$this->manager->addEventListener('onFoo', $listener2);
+		$this->manager->addEventListener('onBar', $listener2);
+		Assert::count(2, $this->manager->getListeners('onFoo'));
+		Assert::count(2, $this->manager->getListeners('onBar'));
+
+		$this->manager->removeEventListener($listener);
+		$this->manager->removeEventListener('onFoo', $listener2);
+		Assert::count(0, $this->manager->getListeners('onFoo'));
+		Assert::count(1, $this->manager->getListeners('onBar'));
+		Assert::same(array('onBar' => array($listener2)), $this->manager->getListeners());
+	}
+
+
 	public function testListenerDontHaveRequiredMethodException()
 	{
 		$evm = $this->manager;

diff --git a/tests/KdybyTests/Events/mocks.php b/tests/KdybyTests/Events/mocks.php
@@ -201,6 +201,37 @@ public function onBar(EventArgsMock $args)
 
 
 
+/**
+ * @author Filip Procházka <[email protected]>
+ */
+class EventListenerMock2 extends Nette\Object implements Kdyby\Events\Subscriber
+{
+
+	/**
+	 * @return array
+	 */
+	public function getSubscribedEvents()
+	{
+		return array(
+				'onFoo',
+				'onBar'
+		);
+	}
+
+
+	public function onFoo()
+	{
+	}
+
+
+	public function onBar()
+	{
+	}
+
+}
+
+
+
 /**
  * @author Filip Procházka <[email protected]>
  */