adjust to 21

- CI updated
- few code adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

4 files changed, 12 insertions, 20 deletions

diff --git a/lib/AdminSettings.php b/lib/AdminSettings.php
index a86fed2..73fd16a 100644
--- a/lib/AdminSettings.php
+++ b/lib/AdminSettings.php
@@ -21,7 +21,6 @@
 
 namespace OCA\Impersonate;
 
-
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 0c87686..112bb5d 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -48,7 +48,7 @@ class Application extends App implements IBootstrap {
 	public function boot(IBootContext $context): void {
 		$session = $context->getServerContainer()->get(ISession::class);
 
-		if($session->get('oldUserId') !== null) {
+		if ($session->get('oldUserId') !== null) {
 			Util::addScript(self::APP_ID,'impersonate_logout');
 		}
 	}
diff --git a/lib/Controller/LogoutController.php b/lib/Controller/LogoutController.php
index 77dee68..02c539d 100644
--- a/lib/Controller/LogoutController.php
+++ b/lib/Controller/LogoutController.php
@@ -4,7 +4,7 @@ namespace OCA\Impersonate\Controller;
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 use OCP\ISession;
@@ -16,7 +16,7 @@ class LogoutController extends Controller {
 	private $userManager;
 	/** @var IUserSession */
 	private $userSession;
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	private $logger;
 	/** @var ISession */
 	private $session;
@@ -27,14 +27,14 @@ class LogoutController extends Controller {
 	 * @param IUserManager $userManager
 	 * @param IUserSession $userSession
 	 * @param ISession $session
-	 * @param ILogger $logger
+	 * @param LoggerInterface $logger
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								IUserManager $userManager,
 								IUserSession $userSession,
 								ISession $session,
-								ILogger $logger) {
+								LoggerInterface $logger) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
 		$this->userSession = $userSession;
@@ -45,15 +45,12 @@ class LogoutController extends Controller {
 	/**
 	 * @UseSession
 	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return JSONResponse
 	 */
-	public function logout($userId) {
+	public function logout(string $userId): JSONResponse {
 		$user = $this->session->get('oldUserId');
 		$user = $this->userManager->get($user);
 
-		if($user === null) {
+		if ($user === null) {
 			return new JSONResponse(
 				sprintf(
 					'No user found for %s',
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index a63d52b..dc1027e 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -17,7 +17,7 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IL10N;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 use OCP\ISession;
@@ -36,7 +36,7 @@ class SettingsController extends Controller {
 	private $session;
 	/** @var IConfig */
 	private $config;
-	/** @var ILogger */
+	/** @var LoggerInterface */
 	private $logger;
 	/** @var IL10N */
 	private $l;
@@ -49,7 +49,7 @@ class SettingsController extends Controller {
 	 * @param IUserSession $userSession
 	 * @param ISession $session
 	 * @param IConfig $config
-	 * @param ILogger $logger
+	 * @param LoggerInterface $logger
 	 * @param IL10N $l
 	 */
 	public function __construct($appName,
@@ -59,7 +59,7 @@ class SettingsController extends Controller {
 								IUserSession $userSession,
 								ISession $session,
 								IConfig $config,
-								ILogger $logger,
+								LoggerInterface $logger,
 								IL10N $l) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
@@ -74,11 +74,8 @@ class SettingsController extends Controller {
 	/**
 	 * @UseSession
 	 * @NoAdminRequired
-	 *
-	 * @param string $userId
-	 * @return JSONResponse
 	 */
-	public function impersonate($userId) {
+	public function impersonate(string $userId): JSONResponse {
 		/** @var IUser $currentUser */
 		$currentUser = $this->userSession->getUser();
 
@@ -161,4 +158,3 @@ class SettingsController extends Controller {
 		return new JSONResponse();
 	}
 }
-