github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Make StyleCI happy and fix some docblocks

Browse Source
This commit is contained in:
Franz Liedke 2016-05-27 09:07:49 +09:00
parent e41a427a6b
commit 558f2103ef
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Admin/Controller/WebAppController.php
View File

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

2
framework/core/src/Asset/RevisionCompiler.php
View File

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

2
framework/core/src/Forum/Controller/DiscussionController.php
View File

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

1
framework/core/src/Http/WebApp/AbstractWebApp.php
View File

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

8
framework/core/src/Http/WebApp/WebAppAssets.php
View File

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

9
framework/core/src/Http/WebApp/WebAppView.php
View File

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