From 798bcaa5f4e77b71fe250751794e8ac6b93b5200 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 27 Jul 2015 11:53:47 +0930 Subject: [PATCH] PERF: avoid reinstantiation of event subscribers --- .../Core/Activity/Listeners/UserActivitySyncer.php | 10 +++++----- .../Listeners/DiscussionMetadataUpdater.php | 8 ++++---- .../Listeners/DiscussionRenamedNotifier.php | 2 +- .../Core/Users/Listeners/EmailConfirmationMailer.php | 4 ++-- .../src/Core/Users/Listeners/UserMetadataUpdater.php | 12 ++++++------ .../extension/src/Listeners/AddClientAssets.php | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/framework/core/src/Core/Activity/Listeners/UserActivitySyncer.php b/framework/core/src/Core/Activity/Listeners/UserActivitySyncer.php index 2aebbcd3e..fa8f70c4e 100755 --- a/framework/core/src/Core/Activity/Listeners/UserActivitySyncer.php +++ b/framework/core/src/Core/Activity/Listeners/UserActivitySyncer.php @@ -33,11 +33,11 @@ class UserActivitySyncer */ public function subscribe(Dispatcher $events) { - $events->listen('Flarum\Events\PostWasPosted', __CLASS__.'@whenPostWasPosted'); - $events->listen('Flarum\Events\PostWasHidden', __CLASS__.'@whenPostWasHidden'); - $events->listen('Flarum\Events\PostWasRestored', __CLASS__.'@whenPostWasRestored'); - $events->listen('Flarum\Events\PostWasDeleted', __CLASS__.'@whenPostWasDeleted'); - $events->listen('Flarum\Events\UserWasRegistered', __CLASS__.'@whenUserWasRegistered'); + $events->listen('Flarum\Events\PostWasPosted', [$this, 'whenPostWasPosted']); + $events->listen('Flarum\Events\PostWasHidden', [$this, 'whenPostWasHidden']); + $events->listen('Flarum\Events\PostWasRestored', [$this, 'whenPostWasRestored']); + $events->listen('Flarum\Events\PostWasDeleted', [$this, 'whenPostWasDeleted']); + $events->listen('Flarum\Events\UserWasRegistered', [$this, 'whenUserWasRegistered']); } /** diff --git a/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php b/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php index 30414333f..b9f3dd498 100755 --- a/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php +++ b/framework/core/src/Core/Discussions/Listeners/DiscussionMetadataUpdater.php @@ -14,10 +14,10 @@ class DiscussionMetadataUpdater */ public function subscribe(Dispatcher $events) { - $events->listen(PostWasPosted::class, __CLASS__.'@whenPostWasPosted'); - $events->listen(PostWasDeleted::class, __CLASS__.'@whenPostWasDeleted'); - $events->listen(PostWasHidden::class, __CLASS__.'@whenPostWasHidden'); - $events->listen(PostWasRestored::class, __CLASS__.'@whenPostWasRestored'); + $events->listen(PostWasPosted::class, [$this, 'whenPostWasPosted']); + $events->listen(PostWasDeleted::class, [$this, 'whenPostWasDeleted']); + $events->listen(PostWasHidden::class, [$this, 'whenPostWasHidden']); + $events->listen(PostWasRestored::class, [$this, 'whenPostWasRestored']); } /** diff --git a/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php b/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php index c8276c7a8..ccef4699c 100755 --- a/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php +++ b/framework/core/src/Core/Notifications/Listeners/DiscussionRenamedNotifier.php @@ -26,7 +26,7 @@ class DiscussionRenamedNotifier */ public function subscribe(Dispatcher $events) { - $events->listen(DiscussionWasRenamed::class, __CLASS__.'@whenDiscussionWasRenamed'); + $events->listen(DiscussionWasRenamed::class, [$this, 'whenDiscussionWasRenamed']); } /** diff --git a/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php b/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php index d6b70b91e..b10fbef76 100755 --- a/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php +++ b/framework/core/src/Core/Users/Listeners/EmailConfirmationMailer.php @@ -37,8 +37,8 @@ class EmailConfirmationMailer */ public function subscribe(Dispatcher $events) { - $events->listen(UserWasRegistered::class, __CLASS__.'@whenUserWasRegistered'); - $events->listen(UserEmailChangeWasRequested::class, __CLASS__.'@whenUserEmailChangeWasRequested'); + $events->listen(UserWasRegistered::class, [$this, 'whenUserWasRegistered']); + $events->listen(UserEmailChangeWasRequested::class, [$this, 'whenUserEmailChangeWasRequested']); } /** diff --git a/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php b/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php index 2687bb310..54fd8d40d 100755 --- a/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php +++ b/framework/core/src/Core/Users/Listeners/UserMetadataUpdater.php @@ -16,12 +16,12 @@ class UserMetadataUpdater */ public function subscribe(Dispatcher $events) { - $events->listen(PostWasPosted::class, __CLASS__.'@whenPostWasPosted'); - $events->listen(PostWasDeleted::class, __CLASS__.'@whenPostWasDeleted'); - $events->listen(PostWasHidden::class, __CLASS__.'@whenPostWasHidden'); - $events->listen(PostWasRestored::class, __CLASS__.'@whenPostWasRestored'); - $events->listen(DiscussionWasStarted::class, __CLASS__.'@whenDiscussionWasStarted'); - $events->listen(DiscussionWasDeleted::class, __CLASS__.'@whenDiscussionWasDeleted'); + $events->listen(PostWasPosted::class, [$this, 'whenPostWasPosted']); + $events->listen(PostWasDeleted::class, [$this, 'whenPostWasDeleted']); + $events->listen(PostWasHidden::class, [$this, 'whenPostWasHidden']); + $events->listen(PostWasRestored::class, [$this, 'whenPostWasRestored']); + $events->listen(DiscussionWasStarted::class, [$this, 'whenDiscussionWasStarted']); + $events->listen(DiscussionWasDeleted::class, [$this, 'whenDiscussionWasDeleted']); } /** diff --git a/framework/core/stubs/extension/src/Listeners/AddClientAssets.php b/framework/core/stubs/extension/src/Listeners/AddClientAssets.php index a342bd216..d7cb41a02 100755 --- a/framework/core/stubs/extension/src/Listeners/AddClientAssets.php +++ b/framework/core/stubs/extension/src/Listeners/AddClientAssets.php @@ -8,8 +8,8 @@ class AddClientAssets { public function subscribe(Dispatcher $events) { - $events->listen(RegisterLocales::class, __CLASS__.'@addLocale'); - $events->listen(BuildClientView::class, __CLASS__.'@addAssets'); + $events->listen(RegisterLocales::class, [$this, 'addLocale']); + $events->listen(BuildClientView::class, [$this, 'addAssets']); } public function addLocale(RegisterLocales $event)