Merge pull request #1994 from nextcloud/carl/queryexception

refactor: Port away from QueryException

Author: artonge

lib/AP.php

@@ -61,8 +61,8 @@
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Tools\Traits\TArrayTools;
-use OCP\AppFramework\QueryException;
 use OCP\Server;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -147,10 +147,10 @@ public function __construct(
 		$this->configService = $configService;
 	}
 
-	public static function init() {
+	public static function init(): void {
 		try {
 			AP::$activityPub = Server::get(AP::class);
-		} catch (QueryException $e) {
+		} catch (ContainerExceptionInterface $e) {
 			Server::get(LoggerInterface::class)
 				->error($e->getMessage(), ['exception' => $e]);
 		}

lib/Cron/Cache.php

@@ -14,9 +14,9 @@
 use OCA\Social\Service\CacheActorService;
 use OCA\Social\Service\DocumentService;
 use OCA\Social\Service\HashtagService;
-use OCP\AppFramework\QueryException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use Psr\Container\ContainerExceptionInterface;
 
 /**
  * Class Cache
@@ -41,7 +41,7 @@ public function __construct(ITimeFactory $time, AccountService $accountService,
 	/**
 	 * @param mixed $argument
 	 *
-	 * @throws QueryException
+	 * @throws ContainerExceptionInterface
 	 */
 	protected function run($argument) {
 		try {

lib/Cron/Queue.php

@@ -13,9 +13,9 @@
 use OCA\Social\Service\ActivityService;
 use OCA\Social\Service\RequestQueueService;
 use OCA\Social\Service\StreamQueueService;
-use OCP\AppFramework\QueryException;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\TimedJob;
+use Psr\Container\ContainerExceptionInterface;
 
 /**
  * Class Queue
@@ -42,7 +42,7 @@ public function __construct(ITimeFactory $time, RequestQueueService $requestQueu
 	/**
 	 * @param mixed $argument
 	 *
-	 * @throws QueryException
+	 * @throws ContainerExceptionInterface
 	 */
 	protected function run($argument) {
 		$this->manageRequestQueue();

lib/Service/PushService.php

@@ -15,7 +15,7 @@
 use OCA\Social\Exceptions\StreamNotFoundException;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Tools\Traits\TAsync;
-use OCP\AppFramework\QueryException;
+use Psr\Container\ContainerExceptionInterface;
 
 //use OCP\Push\Exceptions\PushInstallException;
 //use OCP\Push\IPushManager;
@@ -49,8 +49,8 @@ public function __construct(
 		//		if ($this->miscService->getNcVersion() >= 19) {
 		//			try {
 		//				$this->pushManager = OC::$server->query(IPushManager::class);
-		//			} catch (QueryException $e) {
-		//				$miscService->log('QueryException while loading IPushManager - ' . $e->getMessage());
+		//			} catch (ContainerInterfaceException $e) {
+		//				$miscService->log('ContainerInterfaceException while loading IPushManager - ' . $e->getMessage());
 		//			}
 		//		}
 	}