From 558e386e467fc26ff6c3db25741bdc734a883525 Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Tue, 4 Jul 2023 11:24:24 +0200 Subject: [PATCH] fix(CardDAV): catch right exception when checking for federated app classes Signed-off-by: Anna Larch --- apps/dav/lib/CardDAV/UserAddressBooks.php | 2 +- lib/private/AppFramework/Utility/SimpleContainer.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php index 938575bd1a7..d42af7790f8 100644 --- a/apps/dav/lib/CardDAV/UserAddressBooks.php +++ b/apps/dav/lib/CardDAV/UserAddressBooks.php @@ -107,7 +107,7 @@ class UserAddressBooks extends \Sabre\CardDAV\AddressBookHome { try { $trustedServers = \OC::$server->get(TrustedServers::class); $request = \OC::$server->get(IRequest::class); - } catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) { + } catch (QueryException | NotFoundExceptionInterface | ContainerExceptionInterface $e) { // nothing to do, the request / trusted servers don't exist } if ($addressBook['principaluri'] === 'principals/system/system') { diff --git a/lib/private/AppFramework/Utility/SimpleContainer.php b/lib/private/AppFramework/Utility/SimpleContainer.php index 89e4204c85e..7aa5cb83926 100644 --- a/lib/private/AppFramework/Utility/SimpleContainer.php +++ b/lib/private/AppFramework/Utility/SimpleContainer.php @@ -59,7 +59,6 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer { * @psalm-template S as class-string|string * @psalm-param S $id * @psalm-return (S is class-string ? T : mixed) - * @throws QueryException */ public function get(string $id) { return $this->query($id);