nextcloud / server

lib/private/Talk/ConversationOptions.php

Indentation +14 added lines, -14 removed lines

@@ -28,22 +28,22 @@
 use OCP\Talk\IConversationOptions;
 
 class ConversationOptions implements IConversationOptions {
-	private bool $isPublic;
+    private bool $isPublic;
 
-	private function __construct(bool $isPublic) {
-		$this->isPublic = $isPublic;
-	}
+    private function __construct(bool $isPublic) {
+        $this->isPublic = $isPublic;
+    }
 
-	public static function default(): self {
-		return new self(false);
-	}
+    public static function default(): self {
+        return new self(false);
+    }
 
-	public function setPublic(bool $isPublic = true): IConversationOptions {
-		$this->isPublic = $isPublic;
-		return $this;
-	}
+    public function setPublic(bool $isPublic = true): IConversationOptions {
+        $this->isPublic = $isPublic;
+        return $this;
+    }
 
-	public function isPublic(): bool {
-		return $this->isPublic;
-	}
+    public function isPublic(): bool {
+        return $this->isPublic;
+    }
 }

lib/private/Talk/Broker.php

Indentation +69 added lines, -69 removed lines

@@ -37,73 +37,73 @@
 use Throwable;
 
 class Broker implements IBroker {
-	private Coordinator $coordinator;
-
-	private IServerContainer $container;
-
-	private LoggerInterface $logger;
-
-	private ?bool $hasBackend = null;
-
-	private ?ITalkBackend $backend = null;
-
-	public function __construct(Coordinator $coordinator,
-								IServerContainer $container,
-								LoggerInterface $logger) {
-		$this->coordinator = $coordinator;
-		$this->container = $container;
-		$this->logger = $logger;
-	}
-
-	public function hasBackend(): bool {
-		if ($this->hasBackend !== null) {
-			return $this->hasBackend;
-		}
-
-		$context = $this->coordinator->getRegistrationContext();
-		if ($context === null) {
-			// Backend requested too soon, e.g. from the bootstrap `register` method of an app
-			throw new RuntimeException("Not all apps have been registered yet");
-		}
-		$backendRegistration = $context->getTalkBackendRegistration();
-		if ($backendRegistration === null) {
-			// Nothing to do. Remember and exit.
-			return $this->hasBackend = false;
-		}
-
-		try {
-			$this->backend = $this->container->get(
-				$backendRegistration->getService()
-			);
-
-			// Remember and return
-			return $this->hasBackend = true;
-		} catch (Throwable $e) {
-			$this->logger->error("Talk backend {class} could not be loaded: " . $e->getMessage(), [
-				'class' => $backendRegistration->getService(),
-				'exception' => $e,
-			]);
-
-			// Temporary result. Maybe the next time the backend is requested it can be loaded.
-			return false;
-		}
-	}
-
-	public function newConversationOptions(): IConversationOptions {
-		return ConversationOptions::default();
-	}
-
-	public function createConversation(string $name,
-									   array $moderators,
-									   IConversationOptions $options = null): IConversation {
-		if (!$this->hasBackend()) {
-			throw new NoBackendException("The Talk broker has no registered backend");
-		}
-
-		return $this->backend->createConversation(
-			$name,
-			$moderators,
-			$options ?? ConversationOptions::default()
-		);
-	}
+    private Coordinator $coordinator;
+
+    private IServerContainer $container;
+
+    private LoggerInterface $logger;
+
+    private ?bool $hasBackend = null;
+
+    private ?ITalkBackend $backend = null;
+
+    public function __construct(Coordinator $coordinator,
+                                IServerContainer $container,
+                                LoggerInterface $logger) {
+        $this->coordinator = $coordinator;
+        $this->container = $container;
+        $this->logger = $logger;
+    }
+
+    public function hasBackend(): bool {
+        if ($this->hasBackend !== null) {
+            return $this->hasBackend;
+        }
+
+        $context = $this->coordinator->getRegistrationContext();
+        if ($context === null) {
+            // Backend requested too soon, e.g. from the bootstrap `register` method of an app
+            throw new RuntimeException("Not all apps have been registered yet");
+        }
+        $backendRegistration = $context->getTalkBackendRegistration();
+        if ($backendRegistration === null) {
+            // Nothing to do. Remember and exit.
+            return $this->hasBackend = false;
+        }
+
+        try {
+            $this->backend = $this->container->get(
+                $backendRegistration->getService()
+            );
+
+            // Remember and return
+            return $this->hasBackend = true;
+        } catch (Throwable $e) {
+            $this->logger->error("Talk backend {class} could not be loaded: " . $e->getMessage(), [
+                'class' => $backendRegistration->getService(),
+                'exception' => $e,
+            ]);
+
+            // Temporary result. Maybe the next time the backend is requested it can be loaded.
+            return false;
+        }
+    }
+
+    public function newConversationOptions(): IConversationOptions {
+        return ConversationOptions::default();
+    }
+
+    public function createConversation(string $name,
+                                        array $moderators,
+                                        IConversationOptions $options = null): IConversation {
+        if (!$this->hasBackend()) {
+            throw new NoBackendException("The Talk broker has no registered backend");
+        }
+
+        return $this->backend->createConversation(
+            $name,
+            $moderators,
+            $options ?? ConversationOptions::default()
+        );
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 			// Remember and return
 			return $this->hasBackend = true;
 		} catch (Throwable $e) {
-			$this->logger->error("Talk backend {class} could not be loaded: " . $e->getMessage(), [
+			$this->logger->error("Talk backend {class} could not be loaded: ".$e->getMessage(), [
 				'class' => $backendRegistration->getService(),
 				'exception' => $e,
 			]);

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +574 added lines, -574 removed lines

@@ -55,584 +55,584 @@
 
 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 ServiceFactoryRegistration[] */
-	private $services = [];
+    /** @var ServiceFactoryRegistration[] */
+    private $services = [];
 
-	/** @var ServiceAliasRegistration[] */
-	private $aliases = [];
-
-	/** @var ParameterRegistration[] */
-	private $parameters = [];
-
-	/** @var EventListenerRegistration[] */
-	private $eventListeners = [];
-
-	/** @var ServiceRegistration<Middleware>[] */
-	private $middlewares = [];
-
-	/** @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 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): void {
-				$this->context->registerMiddleware(
-					$this->appId,
-					$class
-				);
-			}
-
-			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 registerProfileLinkAction(string $actionClass): void {
-				$this->context->registerProfileLinkAction(
-					$this->appId,
-					$actionClass
-				);
-			}
-
-			public function registerTalkBackend(string $backend): void {
-				$this->context->registerTalkBackend(
-					$this->appId,
-					$backend
-				);
-			}
-		};
-	}
-
-	/**
-	 * @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): void {
-		$this->middlewares[] = new ServiceRegistration($appId, $class);
-	}
-
-	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);
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * @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(array $apps, IManager $dashboardManager): void {
-		while (($panel = array_shift($this->dashboardPanels)) !== null) {
-			try {
-				$dashboardManager->lazyRegisterWidget($panel->getService());
-			} 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,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateMiddlewareRegistrations(array $apps): void {
-		while (($middleware = array_shift($this->middlewares)) !== null) {
-			$appId = $middleware->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 middleware registration");
-
-				continue;
-			}
-
-			try {
-				$apps[$appId]
-					->getContainer()
-					->registerMiddleWare($middleware->getService());
-			} catch (Throwable $e) {
-				$this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @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<ILinkAction>[]
-	 */
-	public function getProfileLinkActions(): array {
-		return $this->profileLinkActions;
-	}
-
-	/**
-	 * @return ServiceRegistration|null
-	 * @psalm-return ServiceRegistration<ITalkBackend>|null
-	 */
-	public function getTalkBackendRegistration(): ?ServiceRegistration {
-		return $this->talkBackendRegistration;
-	}
+    /** @var ServiceAliasRegistration[] */
+    private $aliases = [];
+
+    /** @var ParameterRegistration[] */
+    private $parameters = [];
+
+    /** @var EventListenerRegistration[] */
+    private $eventListeners = [];
+
+    /** @var ServiceRegistration<Middleware>[] */
+    private $middlewares = [];
+
+    /** @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 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): void {
+                $this->context->registerMiddleware(
+                    $this->appId,
+                    $class
+                );
+            }
+
+            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 registerProfileLinkAction(string $actionClass): void {
+                $this->context->registerProfileLinkAction(
+                    $this->appId,
+                    $actionClass
+                );
+            }
+
+            public function registerTalkBackend(string $backend): void {
+                $this->context->registerTalkBackend(
+                    $this->appId,
+                    $backend
+                );
+            }
+        };
+    }
+
+    /**
+     * @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): void {
+        $this->middlewares[] = new ServiceRegistration($appId, $class);
+    }
+
+    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);
+    }
+
+    /**
+     * @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);
+    }
+
+    /**
+     * @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(array $apps, IManager $dashboardManager): void {
+        while (($panel = array_shift($this->dashboardPanels)) !== null) {
+            try {
+                $dashboardManager->lazyRegisterWidget($panel->getService());
+            } 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,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateMiddlewareRegistrations(array $apps): void {
+        while (($middleware = array_shift($this->middlewares)) !== null) {
+            $appId = $middleware->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 middleware registration");
+
+                continue;
+            }
+
+            try {
+                $apps[$appId]
+                    ->getContainer()
+                    ->registerMiddleWare($middleware->getService());
+            } catch (Throwable $e) {
+                $this->logger->error("Error during capability registration of $appId: " . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @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<ILinkAction>[]
+     */
+    public function getProfileLinkActions(): array {
+        return $this->profileLinkActions;
+    }
+
+    /**
+     * @return ServiceRegistration|null
+     * @psalm-return ServiceRegistration<ITalkBackend>|null
+     */
+    public function getTalkBackendRegistration(): ?ServiceRegistration {
+        return $this->talkBackendRegistration;
+    }
 }

lib/public/Talk/IBroker.php

Indentation +32 added lines, -32 removed lines

@@ -37,38 +37,38 @@
  */
 interface IBroker {
 
-	/**
-	 * Check if the Talk backend is available
-	 *
-	 * @return bool
-	 * @since 24.0.0
-	 */
-	public function hasBackend(): bool;
+    /**
+     * Check if the Talk backend is available
+     *
+     * @return bool
+     * @since 24.0.0
+     */
+    public function hasBackend(): bool;
 
-	/**
-	 * Create a new instance of the objects object for specifics of a new conversation
-	 *
-	 * @return IConversationOptions
-	 * @throws NoBackendException when Talk is not available
-	 * @since 24.0.0
-	 */
-	public function newConversationOptions(): IConversationOptions;
+    /**
+     * Create a new instance of the objects object for specifics of a new conversation
+     *
+     * @return IConversationOptions
+     * @throws NoBackendException when Talk is not available
+     * @since 24.0.0
+     */
+    public function newConversationOptions(): IConversationOptions;
 
-	/**
-	 * Create a new conversation
-	 *
-	 * The conversation is private by default. Use the options parameter to make
-	 * it public.
-	 *
-	 * @param string $name
-	 * @param IUser[] $moderators
-	 * @param IConversationOptions|null $options optional configuration for the conversation
-	 *
-	 * @return IConversation
-	 * @throws NoBackendException when Talk is not available
-	 * @since 24.0.0
-	 */
-	public function createConversation(string $name,
-									   array $moderators,
-									   IConversationOptions $options = null): IConversation;
+    /**
+     * Create a new conversation
+     *
+     * The conversation is private by default. Use the options parameter to make
+     * it public.
+     *
+     * @param string $name
+     * @param IUser[] $moderators
+     * @param IConversationOptions|null $options optional configuration for the conversation
+     *
+     * @return IConversation
+     * @throws NoBackendException when Talk is not available
+     * @since 24.0.0
+     */
+    public function createConversation(string $name,
+                                        array $moderators,
+                                        IConversationOptions $options = null): IConversation;
 }

lib/public/Talk/IConversationOptions.php

Indentation +16 added lines, -16 removed lines

@@ -30,21 +30,21 @@
  */
 interface IConversationOptions {
 
-	/**
-	 * Will the conversation be public?
-	 *
-	 * @return bool
-	 * @since 24.0.0
-	 */
-	public function isPublic(): bool;
+    /**
+     * Will the conversation be public?
+     *
+     * @return bool
+     * @since 24.0.0
+     */
+    public function isPublic(): bool;
 
-	/**
-	 * Make the new conversation public
-	 *
-	 * @param bool $isPublic
-	 *
-	 * @return $this
-	 * @since 24.0.0
-	 */
-	public function setPublic(bool $isPublic = true): self;
+    /**
+     * Make the new conversation public
+     *
+     * @param bool $isPublic
+     *
+     * @return $this
+     * @since 24.0.0
+     */
+    public function setPublic(bool $isPublic = true): self;
 }

lib/public/Talk/ITalkBackend.php

Indentation +11 added lines, -11 removed lines

@@ -38,15 +38,15 @@
  */
 interface ITalkBackend {
 
-	/**
-	 * @param string $name
-	 * @param IUser[] $moderators
-	 * @param IConversationOptions $options configuration for the conversation
-	 *
-	 * @return IConversation
-	 * @since 24.0.0
-	 */
-	public function createConversation(string $name,
-									   array $moderators,
-									   IConversationOptions $options): IConversation;
+    /**
+     * @param string $name
+     * @param IUser[] $moderators
+     * @param IConversationOptions $options configuration for the conversation
+     *
+     * @return IConversation
+     * @since 24.0.0
+     */
+    public function createConversation(string $name,
+                                        array $moderators,
+                                        IConversationOptions $options): IConversation;
 }

lib/public/Talk/IConversation.php

Indentation +7 added lines, -7 removed lines

@@ -30,11 +30,11 @@
  */
 interface IConversation {
 
-	/**
-	 * Get the absolute URL to this conversation
-	 *
-	 * @return string
-	 * @since 24.0.0
-	 */
-	public function getAbsoluteUrl(): string;
+    /**
+     * Get the absolute URL to this conversation
+     *
+     * @return string
+     * @since 24.0.0
+     */
+    public function getAbsoluteUrl(): string;
 }

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +210 added lines, -210 removed lines

@@ -47,232 +47,232 @@
  */
 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
-	 * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
-	 *
-	 * @return void
-	 * @see IAppContainer::registerMiddleWare()
-	 *
-	 * @since 20.0.0
-	 */
-	public function registerMiddleware(string $class): void;
+    /**
+     * @param string $class
+     * @psalm-param class-string<\OCP\AppFramework\Middleware> $class
+     *
+     * @return void
+     * @see IAppContainer::registerMiddleWare()
+     *
+     * @since 20.0.0
+     */
+    public function registerMiddleware(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 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 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;
 }