mirror of
https://github.com/flarum/core.git
synced 2025-08-03 15:07:53 +02:00
Apply fixes from StyleCI
This commit is contained in:
@@ -21,7 +21,6 @@ use Flarum\Frontend\AddLocaleAssets;
|
|||||||
use Flarum\Frontend\AddTranslations;
|
use Flarum\Frontend\AddTranslations;
|
||||||
use Flarum\Frontend\Asset\Css;
|
use Flarum\Frontend\Asset\Css;
|
||||||
use Flarum\Frontend\Asset\Js;
|
use Flarum\Frontend\Asset\Js;
|
||||||
use Flarum\Frontend\Asset\Type;
|
|
||||||
use Flarum\Frontend\Compiler\Source\SourceCollector;
|
use Flarum\Frontend\Compiler\Source\SourceCollector;
|
||||||
use Flarum\Frontend\RecompileFrontendAssets;
|
use Flarum\Frontend\RecompileFrontendAssets;
|
||||||
use Flarum\Http\Middleware as HttpMiddleware;
|
use Flarum\Http\Middleware as HttpMiddleware;
|
||||||
@@ -105,7 +104,7 @@ class AdminServiceProvider extends AbstractServiceProvider
|
|||||||
->ofType('css')
|
->ofType('css')
|
||||||
->first()
|
->first()
|
||||||
->addSource(function (SourceCollector $sources) {
|
->addSource(function (SourceCollector $sources) {
|
||||||
$sources->addFile(__DIR__ . '/../../less/admin.less');
|
$sources->addFile(__DIR__.'/../../less/admin.less');
|
||||||
});
|
});
|
||||||
|
|
||||||
/** @var LocaleManager $locales */
|
/** @var LocaleManager $locales */
|
||||||
|
@@ -22,7 +22,6 @@ use Flarum\Frontend\AddLocaleAssets;
|
|||||||
use Flarum\Frontend\AddTranslations;
|
use Flarum\Frontend\AddTranslations;
|
||||||
use Flarum\Frontend\Asset\Css;
|
use Flarum\Frontend\Asset\Css;
|
||||||
use Flarum\Frontend\Asset\Js;
|
use Flarum\Frontend\Asset\Js;
|
||||||
use Flarum\Frontend\Asset\Type;
|
|
||||||
use Flarum\Frontend\Assets;
|
use Flarum\Frontend\Assets;
|
||||||
use Flarum\Frontend\Compiler\Source\SourceCollector;
|
use Flarum\Frontend\Compiler\Source\SourceCollector;
|
||||||
use Flarum\Frontend\RecompileFrontendAssets;
|
use Flarum\Frontend\RecompileFrontendAssets;
|
||||||
|
@@ -37,13 +37,15 @@ class AddLocaleAssets
|
|||||||
$assets->localeCss([$this, 'getLocaleCss']);
|
$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) {
|
foreach ($this->locales->getJsFiles($locale) as $file) {
|
||||||
$sources->addFile($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) {
|
foreach ($this->locales->getCssFiles($locale) as $file) {
|
||||||
$sources->addFile($file);
|
$sources->addFile($file);
|
||||||
}
|
}
|
||||||
|
@@ -43,7 +43,8 @@ class AddTranslations
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getSources(SourceCollector $sources, string $locale) {
|
public function getSources(SourceCollector $sources, string $locale)
|
||||||
|
{
|
||||||
$sources->addString(function () use ($locale) {
|
$sources->addString(function () use ($locale) {
|
||||||
$translations = $this->getTranslations($locale);
|
$translations = $this->getTranslations($locale);
|
||||||
|
|
||||||
|
@@ -1,5 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Flarum.
|
||||||
|
*
|
||||||
|
* For detailed copyright and license information, please view the
|
||||||
|
* LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Flarum\Frontend\Asset;
|
namespace Flarum\Frontend\Asset;
|
||||||
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
@@ -1,5 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Flarum.
|
||||||
|
*
|
||||||
|
* For detailed copyright and license information, please view the
|
||||||
|
* LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Flarum\Frontend\Asset;
|
namespace Flarum\Frontend\Asset;
|
||||||
|
|
||||||
use Flarum\Frontend\Compiler\LessCompiler;
|
use Flarum\Frontend\Compiler\LessCompiler;
|
||||||
|
@@ -1,5 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Flarum.
|
||||||
|
*
|
||||||
|
* For detailed copyright and license information, please view the
|
||||||
|
* LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Flarum\Frontend\Asset;
|
namespace Flarum\Frontend\Asset;
|
||||||
|
|
||||||
use Flarum\Frontend\Compiler\JsCompiler;
|
use Flarum\Frontend\Compiler\JsCompiler;
|
||||||
|
@@ -1,5 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of Flarum.
|
||||||
|
*
|
||||||
|
* For detailed copyright and license information, please view the
|
||||||
|
* LICENSE file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
namespace Flarum\Frontend\Asset;
|
namespace Flarum\Frontend\Asset;
|
||||||
|
|
||||||
use Flarum\Frontend\Compiler\CompilerInterface;
|
use Flarum\Frontend\Compiler\CompilerInterface;
|
||||||
|
Reference in New Issue
Block a user