nextcloud / server

lib/private/AppFramework/App.php

Indentation +197 added lines, -197 removed lines

@@ -29,206 +29,206 @@
  * Handles all the dependency injection, controllers and output flow
  */
 class App {
-	/** @var string[] */
-	private static $nameSpaceCache = [];
-
-	/**
-	 * Turns an app id into a namespace by either reading the appinfo.xml's
-	 * namespace tag or uppercasing the appid's first letter
-	 * @param string $appId the app id
-	 * @param string $topNamespace the namespace which should be prepended to
-	 *                             the transformed app id, defaults to OCA\
-	 * @return string the starting namespace for the app
-	 */
-	public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
-		// Hit the cache!
-		if (isset(self::$nameSpaceCache[$appId])) {
-			return $topNamespace . self::$nameSpaceCache[$appId];
-		}
-
-		$appInfo = \OCP\Server::get(IAppManager::class)->getAppInfo($appId);
-		if (isset($appInfo['namespace'])) {
-			self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
-		} else {
-			// if the tag is not found, fall back to uppercasing the first letter
-			self::$nameSpaceCache[$appId] = ucfirst($appId);
-		}
-
-		return $topNamespace . self::$nameSpaceCache[$appId];
-	}
-
-	public static function getAppIdForClass(string $className, string $topNamespace = 'OCA\\'): ?string {
-		if (!str_starts_with($className, $topNamespace)) {
-			return null;
-		}
-
-		foreach (self::$nameSpaceCache as $appId => $namespace) {
-			if (str_starts_with($className, $topNamespace . $namespace . '\\')) {
-				return $appId;
-			}
-		}
-
-		return null;
-	}
-
-
-	/**
-	 * Shortcut for calling a controller method and printing the result
-	 *
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @param DIContainer $container an instance of a pimple container.
-	 * @param array $urlParams list of URL parameters (optional)
-	 * @throws HintException
-	 */
-	public static function main(string $controllerName, string $methodName, DIContainer $container, ?array $urlParams = null) {
-		/** @var IProfiler $profiler */
-		$profiler = $container->get(IProfiler::class);
-		$eventLogger = $container->get(IEventLogger::class);
-		// Disable profiler on the profiler UI
-		$profiler->setEnabled($profiler->isEnabled() && !is_null($urlParams) && isset($urlParams['_route']) && !str_starts_with($urlParams['_route'], 'profiler.'));
-		if ($profiler->isEnabled()) {
-			\OC::$server->get(IEventLogger::class)->activate();
-			$profiler->add(new RoutingDataCollector($container['appName'], $controllerName, $methodName));
-		}
-
-		$eventLogger->start('app:controller:params', 'Gather controller parameters');
-
-		if (!is_null($urlParams)) {
-			/** @var Request $request */
-			$request = $container->get(IRequest::class);
-			$request->setUrlParameters($urlParams);
-		} elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) {
-			/** @var Request $request */
-			$request = $container->get(IRequest::class);
-			$request->setUrlParameters($container['urlParams']);
-		}
-		$appName = $container['appName'];
-
-		$eventLogger->end('app:controller:params');
-
-		$eventLogger->start('app:controller:load', 'Load app controller');
-
-		// first try $controllerName then go for \OCA\AppName\Controller\$controllerName
-		try {
-			$controller = $container->get($controllerName);
-		} catch (QueryException $e) {
-			if (str_contains($controllerName, '\\Controller\\')) {
-				// This is from a global registered app route that is not enabled.
-				[/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
-				throw new HintException('App ' . strtolower($app) . ' is not enabled');
-			}
-
-			if ($appName === 'core') {
-				$appNameSpace = 'OC\\Core';
-			} else {
-				$appNameSpace = self::buildAppNamespace($appName);
-			}
-			$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
-			$controller = $container->query($controllerName);
-		}
-
-		$eventLogger->end('app:controller:load');
-
-		$eventLogger->start('app:controller:dispatcher', 'Initialize dispatcher and pre-middleware');
-
-		// initialize the dispatcher and run all the middleware before the controller
-		$dispatcher = $container->get(Dispatcher::class);
-
-		$eventLogger->end('app:controller:dispatcher');
-
-		$eventLogger->start('app:controller:run', 'Run app controller');
-
-		[
-			$httpHeaders,
-			$responseHeaders,
-			$responseCookies,
-			$output,
-			$response
-		] = $dispatcher->dispatch($controller, $methodName);
-
-		$eventLogger->end('app:controller:run');
-
-		$io = $container[IOutput::class];
-
-		if ($profiler->isEnabled()) {
-			$eventLogger->end('runtime');
-			$profile = $profiler->collect($container->get(IRequest::class), $response);
-			$profiler->saveProfile($profile);
-			$io->setHeader('X-Debug-Token:' . $profile->getToken());
-			$io->setHeader('Server-Timing: token;desc="' . $profile->getToken() . '"');
-		}
-
-		if (!is_null($httpHeaders)) {
-			$io->setHeader($httpHeaders);
-		}
-
-		foreach ($responseHeaders as $name => $value) {
-			$io->setHeader($name . ': ' . $value);
-		}
-
-		foreach ($responseCookies as $name => $value) {
-			$expireDate = null;
-			if ($value['expireDate'] instanceof \DateTime) {
-				$expireDate = $value['expireDate']->getTimestamp();
-			}
-			$sameSite = $value['sameSite'] ?? 'Lax';
-
-			$io->setCookie(
-				$name,
-				$value['value'],
-				$expireDate,
-				$container->getServer()->getWebRoot(),
-				null,
-				$container->getServer()->getRequest()->getServerProtocol() === 'https',
-				true,
-				$sameSite
-			);
-		}
-
-		/*
+    /** @var string[] */
+    private static $nameSpaceCache = [];
+
+    /**
+     * Turns an app id into a namespace by either reading the appinfo.xml's
+     * namespace tag or uppercasing the appid's first letter
+     * @param string $appId the app id
+     * @param string $topNamespace the namespace which should be prepended to
+     *                             the transformed app id, defaults to OCA\
+     * @return string the starting namespace for the app
+     */
+    public static function buildAppNamespace(string $appId, string $topNamespace = 'OCA\\'): string {
+        // Hit the cache!
+        if (isset(self::$nameSpaceCache[$appId])) {
+            return $topNamespace . self::$nameSpaceCache[$appId];
+        }
+
+        $appInfo = \OCP\Server::get(IAppManager::class)->getAppInfo($appId);
+        if (isset($appInfo['namespace'])) {
+            self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
+        } else {
+            // if the tag is not found, fall back to uppercasing the first letter
+            self::$nameSpaceCache[$appId] = ucfirst($appId);
+        }
+
+        return $topNamespace . self::$nameSpaceCache[$appId];
+    }
+
+    public static function getAppIdForClass(string $className, string $topNamespace = 'OCA\\'): ?string {
+        if (!str_starts_with($className, $topNamespace)) {
+            return null;
+        }
+
+        foreach (self::$nameSpaceCache as $appId => $namespace) {
+            if (str_starts_with($className, $topNamespace . $namespace . '\\')) {
+                return $appId;
+            }
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Shortcut for calling a controller method and printing the result
+     *
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @param DIContainer $container an instance of a pimple container.
+     * @param array $urlParams list of URL parameters (optional)
+     * @throws HintException
+     */
+    public static function main(string $controllerName, string $methodName, DIContainer $container, ?array $urlParams = null) {
+        /** @var IProfiler $profiler */
+        $profiler = $container->get(IProfiler::class);
+        $eventLogger = $container->get(IEventLogger::class);
+        // Disable profiler on the profiler UI
+        $profiler->setEnabled($profiler->isEnabled() && !is_null($urlParams) && isset($urlParams['_route']) && !str_starts_with($urlParams['_route'], 'profiler.'));
+        if ($profiler->isEnabled()) {
+            \OC::$server->get(IEventLogger::class)->activate();
+            $profiler->add(new RoutingDataCollector($container['appName'], $controllerName, $methodName));
+        }
+
+        $eventLogger->start('app:controller:params', 'Gather controller parameters');
+
+        if (!is_null($urlParams)) {
+            /** @var Request $request */
+            $request = $container->get(IRequest::class);
+            $request->setUrlParameters($urlParams);
+        } elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) {
+            /** @var Request $request */
+            $request = $container->get(IRequest::class);
+            $request->setUrlParameters($container['urlParams']);
+        }
+        $appName = $container['appName'];
+
+        $eventLogger->end('app:controller:params');
+
+        $eventLogger->start('app:controller:load', 'Load app controller');
+
+        // first try $controllerName then go for \OCA\AppName\Controller\$controllerName
+        try {
+            $controller = $container->get($controllerName);
+        } catch (QueryException $e) {
+            if (str_contains($controllerName, '\\Controller\\')) {
+                // This is from a global registered app route that is not enabled.
+                [/*OC(A)*/, $app, /* Controller/Name*/] = explode('\\', $controllerName, 3);
+                throw new HintException('App ' . strtolower($app) . ' is not enabled');
+            }
+
+            if ($appName === 'core') {
+                $appNameSpace = 'OC\\Core';
+            } else {
+                $appNameSpace = self::buildAppNamespace($appName);
+            }
+            $controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
+            $controller = $container->query($controllerName);
+        }
+
+        $eventLogger->end('app:controller:load');
+
+        $eventLogger->start('app:controller:dispatcher', 'Initialize dispatcher and pre-middleware');
+
+        // initialize the dispatcher and run all the middleware before the controller
+        $dispatcher = $container->get(Dispatcher::class);
+
+        $eventLogger->end('app:controller:dispatcher');
+
+        $eventLogger->start('app:controller:run', 'Run app controller');
+
+        [
+            $httpHeaders,
+            $responseHeaders,
+            $responseCookies,
+            $output,
+            $response
+        ] = $dispatcher->dispatch($controller, $methodName);
+
+        $eventLogger->end('app:controller:run');
+
+        $io = $container[IOutput::class];
+
+        if ($profiler->isEnabled()) {
+            $eventLogger->end('runtime');
+            $profile = $profiler->collect($container->get(IRequest::class), $response);
+            $profiler->saveProfile($profile);
+            $io->setHeader('X-Debug-Token:' . $profile->getToken());
+            $io->setHeader('Server-Timing: token;desc="' . $profile->getToken() . '"');
+        }
+
+        if (!is_null($httpHeaders)) {
+            $io->setHeader($httpHeaders);
+        }
+
+        foreach ($responseHeaders as $name => $value) {
+            $io->setHeader($name . ': ' . $value);
+        }
+
+        foreach ($responseCookies as $name => $value) {
+            $expireDate = null;
+            if ($value['expireDate'] instanceof \DateTime) {
+                $expireDate = $value['expireDate']->getTimestamp();
+            }
+            $sameSite = $value['sameSite'] ?? 'Lax';
+
+            $io->setCookie(
+                $name,
+                $value['value'],
+                $expireDate,
+                $container->getServer()->getWebRoot(),
+                null,
+                $container->getServer()->getRequest()->getServerProtocol() === 'https',
+                true,
+                $sameSite
+            );
+        }
+
+        /*
 		 * Status 204 does not have a body and no Content Length
 		 * Status 304 does not have a body and does not need a Content Length
 		 * https://tools.ietf.org/html/rfc7230#section-3.3
 		 * https://tools.ietf.org/html/rfc7230#section-3.3.2
 		 */
-		$emptyResponse = false;
-		if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) {
-			$status = (int)$matches[1];
-			if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) {
-				$emptyResponse = true;
-			}
-		}
-
-		if (!$emptyResponse) {
-			if ($response instanceof ICallbackResponse) {
-				$response->callback($io);
-			} elseif (!is_null($output)) {
-				$io->setHeader('Content-Length: ' . strlen($output));
-				$io->setOutput($output);
-			}
-		}
-	}
-
-	/**
-	 * Shortcut for calling a controller method and printing the result.
-	 * Similar to App:main except that no headers will be sent.
-	 *
-	 * @param string $controllerName the name of the controller under which it is
-	 *                               stored in the DI container
-	 * @param string $methodName the method that you want to call
-	 * @param array $urlParams an array with variables extracted from the routes
-	 * @param DIContainer $container an instance of a pimple container.
-	 */
-	public static function part(string $controllerName, string $methodName, array $urlParams,
-		DIContainer $container) {
-		$container['urlParams'] = $urlParams;
-		$controller = $container[$controllerName];
-
-		$dispatcher = $container['Dispatcher'];
-
-		[, , $output] = $dispatcher->dispatch($controller, $methodName);
-		return $output;
-	}
+        $emptyResponse = false;
+        if (preg_match('/^HTTP\/\d\.\d (\d{3}) .*$/', $httpHeaders, $matches)) {
+            $status = (int)$matches[1];
+            if ($status === Http::STATUS_NO_CONTENT || $status === Http::STATUS_NOT_MODIFIED) {
+                $emptyResponse = true;
+            }
+        }
+
+        if (!$emptyResponse) {
+            if ($response instanceof ICallbackResponse) {
+                $response->callback($io);
+            } elseif (!is_null($output)) {
+                $io->setHeader('Content-Length: ' . strlen($output));
+                $io->setOutput($output);
+            }
+        }
+    }
+
+    /**
+     * Shortcut for calling a controller method and printing the result.
+     * Similar to App:main except that no headers will be sent.
+     *
+     * @param string $controllerName the name of the controller under which it is
+     *                               stored in the DI container
+     * @param string $methodName the method that you want to call
+     * @param array $urlParams an array with variables extracted from the routes
+     * @param DIContainer $container an instance of a pimple container.
+     */
+    public static function part(string $controllerName, string $methodName, array $urlParams,
+        DIContainer $container) {
+        $container['urlParams'] = $urlParams;
+        $controller = $container[$controllerName];
+
+        $dispatcher = $container['Dispatcher'];
+
+        [, , $output] = $dispatcher->dispatch($controller, $methodName);
+        return $output;
+    }
 }

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +297 added lines, -297 removed lines

