Move events to Flarum\Extension\Event namespace

This commit is contained in:
Franz Liedke 2017-06-24 13:31:13 +02:00
parent 8c0459139d
commit aacf6f05d6
10 changed files with 60 additions and 60 deletions

View File

@ -11,8 +11,8 @@
namespace Flarum\Admin;
use Flarum\Event\ExtensionWasDisabled;
use Flarum\Event\ExtensionWasEnabled;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Settings\Event\Saved;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
@ -74,8 +74,8 @@ class AdminServiceProvider extends AbstractServiceProvider
{
$events = $this->app->make('events');
$events->listen(ExtensionWasEnabled::class, [$this, 'flushWebAppAssets']);
$events->listen(ExtensionWasDisabled::class, [$this, 'flushWebAppAssets']);
$events->listen(Enabled::class, [$this, 'flushWebAppAssets']);
$events->listen(Disabled::class, [$this, 'flushWebAppAssets']);
}
public function flushWebAppAssets()

View File

@ -1,30 +0,0 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Event;
use Flarum\Extension\Extension;
class ExtensionWasUninstalled
{
/**
* @var Extension
*/
public $extension;
/**
* @param Extension $extension
*/
public function __construct(Extension $extension)
{
$this->extension = $extension;
}
}

View File

@ -9,11 +9,11 @@
* file that was distributed with this source code.
*/
namespace Flarum\Event;
namespace Flarum\Extension\Event;
use Flarum\Extension\Extension;
class ExtensionWasEnabled
class Disabled
{
/**
* @var Extension

View File

@ -9,11 +9,11 @@
* file that was distributed with this source code.
*/
namespace Flarum\Event;
namespace Flarum\Extension\Event;
use Flarum\Extension\Extension;
class ExtensionWasDisabled
class Disabling
{
/**
* @var Extension

View File

@ -9,11 +9,11 @@
* file that was distributed with this source code.
*/
namespace Flarum\Event;
namespace Flarum\Extension\Event;
use Flarum\Extension\Extension;
class ExtensionWillBeEnabled
class Enabled
{
/**
* @var Extension

View File

@ -9,11 +9,11 @@
* file that was distributed with this source code.
*/
namespace Flarum\Event;
namespace Flarum\Extension\Event;
use Flarum\Extension\Extension;
class ExtensionWillBeDisabled
class Enabling
{
/**
* @var Extension

View File

@ -0,0 +1,30 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Extension\Event;
use Flarum\Extension\Extension;
class Uninstalled
{
/**
* @var Extension
*/
public $extension;
/**
* @param Extension $extension
*/
public function __construct(Extension $extension)
{
$this->extension = $extension;
}
}

View File

@ -12,11 +12,11 @@
namespace Flarum\Extension;
use Flarum\Database\Migrator;
use Flarum\Event\ExtensionWasDisabled;
use Flarum\Event\ExtensionWasEnabled;
use Flarum\Event\ExtensionWasUninstalled;
use Flarum\Event\ExtensionWillBeDisabled;
use Flarum\Event\ExtensionWillBeEnabled;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Extension\Event\Uninstalled;
use Flarum\Extension\Event\Disabling;
use Flarum\Extension\Event\Enabling;
use Flarum\Foundation\Application;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;
@ -115,7 +115,7 @@ class ExtensionManager
if (! $this->isEnabled($name)) {
$extension = $this->getExtension($name);
$this->dispatcher->fire(new ExtensionWillBeEnabled($extension));
$this->dispatcher->fire(new Enabling($extension));
$enabled = $this->getEnabled();
@ -129,7 +129,7 @@ class ExtensionManager
$extension->setEnabled(true);
$this->dispatcher->fire(new ExtensionWasEnabled($extension));
$this->dispatcher->fire(new Enabled($extension));
}
}
@ -145,7 +145,7 @@ class ExtensionManager
if (($k = array_search($name, $enabled)) !== false) {
$extension = $this->getExtension($name);
$this->dispatcher->fire(new ExtensionWillBeDisabled($extension));
$this->dispatcher->fire(new Disabling($extension));
unset($enabled[$k]);
@ -153,7 +153,7 @@ class ExtensionManager
$extension->setEnabled(false);
$this->dispatcher->fire(new ExtensionWasDisabled($extension));
$this->dispatcher->fire(new Disabled($extension));
}
}
@ -174,7 +174,7 @@ class ExtensionManager
$extension->setInstalled(false);
$this->dispatcher->fire(new ExtensionWasUninstalled($extension));
$this->dispatcher->fire(new Uninstalled($extension));
}
/**

View File

@ -11,8 +11,8 @@
namespace Flarum\Formatter;
use Flarum\Event\ExtensionWasDisabled;
use Flarum\Event\ExtensionWasEnabled;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Foundation\AbstractServiceProvider;
use Illuminate\Contracts\Container\Container;
use Illuminate\Contracts\Events\Dispatcher;
@ -24,8 +24,8 @@ class FormatterServiceProvider extends AbstractServiceProvider
*/
public function boot(Dispatcher $events)
{
$events->listen(ExtensionWasEnabled::class, [$this, 'flushFormatter']);
$events->listen(ExtensionWasDisabled::class, [$this, 'flushFormatter']);
$events->listen(Enabled::class, [$this, 'flushFormatter']);
$events->listen(Disabled::class, [$this, 'flushFormatter']);
}
/**

View File

@ -12,8 +12,8 @@
namespace Flarum\Forum;
use Flarum\Event\ConfigureForumRoutes;
use Flarum\Event\ExtensionWasDisabled;
use Flarum\Event\ExtensionWasEnabled;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Settings\Event\Saved;
use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Http\RouteHandlerFactory;
@ -93,8 +93,8 @@ class ForumServiceProvider extends AbstractServiceProvider
{
$events = $this->app->make('events');
$events->listen(ExtensionWasEnabled::class, [$this, 'flushWebAppAssets']);
$events->listen(ExtensionWasDisabled::class, [$this, 'flushWebAppAssets']);
$events->listen(Enabled::class, [$this, 'flushWebAppAssets']);
$events->listen(Disabled::class, [$this, 'flushWebAppAssets']);
}
public function flushWebAppAssets()