From 3899de12b77abf7489557729cb4a9e0b8935933a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 16 Nov 2022 20:21:33 +0100
Subject: [PATCH] Skip querying the app container for server namespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../AppFramework/DependencyInjection/DIContainer.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 5fd363ee963..8fe17d5a85e 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -442,6 +442,12 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		if ($name === 'AppName' || $name === 'appName') {
 			return $this->appName;
 		}
+
+		$isServerClass = str_starts_with($name, 'OCP\\') || str_starts_with($name, 'OC\\');
+		if ($isServerClass && !$this->has($name)) {
+			return $this->getServer()->query($name, $autoload);
+		}
+
 		try {
 			return $this->queryNoFallback($name);
 		} catch (QueryException $firstException) {