add PSR 2 compliance

This commit is contained in:
Simon Vieille 2020-08-13 11:21:59 +02:00
parent ef72c00fbb
commit e4abc5b43f
Signed by: deblan
GPG key ID: 03383D15A1D31745
5 changed files with 18 additions and 24 deletions

View file

@ -18,12 +18,12 @@
namespace OCA\SideMenu\Controller; namespace OCA\SideMenu\Controller;
use OC;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig; use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
use OC;
use OCP\IUserSession; use OCP\IUserSession;
class CssController extends Controller class CssController extends Controller
@ -35,8 +35,6 @@ class CssController extends Controller
/** /**
* @param string $appName * @param string $appName
* @param IRequest $request
* @param IConfig $config
*/ */
public function __construct($appName, IRequest $request, IConfig $config) public function __construct($appName, IRequest $request, IConfig $config)
{ {

View file

@ -18,17 +18,16 @@
namespace OCA\SideMenu\Controller; namespace OCA\SideMenu\Controller;
use OC;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig; use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
use OCP\IUserSession; use OCP\IUserSession;
use OC;
class JsController extends Controller class JsController extends Controller
{ {
/** /**
* @var \OCP\IConfig * @var \OCP\IConfig
*/ */
@ -36,8 +35,6 @@ class JsController extends Controller
/** /**
* @param string $appName * @param string $appName
* @param IRequest $request
* @param IConfig $config
*/ */
public function __construct($appName, IRequest $request, IConfig $config) public function __construct($appName, IRequest $request, IConfig $config)
{ {

View file

@ -18,17 +18,17 @@
namespace OCA\SideMenu\Controller; namespace OCA\SideMenu\Controller;
use OC;
use OC\App\AppStore\Fetcher\CategoryFetcher; use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\URLGenerator;
use OCA\SideMenu\Service\AppRepository; use OCA\SideMenu\Service\AppRepository;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\IConfig; use OCP\IConfig;
use OCP\IL10N; use OCP\IL10N;
use OCP\IRequest; use OCP\IRequest;
use OCP\L10N\IFactory;
use OC\URLGenerator;
use OC;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\L10N\IFactory;
class NavController extends Controller class NavController extends Controller
{ {
@ -191,7 +191,7 @@ class NavController extends Controller
ksort($items[$category]['apps']); ksort($items[$category]['apps']);
} }
usort($items, function($a, $b) { usort($items, function ($a, $b) {
return ($a['name'] < $b['name']) ? -1 : 1; return ($a['name'] < $b['name']) ? -1 : 1;
}); });

View file

@ -19,7 +19,6 @@
namespace OCA\SideMenu\Controller; namespace OCA\SideMenu\Controller;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\Response;
use OCP\IConfig; use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
@ -48,6 +47,9 @@ class PersonalSettingController extends Controller
/** /**
* @NoAdminRequired * @NoAdminRequired
* *
* @param mixed $name
* @param mixed $value
*
* @return Response * @return Response
*/ */
public function valueSet($name, $value) public function valueSet($name, $value)
@ -55,7 +57,7 @@ class PersonalSettingController extends Controller
$doSave = false; $doSave = false;
$user = $this->userSession->getUser(); $user = $this->userSession->getUser();
if ($name === 'enabled') { if ('enabled' === $name) {
$doSave = true; $doSave = true;
if (!in_array($value, ['0', '1'])) { if (!in_array($value, ['0', '1'])) {
@ -63,7 +65,7 @@ class PersonalSettingController extends Controller
} }
} }
if ($name === 'top-menu-apps') { if ('top-menu-apps' === $name) {
$doSave = true; $doSave = true;
$data = json_decode($value, true); $data = json_decode($value, true);

View file

@ -22,9 +22,6 @@ class AppRepository
*/ */
protected $l10nFactory; protected $l10nFactory;
/**
* @param OC_App $ocApp
*/
public function __construct(OC_App $ocApp, IFactory $l10nFactory) public function __construct(OC_App $ocApp, IFactory $l10nFactory)
{ {
$this->ocApp = $ocApp; $this->ocApp = $ocApp;
@ -38,8 +35,8 @@ class AppRepository
*/ */
public function getVisibleApps() public function getVisibleApps()
{ {
$navigation = $this->ocApp->getNavigation(); $navigation = $this->ocApp->getNavigation();
$apps = $this->ocApp->listAllApps(); $apps = $this->ocApp->listAllApps();
$visibleApps = []; $visibleApps = [];
foreach ($apps as $app) { foreach ($apps as $app) {
@ -53,7 +50,7 @@ class AppRepository
} }
foreach ($navigation as $app) { foreach ($navigation as $app) {
if (substr($app['id'], 0, 14) === 'external_index') { if ('external_index' === substr($app['id'], 0, 14)) {
$visibleApps[$app['id']] = [ $visibleApps[$app['id']] = [
'id' => $app['id'], 'id' => $app['id'],
'name' => $this->l10nFactory->get($app['id'])->t($app['name']), 'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
@ -63,7 +60,7 @@ class AppRepository
'external_links', 'external_links',
], ],
]; ];
} elseif ($app['id'] === 'files') { } elseif ('files' === $app['id']) {
$visibleApps[$app['id']] = [ $visibleApps[$app['id']] = [
'id' => $app['id'], 'id' => $app['id'],
'name' => $this->l10nFactory->get($app['id'])->t($app['name']), 'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
@ -74,7 +71,7 @@ class AppRepository
} }
} }
usort($visibleApps, function($a, $b) { usort($visibleApps, function ($a, $b) {
return ($a['name'] < $b['name']) ? -1 : 1; return ($a['name'] < $b['name']) ? -1 : 1;
}); });