From 9abc63aaaca7d899ca2c54557cf848297dd7914d Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 24 Jun 2017 13:31:13 +0200 Subject: [PATCH] Move events to Flarum\Extension\Event namespace --- src/Admin/AdminServiceProvider.php | 8 ++--- src/Event/ExtensionWasUninstalled.php | 30 ------------------- .../Event/Disabled.php} | 4 +-- .../Event/Disabling.php} | 4 +-- .../Event/Enabled.php} | 4 +-- .../Event/Enabling.php} | 4 +-- src/Extension/Event/Uninstalled.php | 30 +++++++++++++++++++ src/Extension/ExtensionManager.php | 20 ++++++------- src/Formatter/FormatterServiceProvider.php | 8 ++--- src/Forum/ForumServiceProvider.php | 8 ++--- 10 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 src/Event/ExtensionWasUninstalled.php rename src/{Event/ExtensionWasEnabled.php => Extension/Event/Disabled.php} (90%) rename src/{Event/ExtensionWasDisabled.php => Extension/Event/Disabling.php} (90%) rename src/{Event/ExtensionWillBeEnabled.php => Extension/Event/Enabled.php} (90%) rename src/{Event/ExtensionWillBeDisabled.php => Extension/Event/Enabling.php} (89%) create mode 100644 src/Extension/Event/Uninstalled.php diff --git a/src/Admin/AdminServiceProvider.php b/src/Admin/AdminServiceProvider.php index 8d9b0cda1..f394637e2 100644 --- a/src/Admin/AdminServiceProvider.php +++ b/src/Admin/AdminServiceProvider.php @@ -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() diff --git a/src/Event/ExtensionWasUninstalled.php b/src/Event/ExtensionWasUninstalled.php deleted file mode 100644 index 4b50c4a64..000000000 --- a/src/Event/ExtensionWasUninstalled.php +++ /dev/null @@ -1,30 +0,0 @@ - - * - * 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; - } -} diff --git a/src/Event/ExtensionWasEnabled.php b/src/Extension/Event/Disabled.php similarity index 90% rename from src/Event/ExtensionWasEnabled.php rename to src/Extension/Event/Disabled.php index d593fad42..4dd56fe97 100644 --- a/src/Event/ExtensionWasEnabled.php +++ b/src/Extension/Event/Disabled.php @@ -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 diff --git a/src/Event/ExtensionWasDisabled.php b/src/Extension/Event/Disabling.php similarity index 90% rename from src/Event/ExtensionWasDisabled.php rename to src/Extension/Event/Disabling.php index a38bab60b..1660c684f 100644 --- a/src/Event/ExtensionWasDisabled.php +++ b/src/Extension/Event/Disabling.php @@ -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 diff --git a/src/Event/ExtensionWillBeEnabled.php b/src/Extension/Event/Enabled.php similarity index 90% rename from src/Event/ExtensionWillBeEnabled.php rename to src/Extension/Event/Enabled.php index 6bcaed507..d467b82fe 100644 --- a/src/Event/ExtensionWillBeEnabled.php +++ b/src/Extension/Event/Enabled.php @@ -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 diff --git a/src/Event/ExtensionWillBeDisabled.php b/src/Extension/Event/Enabling.php similarity index 89% rename from src/Event/ExtensionWillBeDisabled.php rename to src/Extension/Event/Enabling.php index e1deddba1..656dcd56f 100644 --- a/src/Event/ExtensionWillBeDisabled.php +++ b/src/Extension/Event/Enabling.php @@ -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 diff --git a/src/Extension/Event/Uninstalled.php b/src/Extension/Event/Uninstalled.php new file mode 100644 index 000000000..647269665 --- /dev/null +++ b/src/Extension/Event/Uninstalled.php @@ -0,0 +1,30 @@ + + * + * 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; + } +} diff --git a/src/Extension/ExtensionManager.php b/src/Extension/ExtensionManager.php index 69ab289d9..724250aec 100644 --- a/src/Extension/ExtensionManager.php +++ b/src/Extension/ExtensionManager.php @@ -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)); } /** diff --git a/src/Formatter/FormatterServiceProvider.php b/src/Formatter/FormatterServiceProvider.php index 60f43bc8f..de07468dd 100644 --- a/src/Formatter/FormatterServiceProvider.php +++ b/src/Formatter/FormatterServiceProvider.php @@ -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']); } /** diff --git a/src/Forum/ForumServiceProvider.php b/src/Forum/ForumServiceProvider.php index 69e684c22..8b96164a6 100644 --- a/src/Forum/ForumServiceProvider.php +++ b/src/Forum/ForumServiceProvider.php @@ -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()