1
0
Fork 0
mirror of https://gitnet.fr/deblan/side_menu.git synced 2025-12-18 05:10:50 +01:00

style: apply php linter

This commit is contained in:
Simon Vieille 2025-03-05 21:55:53 +01:00
parent b03a7f7bad
commit 3058c225e0
12 changed files with 80 additions and 89 deletions

View file

@ -14,7 +14,6 @@ use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\IUserSession;
use OCP\Util;
use Psr\Container\ContainerInterface;
/**
* class Application.
@ -26,6 +25,7 @@ class Application extends App implements IBootstrap
public const APP_ID = 'side_menu';
public const APP_NAME = 'Custom menu';
/**
* @var OC\AllConfig
*/
@ -41,14 +41,39 @@ class Application extends App implements IBootstrap
*/
protected $user;
/**
* {@inheritdoc}
*/
public function __construct(array $urlParams = [])
{
parent::__construct(self::APP_ID, $urlParams);
}
public function register(IRegistrationContext $context): void
{
$context->registerService('AppRepository', function () {
return new AppRepository();
});
$context->registerService('CategoryRepository', function () {
return new CategoryRepository();
});
$context->registerService('ConfigProxy', function () {
return new ConfigProxy();
});
}
public function boot(IBootContext $context): void
{
$this->config = \OC::$server->getConfig();
$this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
$this->user = \OC::$server[IUserSession::class]->getUser();
if (!$this->isEnabled()) {
return;
}
$this->addAssets();
}
protected function isEnabled(): bool
{
$enabled = true;
@ -97,38 +122,10 @@ class Application extends App implements IBootstrap
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
foreach ($assets as $value) {
$route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
$route = \OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
$value['attr'][$value['route_attr']] = $route;
Util::addHeader($value['type'], $value['attr'], '');
}
}
public function register(IRegistrationContext $context): void
{
$context->registerService('AppRepository', function () {
return new AppRepository();
});
$context->registerService('CategoryRepository', function () {
return new CategoryRepository();
});
$context->registerService('ConfigProxy', function () {
return new ConfigProxy();
});
}
public function boot(IBootContext $context): void
{
$this->config = OC::$server->getConfig();
$this->cspnm = OC::$server->getContentSecurityPolicyNonceManager();
$this->user = OC::$server[IUserSession::class]->getUser();
if (!$this->isEnabled()) {
return;
}
$this->addAssets();
}
}

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -20,13 +21,13 @@ namespace OCA\SideMenu\Controller;
use OCA\SideMenu\AppInfo\Application;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class AdminSettingController extends Controller
{
@ -40,7 +41,7 @@ class AdminSettingController extends Controller
}
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/admin/cache/remove')]
#[FrontpageRoute(verb: 'GET', url: '/admin/cache/remove')]
public function removeCache(): RedirectResponse
{
$this->config->setAppValue(Application::APP_ID, 'cache-categories', '[]');
@ -51,7 +52,7 @@ class AdminSettingController extends Controller
}
#[NoCSRFRequired]
#[FrontpageRoute(verb: 'GET', url: '/admin/config/export')]
#[FrontpageRoute(verb: 'GET', url: '/admin/config/export')]
public function exportConfiguration(): DataDownloadResponse
{
$keys = $this->config->getAppKeys(Application::APP_ID);

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -18,17 +19,16 @@
namespace OCA\SideMenu\Controller;
use OC;
use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\ConfigProxy;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class AppController extends Controller
{
@ -44,10 +44,10 @@ class AppController extends Controller
#[NoCSRFRequired]
#[NoAdminRequired]
#[FrontpageRoute(verb: 'GET', url: '/')]
#[FrontpageRoute(verb: 'GET', url: '/')]
public function index(): RedirectResponse
{
$user = OC::$server[IUserSession::class]->getUser();
$user = \OC::$server[IUserSession::class]->getUser();
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
$isForced = $this->config->getAppValueBool('force', '0');
@ -75,7 +75,7 @@ class AppController extends Controller
protected function redirectToApp($app, bool $isHref = false): RedirectResponse
{
if (!$isHref) {
$isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
$isIgnoreFrontController = true === \OC::$server->getConfig()->getSystemValue(
'htaccess.IgnoreFrontController',
false
);

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -18,19 +19,17 @@
namespace OCA\SideMenu\Controller;
use OC;
use OC\User\User;
use OCA\SideMenu\AppInfo\Application;
use OCA\SideMenu\Service\Color;
use OCA\SideMenu\Service\ConfigProxy;
use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class CssController extends Controller
{
@ -45,13 +44,13 @@ class CssController extends Controller
) {
parent::__construct($appName, $request);
$this->user = OC::$server[IUserSession::class]->getUser();
$this->user = \OC::$server[IUserSession::class]->getUser();
}
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
#[FrontpageRoute(verb: 'GET', url: '/css/stylesheet')]
public function stylesheet(): TemplateResponse
{
$response = new TemplateResponse(Application::APP_ID, 'css/stylesheet', $this->getConfig(), 'blank');

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -18,21 +19,20 @@
namespace OCA\SideMenu\Controller;
use OC;
use OC\User\User;
use OCA\SideMenu\AppInfo\Application;
use OCA\SideMenu\Service\ConfigProxy;
use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class JsController extends Controller
{
@ -49,7 +49,7 @@ class JsController extends Controller
$this->themingDefaults = $themingDefaults;
$this->user = OC::$server[IUserSession::class]->getUser();
$this->user = \OC::$server[IUserSession::class]->getUser();
$this->config = $config;
$this->l10nFactory = $l10nFactory;
}
@ -57,7 +57,7 @@ class JsController extends Controller
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/js/script')]
#[FrontpageRoute(verb: 'GET', url: '/js/script')]
public function script(): TemplateResponse
{
$response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
@ -69,7 +69,7 @@ class JsController extends Controller
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/js/config')]
#[FrontpageRoute(verb: 'GET', url: '/js/config')]
public function config(): JSONResponse
{
return new JSONResponse($this->getConfig());
@ -111,10 +111,10 @@ class JsController extends Controller
$targetBlankApps = $userTargetBlankApps;
}
$isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
$isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
if ($useAvatar && $isAvatarSet) {
$avatar = OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
$avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUid(),
'size' => 128,
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
@ -122,13 +122,13 @@ class JsController extends Controller
}
if ($this->config->getAppValueBool('show-settings', '0')) {
$settingsNav = OC::$server->getNavigationManager()->getAll('settings');
$settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
if (isset($settingsNav['settings'])) {
$settings = [
'href' => $settingsNav['settings']['href'],
'name' => $settingsNav['settings']['name'],
'avatar' => OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUid(),
'size' => 32,
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
@ -138,7 +138,7 @@ class JsController extends Controller
}
}
$indexUrl = OC::$server->getURLGenerator()->linkTo('', 'index.php');
$indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
return [
'opener-position' => $this->config->getAppValue('opener-position', 'before'),

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -18,20 +19,19 @@
namespace OCA\SideMenu\Controller;
use OC;
use OC\URLGenerator;
use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\CategoryRepository;
use OCA\SideMenu\Service\ConfigProxy;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class NavController extends Controller
{
@ -50,10 +50,10 @@ class NavController extends Controller
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/nav/items')]
#[FrontpageRoute(verb: 'GET', url: '/nav/items')]
public function items(): JSONResponse
{
$user = OC::$server[IUserSession::class]->getUser();
$user = \OC::$server[IUserSession::class]->getUser();
$items = [];
if (!$user) {

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -21,12 +22,12 @@ namespace OCA\SideMenu\Controller;
use OCA\SideMenu\AppInfo\Application;
use OCA\SideMenu\Service\ConfigProxy;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
class PersonalSettingController extends Controller
{
@ -42,7 +43,7 @@ class PersonalSettingController extends Controller
#[NoCSRFRequired]
#[NoAdminRequired]
#[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
#[FrontpageRoute(verb: 'POST', url: '/personalSetting/valueSet')]
public function valueSet($name, $value): array
{
$doSave = false;

View file

@ -21,8 +21,7 @@ class CategoryRepository
protected IConfig $iConfig,
protected IFactory $l10nFactory,
protected IUserSession $userSession
) {
}
) {}
/**
* Retrieves categories.

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -41,8 +42,7 @@ class Admin implements ISettings
protected ThemingDefaults $theming,
protected Color $color,
protected LangRepository $langRepository
) {
}
) {}
/**
* @return TemplateResponse

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -28,8 +29,7 @@ class AdminSection implements IIconSection
public function __construct(
protected IURLGenerator $url,
protected IL10N $l
) {
}
) {}
public function getID()
{
@ -46,9 +46,6 @@ class AdminSection implements IIconSection
return 70;
}
/**
* {@inheritdoc}
*/
public function getIcon()
{
return $this->url->imagePath(Application::APP_ID, 'icon.svg');

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -35,8 +36,7 @@ class Personal implements ISettings
protected ConfigProxy $config,
protected IUserSession $userSession,
protected AppRepository $appRepository
) {
}
) {}
/**
* @return TemplateResponse

View file

@ -1,4 +1,5 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
@ -30,8 +31,7 @@ class PersonalSection implements IIconSection
protected IURLGenerator $url,
protected IL10N $l,
protected ConfigProxy $configProxy
) {
}
) {}
public function getID()
{
@ -60,9 +60,6 @@ class PersonalSection implements IIconSection
return 70;
}
/**
* {@inheritdoc}
*/
public function getIcon()
{
return $this->url->imagePath(Application::APP_ID, 'icon.svg');