nextcloud / server

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +258 added lines, -258 removed lines

@@ -47,285 +47,285 @@
  * @see IBootstrap::register()
  */
 interface IRegistrationContext {
-	/**
-	 * @param string $capability
-	 * @psalm-param class-string<ICapability> $capability
-	 * @see IAppContainer::registerCapability
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerCapability(string $capability): void;
+    /**
+     * @param string $capability
+     * @psalm-param class-string<ICapability> $capability
+     * @see IAppContainer::registerCapability
+     *
+     * @since 20.0.0
+     */
+    public function registerCapability(string $capability): void;
 
-	/**
-	 * Register an implementation of \OCP\Support\CrashReport\IReporter that
-	 * will receive unhandled exceptions and throwables
-	 *
-	 * @param string $reporterClass
-	 * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerCrashReporter(string $reporterClass): void;
+    /**
+     * Register an implementation of \OCP\Support\CrashReport\IReporter that
+     * will receive unhandled exceptions and throwables
+     *
+     * @param string $reporterClass
+     * @psalm-param class-string<\OCP\Support\CrashReport\IReporter> $reporterClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerCrashReporter(string $reporterClass): void;
 
-	/**
-	 * Register an implementation of \OCP\Dashboard\IWidget that
-	 * will handle the implementation of a dashboard widget
-	 *
-	 * @param string $widgetClass
-	 * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
-	 * @return void
-	 * @since 20.0.0
-	 */
-	public function registerDashboardWidget(string $widgetClass): void;
+    /**
+     * Register an implementation of \OCP\Dashboard\IWidget that
+     * will handle the implementation of a dashboard widget
+     *
+     * @param string $widgetClass
+     * @psalm-param class-string<\OCP\Dashboard\IWidget> $widgetClass
+     * @return void
+     * @since 20.0.0
+     */
+    public function registerDashboardWidget(string $widgetClass): void;
 
-	/**
-	 * Register a service
-	 *
-	 * @param string $name
-	 * @param callable $factory
-	 * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
-	 * @param bool $shared
-	 *
-	 * @return void
-	 * @see IContainer::registerService()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerService(string $name, callable $factory, bool $shared = true): void;
+    /**
+     * Register a service
+     *
+     * @param string $name
+     * @param callable $factory
+     * @psalm-param callable(\Psr\Container\ContainerInterface): mixed $factory
+     * @param bool $shared
+     *
+     * @return void
+     * @see IContainer::registerService()
+     *
+     * @since 20.0.0
+     */
+    public function registerService(string $name, callable $factory, bool $shared = true): void;
 
-	/**
-	 * @param string $alias
-	 * @psalm-param string|class-string $alias
-	 * @param string $target
-	 * @psalm-param string|class-string $target
-	 *
-	 * @return void
-	 * @see IContainer::registerAlias()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerServiceAlias(string $alias, string $target): void;
+    /**
+     * @param string $alias
+     * @psalm-param string|class-string $alias
+     * @param string $target
+     * @psalm-param string|class-string $target
+     *
+     * @return void
+     * @see IContainer::registerAlias()
+     *
+     * @since 20.0.0
+     */
+    public function registerServiceAlias(string $alias, string $target): void;
 
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 *
-	 * @return void
-	 * @see IContainer::registerParameter()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerParameter(string $name, $value): void;
+    /**
+     * @param string $name
+     * @param mixed $value
+     *
+     * @return void
+     * @see IContainer::registerParameter()
+     *
+     * @since 20.0.0
+     */
+    public function registerParameter(string $name, $value): void;
 
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @psalm-template T of \OCP\EventDispatcher\Event
-	 * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
-	 * @psalm-param class-string<\OCP\EventDispatcher\IEventListener> $listener fully qualified class name that can be built by the DI container
-	 * @param int $priority The higher this value, the earlier an event
-	 *                      listener will be triggered in the chain (defaults to 0)
-	 *
-	 * @see IEventDispatcher::addServiceListener()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerEventListener(string $event, string $listener, int $priority = 0): void;
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @psalm-template T of \OCP\EventDispatcher\Event
+     * @param string $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @psalm-param string|class-string<T> $event preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $listener fully qualified class name (or ::class notation) of a \OCP\EventDispatcher\IEventListener that can be built by the DI container
+     * @psalm-param class-string<\OCP\EventDispatcher\IEventListener> $listener fully qualified class name that can be built by the DI container
+     * @param int $priority The higher this value, the earlier an event
+     *                      listener will be triggered in the chain (defaults to 0)
+     *
+     * @see IEventDispatcher::addServiceListener()
+     *
+     * @since 20.0.0
+     */
+    public function registerEventListener(string $event, string $listener, int $priority = 0): void;
 
-	/**
-	 * @param string $class
-	 * @param bool $global load this middleware also for requests of other apps? Added in Nextcloud 26
-	 * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 * @since 26.0.0 Added optional argument $global
-	 */
-	public function registerMiddleware(string $class, bool $global = false): void;
+    /**
+     * @param string $class
+     * @param bool $global load this middleware also for requests of other apps? Added in Nextcloud 26
+     * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     * @since 26.0.0 Added optional argument $global
+     */
+    public function registerMiddleware(string $class, bool $global = false): void;
 
-	/**
-	 * Register a search provider for the unified search
-	 *
-	 * It is allowed to register more than one provider per app as the search
-	 * results can go into distinct sections, e.g. "Files" and "Files shared
-	 * with you" in the Files app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Search\IProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerSearchProvider(string $class): void;
+    /**
+     * Register a search provider for the unified search
+     *
+     * It is allowed to register more than one provider per app as the search
+     * results can go into distinct sections, e.g. "Files" and "Files shared
+     * with you" in the Files app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Search\IProvider> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerSearchProvider(string $class): void;
 
-	/**
-	 * Register an alternative login option
-	 *
-	 * It is allowed to register more than one option per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
-	 *
-	 * @return void
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerAlternativeLogin(string $class): void;
+    /**
+     * Register an alternative login option
+     *
+     * It is allowed to register more than one option per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Authentication\IAlternativeLogin> $class
+     *
+     * @return void
+     *
+     * @since 20.0.0
+     */
+    public function registerAlternativeLogin(string $class): void;
 
-	/**
-	 * Register an initialstate provider
-	 *
-	 * It is allowed to register more than one provider per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerInitialStateProvider(string $class): void;
+    /**
+     * Register an initialstate provider
+     *
+     * It is allowed to register more than one provider per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Services\InitialStateProvider> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerInitialStateProvider(string $class): void;
 
-	/**
-	 * Register a well known protocol handler
-	 *
-	 * It is allowed to register more than one handler per app.
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
-	 *
-	 * @return void
-	 *
-	 * @since 21.0.0
-	 */
-	public function registerWellKnownHandler(string $class): void;
+    /**
+     * Register a well known protocol handler
+     *
+     * It is allowed to register more than one handler per app.
+     *
+     * @param string $class
+     * @psalm-param class-string<\OCP\Http\WellKnown\IHandler> $class
+     *
+     * @return void
+     *
+     * @since 21.0.0
+     */
+    public function registerWellKnownHandler(string $class): void;
 
-	/**
-	 * Register a custom template provider class that is able to inject custom templates
-	 * in addition to the user defined ones
-	 *
-	 * @param string $providerClass
-	 * @psalm-param class-string<ICustomTemplateProvider> $providerClass
-	 * @since 21.0.0
-	 */
-	public function registerTemplateProvider(string $providerClass): void;
+    /**
+     * Register a custom template provider class that is able to inject custom templates
+     * in addition to the user defined ones
+     *
+     * @param string $providerClass
+     * @psalm-param class-string<ICustomTemplateProvider> $providerClass
+     * @since 21.0.0
+     */
+    public function registerTemplateProvider(string $providerClass): void;
 
-	/**
-	 * Register an INotifier class
-	 *
-	 * @param string $notifierClass
-	 * @psalm-param class-string<INotifier> $notifierClass
-	 * @since 22.0.0
-	 */
-	public function registerNotifierService(string $notifierClass): void;
+    /**
+     * Register an INotifier class
+     *
+     * @param string $notifierClass
+     * @psalm-param class-string<INotifier> $notifierClass
+     * @since 22.0.0
+     */
+    public function registerNotifierService(string $notifierClass): void;
 
-	/**
-	 * Register a two-factor provider
-	 *
-	 * @param string $twoFactorProviderClass
-	 * @psalm-param class-string<IProvider> $twoFactorProviderClass
-	 * @since 22.0.0
-	 */
-	public function registerTwoFactorProvider(string $twoFactorProviderClass): void;
+    /**
+     * Register a two-factor provider
+     *
+     * @param string $twoFactorProviderClass
+     * @psalm-param class-string<IProvider> $twoFactorProviderClass
+     * @since 22.0.0
+     */
+    public function registerTwoFactorProvider(string $twoFactorProviderClass): void;
 
-	/**
-	 * Register a preview provider
-	 *
-	 * It is allowed to register more than one provider per app.
-	 *
-	 * @param string $previewProviderClass
-	 * @param string $mimeTypeRegex
-	 * @psalm-param class-string<IProviderV2> $previewProviderClass
-	 * @since 23.0.0
-	 */
-	public function registerPreviewProvider(string $previewProviderClass, string $mimeTypeRegex): void;
+    /**
+     * Register a preview provider
+     *
+     * It is allowed to register more than one provider per app.
+     *
+     * @param string $previewProviderClass
+     * @param string $mimeTypeRegex
+     * @psalm-param class-string<IProviderV2> $previewProviderClass
+     * @since 23.0.0
+     */
+    public function registerPreviewProvider(string $previewProviderClass, string $mimeTypeRegex): void;
 
-	/**
-	 * Register a calendar provider
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<ICalendarProvider> $class
-	 * @since 23.0.0
-	 */
-	public function registerCalendarProvider(string $class): void;
+    /**
+     * Register a calendar provider
+     *
+     * @param string $class
+     * @psalm-param class-string<ICalendarProvider> $class
+     * @since 23.0.0
+     */
+    public function registerCalendarProvider(string $class): void;
 
-	/**
-	 * Register a reference provider
-	 *
-	 * @param string $class
-	 * @psalm-param class-string<IReferenceProvider> $class
-	 * @since 25.0.0
-	 */
-	public function registerReferenceProvider(string $class): void;
+    /**
+     * Register a reference provider
+     *
+     * @param string $class
+     * @psalm-param class-string<IReferenceProvider> $class
+     * @since 25.0.0
+     */
+    public function registerReferenceProvider(string $class): void;
 
-	/**
-	 * Register an implementation of \OCP\Profile\ILinkAction that
-	 * will handle the implementation of a profile link action
-	 *
-	 * @param string $actionClass
-	 * @psalm-param class-string<\OCP\Profile\ILinkAction> $actionClass
-	 * @return void
-	 * @since 23.0.0
-	 */
-	public function registerProfileLinkAction(string $actionClass): void;
+    /**
+     * Register an implementation of \OCP\Profile\ILinkAction that
+     * will handle the implementation of a profile link action
+     *
+     * @param string $actionClass
+     * @psalm-param class-string<\OCP\Profile\ILinkAction> $actionClass
+     * @return void
+     * @since 23.0.0
+     */
+    public function registerProfileLinkAction(string $actionClass): void;
 
-	/**
-	 * Register the backend of the Talk app
-	 *
-	 * This service must only be used by the Talk app
-	 *
-	 * @param string $backend
-	 * @return void
-	 * @since 24.0.0
-	 */
-	public function registerTalkBackend(string $backend): void;
+    /**
+     * Register the backend of the Talk app
+     *
+     * This service must only be used by the Talk app
+     *
+     * @param string $backend
+     * @return void
+     * @since 24.0.0
+     */
+    public function registerTalkBackend(string $backend): void;
 
-	/**
-	 * Register a resource backend for the DAV server
-	 *
-	 * @param string $actionClass
-	 * @psalm-param class-string<\OCP\Calendar\Resource\IBackend> $actionClass
-	 * @return void
-	 * @since 24.0.0
-	 */
-	public function registerCalendarResourceBackend(string $class): void;
+    /**
+     * Register a resource backend for the DAV server
+     *
+     * @param string $actionClass
+     * @psalm-param class-string<\OCP\Calendar\Resource\IBackend> $actionClass
+     * @return void
+     * @since 24.0.0
+     */
+    public function registerCalendarResourceBackend(string $class): void;
 
-	/**
-	 * Register a room backend for the DAV server
-	 *
-	 * @param string $actionClass
-	 * @psalm-param class-string<\OCP\Calendar\Room\IBackend> $actionClass
-	 * @return void
-	 * @since 24.0.0
-	 */
-	public function registerCalendarRoomBackend(string $class): void;
+    /**
+     * Register a room backend for the DAV server
+     *
+     * @param string $actionClass
+     * @psalm-param class-string<\OCP\Calendar\Room\IBackend> $actionClass
+     * @return void
+     * @since 24.0.0
+     */
+    public function registerCalendarRoomBackend(string $class): void;
 
-	/**
-	 * Register an implementation of \OCP\UserMigration\IMigrator that
-	 * will handle the implementation of a migrator
-	 *
-	 * @param string $migratorClass
-	 * @psalm-param class-string<\OCP\UserMigration\IMigrator> $migratorClass
-	 * @return void
-	 * @since 24.0.0
-	 */
-	public function registerUserMigrator(string $migratorClass): void;
+    /**
+     * Register an implementation of \OCP\UserMigration\IMigrator that
+     * will handle the implementation of a migrator
+     *
+     * @param string $migratorClass
+     * @psalm-param class-string<\OCP\UserMigration\IMigrator> $migratorClass
+     * @return void
+     * @since 24.0.0
+     */
+    public function registerUserMigrator(string $migratorClass): void;
 
-	/**
-	 * Announce methods of classes that may contain sensitive values, which
-	 * should be obfuscated before being logged.
-	 *
-	 * @param string $class
-	 * @param string[] $methods
-	 * @return void
-	 * @since 25.0.0
-	 */
-	public function registerSensitiveMethods(string $class, array $methods): void;
+    /**
+     * Announce methods of classes that may contain sensitive values, which
+     * should be obfuscated before being logged.
+     *
+     * @param string $class
+     * @param string[] $methods
+     * @return void
+     * @since 25.0.0
+     */
+    public function registerSensitiveMethods(string $class, array $methods): void;
 }

