diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 0f73c70..2da9429 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -6,6 +6,7 @@ use OC\AllConfig; use OC\App\AppStore\Fetcher\CategoryFetcher; use OC\AppFramework\Http\Request; use OC\Security\CSP\ContentSecurityPolicyNonceManager; +use OC\Security\CSRF\CsrfTokenManager; use OC\User\User; use OCA\SideMenu\Service\AppRepository; use OCA\SideMenu\Service\CategoryRepository; @@ -19,8 +20,11 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\EventDispatcher\IEventDispatcher; use OCP\IConfig; use OCP\INavigationManager; +use OCP\IRequest; +use OCP\IURLGenerator; use OCP\IUserSession; use OCP\L10N\IFactory; +use OCP\Server; use OCP\Util; use Psr\Container\ContainerInterface; @@ -34,9 +38,9 @@ class Application extends App implements IBootstrap public const APP_ID = 'side_menu'; public const APP_NAME = 'Custom menu'; - protected AllConfig $config; + protected IConfig $config; protected ContentSecurityPolicyNonceManager $cspnm; - protected Request $request; + protected IRequest $request; protected ?User $user = null; public function __construct(array $urlParams = []) @@ -83,10 +87,9 @@ class Application extends App implements IBootstrap public function boot(IBootContext $context): void { - $this->config = \OC::$server->getConfig(); - $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager(); - $this->user = \OC::$server[IUserSession::class]->getUser(); - $this->request = \OC::$server->getRequest(); + $this->config = Server::get(IConfig::class); + $this->user = Server::get(IUserSession::class)->getUser(); + $this->request = Server::get(IRequest::class); if (!$this->isEnabled()) { return; @@ -138,7 +141,7 @@ class Application extends App implements IBootstrap $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0'); foreach ($assets as $value) { - $route = \OC::$server->getURLGenerator()->linkToRoute( + $route = Server::get(IURLGenerator::class)->linkToRoute( $value['route'], ['v' => $cache] );