@@ -63,301 +63,301 @@
 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),
-				$server->getAppManager(),
-				$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;
-	}
-
-	public function query(string $name, bool $autoload = true) {
-		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) {
-			try {
-				return $this->getServer()->query($name, $autoload);
-			} 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) {
-		$name = $this->sanitizeName($name);
-
-		if ($this->offsetExists($name)) {
-			return parent::query($name);
-		} elseif ($this->appName === 'settings' && str_starts_with($name, 'OC\\Settings\\')) {
-			return parent::query($name);
-		} elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
-			return parent::query($name);
-		} elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
-			return parent::query($name);
-		} 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);
-		}
-
-		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),
+                $server->getAppManager(),
+                $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;
+    }
+
+    public function query(string $name, bool $autoload = true) {
+        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) {
+            try {
+                return $this->getServer()->query($name, $autoload);
+            } 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) {
+        $name = $this->sanitizeName($name);
+
+        if ($this->offsetExists($name)) {
+            return parent::query($name);
+        } elseif ($this->appName === 'settings' && str_starts_with($name, 'OC\\Settings\\')) {
+            return parent::query($name);
+        } elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
+            return parent::query($name);
+        } elseif (str_starts_with($name, \OC\AppFramework\App::buildAppNamespace($this->appName) . '\\')) {
+            return parent::query($name);
+        } 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);
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!'
+            . ' Class can not be instantiated', 1);
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -96,20 +96,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),
@@ -117,7 +117,7 @@ 
 			);
 		});
 
