Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/WildcardEmitterTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,29 +126,28 @@ public function listeners(string $eventName): array
if (!\array_key_exists($eventName, $this->listenerIndex)) {
// Create a new index.
$listeners = [];
$listenersPriority = [];
if (isset($this->listeners[$eventName])) {
foreach ($this->listeners[$eventName] as $listener) {
$listenersPriority[] = $listener[0];
$listeners[] = $listener[1];
$listeners[] = $listener;
}
}

foreach ($this->wildcardListeners as $wcEvent => $wcListeners) {
// Wildcard match
if (\substr($eventName, 0, \strlen($wcEvent)) === $wcEvent) {
foreach ($wcListeners as $listener) {
$listenersPriority[] = $listener[0];
$listeners[] = $listener[1];
$listeners[] = $listener;
}
}
}

// Sorting by priority
\array_multisort($listenersPriority, SORT_NUMERIC, $listeners);
\usort($listeners, static function ($l1, $l2) {
return $l1[0] <=> $l2[0];
});

// Creating index
$this->listenerIndex[$eventName] = $listeners;
$this->listenerIndex[$eventName] = \array_column($listeners, 1);
}

return $this->listenerIndex[$eventName];
Expand Down