From 6f43ab82fd244cb60a26512b646e575efbde6b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 16 May 2023 20:32:39 +0200 Subject: [PATCH] fix: Throw early when a service cannot be found in the app container MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/private/ServerContainer.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/private/ServerContainer.php b/lib/private/ServerContainer.php index e53737990e8..e1ead1bfeda 100644 --- a/lib/private/ServerContainer.php +++ b/lib/private/ServerContainer.php @@ -154,8 +154,10 @@ class ServerContainer extends SimpleContainer { try { return $appContainer->queryNoFallback($name); } catch (QueryException $e) { - // Didn't find the service or the respective app container, - // ignore it and fall back to the core container. + // Didn't find the service or the respective app container + // In this case the service won't be part of the core container, + // so we can throw directly + throw $e; } } elseif (strpos($name, 'OC\\Settings\\') === 0 && substr_count($name, '\\') >= 3) { $segments = explode('\\', $name);