summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-05-16 20:32:39 +0200
committerJulius Härtl <jus@bitgrid.net>2023-05-16 20:32:39 +0200
commit6f43ab82fd244cb60a26512b646e575efbde6b28 (patch)
tree6e50b6d9c2aa8c3e5b9fc3d9b8260ce7a604bd6b
parent1ce8fc6b313a7c0421729b9ce396fe7ece54dd8b (diff)
downloadnextcloud-server-6f43ab82fd244cb60a26512b646e575efbde6b28.tar.gz
nextcloud-server-6f43ab82fd244cb60a26512b646e575efbde6b28.zip
fix: Throw early when a service cannot be found in the app container
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--lib/private/ServerContainer.php6
1 files 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);