Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove state property in PrioritizedListenersForEvent #102

Merged
merged 1 commit into from Oct 29, 2022
Merged

Remove state property in PrioritizedListenersForEvent #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 14 additions & 40 deletions src/PrioritizedListenersForEvent.php
View file
Open in desktop
Expand Up @@ -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;
}
}
2 changes: 2 additions & 0 deletions src/PrioritizedListenersForEventTest.php
View file
Open in desktop
Expand Up @@ -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
Expand Down