github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-26 10:14:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Use lifecycle interface for frontend extender (#2211)" (#2301)

Browse Source 
This reverts commit 368a9836bd.
This commit is contained in:
Alexander Skvortsov 2020-09-23 00:21:45 -04:00 committed by GitHub
parent 39437ff1c9
commit ea7d31e15e
3 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Admin/AdminServiceProvider.php
View File

@ -9,6 +9,8 @@
namespace Flarum\Admin; namespace Flarum\Admin;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Foundation\ErrorHandling\Registry; use Flarum\Foundation\ErrorHandling\Registry;
use Flarum\Foundation\ErrorHandling\Reporter; use Flarum\Foundation\ErrorHandling\Reporter;
@ -116,7 +118,7 @@ class AdminServiceProvider extends AbstractServiceProvider
$events = $this->app->make('events'); $events = $this->app->make('events');
$events->listen( $events->listen(
ClearingCache::class, [Enabled::class, Disabled::class, ClearingCache::class],
function () { function () {
$recompile = new RecompileFrontendAssets( $recompile = new RecompileFrontendAssets(
$this->app->make('flarum.assets.admin'), $this->app->make('flarum.assets.admin'),

37
framework/core/src/Extend/Frontend.php
View File

@ -9,6 +9,8 @@
namespace Flarum\Extend; namespace Flarum\Extend;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Extension\Extension; use Flarum\Extension\Extension;
use Flarum\Foundation\Event\ClearingCache; use Flarum\Foundation\Event\ClearingCache;
use Flarum\Frontend\Assets; use Flarum\Frontend\Assets;
@ -21,7 +23,7 @@ use Flarum\Locale\LocaleManager;
use Flarum\Settings\Event\Saved; use Flarum\Settings\Event\Saved;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
class Frontend implements ExtenderInterface, LifecycleInterface class Frontend implements ExtenderInterface
{ {
private $frontend; private $frontend;
@ -113,9 +115,13 @@ class Frontend implements ExtenderInterface, LifecycleInterface
$events = $container->make('events'); $events = $container->make('events');
$events->listen( $events->listen(
ClearingCache::class, [Enabled::class, Disabled::class, ClearingCache::class],
function () use ($container) { function () use ($container, $abstract) {
$this->recompile($container); $recompile = new RecompileFrontendAssets(
$container->make($abstract),
$container->make(LocaleManager::class)
);
$recompile->flush();
} }
); );
@ -179,27 +185,4 @@ class Frontend implements ExtenderInterface, LifecycleInterface
{ {
return $extension ? $extension->getId() : 'site-custom'; return $extension ? $extension->getId() : 'site-custom';
} }
public function onEnable(Container $container, Extension $extension)
{
if (! empty($this->js) || ! empty($this->css)) {
$this->recompile($container);
}
}
public function onDisable(Container $container, Extension $extension)
{
if (! empty($this->js) || ! empty($this->css)) {
$this->recompile($container);
}
}
private function recompile($container)
{
$recompile = new RecompileFrontendAssets(
$container->make('flarum.assets.'.$this->frontend),
$container->make(LocaleManager::class)
);
$recompile->flush();
}
} }

4
framework/core/src/Forum/ForumServiceProvider.php
View File

@ -9,6 +9,8 @@
namespace Flarum\Forum; namespace Flarum\Forum;
use Flarum\Extension\Event\Disabled;
use Flarum\Extension\Event\Enabled;
use Flarum\Formatter\Formatter; use Flarum\Formatter\Formatter;
use Flarum\Foundation\AbstractServiceProvider; use Flarum\Foundation\AbstractServiceProvider;
use Flarum\Foundation\ErrorHandling\Registry; use Flarum\Foundation\ErrorHandling\Registry;
@ -132,7 +134,7 @@ class ForumServiceProvider extends AbstractServiceProvider
$events = $this->app->make('events'); $events = $this->app->make('events');
$events->listen( $events->listen(
ClearingCache::class, [Enabled::class, Disabled::class, ClearingCache::class],
function () { function () {
$recompile = new RecompileFrontendAssets( $recompile = new RecompileFrontendAssets(
$this->app->make('flarum.assets.forum'), $this->app->make('flarum.assets.forum'),