Unsubscribe one time event trap

mleko · Oct 16, 2016 · 6108f53 · 6108f53
1 parent 4d32281
commit 6108f53
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Listener/EventTrap.php b/src/Listener/EventTrap.php
@@ -33,8 +33,11 @@ public function __construct($oneTime = true)
      */
     public function handle($event, \Mleko\Narrator\Meta $meta)
     {
-        if ($this->oneTime && !empty($this->trappedEvents)) {
-            return;
+        if ($this->oneTime) {
+            $this->close($meta);
+            if (!empty($this->trappedEvents)) {
+                return;
+            }
         }
         $this->trappedEvents[] = $event;
     }
@@ -55,4 +58,13 @@ public function getFirstEvent()
         return isset($this->trappedEvents[0]) ? $this->trappedEvents[0] : null;
     }
 
+    /**
+     * @param \Mleko\Narrator\Meta $meta
+     * @return bool
+     */
+    public function close(\Mleko\Narrator\Meta $meta)
+    {
+        return $meta->getEventSource()->unsubscribe($meta->getMatchedName(), $this);
+    }
+
 }