chore: Port away from QueryException

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

lib/Collaboration/Resources/ResourceProvider.php

@@ -12,13 +12,13 @@
 use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\AppFramework\QueryException;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IProvider;
 use OCP\Collaboration\Resources\IResource;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Server;
+use Psr\Container\ContainerExceptionInterface;
 
 class ResourceProvider implements IProvider {
 	public const RESOURCE_TYPE = 'deck';
@@ -106,7 +106,7 @@ public function invalidateAccessCache($boardId = null) {
 		try {
 			/** @var IManager $resourceManager */
 			$resourceManager = Server::get(IManager::class);
-		} catch (QueryException $e) {
+		} catch (ContainerExceptionInterface $e) {
 		}
 		if ($boardId !== null) {
 			$resource = $resourceManager->getResourceForUser(self::RESOURCE_TYPE, (string)$boardId, null);

lib/Collaboration/Resources/ResourceProviderCard.php

@@ -14,14 +14,14 @@
 use OCA\Deck\Service\PermissionService;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
-use OCP\AppFramework\QueryException;
 use OCP\Collaboration\Resources\IManager;
 use OCP\Collaboration\Resources\IProvider;
 use OCP\Collaboration\Resources\IResource;
 use OCP\Collaboration\Resources\ResourceException;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Server;
+use Psr\Container\ContainerExceptionInterface;
 
 class ResourceProviderCard implements IProvider {
 	public const RESOURCE_TYPE = 'deck-card';
@@ -127,7 +127,7 @@ public function invalidateAccessCache($cardId = null) {
 		try {
 			/** @var IManager $resourceManager */
 			$resourceManager = Server::get(IManager::class);
-		} catch (QueryException $e) {
+		} catch (ContainerExceptionInterface $e) {
 		}
 		if ($cardId !== null) {
 			$resource = $resourceManager->getResourceForUser(self::RESOURCE_TYPE, (string)$cardId, null);

tests/unit/Service/AttachmentServiceTest.php

@@ -98,9 +98,6 @@ class AttachmentServiceTest extends TestCase {
 	 */
 	private $attachmentServiceValidator;
 
-	/**
-	 * @throws \OCP\AppFramework\QueryException
-	 */
 	public function setUp(): void {
 		parent::setUp();