nextcloud / server

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +305 added lines, -305 removed lines

@@ -64,309 +64,309 @@
 use Psr\Log\LoggerInterface;
 
 class DIContainer extends SimpleContainer implements IAppContainer {
-	protected string $appName;
-	private array $middleWares = [];
-	private ServerContainer $server;
-
-	public function __construct(string $appName, array $urlParams = [], ?ServerContainer $server = null) {
-		parent::__construct();
-		$this->appName = $appName;
-		$this->registerParameter('appName', $appName);
-		$this->registerParameter('urlParams', $urlParams);
-
-		/** @deprecated 32.0.0 */
-		$this->registerDeprecatedAlias('Request', IRequest::class);
-
-		if ($server === null) {
-			$server = \OC::$server;
-		}
-		$this->server = $server;
-		$this->server->registerAppContainer($appName, $this);
-
-		// aliases
-		/** @deprecated 26.0.0 inject $appName */
-		$this->registerDeprecatedAlias('AppName', 'appName');
-		/** @deprecated 26.0.0 inject $webRoot*/
-		$this->registerDeprecatedAlias('WebRoot', 'webRoot');
-		/** @deprecated 26.0.0 inject $userId */
-		$this->registerDeprecatedAlias('UserId', 'userId');
-
-		/**
-		 * Core services
-		 */
-		/* Cannot be an alias because Output is not in OCA */
-		$this->registerService(IOutput::class, fn (ContainerInterface $c): IOutput => new Output($c->get('webRoot')));
-
-		$this->registerService(Folder::class, function () {
-			return $this->getServer()->getUserFolder();
-		});
-
-		$this->registerService(IAppData::class, function (ContainerInterface $c): IAppData {
-			return $c->get(IAppDataFactory::class)->get($c->get('appName'));
-		});
-
-		$this->registerService(IL10N::class, function (ContainerInterface $c) {
-			return $this->getServer()->getL10N($c->get('appName'));
-		});
-
-		// Log wrappers
-		$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
-			/* Cannot be an alias because it uses LoggerInterface so it would infinite loop */
-			return new ScopedPsrLogger(
-				$c->get(PsrLoggerAdapter::class),
-				$c->get('appName')
-			);
-		});
-
-		$this->registerService(IServerContainer::class, function () {
-			return $this->getServer();
-		});
-		/** @deprecated 32.0.0 */
-		$this->registerDeprecatedAlias('ServerContainer', IServerContainer::class);
-
-		$this->registerAlias(\OCP\WorkflowEngine\IManager::class, Manager::class);
-
-		$this->registerService(ContainerInterface::class, fn (ContainerInterface $c) => $c);
-		$this->registerDeprecatedAlias(IAppContainer::class, ContainerInterface::class);
-
-		// commonly used attributes
-		$this->registerService('userId', function (ContainerInterface $c): ?string {
-			return $c->get(ISession::class)->get('user_id');
-		});
-
-		$this->registerService('webRoot', function (ContainerInterface $c): string {
-			return $c->get(IServerContainer::class)->getWebRoot();
-		});
-
-		$this->registerService('OC_Defaults', function (ContainerInterface $c): object {
-			return $c->get(IServerContainer::class)->get('ThemingDefaults');
-		});
-
-		/** @deprecated 32.0.0 */
-		$this->registerDeprecatedAlias('Protocol', Http::class);
-		$this->registerService(Http::class, function (ContainerInterface $c) {
-			$protocol = $c->get(IRequest::class)->getHttpProtocol();
-			return new Http($_SERVER, $protocol);
-		});
-
-		/** @deprecated 32.0.0 */
-		$this->registerDeprecatedAlias('Dispatcher', Dispatcher::class);
-		$this->registerService(Dispatcher::class, function (ContainerInterface $c) {
-			return new Dispatcher(
-				$c->get(Http::class),
-				$c->get(MiddlewareDispatcher::class),
-				$c->get(IControllerMethodReflector::class),
-				$c->get(IRequest::class),
-				$c->get(IConfig::class),
-				$c->get(IDBConnection::class),
-				$c->get(LoggerInterface::class),
-				$c->get(EventLogger::class),
-				$c,
-			);
-		});
-
-		/**
-		 * App Framework default arguments
-		 */
-		$this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
-		$this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
-		$this->registerParameter('corsMaxAge', 1728000);
-
-		/**
-		 * Middleware
-		 */
-		/** @deprecated 32.0.0 */
-		$this->registerDeprecatedAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
-			$server = $this->getServer();
-
-			$dispatcher = new MiddlewareDispatcher();
-
-			$dispatcher->registerMiddleware($c->get(CompressionMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(NotModifiedMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(ReloadExecutionMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(SameSiteCookieMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(CORSMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(OCSMiddleware::class));
-
-			$dispatcher->registerMiddleware($c->get(FlowV2EphemeralSessionsMiddleware::class));
-
-			$securityMiddleware = new SecurityMiddleware(
-				$c->get(IRequest::class),
-				$c->get(IControllerMethodReflector::class),
-				$c->get(INavigationManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				$c->get('appName'),
-				$server->getUserSession()->isLoggedIn(),
-				$c->get(IGroupManager::class),
-				$c->get(ISubAdmin::class),
-				$c->get(IAppManager::class),
-				$server->getL10N('lib'),
-				$c->get(AuthorizedGroupMapper::class),
-				$c->get(IUserSession::class),
-				$c->get(IRemoteAddress::class),
-			);
-			$dispatcher->registerMiddleware($securityMiddleware);
-			$dispatcher->registerMiddleware($c->get(CSPMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(FeaturePolicyMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(PasswordConfirmationMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(TwoFactorMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(BruteForceMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(RateLimitingMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(PublicShareMiddleware::class));
-			$dispatcher->registerMiddleware($c->get(AdditionalScriptsMiddleware::class));
-
-			$coordinator = $c->get(\OC\AppFramework\Bootstrap\Coordinator::class);
-			$registrationContext = $coordinator->getRegistrationContext();
-			if ($registrationContext !== null) {
-				$appId = $this->get('appName');
-				foreach ($registrationContext->getMiddlewareRegistrations() as $middlewareRegistration) {
-					if ($middlewareRegistration->getAppId() === $appId
-						|| $middlewareRegistration->isGlobal()) {
-						$dispatcher->registerMiddleware($c->get($middlewareRegistration->getService()));
-					}
-				}
-			}
-			foreach ($this->middleWares as $middleWare) {
-				$dispatcher->registerMiddleware($c->get($middleWare));
-			}
-
-			$dispatcher->registerMiddleware($c->get(SessionMiddleware::class));
-			return $dispatcher;
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppFramework\Services\AppConfig::class);
-		$this->registerAlias(IInitialState::class, \OC\AppFramework\Services\InitialState::class);
-	}
-
-	/**
-	 * @return \OCP\IServerContainer
-	 */
-	public function getServer() {
-		return $this->server;
-	}
-
-	/**
-	 * @param string $middleWare
-	 */
-	public function registerMiddleWare($middleWare): bool {
-		if (in_array($middleWare, $this->middleWares, true) !== false) {
-			return false;
-		}
-		$this->middleWares[] = $middleWare;
-		return true;
-	}
-
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 */
-	public function getAppName() {
-		return $this->query('appName');
-	}
-
-	/**
-	 * @deprecated 12.0.0 use IUserSession->isLoggedIn()
-	 * @return boolean
-	 */
-	public function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * @deprecated 12.0.0 use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 */
-	public function isAdminUser() {
-		$uid = $this->getUserId();
-		return \OC_User::isAdminUser($uid);
-	}
-
-	private function getUserId(): string {
-		return $this->getServer()->getSession()->get('user_id');
-	}
-
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 */
-	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
-			return $this->query($serviceName);
-		});
-	}
-
-	public function has($id): bool {
-		if (parent::has($id)) {
-			return true;
-		}
-
-		if ($this->server->has($id, true)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @inheritDoc
-	 * @param list<class-string> $chain
-	 */
-	public function query(string $name, bool $autoload = true, array $chain = []) {
-		if ($name === 'AppName' || $name === 'appName') {
-			return $this->appName;
-		}
-
-		$isServerClass = str_starts_with($name, 'OCP\\') || str_starts_with($name, 'OC\\');
-		if ($isServerClass && !$this->has($name)) {
-			/** @var ServerContainer $server */
-			$server = $this->getServer();
-			return $server->query($name, $autoload, $chain);
-		}
-
-		try {
-			return $this->queryNoFallback($name, $chain);
-		} catch (QueryException $firstException) {
-			try {
-				/** @var ServerContainer $server */
-				$server = $this->getServer();
-				return $server->query($name, $autoload, $chain);
-			} catch (QueryException $secondException) {
-				if ($firstException->getCode() === 1) {
-					throw $secondException;
-				}
-				throw $firstException;
-			}
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function queryNoFallback($name, array $chain) {
-		$name = $this->sanitizeName($name);
-
-		if ($this->offsetExists($name)) {
-			return parent::query($name, chain: $chain);
-		} elseif ($this->appName === 'settings' && str_starts_with($name, 'OC\\Settings\\')) {
-			return parent::query($name, chain: $chain);
-		} elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
-			return parent::query($name, chain: $chain);
-		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
-			return parent::query($name, chain: $chain);
-		} elseif (
-			str_starts_with($name, 'OC\\AppFramework\\Services\\')
-			|| str_starts_with($name, 'OC\\AppFramework\\Middleware\\')
-		) {
-			/* AppFramework services are scoped to the application */
-			return parent::query($name, chain: $chain);
-		}
-
-		throw new QueryException('Could not resolve ' . $name . '!'
-			. ' Class can not be instantiated', 1);
-	}
+    protected string $appName;
+    private array $middleWares = [];
+    private ServerContainer $server;
+
+    public function __construct(string $appName, array $urlParams = [], ?ServerContainer $server = null) {
+        parent::__construct();
+        $this->appName = $appName;
+        $this->registerParameter('appName', $appName);
+        $this->registerParameter('urlParams', $urlParams);
+
+        /** @deprecated 32.0.0 */
+        $this->registerDeprecatedAlias('Request', IRequest::class);
+
+        if ($server === null) {
+            $server = \OC::$server;
+        }
+        $this->server = $server;
+        $this->server->registerAppContainer($appName, $this);
+
+        // aliases
+        /** @deprecated 26.0.0 inject $appName */
+        $this->registerDeprecatedAlias('AppName', 'appName');
+        /** @deprecated 26.0.0 inject $webRoot*/
+        $this->registerDeprecatedAlias('WebRoot', 'webRoot');
+        /** @deprecated 26.0.0 inject $userId */
+        $this->registerDeprecatedAlias('UserId', 'userId');
+
+        /**
+         * Core services
+         */
+        /* Cannot be an alias because Output is not in OCA */
+        $this->registerService(IOutput::class, fn (ContainerInterface $c): IOutput => new Output($c->get('webRoot')));
+
+        $this->registerService(Folder::class, function () {
+            return $this->getServer()->getUserFolder();
+        });
+
+        $this->registerService(IAppData::class, function (ContainerInterface $c): IAppData {
+            return $c->get(IAppDataFactory::class)->get($c->get('appName'));
+        });
+
+        $this->registerService(IL10N::class, function (ContainerInterface $c) {
+            return $this->getServer()->getL10N($c->get('appName'));
+        });
+
+        // Log wrappers
+        $this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
+            /* Cannot be an alias because it uses LoggerInterface so it would infinite loop */
+            return new ScopedPsrLogger(
+                $c->get(PsrLoggerAdapter::class),
+                $c->get('appName')
+            );
+        });
+
+        $this->registerService(IServerContainer::class, function () {
+            return $this->getServer();
+        });
+        /** @deprecated 32.0.0 */
+        $this->registerDeprecatedAlias('ServerContainer', IServerContainer::class);
+
+        $this->registerAlias(\OCP\WorkflowEngine\IManager::class, Manager::class);
+
+        $this->registerService(ContainerInterface::class, fn (ContainerInterface $c) => $c);
+        $this->registerDeprecatedAlias(IAppContainer::class, ContainerInterface::class);
+
+        // commonly used attributes
+        $this->registerService('userId', function (ContainerInterface $c): ?string {
+            return $c->get(ISession::class)->get('user_id');
+        });
+
+        $this->registerService('webRoot', function (ContainerInterface $c): string {
+            return $c->get(IServerContainer::class)->getWebRoot();
+        });
+
+        $this->registerService('OC_Defaults', function (ContainerInterface $c): object {
+            return $c->get(IServerContainer::class)->get('ThemingDefaults');
+        });
+
+        /** @deprecated 32.0.0 */
+        $this->registerDeprecatedAlias('Protocol', Http::class);
+        $this->registerService(Http::class, function (ContainerInterface $c) {
+            $protocol = $c->get(IRequest::class)->getHttpProtocol();
+            return new Http($_SERVER, $protocol);
+        });
+
+        /** @deprecated 32.0.0 */
+        $this->registerDeprecatedAlias('Dispatcher', Dispatcher::class);
+        $this->registerService(Dispatcher::class, function (ContainerInterface $c) {
+            return new Dispatcher(
+                $c->get(Http::class),
+                $c->get(MiddlewareDispatcher::class),
+                $c->get(IControllerMethodReflector::class),
+                $c->get(IRequest::class),
+                $c->get(IConfig::class),
+                $c->get(IDBConnection::class),
+                $c->get(LoggerInterface::class),
+                $c->get(EventLogger::class),
+                $c,
+            );
+        });
+
+        /**
+         * App Framework default arguments
+         */
+        $this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
+        $this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
+        $this->registerParameter('corsMaxAge', 1728000);
+
+        /**
+         * Middleware
+         */
+        /** @deprecated 32.0.0 */
+        $this->registerDeprecatedAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
+        $this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+            $server = $this->getServer();
+
+            $dispatcher = new MiddlewareDispatcher();
+
+            $dispatcher->registerMiddleware($c->get(CompressionMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(NotModifiedMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(ReloadExecutionMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(SameSiteCookieMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(CORSMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(OCSMiddleware::class));
+
+            $dispatcher->registerMiddleware($c->get(FlowV2EphemeralSessionsMiddleware::class));
+
+            $securityMiddleware = new SecurityMiddleware(
+                $c->get(IRequest::class),
+                $c->get(IControllerMethodReflector::class),
+                $c->get(INavigationManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                $c->get('appName'),
+                $server->getUserSession()->isLoggedIn(),
+                $c->get(IGroupManager::class),
+                $c->get(ISubAdmin::class),
+                $c->get(IAppManager::class),
+                $server->getL10N('lib'),
+                $c->get(AuthorizedGroupMapper::class),
+                $c->get(IUserSession::class),
+                $c->get(IRemoteAddress::class),
+            );
+            $dispatcher->registerMiddleware($securityMiddleware);
+            $dispatcher->registerMiddleware($c->get(CSPMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(FeaturePolicyMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(PasswordConfirmationMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(TwoFactorMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(BruteForceMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(RateLimitingMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(PublicShareMiddleware::class));
+            $dispatcher->registerMiddleware($c->get(AdditionalScriptsMiddleware::class));
+
+            $coordinator = $c->get(\OC\AppFramework\Bootstrap\Coordinator::class);
+            $registrationContext = $coordinator->getRegistrationContext();
+            if ($registrationContext !== null) {
+                $appId = $this->get('appName');
+                foreach ($registrationContext->getMiddlewareRegistrations() as $middlewareRegistration) {
+                    if ($middlewareRegistration->getAppId() === $appId
+                        || $middlewareRegistration->isGlobal()) {
+                        $dispatcher->registerMiddleware($c->get($middlewareRegistration->getService()));
+                    }
+                }
+            }
+            foreach ($this->middleWares as $middleWare) {
+                $dispatcher->registerMiddleware($c->get($middleWare));
+            }
+
+            $dispatcher->registerMiddleware($c->get(SessionMiddleware::class));
+            return $dispatcher;
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppFramework\Services\AppConfig::class);
+        $this->registerAlias(IInitialState::class, \OC\AppFramework\Services\InitialState::class);
+    }
+
+    /**
+     * @return \OCP\IServerContainer
+     */
+    public function getServer() {
+        return $this->server;
+    }
+
+    /**
+     * @param string $middleWare
+     */
+    public function registerMiddleWare($middleWare): bool {
+        if (in_array($middleWare, $this->middleWares, true) !== false) {
+            return false;
+        }
+        $this->middleWares[] = $middleWare;
+        return true;
+    }
+
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     */
+    public function getAppName() {
+        return $this->query('appName');
+    }
+
+    /**
+     * @deprecated 12.0.0 use IUserSession->isLoggedIn()
+     * @return boolean
+     */
+    public function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * @deprecated 12.0.0 use IGroupManager->isAdmin($userId)
+     * @return boolean
+     */
+    public function isAdminUser() {
+        $uid = $this->getUserId();
+        return \OC_User::isAdminUser($uid);
+    }
+
+    private function getUserId(): string {
+        return $this->getServer()->getSession()->get('user_id');
+    }
+
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     */
+    public function registerCapability($serviceName) {
+        $this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
+            return $this->query($serviceName);
+        });
+    }
+
+    public function has($id): bool {
+        if (parent::has($id)) {
+            return true;
+        }
+
+        if ($this->server->has($id, true)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritDoc
+     * @param list<class-string> $chain
+     */
+    public function query(string $name, bool $autoload = true, array $chain = []) {
+        if ($name === 'AppName' || $name === 'appName') {
+            return $this->appName;
+        }
+
+        $isServerClass = str_starts_with($name, 'OCP\\') || str_starts_with($name, 'OC\\');
+        if ($isServerClass && !$this->has($name)) {
+            /** @var ServerContainer $server */
+            $server = $this->getServer();
+            return $server->query($name, $autoload, $chain);
+        }
+
+        try {
+            return $this->queryNoFallback($name, $chain);
+        } catch (QueryException $firstException) {
+            try {
+                /** @var ServerContainer $server */
+                $server = $this->getServer();
+                return $server->query($name, $autoload, $chain);
+            } catch (QueryException $secondException) {
+                if ($firstException->getCode() === 1) {
+                    throw $secondException;
+                }
+                throw $firstException;
+            }
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     */
+    public function queryNoFallback($name, array $chain) {
+        $name = $this->sanitizeName($name);
+
+        if ($this->offsetExists($name)) {
+            return parent::query($name, chain: $chain);
+        } elseif ($this->appName === 'settings' && str_starts_with($name, 'OC\\Settings\\')) {
+            return parent::query($name, chain: $chain);
+        } elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
+            return parent::query($name, chain: $chain);
+        } elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
+            return parent::query($name, chain: $chain);
+        } elseif (
+            str_starts_with($name, 'OC\\AppFramework\\Services\\')
+            || str_starts_with($name, 'OC\\AppFramework\\Middleware\\')
+        ) {
+            /* AppFramework services are scoped to the application */
+            return parent::query($name, chain: $chain);
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!'
+            . ' Class can not be instantiated', 1);
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -97,20 +97,20 @@ 
 		/* Cannot be an alias because Output is not in OCA */
 		$this->registerService(IOutput::class, fn (ContainerInterface $c): IOutput => new Output($c->get('webRoot')));
 
-		$this->registerService(Folder::class, function () {
+		$this->registerService(Folder::class, function() {
 			return $this->getServer()->getUserFolder();
 		});
 
-		$this->registerService(IAppData::class, function (ContainerInterface $c): IAppData {
+		$this->registerService(IAppData::class, function(ContainerInterface $c): IAppData {
 			return $c->get(IAppDataFactory::class)->get($c->get('appName'));
 		});
 
-		$this->registerService(IL10N::class, function (ContainerInterface $c) {
+		$this->registerService(IL10N::class, function(ContainerInterface $c) {
 			return $this->getServer()->getL10N($c->get('appName'));
 		});
 
 		// Log wrappers
-		$this->registerService(LoggerInterface::class, function (ContainerInterface $c) {
+		$this->registerService(LoggerInterface::class, function(ContainerInterface $c) {
 			/* Cannot be an alias because it uses LoggerInterface so it would infinite loop */
 			return new ScopedPsrLogger(
 				$c->get(PsrLoggerAdapter::class),
@@ -118,7 +118,7 @@ 
 			);
 		});
 
-		$this->registerService(IServerContainer::class, function () {
+		$this->registerService(IServerContainer::class, function() {
 			return $this->getServer();
 		});
 		/** @deprecated 32.0.0 */
@@ -130,28 +130,28 @@ 
 		$this->registerDeprecatedAlias(IAppContainer::class, ContainerInterface::class);
 
 		// commonly used attributes
-		$this->registerService('userId', function (ContainerInterface $c): ?string {
+		$this->registerService('userId', function(ContainerInterface $c): ?string {
 			return $c->get(ISession::class)->get('user_id');
 		});
 
-		$this->registerService('webRoot', function (ContainerInterface $c): string {
+		$this->registerService('webRoot', function(ContainerInterface $c): string {
 			return $c->get(IServerContainer::class)->getWebRoot();
 		});
 
-		$this->registerService('OC_Defaults', function (ContainerInterface $c): object {
+		$this->registerService('OC_Defaults', function(ContainerInterface $c): object {
 			return $c->get(IServerContainer::class)->get('ThemingDefaults');
 		});
 
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('Protocol', Http::class);
-		$this->registerService(Http::class, function (ContainerInterface $c) {
+		$this->registerService(Http::class, function(ContainerInterface $c) {
 			$protocol = $c->get(IRequest::class)->getHttpProtocol();
 			return new Http($_SERVER, $protocol);
 		});
 
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('Dispatcher', Dispatcher::class);
-		$this->registerService(Dispatcher::class, function (ContainerInterface $c) {
+		$this->registerService(Dispatcher::class, function(ContainerInterface $c) {
 			return new Dispatcher(
 				$c->get(Http::class),
 				$c->get(MiddlewareDispatcher::class),
@@ -177,7 +177,7 @@ 
 		 */
 		/** @deprecated 32.0.0 */
 		$this->registerDeprecatedAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+		$this->registerService(MiddlewareDispatcher::class, function(ContainerInterface $c) {
 			$server = $this->getServer();
 
 			$dispatcher = new MiddlewareDispatcher();
@@ -293,7 +293,7 @@ 
 	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
 	 */
 	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function () use ($serviceName) {
+		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
 			return $this->query($serviceName);
 		});
 	}
@@ -356,7 +356,7 @@ 
 			return parent::query($name, chain: $chain);
 		} elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
 			return parent::query($name, chain: $chain);
-		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
+		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName).'\\')) {
 			return parent::query($name, chain: $chain);
 		} elseif (
 			str_starts_with($name, 'OC\\AppFramework\\Services\\')
@@ -366,7 +366,7 @@ 
 			return parent::query($name, chain: $chain);
 		}
 
-		throw new QueryException('Could not resolve ' . $name . '!'
+		throw new QueryException('Could not resolve '.$name.'!'
 			. ' Class can not be instantiated', 1);
 	}
 }

lib/private/AppFramework/Utility/SimpleContainer.php

Indentation +211 added lines, -211 removed lines

@@ -26,242 +26,242 @@
  * SimpleContainer is a simple implementation of a container on basis of Pimple
  */
 class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
-	public static bool $useLazyObjects = false;
+    public static bool $useLazyObjects = false;
 
-	private Container $container;
+    private Container $container;
 
-	public function __construct() {
-		$this->container = new Container();
-	}
+    public function __construct() {
+        $this->container = new Container();
+    }
 
-	/**
-	 * @template T
-	 * @param class-string<T>|string $id
-	 * @return T|mixed
-	 * @psalm-template S as class-string<T>|string
-	 * @psalm-param S $id
-	 * @psalm-return (S is class-string<T> ? T : mixed)
-	 */
-	public function get(string $id): mixed {
-		return $this->query($id);
-	}
+    /**
+     * @template T
+     * @param class-string<T>|string $id
+     * @return T|mixed
+     * @psalm-template S as class-string<T>|string
+     * @psalm-param S $id
+     * @psalm-return (S is class-string<T> ? T : mixed)
+     */
+    public function get(string $id): mixed {
+        return $this->query($id);
+    }
 
-	public function has(string $id): bool {
-		// If a service is no registered but is an existing class, we can probably load it
-		return isset($this->container[$id]) || class_exists($id);
-	}
+    public function has(string $id): bool {
+        // If a service is no registered but is an existing class, we can probably load it
+        return isset($this->container[$id]) || class_exists($id);
+    }
 
-	/**
-	 * @param ReflectionClass $class the class to instantiate
-	 * @param list<class-string> $chain
-	 * @return object the created class
-	 * @suppress PhanUndeclaredClassInstanceof
-	 */
-	private function buildClass(ReflectionClass $class, array $chain): object {
-		$constructor = $class->getConstructor();
-		if ($constructor === null) {
-			/* No constructor, return a instance directly */
-			return $class->newInstance();
-		}
-		if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects && !$class->isInternal()) {
-			/* For PHP>=8.4, use a lazy ghost to delay constructor and dependency resolving */
-			/** @psalm-suppress UndefinedMethod */
-			return $class->newLazyGhost(function (object $object) use ($constructor, $chain): void {
-				/** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
-				$object->__construct(...$this->buildClassConstructorParameters($constructor, $chain));
-			});
-		} else {
-			return $class->newInstanceArgs($this->buildClassConstructorParameters($constructor, $chain));
-		}
-	}
+    /**
+     * @param ReflectionClass $class the class to instantiate
+     * @param list<class-string> $chain
+     * @return object the created class
+     * @suppress PhanUndeclaredClassInstanceof
+     */
+    private function buildClass(ReflectionClass $class, array $chain): object {
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            /* No constructor, return a instance directly */
+            return $class->newInstance();
+        }
+        if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects && !$class->isInternal()) {
+            /* For PHP>=8.4, use a lazy ghost to delay constructor and dependency resolving */
+            /** @psalm-suppress UndefinedMethod */
+            return $class->newLazyGhost(function (object $object) use ($constructor, $chain): void {
+                /** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
+                $object->__construct(...$this->buildClassConstructorParameters($constructor, $chain));
+            });
+        } else {
+            return $class->newInstanceArgs($this->buildClassConstructorParameters($constructor, $chain));
+        }
+    }
 
-	/**
-	 * @param list<class-string> $chain
-	 */
-	private function buildClassConstructorParameters(\ReflectionMethod $constructor, array $chain): array {
-		return array_map(function (ReflectionParameter $parameter) use ($chain) {
-			$parameterType = $parameter->getType();
+    /**
+     * @param list<class-string> $chain
+     */
+    private function buildClassConstructorParameters(\ReflectionMethod $constructor, array $chain): array {
+        return array_map(function (ReflectionParameter $parameter) use ($chain) {
+            $parameterType = $parameter->getType();
 
-			$resolveName = $parameter->getName();
+            $resolveName = $parameter->getName();
 
-			// try to find out if it is a class or a simple parameter
-			if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
-				$resolveName = $parameterType->getName();
-			}
+            // try to find out if it is a class or a simple parameter
+            if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
+                $resolveName = $parameterType->getName();
+            }
 
-			try {
-				$builtIn = $parameterType !== null && ($parameterType instanceof ReflectionNamedType)
-							&& $parameterType->isBuiltin();
-				return $this->query($resolveName, !$builtIn, $chain);
-			} catch (ContainerExceptionInterface $e) {
-				// Service not found, use the default value when available
-				if ($parameter->isDefaultValueAvailable()) {
-					return $parameter->getDefaultValue();
-				}
+            try {
+                $builtIn = $parameterType !== null && ($parameterType instanceof ReflectionNamedType)
+                            && $parameterType->isBuiltin();
+                return $this->query($resolveName, !$builtIn, $chain);
+            } catch (ContainerExceptionInterface $e) {
+                // Service not found, use the default value when available
+                if ($parameter->isDefaultValueAvailable()) {
+                    return $parameter->getDefaultValue();
+                }
 
-				if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
-					$resolveName = $parameter->getName();
-					try {
-						return $this->query($resolveName, chain: $chain);
-					} catch (ContainerExceptionInterface $e2) {
-						// Pass null if typed and nullable
-						if ($parameter->allowsNull() && ($parameterType instanceof ReflectionNamedType)) {
-							return null;
-						}
+                if ($parameterType !== null && ($parameterType instanceof ReflectionNamedType) && !$parameterType->isBuiltin()) {
+                    $resolveName = $parameter->getName();
+                    try {
+                        return $this->query($resolveName, chain: $chain);
+                    } catch (ContainerExceptionInterface $e2) {
+                        // Pass null if typed and nullable
+                        if ($parameter->allowsNull() && ($parameterType instanceof ReflectionNamedType)) {
+                            return null;
+                        }
 
-						// don't lose the error we got while trying to query by type
-						throw new QueryException($e->getMessage(), (int)$e->getCode(), $e);
-					}
-				}
+                        // don't lose the error we got while trying to query by type
+                        throw new QueryException($e->getMessage(), (int)$e->getCode(), $e);
+                    }
+                }
 
-				throw $e;
-			}
-		}, $constructor->getParameters());
-	}
+                throw $e;
+            }
+        }, $constructor->getParameters());
+    }
 
-	/**
-	 * @inheritDoc
-	 * @param list<class-string> $chain
-	 */
-	public function resolve($name, array $chain = []) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
-		try {
-			$class = new ReflectionClass($name);
-			if ($class->isInstantiable()) {
-				return $this->buildClass($class, $chain);
-			} else {
-				throw new QueryException($baseMsg
-					. ' Class can not be instantiated');
-			}
-		} catch (ReflectionException $e) {
-			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
-		}
-	}
+    /**
+     * @inheritDoc
+     * @param list<class-string> $chain
+     */
+    public function resolve($name, array $chain = []) {
+        $baseMsg = 'Could not resolve ' . $name . '!';
+        try {
+            $class = new ReflectionClass($name);
+            if ($class->isInstantiable()) {
+                return $this->buildClass($class, $chain);
+            } else {
+                throw new QueryException($baseMsg
+                    . ' Class can not be instantiated');
+            }
+        } catch (ReflectionException $e) {
+            // Class does not exist
+            throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+        }
+    }
 
-	/**
-	 * @inheritDoc
-	 * @param list<class-string> $chain
-	 */
-	public function query(string $name, bool $autoload = true, array $chain = []) {
-		$name = $this->sanitizeName($name);
-		if (isset($this->container[$name])) {
-			return $this->container[$name];
-		}
+    /**
+     * @inheritDoc
+     * @param list<class-string> $chain
+     */
+    public function query(string $name, bool $autoload = true, array $chain = []) {
+        $name = $this->sanitizeName($name);
+        if (isset($this->container[$name])) {
+            return $this->container[$name];
+        }
 
-		if ($autoload) {
-			if (in_array($name, $chain, true)) {
-				throw new RuntimeException('Tried to query ' . $name . ', but it is already in the chain: ' . implode(', ', $chain));
-			}
+        if ($autoload) {
+            if (in_array($name, $chain, true)) {
+                throw new RuntimeException('Tried to query ' . $name . ', but it is already in the chain: ' . implode(', ', $chain));
+            }
 
-			$object = $this->resolve($name, array_merge($chain, [$name]));
-			$this->registerService($name, function () use ($object) {
-				return $object;
-			});
-			return $object;
-		}
+            $object = $this->resolve($name, array_merge($chain, [$name]));
+            $this->registerService($name, function () use ($object) {
+                return $object;
+            });
+            return $object;
+        }
 
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
-	}
+        throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+    }
 
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public function registerParameter($name, $value) {
-		$this[$name] = $value;
-	}
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function registerParameter($name, $value) {
+        $this[$name] = $value;
+    }
 
-	/**
-	 * The given closure is call the first time the given service is queried.
-	 * The closure has to return the instance for the given service.
-	 * Created instance will be cached in case $shared is true.
-	 *
-	 * @param string $name name of the service to register another backend for
-	 * @param Closure $closure the closure to be called on service creation
-	 * @param bool $shared
-	 */
-	public function registerService($name, Closure $closure, $shared = true) {
-		$wrapped = function () use ($closure) {
-			return $closure($this);
-		};
-		$name = $this->sanitizeName($name);
-		if (isset($this->container[$name])) {
-			unset($this->container[$name]);
-		}
-		if ($shared) {
-			$this->container[$name] = $wrapped;
-		} else {
-			$this->container[$name] = $this->container->factory($wrapped);
-		}
-	}
+    /**
+     * The given closure is call the first time the given service is queried.
+     * The closure has to return the instance for the given service.
+     * Created instance will be cached in case $shared is true.
+     *
+     * @param string $name name of the service to register another backend for
+     * @param Closure $closure the closure to be called on service creation
+     * @param bool $shared
+     */
+    public function registerService($name, Closure $closure, $shared = true) {
+        $wrapped = function () use ($closure) {
+            return $closure($this);
+        };
+        $name = $this->sanitizeName($name);
+        if (isset($this->container[$name])) {
+            unset($this->container[$name]);
+        }
+        if ($shared) {
+            $this->container[$name] = $wrapped;
+        } else {
+            $this->container[$name] = $this->container->factory($wrapped);
+        }
+    }
 
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 */
-	public function registerAlias($alias, $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target): mixed {
-			return $container->get($target);
-		}, false);
-	}
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     */
+    public function registerAlias($alias, $target): void {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target): mixed {
+            return $container->get($target);
+        }, false);
+    }
 
-	protected function registerDeprecatedAlias(string $alias, string $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias): mixed {
-			try {
-				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', [
-					'app' => $this->appName ?? 'serverDI',
-				]);
-			} catch (ContainerExceptionInterface $e) {
-				// Could not get logger. Continue
-			}
+    protected function registerDeprecatedAlias(string $alias, string $target): void {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias): mixed {
+            try {
+                $logger = $container->get(LoggerInterface::class);
+                $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', [
+                    'app' => $this->appName ?? 'serverDI',
+                ]);
+            } catch (ContainerExceptionInterface $e) {
+                // Could not get logger. Continue
+            }
 
-			return $container->get($target);
-		}, false);
-	}
+            return $container->get($target);
+        }, false);
+    }
 
-	/**
-	 * @param string $name
-	 * @return string
-	 */
-	protected function sanitizeName($name) {
-		if (isset($name[0]) && $name[0] === '\\') {
-			return ltrim($name, '\\');
-		}
-		return $name;
-	}
+    /**
+     * @param string $name
+     * @return string
+     */
+    protected function sanitizeName($name) {
+        if (isset($name[0]) && $name[0] === '\\') {
+            return ltrim($name, '\\');
+        }
+        return $name;
+    }
 
-	/**
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::has
-	 */
-	public function offsetExists($id): bool {
-		return $this->container->offsetExists($id);
-	}
+    /**
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::has
+     */
+    public function offsetExists($id): bool {
+        return $this->container->offsetExists($id);
+    }
 
-	/**
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 * @return mixed
-	 */
-	#[\ReturnTypeWillChange]
-	public function offsetGet($id) {
-		return $this->container->offsetGet($id);
-	}
+    /**
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     * @return mixed
+     */
+    #[\ReturnTypeWillChange]
+    public function offsetGet($id) {
+        return $this->container->offsetGet($id);
+    }
 
-	/**
-	 * @deprecated 20.0.0 use \OCP\IContainer::registerService
-	 */
-	public function offsetSet($offset, $value): void {
-		$this->container->offsetSet($offset, $value);
-	}
+    /**
+     * @deprecated 20.0.0 use \OCP\IContainer::registerService
+     */
+    public function offsetSet($offset, $value): void {
+        $this->container->offsetSet($offset, $value);
+    }
 
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public function offsetUnset($offset): void {
-		$this->container->offsetUnset($offset);
-	}
+    /**
+     * @deprecated 20.0.0
+     */
+    public function offsetUnset($offset): void {
+        $this->container->offsetUnset($offset);
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -66,7 +66,7 @@ 
 		if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects && !$class->isInternal()) {
 			/* For PHP>=8.4, use a lazy ghost to delay constructor and dependency resolving */
 			/** @psalm-suppress UndefinedMethod */
-			return $class->newLazyGhost(function (object $object) use ($constructor, $chain): void {
+			return $class->newLazyGhost(function(object $object) use ($constructor, $chain): void {
 				/** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
 				$object->__construct(...$this->buildClassConstructorParameters($constructor, $chain));
 			});
@@ -79,7 +79,7 @@ 
 	 * @param list<class-string> $chain
 	 */
 	private function buildClassConstructorParameters(\ReflectionMethod $constructor, array $chain): array {
-		return array_map(function (ReflectionParameter $parameter) use ($chain) {
+		return array_map(function(ReflectionParameter $parameter) use ($chain) {
 			$parameterType = $parameter->getType();
 
 			$resolveName = $parameter->getName();
@@ -110,7 +110,7 @@ 
 						}
 
 						// don't lose the error we got while trying to query by type
-						throw new QueryException($e->getMessage(), (int)$e->getCode(), $e);
+						throw new QueryException($e->getMessage(), (int) $e->getCode(), $e);
 					}
 				}
 
@@ -124,7 +124,7 @@ 
 	 * @param list<class-string> $chain
 	 */
 	public function resolve($name, array $chain = []) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
+		$baseMsg = 'Could not resolve '.$name.'!';
 		try {
 			$class = new ReflectionClass($name);
 			if ($class->isInstantiable()) {
@@ -135,7 +135,7 @@ 
 			}
 		} catch (ReflectionException $e) {
 			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+			throw new QueryNotFoundException($baseMsg.' '.$e->getMessage());
 		}
 	}
 
@@ -151,17 +151,17 @@ 
 
 		if ($autoload) {
 			if (in_array($name, $chain, true)) {
-				throw new RuntimeException('Tried to query ' . $name . ', but it is already in the chain: ' . implode(', ', $chain));
+				throw new RuntimeException('Tried to query '.$name.', but it is already in the chain: '.implode(', ', $chain));
 			}
 
 			$object = $this->resolve($name, array_merge($chain, [$name]));
-			$this->registerService($name, function () use ($object) {
+			$this->registerService($name, function() use ($object) {
 				return $object;
 			});
 			return $object;
 		}
 
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+		throw new QueryNotFoundException('Could not resolve '.$name.'!');
 	}
 
 	/**
@@ -182,7 +182,7 @@ 
 	 * @param bool $shared
 	 */
 	public function registerService($name, Closure $closure, $shared = true) {
-		$wrapped = function () use ($closure) {
+		$wrapped = function() use ($closure) {
 			return $closure($this);
 		};
 		$name = $this->sanitizeName($name);
@@ -204,16 +204,16 @@ 
 	 * @param string $target the target that should be resolved instead
 	 */
 	public function registerAlias($alias, $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target): mixed {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target): mixed {
 			return $container->get($target);
 		}, false);
 	}
 
 	protected function registerDeprecatedAlias(string $alias, string $target): void {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias): mixed {
+		$this->registerService($alias, function(ContainerInterface $container) use ($target, $alias): mixed {
 			try {
 				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', [
+				$logger->debug('The requested alias "'.$alias.'" is deprecated. Please request "'.$target.'" directly. This alias will be removed in a future Nextcloud version.', [
 					'app' => $this->appName ?? 'serverDI',
 				]);
 			} catch (ContainerExceptionInterface $e) {

lib/private/ServerContainer.php

Indentation +151 added lines, -151 removed lines

@@ -21,155 +21,155 @@
  * @package OC
  */
 class ServerContainer extends SimpleContainer {
-	/** @var DIContainer[] */
-	protected $appContainers;
-
-	/** @var string[] */
-	protected $hasNoAppContainer;
-
-	/** @var string[] */
-	protected $namespaces;
-
-	/**
-	 * ServerContainer constructor.
-	 */
-	public function __construct() {
-		parent::__construct();
-		$this->appContainers = [];
-		$this->namespaces = [];
-		$this->hasNoAppContainer = [];
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $appNamespace
-	 */
-	public function registerNamespace(string $appName, string $appNamespace): void {
-		// Cut of OCA\ and lowercase
-		$appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
-		$this->namespaces[$appNamespace] = $appName;
-	}
-
-	/**
-	 * @param string $appName
-	 * @param DIContainer $container
-	 */
-	public function registerAppContainer(string $appName, DIContainer $container): void {
-		$this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
-	}
-
-	/**
-	 * @param string $appName
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	public function getRegisteredAppContainer(string $appName): DIContainer {
-		if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
-			return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
-		}
-
-		throw new QueryException();
-	}
-
-	/**
-	 * @param string $namespace
-	 * @param string $sensitiveNamespace
-	 * @return DIContainer
-	 * @throws QueryException
-	 */
-	protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
-		if (isset($this->appContainers[$namespace])) {
-			return $this->appContainers[$namespace];
-		}
-
-		if (isset($this->namespaces[$namespace])) {
-			if (!isset($this->hasNoAppContainer[$namespace])) {
-				$applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
-				if (class_exists($applicationClassName)) {
-					$app = new $applicationClassName();
-					if (isset($this->appContainers[$namespace])) {
-						$this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
-						return $this->appContainers[$namespace];
-					}
-				}
-				$this->hasNoAppContainer[$namespace] = true;
-			}
-
-			return new DIContainer($this->namespaces[$namespace]);
-		}
-		throw new QueryException();
-	}
-
-	public function has($id, bool $noRecursion = false): bool {
-		if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
-			return $appContainer->has($id);
-		}
-
-		return parent::has($id);
-	}
-
-	/**
-	 * @template T
-	 * @param class-string<T>|string $name
-	 * @param list<class-string> $chain
-	 * @return T|mixed
-	 * @psalm-template S as class-string<T>|string
-	 * @psalm-param S $name
-	 * @psalm-return (S is class-string<T> ? T : mixed)
-	 * @throws QueryException
-	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
-	 */
-	public function query(string $name, bool $autoload = true, array $chain = []) {
-		$name = $this->sanitizeName($name);
-
-		if (str_starts_with($name, 'OCA\\')) {
-			// Skip server container query for app namespace classes
-			try {
-				return parent::query($name, false, $chain);
-			} catch (QueryException $e) {
-				// Continue with general autoloading then
-			}
-			// In case the service starts with OCA\ we try to find the service in
-			// the apps container first.
-			if (($appContainer = $this->getAppContainerForService($name)) !== null) {
-				try {
-					return $appContainer->queryNoFallback($name, $chain);
-				} catch (QueryException $e) {
-					// 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 (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
-			$segments = explode('\\', $name);
-			try {
-				$appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
-				return $appContainer->queryNoFallback($name, $chain);
-			} catch (QueryException $e) {
-				// Didn't find the service or the respective app container,
-				// ignore it and fall back to the core container.
-			}
-		}
-
-		return parent::query($name, $autoload, $chain);
-	}
-
-	/**
-	 * @internal
-	 * @param string $id
-	 * @return DIContainer|null
-	 */
-	public function getAppContainerForService(string $id): ?DIContainer {
-		if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
-			return null;
-		}
-
-		try {
-			[,$namespace,] = explode('\\', $id);
-			return $this->getAppContainer(strtolower($namespace), $namespace);
-		} catch (QueryException $e) {
-			return null;
-		}
-	}
+    /** @var DIContainer[] */
+    protected $appContainers;
+
+    /** @var string[] */
+    protected $hasNoAppContainer;
+
+    /** @var string[] */
+    protected $namespaces;
+
+    /**
+     * ServerContainer constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        $this->appContainers = [];
+        $this->namespaces = [];
+        $this->hasNoAppContainer = [];
+    }
+
+    /**
+     * @param string $appName
+     * @param string $appNamespace
+     */
+    public function registerNamespace(string $appName, string $appNamespace): void {
+        // Cut of OCA\ and lowercase
+        $appNamespace = strtolower(substr($appNamespace, strrpos($appNamespace, '\\') + 1));
+        $this->namespaces[$appNamespace] = $appName;
+    }
+
+    /**
+     * @param string $appName
+     * @param DIContainer $container
+     */
+    public function registerAppContainer(string $appName, DIContainer $container): void {
+        $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))] = $container;
+    }
+
+    /**
+     * @param string $appName
+     * @return DIContainer
+     * @throws QueryException
+     */
+    public function getRegisteredAppContainer(string $appName): DIContainer {
+        if (isset($this->appContainers[strtolower(App::buildAppNamespace($appName, ''))])) {
+            return $this->appContainers[strtolower(App::buildAppNamespace($appName, ''))];
+        }
+
+        throw new QueryException();
+    }
+
+    /**
+     * @param string $namespace
+     * @param string $sensitiveNamespace
+     * @return DIContainer
+     * @throws QueryException
+     */
+    protected function getAppContainer(string $namespace, string $sensitiveNamespace): DIContainer {
+        if (isset($this->appContainers[$namespace])) {
+            return $this->appContainers[$namespace];
+        }
+
+        if (isset($this->namespaces[$namespace])) {
+            if (!isset($this->hasNoAppContainer[$namespace])) {
+                $applicationClassName = 'OCA\\' . $sensitiveNamespace . '\\AppInfo\\Application';
+                if (class_exists($applicationClassName)) {
+                    $app = new $applicationClassName();
+                    if (isset($this->appContainers[$namespace])) {
+                        $this->appContainers[$namespace]->offsetSet($applicationClassName, $app);
+                        return $this->appContainers[$namespace];
+                    }
+                }
+                $this->hasNoAppContainer[$namespace] = true;
+            }
+
+            return new DIContainer($this->namespaces[$namespace]);
+        }
+        throw new QueryException();
+    }
+
+    public function has($id, bool $noRecursion = false): bool {
+        if (!$noRecursion && ($appContainer = $this->getAppContainerForService($id)) !== null) {
+            return $appContainer->has($id);
+        }
+
+        return parent::has($id);
+    }
+
+    /**
+     * @template T
+     * @param class-string<T>|string $name
+     * @param list<class-string> $chain
+     * @return T|mixed
+     * @psalm-template S as class-string<T>|string
+     * @psalm-param S $name
+     * @psalm-return (S is class-string<T> ? T : mixed)
+     * @throws QueryException
+     * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
+     */
+    public function query(string $name, bool $autoload = true, array $chain = []) {
+        $name = $this->sanitizeName($name);
+
+        if (str_starts_with($name, 'OCA\\')) {
+            // Skip server container query for app namespace classes
+            try {
+                return parent::query($name, false, $chain);
+            } catch (QueryException $e) {
+                // Continue with general autoloading then
+            }
+            // In case the service starts with OCA\ we try to find the service in
+            // the apps container first.
+            if (($appContainer = $this->getAppContainerForService($name)) !== null) {
+                try {
+                    return $appContainer->queryNoFallback($name, $chain);
+                } catch (QueryException $e) {
+                    // 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 (str_starts_with($name, 'OC\\Settings\\') && substr_count($name, '\\') >= 3) {
+            $segments = explode('\\', $name);
+            try {
+                $appContainer = $this->getAppContainer(strtolower($segments[1]), $segments[1]);
+                return $appContainer->queryNoFallback($name, $chain);
+            } catch (QueryException $e) {
+                // Didn't find the service or the respective app container,
+                // ignore it and fall back to the core container.
+            }
+        }
+
+        return parent::query($name, $autoload, $chain);
+    }
+
+    /**
+     * @internal
+     * @param string $id
+     * @return DIContainer|null
+     */
+    public function getAppContainerForService(string $id): ?DIContainer {
+        if (!str_starts_with($id, 'OCA\\') || substr_count($id, '\\') < 2) {
+            return null;
+        }
+
+        try {
+            [,$namespace,] = explode('\\', $id);
+            return $this->getAppContainer(strtolower($namespace), $namespace);
+        } catch (QueryException $e) {
+            return null;
+        }
+    }
 }