Merge pull request #39132 from nextcloud/fix/correct-exceptions-for-SAB

fix(CardDAV): catch right exception when checking for federated app classes
nextcloud · Jul 14, 2023 · 27f76dc · 27f76dc
2 parents 2601db2 + 49b6541
commit 27f76dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/apps/dav/lib/CardDAV/UserAddressBooks.php b/apps/dav/lib/CardDAV/UserAddressBooks.php
@@ -107,7 +107,7 @@ public function getChildren() {
 				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
@@ -59,7 +59,6 @@ public function __construct() {
 	 * @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);