cleanup: Qualifier -> Imports (#125)

Fixes IDE warnings:

* Qualifier can be replaced with an import
* Argument matches the parameter's default value

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>

lib/AppAPIAuthBackend.php

@@ -19,7 +19,7 @@ class AppAPIAuthBackend implements BackendInterface {
 	) {
 	}
 
-	public function check(RequestInterface $request, ResponseInterface $response) {
+	public function check(RequestInterface $request, ResponseInterface $response): array {
 		if ($this->request->getHeader('AUTHORIZATION-APP-API')) {
 			$davAuthenticated = $this->session->get(Auth::DAV_AUTHENTICATED);
 			$userIdHeader = explode(':', base64_decode($this->request->getHeader('AUTHORIZATION-APP-API')), 2)[0];

lib/AppInfo/Application.php

@@ -34,6 +34,7 @@ use OCP\SabrePluginEvent;
 use OCP\User\Events\UserDeletedEvent;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Throwable;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'app_api';
@@ -66,7 +67,7 @@ class Application extends App implements IBootstrap {
 				$profiler->add(new AppAPIDataCollector());
 			}
 			$context->injectFn($this->registerExAppsManagementNavigation(...));
-		} catch (NotFoundExceptionInterface|ContainerExceptionInterface|\Throwable) {
+		} catch (NotFoundExceptionInterface|ContainerExceptionInterface|Throwable) {
 		}
 	}
 

lib/Command/ExApp/Deploy.php

@@ -64,7 +64,7 @@ class Deploy extends Command {
 			return 2;
 		}
 
-		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
+		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config');
 		$daemonConfigName = $input->getArgument('daemon-config-name');
 		if (!isset($daemonConfigName) && $defaultDaemonConfigName !== '') {
 			$daemonConfigName = $defaultDaemonConfigName;

lib/Command/ExApp/Register.php

@@ -59,7 +59,7 @@ class Register extends Command {
 			return 2;
 		}
 
-		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
+		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config');
 		$daemonConfigName = $input->getArgument('daemon-config-name');
 		if (!isset($daemonConfigName) && $defaultDaemonConfigName !== '') {
 			$daemonConfigName = $defaultDaemonConfigName;

lib/Controller/ExAppsPageController.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Controller;
 
+use Exception;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\App\AppStore\Version\VersionParser;
 use OC\App\DependencyAnalyzer;
@@ -34,6 +35,7 @@ use OCP\IL10N;
 use OCP\IRequest;
 use OCP\L10N\IFactory;
 use Psr\Log\LoggerInterface;
+use SimpleXMLElement;
 
 /**
  * ExApps actions controller similar to default one with project-specific changes and additions
@@ -96,7 +98,7 @@ class ExAppsPageController extends Controller {
 	 */
 	#[NoCSRFRequired]
 	public function viewApps(): TemplateResponse {
-		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
+		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config');
 
 		$appInitialData = [
 			'appstoreEnabled' => $this->config->getSystemValueBool('appstoreenabled', true),
@@ -142,7 +144,7 @@ class ExAppsPageController extends Controller {
 	 * @param string $requestedCategory
 	 * @return array
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	private function getAppsForCategory(string $requestedCategory = ''): array {
 		$versionParser = new VersionParser();
@@ -498,13 +500,13 @@ class ExAppsPageController extends Controller {
 			}
 
 			return new JSONResponse(['data' => ['update_required' => $updateRequired]]);
-		} catch (\Exception $e) {
+		} catch (Exception $e) {
 			$this->logger->error('Could not enable ExApps', ['exception' => $e]);
 			return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
 	}
 
-	private function deployExApp(string $appId, \SimpleXMLElement $infoXml, DaemonConfig $daemonConfig): bool {
+	private function deployExApp(string $appId, SimpleXMLElement $infoXml, DaemonConfig $daemonConfig): bool {
 		$deployParams = $this->dockerActions->buildDeployParams($daemonConfig, $infoXml);
 		[$pullResult, $createResult, $startResult] = $this->dockerActions->deployExApp($daemonConfig, $deployParams);
 
@@ -527,7 +529,7 @@ class ExAppsPageController extends Controller {
 		return true;
 	}
 
-	private function registerExApp(string $appId, \SimpleXMLElement $infoXml, DaemonConfig $daemonConfig): bool {
+	private function registerExApp(string $appId, SimpleXMLElement $infoXml, DaemonConfig $daemonConfig): bool {
 		$exAppInfo = $this->dockerActions->loadExAppInfo($appId, $daemonConfig);
 
 		$exApp = $this->service->registerExApp($appId, [
@@ -603,7 +605,7 @@ class ExAppsPageController extends Controller {
 				}
 			}
 			return new JSONResponse([]);
-		} catch (\Exception $e) {
+		} catch (Exception $e) {
 			$this->logger->error('Could not disable ExApp', ['exception' => $e]);
 			return new JSONResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_INTERNAL_SERVER_ERROR);
 		}
@@ -695,11 +697,11 @@ class ExAppsPageController extends Controller {
 
 	/**
 	 * @param ExApp $exApp
-	 * @param \SimpleXMLElement $infoXml
+	 * @param SimpleXMLElement $infoXml
 	 *
 	 * @return void
 	 */
-	private function upgradeExAppScopes(ExApp $exApp, \SimpleXMLElement $infoXml): void {
+	private function upgradeExAppScopes(ExApp $exApp, SimpleXMLElement $infoXml): void {
 		$newExAppScopes = $this->service->getExAppRequestedScopes($exApp, $infoXml);
 
 		$newExAppScopes = array_merge(

lib/Controller/OCSApiController.php

@@ -16,6 +16,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
+use Psr\Log\InvalidArgumentException;
 use Psr\Log\LoggerInterface;
 
 class OCSApiController extends OCSController {
@@ -63,7 +64,7 @@ class OCSApiController extends OCSController {
 				'app' => $appId,
 			]);
 			return new DataResponse();
-		} catch (\Psr\Log\InvalidArgumentException) {
+		} catch (InvalidArgumentException) {
 			$this->logger->error('Invalid log level');
 			throw new OCSBadRequestException('Invalid log level');
 		}

lib/DeployActions/AIODockerActions.php

@@ -37,7 +37,7 @@ class AIODockerActions {
 	 * @return DaemonConfig|null
 	 */
 	public function registerAIODaemonConfig(): ?DaemonConfig {
-		$defaultDaemonConfig = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
+		$defaultDaemonConfig = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config');
 		if ($defaultDaemonConfig !== '') {
 			$daemonConfig = $this->daemonConfigService->getDaemonConfigByName(self::AIO_DAEMON_CONFIG_NAME);
 			if ($daemonConfig !== null) {

lib/DeployActions/DockerActions.php

@@ -18,6 +18,7 @@ use OCP\IConfig;
 use OCP\IURLGenerator;
 use OCP\Security\ISecureRandom;
 use Psr\Log\LoggerInterface;
+use SimpleXMLElement;
 
 class DockerActions implements IDeployActions {
 	public const DOCKER_API_VERSION = 'v1.41';
@@ -327,7 +328,7 @@ class DockerActions implements IDeployActions {
 		return [$stopResult, $removeResult];
 	}
 
-	public function buildDeployParams(DaemonConfig $daemonConfig, \SimpleXMLElement $infoXml, array $params = []): array {
+	public function buildDeployParams(DaemonConfig $daemonConfig, SimpleXMLElement $infoXml, array $params = []): array {
 		$appId = (string) $infoXml->id;
 		$deployConfig = $daemonConfig->getDeployConfig();
 

lib/Exceptions/AppAPIAuthNotValidException.php

@@ -4,12 +4,13 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Exceptions;
 
+use Exception;
 use OCP\AppFramework\Http;
 
 /**
  * @package OCA\AppAPI\Exceptions
  */
-class AppAPIAuthNotValidException extends \Exception {
+class AppAPIAuthNotValidException extends Exception {
 	public function __construct($message = 'AppAPIAuth failed', $code = Http::STATUS_UNAUTHORIZED) {
 		parent::__construct($message, $code);
 	}

lib/Fetcher/AppAPIFetcher.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Fetcher;
 
+use Exception;
 use GuzzleHttp\Exception\ConnectException;
 use OC\Files\AppData\Factory;
 use OCA\AppAPI\AppInfo\Application;
@@ -45,7 +46,7 @@ abstract class AppAPIFetcher {
 	 * @param string $ETag
 	 * @param string $content
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 * @return array
 	 */
 	protected function fetch(string $ETag, string $content): array {
@@ -160,7 +161,7 @@ abstract class AppAPIFetcher {
 		} catch (ConnectException $e) {
 			$this->logger->warning('Could not connect to appstore: ' . $e->getMessage(), ['app' => 'appstoreFetcher']);
 			return [];
-		} catch (\Exception $e) {
+		} catch (Exception $e) {
 			$this->logger->warning($e->getMessage(), [
 				'exception' => $e,
 				'app' => 'appstoreFetcher',

lib/Fetcher/ExAppArchiveFetcher.php

@@ -4,10 +4,12 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Fetcher;
 
+use Exception;
 use OC\Archive\TAR;
 use OCP\Http\Client\IClientService;
 use OCP\ITempManager;
 use phpseclib\File\X509;
+use SimpleXMLElement;
 
 /**
  * ExApps release archive fetcher with the same logic as for default (signature check).
@@ -26,9 +28,9 @@ class ExAppArchiveFetcher {
 	 *
 	 * @param array $exAppAppstoreData
 	 *
-	 * @return \SimpleXMLElement|null
+	 * @return SimpleXMLElement|null
 	 */
-	public function downloadInfoXml(array $exAppAppstoreData): ?\SimpleXMLElement {
+	public function downloadInfoXml(array $exAppAppstoreData): ?SimpleXMLElement {
 		// 1. Signature check
 		if (!$this->checkExAppSignature($exAppAppstoreData)) {
 			return null;
@@ -99,12 +101,12 @@ class ExAppArchiveFetcher {
 		}
 		$crl->loadCRL(file_get_contents(\OC::$SERVERROOT . '/resources/codesigning/root.crl'));
 		if ($crl->validateSignature() !== true) {
-			throw new \Exception('Could not validate CRL signature');
+			throw new Exception('Could not validate CRL signature');
 		}
 		$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
 		$revoked = $crl->getRevoked($csn);
 		if ($revoked !== false) {
-			throw new \Exception(
+			throw new Exception(
 				sprintf(
 					'Certificate "%s" has been revoked',
 					$csn
@@ -114,7 +116,7 @@ class ExAppArchiveFetcher {
 
 		// Verify if the certificate has been issued by the Nextcloud Code Authority CA
 		if ($certificate->validateSignature() !== true) {
-			throw new \Exception(
+			throw new Exception(
 				sprintf(
 					'App with id %s has a certificate not issued by a trusted Code Signing Authority',
 					$appId
@@ -125,7 +127,7 @@ class ExAppArchiveFetcher {
 		// Verify if the certificate is issued for the requested app id
 		$certInfo = openssl_x509_parse($exAppAppstoreData['certificate']);
 		if (!isset($certInfo['subject']['CN'])) {
-			throw new \Exception(
+			throw new Exception(
 				sprintf(
 					'App with id %s has a cert with no CN',
 					$appId
@@ -133,7 +135,7 @@ class ExAppArchiveFetcher {
 			);
 		}
 		if ($certInfo['subject']['CN'] !== $appId) {
-			throw new \Exception(
+			throw new Exception(
 				sprintf(
 					'App with id %s has a cert issued to %s',
 					$appId,

lib/Fetcher/ExAppFetcher.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Fetcher;
 
+use Exception;
+use InvalidArgumentException;
 use OC\App\AppStore\Version\VersionParser;
 use OC\App\CompareVersion;
 use OC\Files\AppData\Factory;
@@ -49,7 +51,7 @@ class ExAppFetcher extends AppAPIFetcher {
 	 * @param string $content
 	 * @param bool $allowUnstable [$allowUnstable] Allow unstable releases
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 * @return array
 	 */
 	protected function fetch(string $ETag, string $content, bool $allowUnstable = false): array {
@@ -102,7 +104,7 @@ class ExAppFetcher extends AppAPIFetcher {
 						if ($minFulfilled && ($this->ignoreMaxVersion || $maxFulfilled) && $isPhpCompatible) {
 							$releases[] = $release;
 						}
-					} catch (\InvalidArgumentException $e) {
+					} catch (InvalidArgumentException $e) {
 						$this->logger->warning($e->getMessage(), [
 							'exception' => $e,
 						]);

lib/Listener/UserDeletedListener.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Listener;
 
+use Exception;
 use OCA\AppAPI\Service\ExAppUsersService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
@@ -30,7 +31,7 @@ class UserDeletedListener implements IEventListener {
 		// Delete ExApp user record on user deletion
 		try {
 			$this->exAppUsersService->removeDeletedUser($event->getUser()->getUID());
-		} catch (\Exception $e) {
+		} catch (Exception $e) {
 			// Ignore exceptions
 			$this->logger->info('Could not delete ExApp user ' . $event->getUser()->getUID(), [
 				'exception' => $e,

lib/Middleware/AppAPIAuthMiddleware.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Middleware;
 
+use Exception;
 use OCA\AppAPI\Attribute\AppAPIAuth;
 use OCA\AppAPI\Exceptions\AppAPIAuthNotValidException;
 use OCA\AppAPI\Service\AppAPIService;
@@ -46,11 +47,11 @@ class AppAPIAuthMiddleware extends Middleware {
 	 * @param Controller $controller the controller that is being called
 	 * @param string $methodName the name of the method that will be called on
 	 *                           the controller
-	 * @param \Exception $exception the thrown exception
+	 * @param Exception $exception the thrown exception
 	 * @return Response a Response object or null in case that the exception could not be handled
-	 * @throws \Exception the passed in exception if it can't handle it
+	 * @throws Exception the passed in exception if it can't handle it
 	 */
-	public function afterException($controller, $methodName, \Exception $exception): Response {
+	public function afterException($controller, $methodName, Exception $exception): Response {
 		if ($exception instanceof AppAPIAuth) {
 			$response = new JSONResponse([
 				'message' => $exception->getMessage(),

lib/Notifications/ExAppAdminNotifier.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Notifications;
 
+use InvalidArgumentException;
 use OCA\AppAPI\AppInfo\Application;
 use OCA\AppAPI\Service\AppAPIService;
 use OCP\IURLGenerator;
@@ -33,10 +34,10 @@ class ExAppAdminNotifier implements INotifier {
 		// TODO: Think about another possible admin ExApp notifications, make them unified
 		// TODO: Think about ExApp rich objects
 		if ($exApp === null || $notification->getSubject() !== 'ex_app_version_update') {
-			throw new \InvalidArgumentException();
+			throw new InvalidArgumentException();
 		}
 		if ($exApp->getEnabled()) {
-			throw new \InvalidArgumentException('ExApp is probably already re-enabled');
+			throw new InvalidArgumentException('ExApp is probably already re-enabled');
 		}
 
 		$parameters = $notification->getSubjectParameters();

lib/Notifications/ExAppNotifier.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Notifications;
 
+use InvalidArgumentException;
 use OCA\AppAPI\AppInfo\Application;
 use OCA\AppAPI\Service\AppAPIService;
 use OCP\IURLGenerator;
@@ -31,12 +32,12 @@ class ExAppNotifier implements INotifier {
 	public function prepare(INotification $notification, string $languageCode): INotification {
 		$exApp = $this->service->getExApp($notification->getApp());
 		if ($exApp === null) {
-			throw new \InvalidArgumentException();
+			throw new InvalidArgumentException();
 		}
 		if ($notification->getSubject() === 'ex_app_version_update' && $exApp->getEnabled()) {
-			throw new \InvalidArgumentException('ExApp is probably already re-enabled');
+			throw new InvalidArgumentException('ExApp is probably already re-enabled');
 		} elseif (!$exApp->getEnabled()) { // Only enabled ExApps can render notifications
-			throw new \InvalidArgumentException('ExApp is disabled');
+			throw new InvalidArgumentException('ExApp is disabled');
 		}
 
 		$parameters = $notification->getSubjectParameters();

lib/Notifications/ExNotificationsManager.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\AppAPI\Notifications;
 
+use DateTime;
 use OCP\IGroupManager;
 use OCP\Notification\IManager;
 use OCP\Notification\INotification;
@@ -29,7 +30,7 @@ class ExNotificationsManager {
 		$notification
 			->setApp($appId)
 			->setUser($userId)
-			->setDateTime(new \DateTime())
+			->setDateTime(new DateTime())
 			->setObject($params['object'], $params['object_id'])
 			->setSubject($params['subject_type'], $params['subject_params']);
 		$this->notificationManager->notify($notification);
@@ -44,7 +45,7 @@ class ExNotificationsManager {
 			$notification
 				->setApp($appId)
 				->setUser($adminUser->getUID())
-				->setDateTime(new \DateTime())
+				->setDateTime(new DateTime())
 				->setObject($params['object'], $params['object_id'])
 				->setSubject($params['subject_type'], $params['subject_params']);
 			$this->notificationManager->notify($notification);

lib/Profiler/AppAPIDataCollector.php

@@ -10,6 +10,7 @@ use OCA\AppAPI\AppInfo\Application;
 
 use OCP\AppFramework\Http\Response;
 use OCP\DataCollector\AbstractDataCollector;
+use Throwable;
 
 /**
  * @psalm-suppress UndefinedClass
@@ -19,7 +20,7 @@ class AppAPIDataCollector extends AbstractDataCollector {
 		return Application::APP_ID;
 	}
 
-	public function collect(Request $request, Response $response, \Throwable $exception = null): void {
+	public function collect(Request $request, Response $response, Throwable $exception = null): void {
 		$headers = [];
 		$aeHeadersList = [
 			'AA-VERSION',

lib/Service/AppAPIService.php

@@ -30,6 +30,7 @@ use OCP\Log\ILogFactory;
 use OCP\Security\Bruteforce\IThrottler;
 use OCP\Security\ISecureRandom;
 use Psr\Log\LoggerInterface;
+use SimpleXMLElement;
 
 class AppAPIService {
 	public const BASIC_API_SCOPE = 1;
@@ -392,7 +393,7 @@ class AppAPIService {
 		}
 	}
 
-	public function getExAppRequestedScopes(ExApp $exApp, ?\SimpleXMLElement $infoXml = null, array $jsonInfo = []): ?array {
+	public function getExAppRequestedScopes(ExApp $exApp, ?SimpleXMLElement $infoXml = null, array $jsonInfo = []): ?array {
 		if (isset($jsonInfo['scopes'])) {
 			return $jsonInfo['scopes'];
 		}
@@ -429,9 +430,9 @@ class AppAPIService {
 	 *
 	 * @param ExApp $exApp
 	 *
-	 * @return \SimpleXMLElement|null
+	 * @return SimpleXMLElement|null
 	 */
-	public function getExAppInfoFromAppstore(ExApp $exApp): ?\SimpleXMLElement {
+	public function getExAppInfoFromAppstore(ExApp $exApp): ?SimpleXMLElement {
 		$exApps = $this->exAppFetcher->get();
 		$exAppAppstoreData = array_filter($exApps, function (array $exAppItem) use ($exApp) {
 			return $exAppItem['id'] === $exApp->getAppid() && count(array_filter($exAppItem['releases'], function (array $release) use ($exApp) {
@@ -449,9 +450,9 @@ class AppAPIService {
 	 *
 	 * @param string $appId
 	 *
-	 * @return \SimpleXMLElement|null
+	 * @return SimpleXMLElement|null
 	 */
-	public function getLatestExAppInfoFromAppstore(string $appId): ?\SimpleXMLElement {
+	public function getLatestExAppInfoFromAppstore(string $appId): ?SimpleXMLElement {
 		$exApps = $this->exAppFetcher->get();
 		$exAppAppstoreData = array_filter($exApps, function (array $exAppItem) use ($appId) {
 			return $exAppItem['id'] === $appId && count($exAppItem['releases']) > 0;
@@ -790,7 +791,7 @@ class AppAPIService {
 		return true;
 	}
 
-	public function updateExAppLastCheckTime(ExApp &$exApp): void {
+	public function updateExAppLastCheckTime(ExApp $exApp): void {
 		$exApp->setLastCheckTime(time());
 		try {
 			$this->exAppMapper->updateLastCheckTime($exApp);
@@ -831,7 +832,7 @@ class AppAPIService {
 	 *
 	 * @return bool
 	 */
-	public function handleExAppVersionChange(IRequest $request, ExApp &$exApp): bool {
+	public function handleExAppVersionChange(IRequest $request, ExApp $exApp): bool {
 		$requestExAppVersion = $request->getHeader('EX-APP-VERSION');
 		$versionValid = $exApp->getVersion() === $requestExAppVersion;
 		if (!$versionValid) {

lib/Settings/Admin.php

@@ -51,11 +51,11 @@ class Admin implements ISettings {
 		}, $this->daemonConfigService->getRegisteredDaemonConfigs());
 		$adminInitialData = [
 			'daemons' => $daemons,
-			'default_daemon_config' => $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', ''),
+			'default_daemon_config' => $this->config->getAppValue(Application::APP_ID, 'default_daemon_config'),
 			'updates_count' => count($this->getExAppsWithUpdates()),
 		];
 
-		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config', '');
+		$defaultDaemonConfigName = $this->config->getAppValue(Application::APP_ID, 'default_daemon_config');
 		if ($defaultDaemonConfigName !== '') {
 			$daemonConfig = $this->daemonConfigService->getDaemonConfigByName($defaultDaemonConfigName);
 			if ($daemonConfig !== null) {