-		$this->registerService(IServerContainer::class, function () {
+		$this->registerService(IServerContainer::class, function() {
 			return $this->getServer();
 		});
 		/** @deprecated 32.0.0 */
@@ -129,28 +129,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),
@@ -176,7 +176,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();
@@ -292,7 +292,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);
 		});
 	}
@@ -347,7 +347,7 @@ 
 			return parent::query($name);
 		} elseif ($this->appName === 'core' && str_starts_with($name, 'OC\\Core\\')) {
 			return parent::query($name);
-		} 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);
 		} elseif (
 			str_starts_with($name, 'OC\\AppFramework\\Services\\')
@@ -357,7 +357,7 @@ 
 			return parent::query($name);
 		}
 
-		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 +222 added lines, -222 removed lines

@@ -25,226 +25,226 @@
  * SimpleContainer is a simple implementation of a container on basis of Pimple
  */
 class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
-	public static bool $useLazyObjects = false;
-
-	private Container $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);
-	}
-
-	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
-	 * @return object the created class
-	 * @suppress PhanUndeclaredClassInstanceof
-	 */
-	private function buildClass(ReflectionClass $class): object {
-		$constructor = $class->getConstructor();
-		if ($constructor === null) {
-			/* No constructor, return a instance directly */
-			return $class->newInstance();
-		}
-		if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects) {
-			/* 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): void {
-				/** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
-				$object->__construct(...$this->buildClassConstructorParameters($constructor));
-			});
-		} else {
-			return $class->newInstanceArgs($this->buildClassConstructorParameters($constructor));
-		}
-	}
-
-	private function buildClassConstructorParameters(\ReflectionMethod $constructor): array {
-		return array_map(function (ReflectionParameter $parameter) {
-			$parameterType = $parameter->getType();
-
-			$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 {
-				$builtIn = $parameterType !== null && ($parameterType instanceof ReflectionNamedType)
-							&& $parameterType->isBuiltin();
-				return $this->query($resolveName, !$builtIn);
-			} 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);
-					} 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);
-					}
-				}
-
-				throw $e;
-			}
-		}, $constructor->getParameters());
-	}
-
-	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
-		try {
-			$class = new ReflectionClass($name);
-			if ($class->isInstantiable()) {
-				return $this->buildClass($class);
-			} else {
-				throw new QueryException($baseMsg
-					. ' Class can not be instantiated');
-			}
-		} catch (ReflectionException $e) {
-			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
-		}
-	}
-
-	public function query(string $name, bool $autoload = true) {
-		$name = $this->sanitizeName($name);
-		if (isset($this->container[$name])) {
-			return $this->container[$name];
-		}
-
-		if ($autoload) {
-			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
-				return $object;
-			});
-			return $object;
-		}
-
-		throw new QueryNotFoundException('Could not resolve ' . $name . '!');
-	}
-
-	/**
-	 * @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);
-		}
-	}
-
-	/**
-	 * 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
-			}
-
-			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;
-	}
-
-	/**
-	 * @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 \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);
-	}
+    public static bool $useLazyObjects = false;
+
+    private Container $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);
+    }
+
+    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
+     * @return object the created class
+     * @suppress PhanUndeclaredClassInstanceof
+     */
+    private function buildClass(ReflectionClass $class): object {
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            /* No constructor, return a instance directly */
+            return $class->newInstance();
+        }
+        if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects) {
+            /* 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): void {
+                /** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
+                $object->__construct(...$this->buildClassConstructorParameters($constructor));
+            });
+        } else {
+            return $class->newInstanceArgs($this->buildClassConstructorParameters($constructor));
+        }
+    }
+
+    private function buildClassConstructorParameters(\ReflectionMethod $constructor): array {
+        return array_map(function (ReflectionParameter $parameter) {
+            $parameterType = $parameter->getType();
+
+            $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 {
+                $builtIn = $parameterType !== null && ($parameterType instanceof ReflectionNamedType)
+                            && $parameterType->isBuiltin();
+                return $this->query($resolveName, !$builtIn);
+            } 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);
+                    } 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);
+                    }
+                }
+
+                throw $e;
+            }
+        }, $constructor->getParameters());
+    }
+
+    public function resolve($name) {
+        $baseMsg = 'Could not resolve ' . $name . '!';
+        try {
+            $class = new ReflectionClass($name);
+            if ($class->isInstantiable()) {
+                return $this->buildClass($class);
+            } else {
+                throw new QueryException($baseMsg
+                    . ' Class can not be instantiated');
+            }
+        } catch (ReflectionException $e) {
+            // Class does not exist
+            throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+        }
+    }
+
+    public function query(string $name, bool $autoload = true) {
+        $name = $this->sanitizeName($name);
+        if (isset($this->container[$name])) {
+            return $this->container[$name];
+        }
+
+        if ($autoload) {
+            $object = $this->resolve($name);
+            $this->registerService($name, function () use ($object) {
+                return $object;
+            });
+            return $object;
+        }
+
+        throw new QueryNotFoundException('Could not resolve ' . $name . '!');
+    }
+
+    /**
+     * @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);
+        }
+    }
+
+    /**
+     * 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
+            }
+
+            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;
+    }
+
+    /**
+     * @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 \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);
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -64,7 +64,7 @@ 
 		if (PHP_VERSION_ID >= 80400 && self::$useLazyObjects) {
 			/* 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): void {
+			return $class->newLazyGhost(function(object $object) use ($constructor): void {
 				/** @psalm-suppress DirectConstructorCall For lazy ghosts we have to call the constructor directly */
 				$object->__construct(...$this->buildClassConstructorParameters($constructor));
 			});
@@ -74,7 +74,7 @@ 
 	}
 
 	private function buildClassConstructorParameters(\ReflectionMethod $constructor): array {
-		return array_map(function (ReflectionParameter $parameter) {
+		return array_map(function(ReflectionParameter $parameter) {
 			$parameterType = $parameter->getType();
 
 			$resolveName = $parameter->getName();
@@ -105,7 +105,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);
 					}
 				}
 
@@ -115,7 +115,7 @@ 
 	}
 
 	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
+		$baseMsg = 'Could not resolve '.$name.'!';
 		try {
 			$class = new ReflectionClass($name);
 			if ($class->isInstantiable()) {
@@ -126,7 +126,7 @@ 
 			}
 		} catch (ReflectionException $e) {
 			// Class does not exist
-			throw new QueryNotFoundException($baseMsg . ' ' . $e->getMessage());
+			throw new QueryNotFoundException($baseMsg.' '.$e->getMessage());
 		}
 	}
 
@@ -138,13 +138,13 @@ 
 
 		if ($autoload) {
 			$object = $this->resolve($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.'!');
 	}
 
 	/**
@@ -165,7 +165,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);
@@ -187,16 +187,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) {