github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-11 21:05:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid unnecessary event subscribers

Browse Source 
Refs #1578.
This commit is contained in:
Franz Liedke 2018-12-19 22:19:34 +01:00
parent c0a51b340b
commit fadf87470d
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/src/Discussion/DiscussionRenamedLogger.php
View File

@ -15,7 +15,6 @@ use Flarum\Discussion\Event\Renamed;
use Flarum\Notification\Blueprint\DiscussionRenamedBlueprint; use Flarum\Notification\Blueprint\DiscussionRenamedBlueprint;
use Flarum\Notification\NotificationSyncer; use Flarum\Notification\NotificationSyncer;
use Flarum\Post\DiscussionRenamedPost; use Flarum\Post\DiscussionRenamedPost;
use Illuminate\Contracts\Events\Dispatcher;
class DiscussionRenamedLogger class DiscussionRenamedLogger
{ {
@ -29,12 +28,7 @@ class DiscussionRenamedLogger
$this->notifications = $notifications; $this->notifications = $notifications;
} }
public function subscribe(Dispatcher $events) public function handle(Renamed $event)
{
$events->listen(Renamed::class, [$this, 'whenDiscussionWasRenamed']);
}
public function whenDiscussionWasRenamed(Renamed $event)
{ {
$post = DiscussionRenamedPost::reply( $post = DiscussionRenamedPost::reply(
$event->discussion->id, $event->discussion->id,

6
framework/core/src/Discussion/DiscussionServiceProvider.php
View File

@ -11,6 +11,7 @@
namespace Flarum\Discussion; namespace Flarum\Discussion;
use Flarum\Discussion\Event\Renamed;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
class DiscussionServiceProvider extends AbstractServiceProvider class DiscussionServiceProvider extends AbstractServiceProvider
@ -24,6 +25,9 @@ class DiscussionServiceProvider extends AbstractServiceProvider
$events->subscribe(DiscussionMetadataUpdater::class); $events->subscribe(DiscussionMetadataUpdater::class);
$events->subscribe(DiscussionPolicy::class); $events->subscribe(DiscussionPolicy::class);
$events->subscribe(DiscussionRenamedLogger::class);
$events->listen(
Renamed::class, DiscussionRenamedLogger::class
);
} }
} }

15
framework/core/src/Extension/DefaultLanguagePackGuard.php
View File

@ -14,7 +14,6 @@ namespace Flarum\Extension;
use Flarum\Extension\Event\Disabling; use Flarum\Extension\Event\Disabling;
use Flarum\Http\Exception\ForbiddenException; use Flarum\Http\Exception\ForbiddenException;
use Flarum\Settings\SettingsRepositoryInterface; use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;
class DefaultLanguagePackGuard class DefaultLanguagePackGuard
{ {
@ -28,19 +27,7 @@ class DefaultLanguagePackGuard
$this->settings = $settings; $this->settings = $settings;
} }
/** public function handle(Disabling $event)
* @param Dispatcher $events
*/
public function subscribe(Dispatcher $events)
{
$events->listen(Disabling::class, [$this, 'whenExtensionWillBeDisabled']);
}
/**
* @param Disabling $event
* @throws ForbiddenException
*/
public function whenExtensionWillBeDisabled(Disabling $event)
{ {
if (! in_array('flarum-locale', $event->extension->extra)) { if (! in_array('flarum-locale', $event->extension->extra)) {
return; return;

8
framework/core/src/Extension/ExtensionServiceProvider.php
View File

@ -11,6 +11,7 @@
namespace Flarum\Extension; namespace Flarum\Extension;
use Flarum\Extension\Event\Disabling;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
@ -38,8 +39,9 @@ class ExtensionServiceProvider extends AbstractServiceProvider
*/ */
public function boot() public function boot()
{ {
$events = $this->app->make('events'); $this->app->make('events')->listen(
Disabling::class,
$events->subscribe(DefaultLanguagePackGuard::class); DefaultLanguagePackGuard::class
);
} }
} }