Apply fixes from StyleCI (#1518)

[ci skip] [skip ci]
This commit is contained in:
Franz Liedke 2018-07-23 16:25:12 +02:00 committed by GitHub
parent a0741f801b
commit 10d39cb06d

View File

@ -14,7 +14,6 @@ namespace Flarum\Extend;
use Flarum\Extension\Extension; use Flarum\Extension\Extension;
use Flarum\Frontend\Asset\ExtensionAssets; use Flarum\Frontend\Asset\ExtensionAssets;
use Flarum\Frontend\CompilerFactory; use Flarum\Frontend\CompilerFactory;
use Flarum\Http\RouteCollection;
use Flarum\Http\RouteHandlerFactory; use Flarum\Http\RouteHandlerFactory;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
@ -46,50 +45,50 @@ class Frontend implements ExtenderInterface
} }
public function route($path, $name, $content = null) public function route($path, $name, $content = null)
{ {
$this->routes[] = compact('path', 'name', 'content'); $this->routes[] = compact('path', 'name', 'content');
return $this; return $this;
} }
public function __invoke(Container $container, Extension $extension = null) public function __invoke(Container $container, Extension $extension = null)
{ {
$this->registerAssets($container, $extension); $this->registerAssets($container, $extension);
$this->registerRoutes($container); $this->registerRoutes($container);
} }
private function registerAssets(Container $container, Extension $extension) private function registerAssets(Container $container, Extension $extension)
{ {
if (empty($this->css) && empty($this->js)) { if (empty($this->css) && empty($this->js)) {
return; return;
} }
$container->resolving( $container->resolving(
"flarum.$this->frontend.assets", "flarum.$this->frontend.assets",
function (CompilerFactory $assets) use ($extension) { function (CompilerFactory $assets) use ($extension) {
$assets->add(function () use ($extension) { $assets->add(function () use ($extension) {
return new ExtensionAssets( return new ExtensionAssets(
$extension, $this->css, $this->js $extension, $this->css, $this->js
); );
}); });
} }
); );
} }
private function registerRoutes(Container $container) private function registerRoutes(Container $container)
{ {
if (empty($this->routes)) { if (empty($this->routes)) {
return; return;
} }
$routes = $container->make("flarum.$this->frontend.routes"); $routes = $container->make("flarum.$this->frontend.routes");
$factory = $container->make(RouteHandlerFactory::class); $factory = $container->make(RouteHandlerFactory::class);
foreach ($this->routes as $route) { foreach ($this->routes as $route) {
$routes->get( $routes->get(
$route['path'], $route['name'], $route['path'], $route['name'],
$factory->toForum($route['content']) $factory->toForum($route['content'])
); );
} }
} }
} }