Merge pull request #19670 from nextcloud/techdebt/noid/allow-to-remove-listeners

Allow to remove listeners

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/private/EventDispatcher/EventDispatcher.php b/lib/private/EventDispatcher/EventDispatcher.php
index 9baa8fc9516..4f83d15bffd 100644
--- a/lib/private/EventDispatcher/EventDispatcher.php
+++ b/lib/private/EventDispatcher/EventDispatcher.php
@@ -63,6 +63,11 @@ class EventDispatcher implements IEventDispatcher {
 		$this->dispatcher->addListener($eventName, $listener, $priority);
 	}
 
+	public function removeListener(string $eventName,
+								   callable $listener): void {
+		$this->dispatcher->removeListener($eventName, $listener);
+	}
+
 	public function addServiceListener(string $eventName,
 									   string $className,
 									   int $priority = 0): void {
diff --git a/lib/public/EventDispatcher/IEventDispatcher.php b/lib/public/EventDispatcher/IEventDispatcher.php
index e8b63e6f03c..e6e1bc5ce61 100644
--- a/lib/public/EventDispatcher/IEventDispatcher.php
+++ b/lib/public/EventDispatcher/IEventDispatcher.php
@@ -43,6 +43,14 @@ interface IEventDispatcher {
 	public function addListener(string $eventName, callable $listener, int $priority = 0): void;
 
 	/**
+	 * @param string $eventName preferably the fully-qualified class name of the Event sub class
+	 * @param callable $listener the object that is invoked when a matching event is dispatched
+	 *
+	 * @since 19.0.0
+	 */
+	public function removeListener(string $eventName, callable $listener): void;
+
+	/**
 	 * @param string $eventName preferably the fully-qualified class name of the Event sub class to listen for
 	 * @param string $className fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
 	 * @param int $priority