lib/private/AppFramework/Bootstrap/MiddlewareRegistration.php

Indentation +8 added lines, -8 removed lines

@@ -32,14 +32,14 @@
  * @template-extends ServiceRegistration<Middleware>
  */
 class MiddlewareRegistration extends ServiceRegistration {
-	private bool $global;
+    private bool $global;
 
-	public function __construct(string $appId, string $service, bool $global) {
-		parent::__construct($appId, $service);
-		$this->global = $global;
-	}
+    public function __construct(string $appId, string $service, bool $global) {
+        parent::__construct($appId, $service);
+        $this->global = $global;
+    }
 
-	public function isGlobal(): bool {
-		return $this->global;
-	}
+    public function isGlobal(): bool {
+        return $this->global;
+    }
 }

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +666 added lines, -666 removed lines

@@ -58,684 +58,684 @@
 use Throwable;
 
 class RegistrationContext {
-	/** @var ServiceRegistration<ICapability>[] */
-	private $capabilities = [];
+    /** @var ServiceRegistration<ICapability>[] */
+    private $capabilities = [];
 
-	/** @var ServiceRegistration<IReporter>[] */
-	private $crashReporters = [];
+    /** @var ServiceRegistration<IReporter>[] */
+    private $crashReporters = [];
 
-	/** @var ServiceRegistration<IWidget>[] */
-	private $dashboardPanels = [];
+    /** @var ServiceRegistration<IWidget>[] */
+    private $dashboardPanels = [];
 
-	/** @var ServiceRegistration<ILinkAction>[] */
-	private $profileLinkActions = [];
+    /** @var ServiceRegistration<ILinkAction>[] */
+    private $profileLinkActions = [];
 
-	/** @var null|ServiceRegistration<ITalkBackend> */
-	private $talkBackendRegistration = null;
+    /** @var null|ServiceRegistration<ITalkBackend> */
+    private $talkBackendRegistration = null;
 
-	/** @var ServiceRegistration<IResourceBackend>[] */
-	private $calendarResourceBackendRegistrations = [];
+    /** @var ServiceRegistration<IResourceBackend>[] */
+    private $calendarResourceBackendRegistrations = [];
 
-	/** @var ServiceRegistration<IRoomBackend>[] */
-	private $calendarRoomBackendRegistrations = [];
+    /** @var ServiceRegistration<IRoomBackend>[] */
+    private $calendarRoomBackendRegistrations = [];
 
-	/** @var ServiceRegistration<IUserMigrator>[] */
-	private $userMigrators = [];
+    /** @var ServiceRegistration<IUserMigrator>[] */
+    private $userMigrators = [];
 
-	/** @var ServiceFactoryRegistration[] */
-	private $services = [];
+    /** @var ServiceFactoryRegistration[] */
+    private $services = [];
 
-	/** @var ServiceAliasRegistration[] */
-	private $aliases = [];
+    /** @var ServiceAliasRegistration[] */
+    private $aliases = [];
 
-	/** @var ParameterRegistration[] */
-	private $parameters = [];
+    /** @var ParameterRegistration[] */
+    private $parameters = [];
 
-	/** @var EventListenerRegistration[] */
-	private $eventListeners = [];
+    /** @var EventListenerRegistration[] */
+    private $eventListeners = [];
 
-	/** @var MiddlewareRegistration[] */
-	private $middlewares = [];
+    /** @var MiddlewareRegistration[] */
+    private $middlewares = [];
 
-	/** @var ServiceRegistration<IProvider>[] */
-	private $searchProviders = [];
+    /** @var ServiceRegistration<IProvider>[] */
+    private $searchProviders = [];
 
-	/** @var ServiceRegistration<IAlternativeLogin>[] */
-	private $alternativeLogins = [];
-
-	/** @var ServiceRegistration<InitialStateProvider>[] */
-	private $initialStates = [];
-
-	/** @var ServiceRegistration<IHandler>[] */
-	private $wellKnownHandlers = [];
-
-	/** @var ServiceRegistration<ICustomTemplateProvider>[] */
-	private $templateProviders = [];
-
-	/** @var ServiceRegistration<INotifier>[] */
-	private $notifierServices = [];
-
-	/** @var ServiceRegistration<\OCP\Authentication\TwoFactorAuth\IProvider>[] */
-	private $twoFactorProviders = [];
-
-	/** @var ServiceRegistration<ICalendarProvider>[] */
-	private $calendarProviders = [];
-
-	/** @var ServiceRegistration<IReferenceProvider>[] */
-	private array $referenceProviders = [];
-
-	/** @var ParameterRegistration[] */
-	private $sensitiveMethods = [];
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var PreviewProviderRegistration[] */
-	private $previewProviders = [];
-
-	public function __construct(LoggerInterface $logger) {
-		$this->logger = $logger;
-	}
-
-	public function for(string $appId): IRegistrationContext {
-		return new class($appId, $this) implements IRegistrationContext {
-			/** @var string */
-			private $appId;
-
-			/** @var RegistrationContext */
-			private $context;
-
-			public function __construct(string $appId, RegistrationContext $context) {
-				$this->appId = $appId;
-				$this->context = $context;
-			}
-
-			public function registerCapability(string $capability): void {
-				$this->context->registerCapability(
-					$this->appId,
-					$capability
-				);
-			}
-
-			public function registerCrashReporter(string $reporterClass): void {
-				$this->context->registerCrashReporter(
-					$this->appId,
-					$reporterClass
-				);
-			}
-
-			public function registerDashboardWidget(string $widgetClass): void {
-				$this->context->registerDashboardPanel(
-					$this->appId,
-					$widgetClass
-				);
-			}
-
-			public function registerService(string $name, callable $factory, bool $shared = true): void {
-				$this->context->registerService(
-					$this->appId,
-					$name,
-					$factory,
-					$shared
-				);
-			}
-
-			public function registerServiceAlias(string $alias, string $target): void {
-				$this->context->registerServiceAlias(
-					$this->appId,
-					$alias,
-					$target
-				);
-			}
-
-			public function registerParameter(string $name, $value): void {
-				$this->context->registerParameter(
-					$this->appId,
-					$name,
-					$value
-				);
-			}
-
-			public function registerEventListener(string $event, string $listener, int $priority = 0): void {
-				$this->context->registerEventListener(
-					$this->appId,
-					$event,
-					$listener,
-					$priority
-				);
-			}
-
-			public function registerMiddleware(string $class, bool $global = false): void {
-				$this->context->registerMiddleware(
-					$this->appId,
-					$class,
-					$global,
-				);
-			}
-
-			public function registerSearchProvider(string $class): void {
-				$this->context->registerSearchProvider(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerAlternativeLogin(string $class): void {
-				$this->context->registerAlternativeLogin(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerInitialStateProvider(string $class): void {
-				$this->context->registerInitialState(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerWellKnownHandler(string $class): void {
-				$this->context->registerWellKnown(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerTemplateProvider(string $providerClass): void {
-				$this->context->registerTemplateProvider(
-					$this->appId,
-					$providerClass
-				);
-			}
-
-			public function registerNotifierService(string $notifierClass): void {
-				$this->context->registerNotifierService(
-					$this->appId,
-					$notifierClass
-				);
-			}
-
-			public function registerTwoFactorProvider(string $twoFactorProviderClass): void {
-				$this->context->registerTwoFactorProvider(
-					$this->appId,
-					$twoFactorProviderClass
-				);
-			}
-
-			public function registerPreviewProvider(string $previewProviderClass, string $mimeTypeRegex): void {
-				$this->context->registerPreviewProvider(
-					$this->appId,
-					$previewProviderClass,
-					$mimeTypeRegex
-				);
-			}
-
-			public function registerCalendarProvider(string $class): void {
-				$this->context->registerCalendarProvider(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerReferenceProvider(string $class): void {
-				$this->context->registerReferenceProvider(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerProfileLinkAction(string $actionClass): void {
-				$this->context->registerProfileLinkAction(
-					$this->appId,
-					$actionClass
-				);
-			}
-
-			public function registerTalkBackend(string $backend): void {
-				$this->context->registerTalkBackend(
-					$this->appId,
-					$backend
-				);
-			}
-
-			public function registerCalendarResourceBackend(string $class): void {
-				$this->context->registerCalendarResourceBackend(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerCalendarRoomBackend(string $class): void {
-				$this->context->registerCalendarRoomBackend(
-					$this->appId,
-					$class
-				);
-			}
-
-			public function registerUserMigrator(string $migratorClass): void {
-				$this->context->registerUserMigrator(
-					$this->appId,
-					$migratorClass
-				);
-			}
-
-			public function registerSensitiveMethods(string $class, array $methods): void {
-				$this->context->registerSensitiveMethods(
-					$this->appId,
-					$class,
-					$methods
-				);
-			}
-		};
-	}
-
-	/**
-	 * @psalm-param class-string<ICapability> $capability
-	 */
-	public function registerCapability(string $appId, string $capability): void {
-		$this->capabilities[] = new ServiceRegistration($appId, $capability);
-	}
-
-	/**
-	 * @psalm-param class-string<IReporter> $capability
-	 */
-	public function registerCrashReporter(string $appId, string $reporterClass): void {
-		$this->crashReporters[] = new ServiceRegistration($appId, $reporterClass);
-	}
-
-	/**
-	 * @psalm-param class-string<IWidget> $capability
-	 */
-	public function registerDashboardPanel(string $appId, string $panelClass): void {
-		$this->dashboardPanels[] = new ServiceRegistration($appId, $panelClass);
-	}
-
-	public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
-		$this->services[] = new ServiceFactoryRegistration($appId, $name, $factory, $shared);
-	}
-
-	public function registerServiceAlias(string $appId, string $alias, string $target): void {
-		$this->aliases[] = new ServiceAliasRegistration($appId, $alias, $target);
-	}
-
-	public function registerParameter(string $appId, string $name, $value): void {
-		$this->parameters[] = new ParameterRegistration($appId, $name, $value);
-	}
-
-	public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
-		$this->eventListeners[] = new EventListenerRegistration($appId, $event, $listener, $priority);
-	}
-
-	/**
-	 * @psalm-param class-string<Middleware> $class
-	 */
-	public function registerMiddleware(string $appId, string $class, bool $global): void {
-		$this->middlewares[] = new MiddlewareRegistration($appId, $class, $global);
-	}
-
-	public function registerSearchProvider(string $appId, string $class) {
-		$this->searchProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerAlternativeLogin(string $appId, string $class): void {
-		$this->alternativeLogins[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerInitialState(string $appId, string $class): void {
-		$this->initialStates[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerWellKnown(string $appId, string $class): void {
-		$this->wellKnownHandlers[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerTemplateProvider(string $appId, string $class): void {
-		$this->templateProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerNotifierService(string $appId, string $class): void {
-		$this->notifierServices[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerTwoFactorProvider(string $appId, string $class): void {
-		$this->twoFactorProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerPreviewProvider(string $appId, string $class, string $mimeTypeRegex): void {
-		$this->previewProviders[] = new PreviewProviderRegistration($appId, $class, $mimeTypeRegex);
-	}
-
-	public function registerCalendarProvider(string $appId, string $class): void {
-		$this->calendarProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	public function registerReferenceProvider(string $appId, string $class): void {
-		$this->referenceProviders[] = new ServiceRegistration($appId, $class);
-	}
-
-	/**
-	 * @psalm-param class-string<ILinkAction> $actionClass
-	 */
-	public function registerProfileLinkAction(string $appId, string $actionClass): void {
-		$this->profileLinkActions[] = new ServiceRegistration($appId, $actionClass);
-	}
-
-	/**
-	 * @psalm-param class-string<ITalkBackend> $backend
-	 */
-	public function registerTalkBackend(string $appId, string $backend) {
-		// Some safeguards for invalid registrations
-		if ($appId !== 'spreed') {
-			throw new RuntimeException("Only the Talk app is allowed to register a Talk backend");
-		}
-		if ($this->talkBackendRegistration !== null) {
-			throw new RuntimeException("There can only be one Talk backend");
-		}
-
-		$this->talkBackendRegistration = new ServiceRegistration($appId, $backend);
-	}
-
-	public function registerCalendarResourceBackend(string $appId, string $class) {
-		$this->calendarResourceBackendRegistrations[] = new ServiceRegistration(
-			$appId,
-			$class,
-		);
-	}
-
-	public function registerCalendarRoomBackend(string $appId, string $class) {
-		$this->calendarRoomBackendRegistrations[] = new ServiceRegistration(
-			$appId,
-			$class,
-		);
-	}
-
-	/**
-	 * @psalm-param class-string<IUserMigrator> $migratorClass
-	 */
-	public function registerUserMigrator(string $appId, string $migratorClass): void {
-		$this->userMigrators[] = new ServiceRegistration($appId, $migratorClass);
-	}
-
-	public function registerSensitiveMethods(string $appId, string $class, array $methods): void {
-		$methods = array_filter($methods, 'is_string');
-		$this->sensitiveMethods[] = new ParameterRegistration($appId, $class, $methods);
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCapabilityRegistrations(array $apps): void {
-		while (($registration = array_shift($this->capabilities)) !== null) {
-			$appId = $registration->getAppId();
-			if (!isset($apps[$appId])) {
-				// If we land here something really isn't right. But at least we caught the
-				// notice that is otherwise emitted for the undefined index
-				$this->logger->error("App $appId not loaded for the capability registration");
-
-				continue;
-			}
-
-			try {
-				$apps[$appId]
-					->getContainer()
-					->registerCapability($registration->getService());
-			} catch (Throwable $e) {
-				$this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCrashReporterRegistrations(array $apps, Registry $registry): void {
-		while (($registration = array_shift($this->crashReporters)) !== null) {
-			try {
-				$registry->registerLazy($registration->getService());
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->error("Error during crash reporter registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateDashboardPanelRegistrations(IManager $dashboardManager): void {
-		while (($panel = array_shift($this->dashboardPanels)) !== null) {
-			try {
-				$dashboardManager->lazyRegisterWidget($panel->getService(), $panel->getAppId());
-			} catch (Throwable $e) {
-				$appId = $panel->getAppId();
-				$this->logger->error("Error during dashboard registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
-		while (($registration = array_shift($this->eventListeners)) !== null) {
-			try {
-				$eventDispatcher->addServiceListener(
-					$registration->getEvent(),
-					$registration->getService(),
-					$registration->getPriority()
-				);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->error("Error during event listener registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateContainerRegistrations(array $apps): void {
-		while (($registration = array_shift($this->services)) !== null) {
-			$appId = $registration->getAppId();
-			if (!isset($apps[$appId])) {
-				// If we land here something really isn't right. But at least we caught the
-				// notice that is otherwise emitted for the undefined index
-				$this->logger->error("App $appId not loaded for the container service registration");
-
-				continue;
-			}
-
-			try {
-				/**
-				 * Register the service and convert the callable into a \Closure if necessary
-				 */
-				$apps[$appId]
-					->getContainer()
-					->registerService(
-						$registration->getName(),
-						Closure::fromCallable($registration->getFactory()),
-						$registration->isShared()
-					);
-			} catch (Throwable $e) {
-				$this->logger->error("Error during service registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->aliases)) !== null) {
-			$appId = $registration->getAppId();
-			if (!isset($apps[$appId])) {
-				// If we land here something really isn't right. But at least we caught the
-				// notice that is otherwise emitted for the undefined index
-				$this->logger->error("App $appId not loaded for the container alias registration");
-
-				continue;
-			}
-
-			try {
-				$apps[$appId]
-					->getContainer()
-					->registerAlias(
-						$registration->getAlias(),
-						$registration->getTarget()
-					);
-			} catch (Throwable $e) {
-				$this->logger->error("Error during service alias registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->parameters)) !== null) {
-			$appId = $registration->getAppId();
-			if (!isset($apps[$appId])) {
-				// If we land here something really isn't right. But at least we caught the
-				// notice that is otherwise emitted for the undefined index
-				$this->logger->error("App $appId not loaded for the container parameter registration");
-
-				continue;
-			}
-
-			try {
-				$apps[$appId]
-					->getContainer()
-					->registerParameter(
-						$registration->getName(),
-						$registration->getValue()
-					);
-			} catch (Throwable $e) {
-				$this->logger->error("Error during service parameter registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @return MiddlewareRegistration[]
-	 */
-	public function getMiddlewareRegistrations(): array {
-		return $this->middlewares;
-	}
-
-	/**
-	 * @return ServiceRegistration<IProvider>[]
-	 */
-	public function getSearchProviders(): array {
-		return $this->searchProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<IAlternativeLogin>[]
-	 */
-	public function getAlternativeLogins(): array {
-		return $this->alternativeLogins;
-	}
-
-	/**
-	 * @return ServiceRegistration<InitialStateProvider>[]
-	 */
-	public function getInitialStates(): array {
-		return $this->initialStates;
-	}
-
-	/**
-	 * @return ServiceRegistration<IHandler>[]
-	 */
-	public function getWellKnownHandlers(): array {
-		return $this->wellKnownHandlers;
-	}
-
-	/**
-	 * @return ServiceRegistration<ICustomTemplateProvider>[]
-	 */
-	public function getTemplateProviders(): array {
-		return $this->templateProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<INotifier>[]
-	 */
-	public function getNotifierServices(): array {
-		return $this->notifierServices;
-	}
-
-	/**
-	 * @return ServiceRegistration<\OCP\Authentication\TwoFactorAuth\IProvider>[]
-	 */
-	public function getTwoFactorProviders(): array {
-		return $this->twoFactorProviders;
-	}
-
-	/**
-	 * @return PreviewProviderRegistration[]
-	 */
-	public function getPreviewProviders(): array {
-		return $this->previewProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<ICalendarProvider>[]
-	 */
-	public function getCalendarProviders(): array {
-		return $this->calendarProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<IReferenceProvider>[]
-	 */
-	public function getReferenceProviders(): array {
-		return $this->referenceProviders;
-	}
-
-	/**
-	 * @return ServiceRegistration<ILinkAction>[]
-	 */
-	public function getProfileLinkActions(): array {
-		return $this->profileLinkActions;
-	}
-
-	/**
-	 * @return ServiceRegistration|null
-	 * @psalm-return ServiceRegistration<ITalkBackend>|null
-	 */
-	public function getTalkBackendRegistration(): ?ServiceRegistration {
-		return $this->talkBackendRegistration;
-	}
-
-	/**
-	 * @return ServiceRegistration[]
-	 * @psalm-return ServiceRegistration<IResourceBackend>[]
-	 */
-	public function getCalendarResourceBackendRegistrations(): array {
-		return $this->calendarResourceBackendRegistrations;
-	}
-
-	/**
-	 * @return ServiceRegistration[]
-	 * @psalm-return ServiceRegistration<IRoomBackend>[]
-	 */
-	public function getCalendarRoomBackendRegistrations(): array {
-		return $this->calendarRoomBackendRegistrations;
-	}
-
-	/**
-	 * @return ServiceRegistration<IUserMigrator>[]
-	 */
-	public function getUserMigrators(): array {
-		return $this->userMigrators;
-	}
-
-	/**
-	 * @return ParameterRegistration[]
-	 */
-	public function getSensitiveMethods(): array {
-		return $this->sensitiveMethods;
-	}
+    /** @var ServiceRegistration<IAlternativeLogin>[] */
+    private $alternativeLogins = [];
+
+    /** @var ServiceRegistration<InitialStateProvider>[] */
+    private $initialStates = [];
+
+    /** @var ServiceRegistration<IHandler>[] */
+    private $wellKnownHandlers = [];
+
+    /** @var ServiceRegistration<ICustomTemplateProvider>[] */
+    private $templateProviders = [];
+
+    /** @var ServiceRegistration<INotifier>[] */
+    private $notifierServices = [];
+
+    /** @var ServiceRegistration<\OCP\Authentication\TwoFactorAuth\IProvider>[] */
+    private $twoFactorProviders = [];
+
+    /** @var ServiceRegistration<ICalendarProvider>[] */
+    private $calendarProviders = [];
+
+    /** @var ServiceRegistration<IReferenceProvider>[] */
+    private array $referenceProviders = [];
+
+    /** @var ParameterRegistration[] */
+    private $sensitiveMethods = [];
+
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var PreviewProviderRegistration[] */
+    private $previewProviders = [];
+
+    public function __construct(LoggerInterface $logger) {
+        $this->logger = $logger;
+    }
+
+    public function for(string $appId): IRegistrationContext {
+        return new class($appId, $this) implements IRegistrationContext {
+            /** @var string */
+            private $appId;
+
+            /** @var RegistrationContext */
+            private $context;
+
+            public function __construct(string $appId, RegistrationContext $context) {
+                $this->appId = $appId;
+                $this->context = $context;
+            }
+
+            public function registerCapability(string $capability): void {
+                $this->context->registerCapability(
+                    $this->appId,
+                    $capability
+                );
+            }
+
+            public function registerCrashReporter(string $reporterClass): void {
+                $this->context->registerCrashReporter(
+                    $this->appId,
+                    $reporterClass
+                );
+            }
+
+            public function registerDashboardWidget(string $widgetClass): void {
+                $this->context->registerDashboardPanel(
+                    $this->appId,
+                    $widgetClass
+                );
+            }
+
+            public function registerService(string $name, callable $factory, bool $shared = true): void {
+                $this->context->registerService(
+                    $this->appId,
+                    $name,
+                    $factory,
+                    $shared
+                );
+            }
+
+            public function registerServiceAlias(string $alias, string $target): void {
+                $this->context->registerServiceAlias(
+                    $this->appId,
+                    $alias,
+                    $target
+                );
+            }
+
+            public function registerParameter(string $name, $value): void {
+                $this->context->registerParameter(
+                    $this->appId,
+                    $name,
+                    $value
+                );
+            }
+
+            public function registerEventListener(string $event, string $listener, int $priority = 0): void {
+                $this->context->registerEventListener(
+                    $this->appId,
+                    $event,
+                    $listener,
+                    $priority
+                );
+            }
+
+            public function registerMiddleware(string $class, bool $global = false): void {
+                $this->context->registerMiddleware(
+                    $this->appId,
+                    $class,
+                    $global,
+                );
+            }
+
+            public function registerSearchProvider(string $class): void {
+                $this->context->registerSearchProvider(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerAlternativeLogin(string $class): void {
+                $this->context->registerAlternativeLogin(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerInitialStateProvider(string $class): void {
+                $this->context->registerInitialState(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerWellKnownHandler(string $class): void {
+                $this->context->registerWellKnown(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerTemplateProvider(string $providerClass): void {
+                $this->context->registerTemplateProvider(
+                    $this->appId,
+                    $providerClass
+                );
+            }
+
+            public function registerNotifierService(string $notifierClass): void {
+                $this->context->registerNotifierService(
+                    $this->appId,
+                    $notifierClass
+                );
+            }
+
+            public function registerTwoFactorProvider(string $twoFactorProviderClass): void {
+                $this->context->registerTwoFactorProvider(
+                    $this->appId,
+                    $twoFactorProviderClass
+                );
+            }
+
+            public function registerPreviewProvider(string $previewProviderClass, string $mimeTypeRegex): void {
+                $this->context->registerPreviewProvider(
+                    $this->appId,
+                    $previewProviderClass,
+                    $mimeTypeRegex
+                );
+            }
+
+            public function registerCalendarProvider(string $class): void {
+                $this->context->registerCalendarProvider(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerReferenceProvider(string $class): void {
+                $this->context->registerReferenceProvider(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerProfileLinkAction(string $actionClass): void {
+                $this->context->registerProfileLinkAction(
+                    $this->appId,
+                    $actionClass
+                );
+            }
+
+            public function registerTalkBackend(string $backend): void {
+                $this->context->registerTalkBackend(
+                    $this->appId,
+                    $backend
+                );
+            }
+
+            public function registerCalendarResourceBackend(string $class): void {
+                $this->context->registerCalendarResourceBackend(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerCalendarRoomBackend(string $class): void {
+                $this->context->registerCalendarRoomBackend(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            public function registerUserMigrator(string $migratorClass): void {
+                $this->context->registerUserMigrator(
+                    $this->appId,
+                    $migratorClass
+                );
+            }
+
+            public function registerSensitiveMethods(string $class, array $methods): void {
+                $this->context->registerSensitiveMethods(
+                    $this->appId,
+                    $class,
+                    $methods
+                );
+            }
+        };
+    }
+
+    /**
+     * @psalm-param class-string<ICapability> $capability
+     */
+    public function registerCapability(string $appId, string $capability): void {
+        $this->capabilities[] = new ServiceRegistration($appId, $capability);
+    }
+
+    /**
+     * @psalm-param class-string<IReporter> $capability
+     */
+    public function registerCrashReporter(string $appId, string $reporterClass): void {
+        $this->crashReporters[] = new ServiceRegistration($appId, $reporterClass);
+    }
+
+    /**
+     * @psalm-param class-string<IWidget> $capability
+     */
+    public function registerDashboardPanel(string $appId, string $panelClass): void {
+        $this->dashboardPanels[] = new ServiceRegistration($appId, $panelClass);
+    }
+
+    public function registerService(string $appId, string $name, callable $factory, bool $shared = true): void {
+        $this->services[] = new ServiceFactoryRegistration($appId, $name, $factory, $shared);
+    }
+
+    public function registerServiceAlias(string $appId, string $alias, string $target): void {
+        $this->aliases[] = new ServiceAliasRegistration($appId, $alias, $target);
+    }
+
+    public function registerParameter(string $appId, string $name, $value): void {
+        $this->parameters[] = new ParameterRegistration($appId, $name, $value);
+    }
+
+    public function registerEventListener(string $appId, string $event, string $listener, int $priority = 0): void {
+        $this->eventListeners[] = new EventListenerRegistration($appId, $event, $listener, $priority);
+    }
+
+    /**
+     * @psalm-param class-string<Middleware> $class
+     */
+    public function registerMiddleware(string $appId, string $class, bool $global): void {
+        $this->middlewares[] = new MiddlewareRegistration($appId, $class, $global);
+    }
+
+    public function registerSearchProvider(string $appId, string $class) {
+        $this->searchProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerAlternativeLogin(string $appId, string $class): void {
+        $this->alternativeLogins[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerInitialState(string $appId, string $class): void {
+        $this->initialStates[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerWellKnown(string $appId, string $class): void {
+        $this->wellKnownHandlers[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerTemplateProvider(string $appId, string $class): void {
+        $this->templateProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerNotifierService(string $appId, string $class): void {
+        $this->notifierServices[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerTwoFactorProvider(string $appId, string $class): void {
+        $this->twoFactorProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerPreviewProvider(string $appId, string $class, string $mimeTypeRegex): void {
+        $this->previewProviders[] = new PreviewProviderRegistration($appId, $class, $mimeTypeRegex);
+    }
+
+    public function registerCalendarProvider(string $appId, string $class): void {
+        $this->calendarProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    public function registerReferenceProvider(string $appId, string $class): void {
+        $this->referenceProviders[] = new ServiceRegistration($appId, $class);
+    }
+
+    /**
+     * @psalm-param class-string<ILinkAction> $actionClass
+     */
+    public function registerProfileLinkAction(string $appId, string $actionClass): void {
+        $this->profileLinkActions[] = new ServiceRegistration($appId, $actionClass);
+    }
+
+    /**
+     * @psalm-param class-string<ITalkBackend> $backend
+     */
+    public function registerTalkBackend(string $appId, string $backend) {
+        // Some safeguards for invalid registrations
+        if ($appId !== 'spreed') {
+            throw new RuntimeException("Only the Talk app is allowed to register a Talk backend");
+        }
+        if ($this->talkBackendRegistration !== null) {
+            throw new RuntimeException("There can only be one Talk backend");
+        }
+
+        $this->talkBackendRegistration = new ServiceRegistration($appId, $backend);
+    }
+
+    public function registerCalendarResourceBackend(string $appId, string $class) {
+        $this->calendarResourceBackendRegistrations[] = new ServiceRegistration(
+            $appId,
+            $class,
+        );
+    }
+
+    public function registerCalendarRoomBackend(string $appId, string $class) {
+        $this->calendarRoomBackendRegistrations[] = new ServiceRegistration(
+            $appId,
+            $class,
+        );
+    }
+
+    /**
+     * @psalm-param class-string<IUserMigrator> $migratorClass
+     */
+    public function registerUserMigrator(string $appId, string $migratorClass): void {
+        $this->userMigrators[] = new ServiceRegistration($appId, $migratorClass);
+    }
+
+    public function registerSensitiveMethods(string $appId, string $class, array $methods): void {
+        $methods = array_filter($methods, 'is_string');
+        $this->sensitiveMethods[] = new ParameterRegistration($appId, $class, $methods);
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCapabilityRegistrations(array $apps): void {
+        while (($registration = array_shift($this->capabilities)) !== null) {
+            $appId = $registration->getAppId();
+            if (!isset($apps[$appId])) {
+                // If we land here something really isn't right. But at least we caught the
+                // notice that is otherwise emitted for the undefined index
+                $this->logger->error("App $appId not loaded for the capability registration");
+
+                continue;
+            }
+
+            try {
+                $apps[$appId]
+                    ->getContainer()
+                    ->registerCapability($registration->getService());
+            } catch (Throwable $e) {
+                $this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCrashReporterRegistrations(array $apps, Registry $registry): void {
+        while (($registration = array_shift($this->crashReporters)) !== null) {
+            try {
+                $registry->registerLazy($registration->getService());
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->error("Error during crash reporter registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateDashboardPanelRegistrations(IManager $dashboardManager): void {
+        while (($panel = array_shift($this->dashboardPanels)) !== null) {
+            try {
+                $dashboardManager->lazyRegisterWidget($panel->getService(), $panel->getAppId());
+            } catch (Throwable $e) {
+                $appId = $panel->getAppId();
+                $this->logger->error("Error during dashboard registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    public function delegateEventListenerRegistrations(IEventDispatcher $eventDispatcher): void {
+        while (($registration = array_shift($this->eventListeners)) !== null) {
+            try {
+                $eventDispatcher->addServiceListener(
+                    $registration->getEvent(),
+                    $registration->getService(),
+                    $registration->getPriority()
+                );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->error("Error during event listener registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateContainerRegistrations(array $apps): void {
+        while (($registration = array_shift($this->services)) !== null) {
+            $appId = $registration->getAppId();
+            if (!isset($apps[$appId])) {
+                // If we land here something really isn't right. But at least we caught the
+                // notice that is otherwise emitted for the undefined index
+                $this->logger->error("App $appId not loaded for the container service registration");
+
+                continue;
+            }
+
+            try {
+                /**
+                 * Register the service and convert the callable into a \Closure if necessary
+                 */
+                $apps[$appId]
+                    ->getContainer()
+                    ->registerService(
+                        $registration->getName(),
+                        Closure::fromCallable($registration->getFactory()),
+                        $registration->isShared()
+                    );
+            } catch (Throwable $e) {
+                $this->logger->error("Error during service registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->aliases)) !== null) {
+            $appId = $registration->getAppId();
+            if (!isset($apps[$appId])) {
+                // If we land here something really isn't right. But at least we caught the
+                // notice that is otherwise emitted for the undefined index
+                $this->logger->error("App $appId not loaded for the container alias registration");
+
+                continue;
+            }
+
+            try {
+                $apps[$appId]
+                    ->getContainer()
+                    ->registerAlias(
+                        $registration->getAlias(),
+                        $registration->getTarget()
+                    );
+            } catch (Throwable $e) {
+                $this->logger->error("Error during service alias registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->parameters)) !== null) {
+            $appId = $registration->getAppId();
+            if (!isset($apps[$appId])) {
+                // If we land here something really isn't right. But at least we caught the
+                // notice that is otherwise emitted for the undefined index
+                $this->logger->error("App $appId not loaded for the container parameter registration");
+
+                continue;
+            }
+
+            try {
+                $apps[$appId]
+                    ->getContainer()
+                    ->registerParameter(
+                        $registration->getName(),
+                        $registration->getValue()
+                    );
+            } catch (Throwable $e) {
+                $this->logger->error("Error during service parameter registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @return MiddlewareRegistration[]
+     */
+    public function getMiddlewareRegistrations(): array {
+        return $this->middlewares;
+    }
+
+    /**
+     * @return ServiceRegistration<IProvider>[]
+     */
+    public function getSearchProviders(): array {
+        return $this->searchProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<IAlternativeLogin>[]
+     */
+    public function getAlternativeLogins(): array {
+        return $this->alternativeLogins;
+    }
+
+    /**
+     * @return ServiceRegistration<InitialStateProvider>[]
+     */
+    public function getInitialStates(): array {
+        return $this->initialStates;
+    }
+
+    /**
+     * @return ServiceRegistration<IHandler>[]
+     */
+    public function getWellKnownHandlers(): array {
+        return $this->wellKnownHandlers;
+    }
+
+    /**
+     * @return ServiceRegistration<ICustomTemplateProvider>[]
+     */
+    public function getTemplateProviders(): array {
+        return $this->templateProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<INotifier>[]
+     */
+    public function getNotifierServices(): array {
+        return $this->notifierServices;
+    }
+
+    /**
+     * @return ServiceRegistration<\OCP\Authentication\TwoFactorAuth\IProvider>[]
+     */
+    public function getTwoFactorProviders(): array {
+        return $this->twoFactorProviders;
+    }
+
+    /**
+     * @return PreviewProviderRegistration[]
+     */
+    public function getPreviewProviders(): array {
+        return $this->previewProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<ICalendarProvider>[]
+     */
+    public function getCalendarProviders(): array {
+        return $this->calendarProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<IReferenceProvider>[]
+     */
+    public function getReferenceProviders(): array {
+        return $this->referenceProviders;
+    }
+
+    /**
+     * @return ServiceRegistration<ILinkAction>[]
+     */
+    public function getProfileLinkActions(): array {
+        return $this->profileLinkActions;
+    }
+
+    /**
+     * @return ServiceRegistration|null
+     * @psalm-return ServiceRegistration<ITalkBackend>|null
+     */
+    public function getTalkBackendRegistration(): ?ServiceRegistration {
+        return $this->talkBackendRegistration;
+    }
+
+    /**
+     * @return ServiceRegistration[]
+     * @psalm-return ServiceRegistration<IResourceBackend>[]
+     */
+    public function getCalendarResourceBackendRegistrations(): array {
+        return $this->calendarResourceBackendRegistrations;
+    }
+
+    /**
+     * @return ServiceRegistration[]
+     * @psalm-return ServiceRegistration<IRoomBackend>[]
+     */
+    public function getCalendarRoomBackendRegistrations(): array {
+        return $this->calendarRoomBackendRegistrations;
+    }
+
+    /**
+     * @return ServiceRegistration<IUserMigrator>[]
+     */
+    public function getUserMigrators(): array {
+        return $this->userMigrators;
+    }
+
+    /**
+     * @return ParameterRegistration[]
+     */
+    public function getSensitiveMethods(): array {
+        return $this->sensitiveMethods;
+    }
 }

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +417 added lines, -417 removed lines

@@ -79,421 +79,421 @@
  * @deprecated 20.0.0
  */
 class DIContainer extends SimpleContainer implements IAppContainer {
-	private string $appName;
-
-	/**
-	 * @var array
-	 */
-	private $middleWares = [];
-
-	/** @var ServerContainer */
-	private $server;
-
-	/**
-	 * Put your class dependencies in here
-	 * @param string $appName the name of the app
-	 * @param array $urlParams
-	 * @param ServerContainer|null $server
-	 */
-	public function __construct(string $appName, array $urlParams = [], ServerContainer $server = null) {
-		parent::__construct();
-		$this->appName = $appName;
-		$this['appName'] = $appName;
-		$this['urlParams'] = $urlParams;
-
-		$this->registerAlias('Request', IRequest::class);
-
-		/** @var \OC\ServerContainer $server */
-		if ($server === null) {
-			$server = \OC::$server;
-		}
-		$this->server = $server;
-		$this->server->registerAppContainer($appName, $this);
-
-		// aliases
-		/** @deprecated inject $appName */
-		$this->registerAlias('AppName', 'appName');
-		/** @deprecated inject $webRoot*/
-		$this->registerAlias('WebRoot', 'webRoot');
-		/** @deprecated inject $userId */
-		$this->registerAlias('UserId', 'userId');
-
-		/**
-		 * Core services
-		 */
-		$this->registerService(IOutput::class, function () {
-			return new Output($this->getServer()->getWebRoot());
-		});
-
-		$this->registerService(Folder::class, function () {
-			return $this->getServer()->getUserFolder();
-		});
-
-		$this->registerService(IAppData::class, function (ContainerInterface $c) {
-			return $this->getServer()->getAppDataDir($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) {
-			return new ScopedPsrLogger(
-				$c->get(PsrLoggerAdapter::class),
-				$c->get('AppName')
-			);
-		});
-		$this->registerService(ILogger::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
-		});
-
-		$this->registerService(IServerContainer::class, function () {
-			return $this->getServer();
-		});
-		$this->registerAlias('ServerContainer', IServerContainer::class);
-
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function (ContainerInterface $c) {
-			return $c->get(Manager::class);
-		});
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerAlias(IAppContainer::class, ContainerInterface::class);
-
-		// commonly used attributes
-		$this->registerService('userId', function (ContainerInterface $c) {
-			return $c->get(IUserSession::class)->getSession()->get('user_id');
-		});
-
-		$this->registerService('webRoot', function (ContainerInterface $c) {
-			return $c->get(IServerContainer::class)->getWebRoot();
-		});
-
-		$this->registerService('OC_Defaults', function (ContainerInterface $c) {
-			return $c->get(IServerContainer::class)->getThemingDefaults();
-		});
-
-		$this->registerService('Protocol', function (ContainerInterface $c) {
-			/** @var \OC\Server $server */
-			$server = $c->get(IServerContainer::class);
-			$protocol = $server->getRequest()->getHttpProtocol();
-			return new Http($_SERVER, $protocol);
-		});
-
-		$this->registerService('Dispatcher', function (ContainerInterface $c) {
-			return new Dispatcher(
-				$c->get('Protocol'),
-				$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
-		 */
-		$this->registerAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
-		$this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
-			$server = $this->getServer();
-
-			$dispatcher = new MiddlewareDispatcher();
-
-			$dispatcher->registerMiddleware(
-				$c->get(OC\AppFramework\Middleware\CompressionMiddleware::class)
-			);
-
-			$dispatcher->registerMiddleware($c->get(OC\AppFramework\Middleware\NotModifiedMiddleware::class));
-
-			$dispatcher->registerMiddleware(
-				$c->get(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
-			);
-
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IControllerMethodReflector::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new CORSMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(IUserSession::class),
-					$c->get(OC\Security\Bruteforce\Throttler::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OCSMiddleware(
-					$c->get(IRequest::class)
-				)
-			);
-
-
-
-			$securityMiddleware = new SecurityMiddleware(
-				$c->get(IRequest::class),
-				$c->get(IControllerMethodReflector::class),
-				$c->get(INavigationManager::class),
-				$c->get(IURLGenerator::class),
-				$server->get(LoggerInterface::class),
-				$c->get('AppName'),
-				$server->getUserSession()->isLoggedIn(),
-				$this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()),
-				$server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
-				$server->getAppManager(),
-				$server->getL10N('lib'),
-				$c->get(AuthorizedGroupMapper::class),
-				$server->get(IUserSession::class)
-			);
-			$dispatcher->registerMiddleware($securityMiddleware);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\CSPMiddleware(
-					$server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
-					$server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
-					$server->query(OC\Security\CSRF\CsrfTokenManager::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(ISession::class),
-					$c->get(IUserSession::class),
-					$c->get(ITimeFactory::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new TwoFactorMiddleware(
-					$c->get(OC\Authentication\TwoFactorAuth\Manager::class),
-					$c->get(IUserSession::class),
-					$c->get(ISession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(OC\Security\Bruteforce\Throttler::class),
-					$c->get(IRequest::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new RateLimitingMiddleware(
-					$c->get(IRequest::class),
-					$c->get(IUserSession::class),
-					$c->get(IControllerMethodReflector::class),
-					$c->get(OC\Security\RateLimiting\Limiter::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
-					$c->get(IRequest::class),
-					$c->get(ISession::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(OC\Security\Bruteforce\Throttler::class)
-				)
-			);
-			$dispatcher->registerMiddleware(
-				$c->get(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
-			);
-
-			/** @var \OC\AppFramework\Bootstrap\Coordinator $coordinator */
-			$coordinator = $c->get(\OC\AppFramework\Bootstrap\Coordinator::class);
-			$registrationContext = $coordinator->getRegistrationContext();
-			if ($registrationContext !== null) {
-				$appId = $this->getAppName();
-				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(
-				new SessionMiddleware(
-					$c->get(IControllerMethodReflector::class),
-					$c->get(ISession::class)
-				)
-			);
-			return $dispatcher;
-		});
-
-		$this->registerService(IAppConfig::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Services\AppConfig(
-				$c->get(IConfig::class),
-				$c->get('AppName')
-			);
-		});
-		$this->registerService(IInitialState::class, function (ContainerInterface $c) {
-			return new OC\AppFramework\Services\InitialState(
-				$c->get(IInitialStateService::class),
-				$c->get('AppName')
-			);
-		});
-	}
-
-	/**
-	 * @return \OCP\IServerContainer
-	 */
-	public function getServer() {
-		return $this->server;
-	}
-
-	/**
-	 * @param string $middleWare
-	 * @return boolean|null
-	 */
-	public function registerMiddleWare($middleWare) {
-		if (in_array($middleWare, $this->middleWares, true) !== false) {
-			return false;
-		}
-		$this->middleWares[] = $middleWare;
-	}
-
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 */
-	public function getAppName() {
-		return $this->query('AppName');
-	}
-
-	/**
-	 * @deprecated use IUserSession->isLoggedIn()
-	 * @return boolean
-	 */
-	public function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * @deprecated use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 */
-	public function isAdminUser() {
-		$uid = $this->getUserId();
-		return \OC_User::isAdminUser($uid);
-	}
-
-	private function getUserId() {
-		return $this->getServer()->getSession()->get('user_id');
-	}
-
-	/**
-	 * @deprecated use the ILogger instead
-	 * @param string $message
-	 * @param string $level
-	 * @return mixed
-	 */
-	public function log($message, $level) {
-		switch ($level) {
-			case 'debug':
-				$level = ILogger::DEBUG;
-				break;
-			case 'info':
-				$level = ILogger::INFO;
-				break;
-			case 'warn':
-				$level = ILogger::WARN;
-				break;
-			case 'fatal':
-				$level = ILogger::FATAL;
-				break;
-			default:
-				$level = ILogger::ERROR;
-				break;
-		}
-		\OCP\Util::writeLog($this->getAppName(), $message, $level);
-	}
-
-	/**
-	 * 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);
-		}
-
-		throw new QueryException('Could not resolve ' . $name . '!' .
-			' Class can not be instantiated', 1);
-	}
+    private string $appName;
+
+    /**
+     * @var array
+     */
+    private $middleWares = [];
+
+    /** @var ServerContainer */
+    private $server;
+
+    /**
+     * Put your class dependencies in here
+     * @param string $appName the name of the app
+     * @param array $urlParams
+     * @param ServerContainer|null $server
+     */
+    public function __construct(string $appName, array $urlParams = [], ServerContainer $server = null) {
+        parent::__construct();
+        $this->appName = $appName;
+        $this['appName'] = $appName;
+        $this['urlParams'] = $urlParams;
+
+        $this->registerAlias('Request', IRequest::class);
+
+        /** @var \OC\ServerContainer $server */
+        if ($server === null) {
+            $server = \OC::$server;
+        }
+        $this->server = $server;
+        $this->server->registerAppContainer($appName, $this);
+
+        // aliases
+        /** @deprecated inject $appName */
+        $this->registerAlias('AppName', 'appName');
+        /** @deprecated inject $webRoot*/
+        $this->registerAlias('WebRoot', 'webRoot');
+        /** @deprecated inject $userId */
+        $this->registerAlias('UserId', 'userId');
+
+        /**
+         * Core services
+         */
+        $this->registerService(IOutput::class, function () {
+            return new Output($this->getServer()->getWebRoot());
+        });
+
+        $this->registerService(Folder::class, function () {
+            return $this->getServer()->getUserFolder();
+        });
+
+        $this->registerService(IAppData::class, function (ContainerInterface $c) {
+            return $this->getServer()->getAppDataDir($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) {
+            return new ScopedPsrLogger(
+                $c->get(PsrLoggerAdapter::class),
+                $c->get('AppName')
+            );
+        });
+        $this->registerService(ILogger::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->get('AppName'));
+        });
+
+        $this->registerService(IServerContainer::class, function () {
+            return $this->getServer();
+        });
+        $this->registerAlias('ServerContainer', IServerContainer::class);
+
+        $this->registerService(\OCP\WorkflowEngine\IManager::class, function (ContainerInterface $c) {
+            return $c->get(Manager::class);
+        });
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerAlias(IAppContainer::class, ContainerInterface::class);
+
+        // commonly used attributes
+        $this->registerService('userId', function (ContainerInterface $c) {
+            return $c->get(IUserSession::class)->getSession()->get('user_id');
+        });
+
+        $this->registerService('webRoot', function (ContainerInterface $c) {
+            return $c->get(IServerContainer::class)->getWebRoot();
+        });
+
+        $this->registerService('OC_Defaults', function (ContainerInterface $c) {
+            return $c->get(IServerContainer::class)->getThemingDefaults();
+        });
+
+        $this->registerService('Protocol', function (ContainerInterface $c) {
+            /** @var \OC\Server $server */
+            $server = $c->get(IServerContainer::class);
+            $protocol = $server->getRequest()->getHttpProtocol();
+            return new Http($_SERVER, $protocol);
+        });
+
+        $this->registerService('Dispatcher', function (ContainerInterface $c) {
+            return new Dispatcher(
+                $c->get('Protocol'),
+                $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
+         */
+        $this->registerAlias('MiddlewareDispatcher', MiddlewareDispatcher::class);
+        $this->registerService(MiddlewareDispatcher::class, function (ContainerInterface $c) {
+            $server = $this->getServer();
+
+            $dispatcher = new MiddlewareDispatcher();
+
+            $dispatcher->registerMiddleware(
+                $c->get(OC\AppFramework\Middleware\CompressionMiddleware::class)
+            );
+
+            $dispatcher->registerMiddleware($c->get(OC\AppFramework\Middleware\NotModifiedMiddleware::class));
+
+            $dispatcher->registerMiddleware(
+                $c->get(OC\AppFramework\Middleware\Security\ReloadExecutionMiddleware::class)
+            );
+
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IControllerMethodReflector::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new CORSMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(IUserSession::class),
+                    $c->get(OC\Security\Bruteforce\Throttler::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OCSMiddleware(
+                    $c->get(IRequest::class)
+                )
+            );
+
+
+
+            $securityMiddleware = new SecurityMiddleware(
+                $c->get(IRequest::class),
+                $c->get(IControllerMethodReflector::class),
+                $c->get(INavigationManager::class),
+                $c->get(IURLGenerator::class),
+                $server->get(LoggerInterface::class),
+                $c->get('AppName'),
+                $server->getUserSession()->isLoggedIn(),
+                $this->getUserId() !== null && $server->getGroupManager()->isAdmin($this->getUserId()),
+                $server->getUserSession()->getUser() !== null && $server->query(ISubAdmin::class)->isSubAdmin($server->getUserSession()->getUser()),
+                $server->getAppManager(),
+                $server->getL10N('lib'),
+                $c->get(AuthorizedGroupMapper::class),
+                $server->get(IUserSession::class)
+            );
+            $dispatcher->registerMiddleware($securityMiddleware);
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\CSPMiddleware(
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
+                    $server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
+                    $server->query(OC\Security\CSRF\CsrfTokenManager::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $server->query(OC\AppFramework\Middleware\Security\FeaturePolicyMiddleware::class)
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(ISession::class),
+                    $c->get(IUserSession::class),
+                    $c->get(ITimeFactory::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new TwoFactorMiddleware(
+                    $c->get(OC\Authentication\TwoFactorAuth\Manager::class),
+                    $c->get(IUserSession::class),
+                    $c->get(ISession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(OC\Security\Bruteforce\Throttler::class),
+                    $c->get(IRequest::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new RateLimitingMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(IUserSession::class),
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(OC\Security\RateLimiting\Limiter::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                new OC\AppFramework\Middleware\PublicShare\PublicShareMiddleware(
+                    $c->get(IRequest::class),
+                    $c->get(ISession::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(OC\Security\Bruteforce\Throttler::class)
+                )
+            );
+            $dispatcher->registerMiddleware(
+                $c->get(\OC\AppFramework\Middleware\AdditionalScriptsMiddleware::class)
+            );
+
+            /** @var \OC\AppFramework\Bootstrap\Coordinator $coordinator */
+            $coordinator = $c->get(\OC\AppFramework\Bootstrap\Coordinator::class);
+            $registrationContext = $coordinator->getRegistrationContext();
+            if ($registrationContext !== null) {
+                $appId = $this->getAppName();
+                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(
+                new SessionMiddleware(
+                    $c->get(IControllerMethodReflector::class),
+                    $c->get(ISession::class)
+                )
+            );
+            return $dispatcher;
+        });
+
+        $this->registerService(IAppConfig::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Services\AppConfig(
+                $c->get(IConfig::class),
+                $c->get('AppName')
+            );
+        });
+        $this->registerService(IInitialState::class, function (ContainerInterface $c) {
+            return new OC\AppFramework\Services\InitialState(
+                $c->get(IInitialStateService::class),
+                $c->get('AppName')
+            );
+        });
+    }
+
+    /**
+     * @return \OCP\IServerContainer
+     */
+    public function getServer() {
+        return $this->server;
+    }
+
+    /**
+     * @param string $middleWare
+     * @return boolean|null
+     */
+    public function registerMiddleWare($middleWare) {
+        if (in_array($middleWare, $this->middleWares, true) !== false) {
+            return false;
+        }
+        $this->middleWares[] = $middleWare;
+    }
+
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     */
+    public function getAppName() {
+        return $this->query('AppName');
+    }
+
+    /**
+     * @deprecated use IUserSession->isLoggedIn()
+     * @return boolean
+     */
+    public function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * @deprecated use IGroupManager->isAdmin($userId)
+     * @return boolean
+     */
+    public function isAdminUser() {
+        $uid = $this->getUserId();
+        return \OC_User::isAdminUser($uid);
+    }
+
+    private function getUserId() {
+        return $this->getServer()->getSession()->get('user_id');
+    }
+
+    /**
+     * @deprecated use the ILogger instead
+     * @param string $message
+     * @param string $level
+     * @return mixed
+     */
+    public function log($message, $level) {
+        switch ($level) {
+            case 'debug':
+                $level = ILogger::DEBUG;
+                break;
+            case 'info':
+                $level = ILogger::INFO;
+                break;
+            case 'warn':
+                $level = ILogger::WARN;
+                break;
+            case 'fatal':
+                $level = ILogger::FATAL;
+                break;
+            default:
+                $level = ILogger::ERROR;
+                break;
+        }
+        \OCP\Util::writeLog($this->getAppName(), $message, $level);
+    }
+
+    /**
+     * 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);
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!' .
+            ' Class can not be instantiated', 1);
+    }
 }