Fixed faulty loop management when unsubscribing listeners

[Closes #90]
Kdyby · May 13, 2017 · 2a7dfe4 · Majkl578 · May 13, 2017 · fprochazka
1 parent fb88e44
commit 2a7dfe4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Kdyby/Events/EventManager.php b/src/Kdyby/Events/EventManager.php
@@ -218,12 +218,16 @@ public function removeEventListener($unsubscribe, $subscriber = NULL)
 			foreach ($this->listeners[$eventName] as $priority => $listeners) {
 				foreach ($listeners as $k => $listener) {
 					if (!($listener == $subscriber || (is_array($listener) && $listener[0] == $subscriber))) {
-						continue(2);
+						continue;
 					}
 					$key = $k;
 					break;
 				}
 
+				if (!isset($key)) {
+					continue;
+				}
+
 				unset($this->listeners[$eventName][$priority][$key]);
 				if (empty($this->listeners[$eventName][$priority])) {
 					unset($this->listeners[$eventName][$priority]);
@@ -237,6 +241,7 @@ public function removeEventListener($unsubscribe, $subscriber = NULL)
 					unset($this->sorted[$eventName]);
 				}
 
+				unset($key);
 			}
 		}
 	}

diff --git a/tests/KdybyTests/Events/EventManager.phpt b/tests/KdybyTests/Events/EventManager.phpt
@@ -161,6 +161,21 @@ class EventManagerTest extends Tester\TestCase
 	}
 
 
+
+	public function testRemovingListenersIssue90()
+	{
+		$listener1 = new EventListenerMock();
+		$listener2 = new EventListenerMock2();
+		$this->manager->addEventListener('onFoo', $listener1);
+		$this->manager->addEventListener('onFoo', $listener2);
+		Assert::count(2, $this->manager->getListeners('onFoo'));
+
+		$this->manager->removeEventListener('onFoo', $listener2);
+		Assert::count(1, $this->manager->getListeners('onFoo'));
+		Assert::same(['onFoo' => [$listener1]], $this->manager->getListeners());
+	}
+
+
 	public function testListenerDontHaveRequiredMethodException()
 	{
 		$evm = $this->manager;