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

[5.6] Event wildcard listeners cache to save on string operations #23299

Merged
merged 1 commit into from
Feb 26, 2018
+30 −4
Merged

[5.6] Event wildcard listeners cache to save on string operations #23299

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/Illuminate/Events/Dispatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ class Dispatcher implements DispatcherContract
*/
protected $wildcards = [];

/**
* Wildcard listeners cache which saves expensive string operations.
*
* @var array
*/
protected $wildcardsCache = [];

/**
* The queue resolver instance.
*
Expand Down Expand Up @@ -82,6 +89,8 @@ public function listen($events, $listener)
protected function setupWildcardListen($event, $listener)
{
$this->wildcards[$event][] = $this->makeListener($listener, true);

$this->wildcardsCache = [];
}

/**
Expand Down Expand Up @@ -281,9 +290,9 @@ public function getListeners($eventName)
{
$listeners = $this->listeners[$eventName] ?? [];

$listeners = array_merge(
$listeners, $this->getWildcardListeners($eventName)
);
$wildcardListeners = $this->wildcardsCache[$eventName] ?? $this->getWildcardListeners($eventName);

$listeners = array_merge($listeners, $wildcardListeners);

return class_exists($eventName, false)
? $this->addInterfaceListeners($eventName, $listeners)
Expand All @@ -306,7 +315,7 @@ protected function getWildcardListeners($eventName)
}
}

return $wildcards;
return $this->wildcardsCache[$eventName] = $wildcards;
}

/**
Expand Down
17 changes: 17 additions & 0 deletions tests/Events/EventsDispatcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,23 @@ public function testWildcardListeners()
$this->assertEquals('wildcard', $_SERVER['__event.test']);
}

public function testWildcardListenersCacheFlushing()
{
unset($_SERVER['__event.test']);
$d = new Dispatcher;
$d->listen('foo.*', function () {
$_SERVER['__event.test'] = 'cached_wildcard';
});
$d->fire('foo.bar');
$this->assertEquals('cached_wildcard', $_SERVER['__event.test']);

$d->listen('foo.*', function () {
$_SERVER['__event.test'] = 'new_wildcard';
});
$d->fire('foo.bar');
$this->assertEquals('new_wildcard', $_SERVER['__event.test']);
}

public function testListenersCanBeRemoved()
{
unset($_SERVER['__event.test']);
Expand Down