Browse Source

fix(CardDAV): catch right exception when checking for federated app classes

Signed-off-by: Anna Larch <anna@nextcloud.com>
pull/39132/head
Anna Larch 2 years ago
parent
commit
558e386e46
  1. 2
      apps/dav/lib/CardDAV/UserAddressBooks.php
  2. 1
      lib/private/AppFramework/Utility/SimpleContainer.php

2
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') {

1
lib/private/AppFramework/Utility/SimpleContainer.php

@ -59,7 +59,6 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* @psalm-template S as class-string<T>|string
* @psalm-param S $id
* @psalm-return (S is class-string<T> ? T : mixed)
* @throws QueryException
*/
public function get(string $id) {
return $this->query($id);

Loading…
Cancel
Save