Make StyleCI happy and fix some docblocks

This commit is contained in:
Franz Liedke 2016-05-27 09:07:49 +09:00
parent 2b9ec71a81
commit 0b0c1055d6
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
6 changed files with 9 additions and 15 deletions

View File

@ -14,9 +14,7 @@ use Flarum\Admin\WebApp;
use Flarum\Core\Permission;
use Flarum\Event\PrepareUnserializedSettings;
use Flarum\Extension\ExtensionManager;
use Flarum\Foundation\Application;
use Flarum\Http\Controller\AbstractWebAppController;
use Flarum\Locale\LocaleManager;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface;

View File

@ -97,7 +97,7 @@ class RevisionCompiler implements CompilerInterface
file_put_contents($file, $this->compile());
} else {
return null;
return;
}
}

View File

@ -12,8 +12,8 @@ namespace Flarum\Forum\Controller;
use Flarum\Api\Client as ApiClient;
use Flarum\Core\User;
use Flarum\Forum\WebApp;
use Flarum\Forum\UrlGenerator;
use Flarum\Forum\WebApp;
use Flarum\Http\Exception\RouteNotFoundException;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface as Request;

View File

@ -10,7 +10,6 @@
namespace Flarum\Http\WebApp;
use Flarum\Http\Controller;
use Flarum\Locale\LocaleManager;
use Flarum\Settings\SettingsRepositoryInterface;

View File

@ -28,17 +28,17 @@ class WebAppAssets
* @var Application
*/
protected $app;
/**
* @var Repository
*/
protected $cache;
/**
* @var LocaleManager
*/
protected $locales;
/**
* @param string $name
* @param Application $app
@ -52,7 +52,7 @@ class WebAppAssets
$this->cache = $cache;
$this->locales = $locales;
}
public function flush()
{
$this->flushJs();

View File

@ -12,10 +12,7 @@ namespace Flarum\Http\WebApp;
use Flarum\Api\Client;
use Flarum\Api\Serializer\AbstractSerializer;
use Flarum\Api\Serializer\CurrentUserSerializer;
use Flarum\Asset\CompilerInterface;
use Flarum\Core\Exception\ValidationException;
use Flarum\Core\User;
use Flarum\Locale\JsCompiler;
use Flarum\Locale\LocaleManager;
use Illuminate\View\Factory;
@ -113,7 +110,7 @@ class WebAppView
protected $localeCss;
/**
* @var ClientAssets
* @var WebAppAssets
*/
protected $assets;
@ -139,7 +136,7 @@ class WebAppView
/**
* @param string $layout
* @param ClientAssets $assets
* @param WebAppAssets $assets
* @param Client $api
* @param Factory $view
* @param LocaleManager $locales
@ -285,7 +282,7 @@ class WebAppView
return $view->render();
}
protected function buildTitle($forumTitle)
{
return ($this->title ? $this->title.' - ' : '').$forumTitle;