diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index e02b231..1cd6dd7 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -19,6 +19,9 @@ use Psr\Container\ContainerInterface; */ class Application extends App { + public const APP_ID = 'side_menu'; + + public const APP_NAME = 'Side menu'; /** * @var OC\AllConfig */ @@ -34,10 +37,6 @@ class Application extends App */ protected $user; - public const APP_ID = 'side_menu'; - - public const APP_NAME = 'Side menu'; - /** * {@inheritdoc} */ diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php index e701097..d10f59e 100644 --- a/lib/Controller/CssController.php +++ b/lib/Controller/CssController.php @@ -20,14 +20,13 @@ namespace OCA\SideMenu\Controller; use OC; use OC\User\User; +use OCA\SideMenu\AppInfo\Application; +use OCA\SideMenu\Service\ConfigProxy; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; use OCP\IRequest; use OCP\IUserSession; -use OCA\SideMenu\AppInfo\Application; -use OCA\SideMenu\Service\ConfigProxy; class CssController extends Controller { @@ -41,12 +40,7 @@ class CssController extends Controller */ protected $user; - /** - * @param string $appName - * @param IRequest $request - * @param IConfig $config - */ - public function __construct($appName, IRequest $request, ConfigProxy $config) + public function __construct(string $appName, IRequest $request, ConfigProxy $config) { parent::__construct($appName, $request); diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index 71b91e2..f4e41b7 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -20,15 +20,14 @@ 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\JSONResponse; use OCP\AppFramework\Http\TemplateResponse; -use OCP\IConfig; use OCP\IRequest; use OCP\IUserSession; -use OCA\SideMenu\AppInfo\Application; -use OCA\SideMenu\Service\ConfigProxy; class JsController extends Controller { @@ -47,13 +46,7 @@ class JsController extends Controller */ protected $themingDefaults; - /** - * @param string $appName - * @param IRequest $request - * @param ConfigProxy $config - * @param ThemingDefaults $themingDefaults - */ - public function __construct($appName, IRequest $request, ConfigProxy $config, ThemingDefaults $themingDefaults) + public function __construct(string $appName, IRequest $request, ConfigProxy $config, ThemingDefaults $themingDefaults) { parent::__construct($appName, $request); diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php index e6bf5e1..e82435c 100644 --- a/lib/Controller/NavController.php +++ b/lib/Controller/NavController.php @@ -21,7 +21,6 @@ namespace OCA\SideMenu\Controller; use OC; use OC\App\AppStore\Fetcher\CategoryFetcher; use OC\URLGenerator; -use OCA\SideMenu\AppInfo\Application; use OCA\SideMenu\Service\AppRepository; use OCA\SideMenu\Service\ConfigProxy; use OCP\AppFramework\Controller; @@ -58,12 +57,8 @@ class NavController extends Controller */ protected $router; - /** - * @param string $appName - * @param IConfig $config - */ public function __construct( - $appName, + string $appName, IRequest $request, ConfigProxy $config, AppRepository $appRepository,