From b7c583b20836d09f143c417e03403b3ba0561b53 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Tue, 26 Jul 2022 00:25:09 +0000 Subject: [PATCH] Apply fixes from StyleCI --- framework/core/src/Admin/AdminServiceProvider.php | 3 +-- framework/core/src/Forum/ForumServiceProvider.php | 1 - framework/core/src/Frontend/AddLocaleAssets.php | 6 ++++-- framework/core/src/Frontend/AddTranslations.php | 3 ++- framework/core/src/Frontend/Asset/AssetCollection.php | 7 +++++++ framework/core/src/Frontend/Asset/Css.php | 7 +++++++ framework/core/src/Frontend/Asset/Js.php | 7 +++++++ framework/core/src/Frontend/Asset/Type.php | 9 ++++++++- 8 files changed, 36 insertions(+), 7 deletions(-) diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php index 58139cb9e..02710e5a0 100644 --- a/framework/core/src/Admin/AdminServiceProvider.php +++ b/framework/core/src/Admin/AdminServiceProvider.php @@ -21,7 +21,6 @@ use Flarum\Frontend\AddLocaleAssets; use Flarum\Frontend\AddTranslations; use Flarum\Frontend\Asset\Css; use Flarum\Frontend\Asset\Js; -use Flarum\Frontend\Asset\Type; use Flarum\Frontend\Compiler\Source\SourceCollector; use Flarum\Frontend\RecompileFrontendAssets; use Flarum\Http\Middleware as HttpMiddleware; @@ -105,7 +104,7 @@ class AdminServiceProvider extends AbstractServiceProvider ->ofType('css') ->first() ->addSource(function (SourceCollector $sources) { - $sources->addFile(__DIR__ . '/../../less/admin.less'); + $sources->addFile(__DIR__.'/../../less/admin.less'); }); /** @var LocaleManager $locales */ diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php index 27cb41704..3108823fc 100644 --- a/framework/core/src/Forum/ForumServiceProvider.php +++ b/framework/core/src/Forum/ForumServiceProvider.php @@ -22,7 +22,6 @@ use Flarum\Frontend\AddLocaleAssets; use Flarum\Frontend\AddTranslations; use Flarum\Frontend\Asset\Css; use Flarum\Frontend\Asset\Js; -use Flarum\Frontend\Asset\Type; use Flarum\Frontend\Assets; use Flarum\Frontend\Compiler\Source\SourceCollector; use Flarum\Frontend\RecompileFrontendAssets; diff --git a/framework/core/src/Frontend/AddLocaleAssets.php b/framework/core/src/Frontend/AddLocaleAssets.php index e020ee064..4793962ff 100644 --- a/framework/core/src/Frontend/AddLocaleAssets.php +++ b/framework/core/src/Frontend/AddLocaleAssets.php @@ -37,13 +37,15 @@ class AddLocaleAssets $assets->localeCss([$this, 'getLocaleCss']); } - public function getLocaleJs(SourceCollector $sources, string $locale) { + public function getLocaleJs(SourceCollector $sources, string $locale) + { foreach ($this->locales->getJsFiles($locale) as $file) { $sources->addFile($file); } } - public function getLocaleCss(SourceCollector $sources, string $locale) { + public function getLocaleCss(SourceCollector $sources, string $locale) + { foreach ($this->locales->getCssFiles($locale) as $file) { $sources->addFile($file); } diff --git a/framework/core/src/Frontend/AddTranslations.php b/framework/core/src/Frontend/AddTranslations.php index d7b581a9a..d7737d9ed 100644 --- a/framework/core/src/Frontend/AddTranslations.php +++ b/framework/core/src/Frontend/AddTranslations.php @@ -43,7 +43,8 @@ class AddTranslations return $this; } - public function getSources(SourceCollector $sources, string $locale) { + public function getSources(SourceCollector $sources, string $locale) + { $sources->addString(function () use ($locale) { $translations = $this->getTranslations($locale); diff --git a/framework/core/src/Frontend/Asset/AssetCollection.php b/framework/core/src/Frontend/Asset/AssetCollection.php index 86e325cfa..3db89bdcf 100644 --- a/framework/core/src/Frontend/Asset/AssetCollection.php +++ b/framework/core/src/Frontend/Asset/AssetCollection.php @@ -1,5 +1,12 @@