Merge pull request #102 from wenbinye/fix-event-listeners

Remove state property in PrioritizedListenersForEvent
thephpleague · Oct 29, 2022 · ed612ec · ed612ec
2 parents a9764f4 + 9ef6813
commit ed612ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 40 deletions.
diff --git a/src/PrioritizedListenersForEvent.php b/src/PrioritizedListenersForEvent.php
@@ -13,61 +13,35 @@ class PrioritizedListenersForEvent
 {
     /** @var array<int, array<int,callable>> */
     private $listeners = [];
-    /** @var array<int,callable> */
-    private $sortedListeners = [];
-    /** @var bool */
-    private $isSorted = false;
-    /** @var bool */
-    private $containsOneTimeListener = false;
+    /** @var array<int,callable>|null */
+    private $sortedListeners;
 
     public function addListener(callable $listener, int $priority): void
     {
-        $this->isSorted = false;
+        $this->sortedListeners = null;
         $this->listeners[$priority][] = $listener;
-
-        if ($listener instanceof OneTimeListener) {
-            $this->containsOneTimeListener = true;
-        }
     }
 
     public function getListeners(): iterable
     {
-        if ($this->isSorted === false) {
-            $this->sortListeners();
-        }
-
-        $listeners = $this->sortedListeners;
-
-        if ($this->containsOneTimeListener) {
-            $this->removeOneTimeListeners();
-        }
-
-        return $listeners;
+        return $this->sortedListeners ?? $this->sortListeners();
     }
 
-    private function sortListeners(): void
+    private function sortListeners(): array
     {
-        $this->isSorted = true;
-        $this->sortedListeners = [];
+        $filter = static function ($listener): bool {
+            return $listener instanceof OneTimeListener === false;
+        };
         krsort($this->listeners, SORT_NUMERIC);
-
-        foreach ($this->listeners as $group) {
+        $listeners = [];
+        foreach ($this->listeners as $priority => $group) {
             foreach ($group as $listener) {
-                $this->sortedListeners[] = $listener;
+                $listeners[] = $listener;
             }
+            $this->listeners[$priority] = array_filter($group, $filter);
         }
-    }
-
-    private function removeOneTimeListeners(): void
-    {
-        $filter = static function ($listener): bool {
-            return $listener instanceof OneTimeListener === false;
-        };
-
-        $this->sortedListeners = array_filter($this->sortedListeners, $filter);
+        $this->sortedListeners = array_filter($listeners, $filter);
 
-        foreach ($this->listeners as $priority => $listeners) {
-            $this->listeners[$priority] = array_filter($listeners, $filter);
-        }
+        return $listeners;
     }
 }
diff --git a/src/PrioritizedListenersForEventTest.php b/src/PrioritizedListenersForEventTest.php
@@ -28,6 +28,8 @@ public function testOneTimeListener(): void
         $listener2 = $group->getListeners();
         $this->assertCount(3, $listener2);
         $this->assertEquals([4, 2, 1], self::inspectListener($listener2));
+        $listener3 = $group->getListeners();
+        $this->assertEquals([4, 2, 1], self::inspectListener($listener3));
     }
 
     public static function inspectListener(iterable $listeners): array