nextcloud / server

lib/private/Notification/Manager.php

Indentation +350 added lines, -350 removed lines

@@ -40,354 +40,354 @@
 use OCP\RichObjectStrings\IValidator;
 
 class Manager implements IManager {
-	/** @var IValidator */
-	protected $validator;
-	/** @var ILogger */
-	protected $logger;
-	/** @var Coordinator */
-	private $coordinator;
-
-	/** @var IApp[] */
-	protected $apps;
-	/** @var string[] */
-	protected $appClasses;
-
-	/** @var INotifier[] */
-	protected $notifiers;
-	/** @var string[] */
-	protected $notifierClasses;
-
-	/** @var bool */
-	protected $preparingPushNotification;
-	/** @var bool */
-	protected $deferPushing;
-	/** @var bool */
-	private $parsedRegistrationContext;
-
-	public function __construct(IValidator $validator,
-								ILogger $logger,
-								Coordinator $coordinator) {
-		$this->validator = $validator;
-		$this->logger = $logger;
-		$this->coordinator = $coordinator;
-
-		$this->apps = [];
-		$this->notifiers = [];
-		$this->appClasses = [];
-		$this->notifierClasses = [];
-		$this->preparingPushNotification = false;
-		$this->deferPushing = false;
-		$this->parsedRegistrationContext = false;
-	}
-	/**
-	 * @param string $appClass The service must implement IApp, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 17.0.0
-	 */
-	public function registerApp(string $appClass): void {
-		$this->appClasses[] = $appClass;
-	}
-
-	/**
-	 * @param \Closure $service The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @param \Closure $info    An array with the keys 'id' and 'name' containing
-	 *                          the app id and the app name
-	 * @deprecated 17.0.0 use registerNotifierService instead.
-	 * @since 8.2.0 - Parameter $info was added in 9.0.0
-	 */
-	public function registerNotifier(\Closure $service, \Closure $info) {
-		$infoData = $info();
-		$this->logger->logException(new \InvalidArgumentException(
-			'Notifier ' . $infoData['name'] . ' (id: ' . $infoData['id'] . ') is not considered because it is using the old way to register.'
-		));
-	}
-
-	/**
-	 * @param string $notifierService The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 17.0.0
-	 */
-	public function registerNotifierService(string $notifierService): void {
-		$this->notifierClasses[] = $notifierService;
-	}
-
-	/**
-	 * @return IApp[]
-	 */
-	protected function getApps(): array {
-		if (empty($this->appClasses)) {
-			return $this->apps;
-		}
-
-		foreach ($this->appClasses as $appClass) {
-			try {
-				$app = \OC::$server->query($appClass);
-			} catch (QueryException $e) {
-				$this->logger->logException($e, [
-					'message' => 'Failed to load notification app class: ' . $appClass,
-					'app' => 'notifications',
-				]);
-				continue;
-			}
-
-			if (!($app instanceof IApp)) {
-				$this->logger->error('Notification app class ' . $appClass . ' is not implementing ' . IApp::class, [
-					'app' => 'notifications',
-				]);
-				continue;
-			}
-
-			$this->apps[] = $app;
-		}
-
-		$this->appClasses = [];
-
-		return $this->apps;
-	}
-
-	/**
-	 * @return INotifier[]
-	 */
-	public function getNotifiers(): array {
-		if (!$this->parsedRegistrationContext) {
-			$notifierServices = $this->coordinator->getRegistrationContext()->getNotifierServices();
-			foreach ($notifierServices as $notifierService) {
-				try {
-					$notifier = \OC::$server->query($notifierService->getService());
-				} catch (QueryException $e) {
-					$this->logger->logException($e, [
-						'message' => 'Failed to load notification notifier class: ' . $notifierService->getService(),
-						'app' => 'notifications',
-					]);
-					continue;
-				}
-
-				if (!($notifier instanceof INotifier)) {
-					$this->logger->error('Notification notifier class ' . $notifierService->getService() . ' is not implementing ' . INotifier::class, [
-						'app' => 'notifications',
-					]);
-					continue;
-				}
-
-				$this->notifiers[] = $notifier;
-			}
-
-			$this->parsedRegistrationContext = true;
-		}
-
-		if (empty($this->notifierClasses)) {
-			return $this->notifiers;
-		}
-
-		foreach ($this->notifierClasses as $notifierClass) {
-			try {
-				$notifier = \OC::$server->query($notifierClass);
-			} catch (QueryException $e) {
-				$this->logger->logException($e, [
-					'message' => 'Failed to load notification notifier class: ' . $notifierClass,
-					'app' => 'notifications',
-				]);
-				continue;
-			}
-
-			if (!($notifier instanceof INotifier)) {
-				$this->logger->error('Notification notifier class ' . $notifierClass . ' is not implementing ' . INotifier::class, [
-					'app' => 'notifications',
-				]);
-				continue;
-			}
-
-			$this->notifiers[] = $notifier;
-		}
-
-		$this->notifierClasses = [];
-
-		return $this->notifiers;
-	}
-
-	/**
-	 * @return INotification
-	 * @since 8.2.0
-	 */
-	public function createNotification(): INotification {
-		return new Notification($this->validator);
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function hasNotifiers(): bool {
-		return !empty($this->notifiers) || !empty($this->notifierClasses);
-	}
-
-	/**
-	 * @param bool $preparingPushNotification
-	 * @since 14.0.0
-	 */
-	public function setPreparingPushNotification(bool $preparingPushNotification): void {
-		$this->preparingPushNotification = $preparingPushNotification;
-	}
-
-	/**
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isPreparingPushNotification(): bool {
-		return $this->preparingPushNotification;
-	}
-
-	/**
-	 * The calling app should only "flush" when it got returned true on the defer call
-	 * @return bool
-	 * @since 20.0.0
-	 */
-	public function defer(): bool {
-		$alreadyDeferring = $this->deferPushing;
-		$this->deferPushing = true;
-
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			if ($app instanceof IDeferrableApp) {
-				$app->defer();
-			}
-		}
-
-		return !$alreadyDeferring;
-	}
-
-	/**
-	 * @since 20.0.0
-	 */
-	public function flush(): void {
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			if (!$app instanceof IDeferrableApp) {
-				continue;
-			}
-
-			try {
-				$app->flush();
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
-
-		$this->deferPushing = false;
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @throws \InvalidArgumentException When the notification is not valid
-	 * @since 8.2.0
-	 */
-	public function notify(INotification $notification): void {
-		if (!$notification->isValid()) {
-			throw new \InvalidArgumentException('The given notification is invalid');
-		}
-
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			try {
-				$app->notify($notification);
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'core';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return 'core';
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 8.2.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		$notifiers = $this->getNotifiers();
-
-		foreach ($notifiers as $notifier) {
-			try {
-				$notification = $notifier->prepare($notification, $languageCode);
-			} catch (\InvalidArgumentException $e) {
-				continue;
-			} catch (AlreadyProcessedException $e) {
-				$this->markProcessed($notification);
-				throw new \InvalidArgumentException('The given notification has been processed');
-			}
-
-			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-				throw new \InvalidArgumentException('The given notification has not been handled');
-			}
-		}
-
-		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-			throw new \InvalidArgumentException('The given notification has not been handled');
-		}
-
-		return $notification;
-	}
-
-	/**
-	 * @param INotification $notification
-	 */
-	public function markProcessed(INotification $notification): void {
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			$app->markProcessed($notification);
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @return int
-	 */
-	public function getCount(INotification $notification): int {
-		$apps = $this->getApps();
-
-		$count = 0;
-		foreach ($apps as $app) {
-			$count += $app->getCount($notification);
-		}
-
-		return $count;
-	}
-
-	public function dismissNotification(INotification $notification): void {
-		$notifiers = $this->getNotifiers();
-
-		foreach ($notifiers as $notifier) {
-			if ($notifier instanceof IDismissableNotifier) {
-				try {
-					$notifier->dismissNotification($notification);
-				} catch (\InvalidArgumentException $e) {
-					continue;
-				}
-			}
-		}
-	}
+    /** @var IValidator */
+    protected $validator;
+    /** @var ILogger */
+    protected $logger;
+    /** @var Coordinator */
+    private $coordinator;
+
+    /** @var IApp[] */
+    protected $apps;
+    /** @var string[] */
+    protected $appClasses;
+
+    /** @var INotifier[] */
+    protected $notifiers;
+    /** @var string[] */
+    protected $notifierClasses;
+
+    /** @var bool */
+    protected $preparingPushNotification;
+    /** @var bool */
+    protected $deferPushing;
+    /** @var bool */
+    private $parsedRegistrationContext;
+
+    public function __construct(IValidator $validator,
+                                ILogger $logger,
+                                Coordinator $coordinator) {
+        $this->validator = $validator;
+        $this->logger = $logger;
+        $this->coordinator = $coordinator;
+
+        $this->apps = [];
+        $this->notifiers = [];
+        $this->appClasses = [];
+        $this->notifierClasses = [];
+        $this->preparingPushNotification = false;
+        $this->deferPushing = false;
+        $this->parsedRegistrationContext = false;
+    }
+    /**
+     * @param string $appClass The service must implement IApp, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 17.0.0
+     */
+    public function registerApp(string $appClass): void {
+        $this->appClasses[] = $appClass;
+    }
+
+    /**
+     * @param \Closure $service The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @param \Closure $info    An array with the keys 'id' and 'name' containing
+     *                          the app id and the app name
+     * @deprecated 17.0.0 use registerNotifierService instead.
+     * @since 8.2.0 - Parameter $info was added in 9.0.0
+     */
+    public function registerNotifier(\Closure $service, \Closure $info) {
+        $infoData = $info();
+        $this->logger->logException(new \InvalidArgumentException(
+            'Notifier ' . $infoData['name'] . ' (id: ' . $infoData['id'] . ') is not considered because it is using the old way to register.'
+        ));
+    }
+
+    /**
+     * @param string $notifierService The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 17.0.0
+     */
+    public function registerNotifierService(string $notifierService): void {
+        $this->notifierClasses[] = $notifierService;
+    }
+
+    /**
+     * @return IApp[]
+     */
+    protected function getApps(): array {
+        if (empty($this->appClasses)) {
+            return $this->apps;
+        }
+
+        foreach ($this->appClasses as $appClass) {
+            try {
+                $app = \OC::$server->query($appClass);
+            } catch (QueryException $e) {
+                $this->logger->logException($e, [
+                    'message' => 'Failed to load notification app class: ' . $appClass,
+                    'app' => 'notifications',
+                ]);
+                continue;
+            }
+
+            if (!($app instanceof IApp)) {
+                $this->logger->error('Notification app class ' . $appClass . ' is not implementing ' . IApp::class, [
+                    'app' => 'notifications',
+                ]);
+                continue;
+            }
+
+            $this->apps[] = $app;
+        }
+
+        $this->appClasses = [];
+
+        return $this->apps;
+    }
+
+    /**
+     * @return INotifier[]
+     */
+    public function getNotifiers(): array {
+        if (!$this->parsedRegistrationContext) {
+            $notifierServices = $this->coordinator->getRegistrationContext()->getNotifierServices();
+            foreach ($notifierServices as $notifierService) {
+                try {
+                    $notifier = \OC::$server->query($notifierService->getService());
+                } catch (QueryException $e) {
+                    $this->logger->logException($e, [
+                        'message' => 'Failed to load notification notifier class: ' . $notifierService->getService(),
+                        'app' => 'notifications',
+                    ]);
+                    continue;
+                }
+
+                if (!($notifier instanceof INotifier)) {
+                    $this->logger->error('Notification notifier class ' . $notifierService->getService() . ' is not implementing ' . INotifier::class, [
+                        'app' => 'notifications',
+                    ]);
+                    continue;
+                }
+
+                $this->notifiers[] = $notifier;
+            }
+
+            $this->parsedRegistrationContext = true;
+        }
+
+        if (empty($this->notifierClasses)) {
+            return $this->notifiers;
+        }
+
+        foreach ($this->notifierClasses as $notifierClass) {
+            try {
+                $notifier = \OC::$server->query($notifierClass);
+            } catch (QueryException $e) {
+                $this->logger->logException($e, [
+                    'message' => 'Failed to load notification notifier class: ' . $notifierClass,
+                    'app' => 'notifications',
+                ]);
+                continue;
+            }
+
+            if (!($notifier instanceof INotifier)) {
+                $this->logger->error('Notification notifier class ' . $notifierClass . ' is not implementing ' . INotifier::class, [
+                    'app' => 'notifications',
+                ]);
+                continue;
+            }
+
+            $this->notifiers[] = $notifier;
+        }
+
+        $this->notifierClasses = [];
+
+        return $this->notifiers;
+    }
+
+    /**
+     * @return INotification
+     * @since 8.2.0
+     */
+    public function createNotification(): INotification {
+        return new Notification($this->validator);
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function hasNotifiers(): bool {
+        return !empty($this->notifiers) || !empty($this->notifierClasses);
+    }
+
+    /**
+     * @param bool $preparingPushNotification
+     * @since 14.0.0
+     */
+    public function setPreparingPushNotification(bool $preparingPushNotification): void {
+        $this->preparingPushNotification = $preparingPushNotification;
+    }
+
+    /**
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isPreparingPushNotification(): bool {
+        return $this->preparingPushNotification;
+    }
+
+    /**
+     * The calling app should only "flush" when it got returned true on the defer call
+     * @return bool
+     * @since 20.0.0
+     */
+    public function defer(): bool {
+        $alreadyDeferring = $this->deferPushing;
+        $this->deferPushing = true;
+
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            if ($app instanceof IDeferrableApp) {
+                $app->defer();
+            }
+        }
+
+        return !$alreadyDeferring;
+    }
+
+    /**
+     * @since 20.0.0
+     */
+    public function flush(): void {
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            if (!$app instanceof IDeferrableApp) {
+                continue;
+            }
+
+            try {
+                $app->flush();
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
+
+        $this->deferPushing = false;
+    }
+
+    /**
+     * @param INotification $notification
+     * @throws \InvalidArgumentException When the notification is not valid
+     * @since 8.2.0
+     */
+    public function notify(INotification $notification): void {
+        if (!$notification->isValid()) {
+            throw new \InvalidArgumentException('The given notification is invalid');
+        }
+
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            try {
+                $app->notify($notification);
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'core';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return 'core';
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 8.2.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        $notifiers = $this->getNotifiers();
+
+        foreach ($notifiers as $notifier) {
+            try {
+                $notification = $notifier->prepare($notification, $languageCode);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            } catch (AlreadyProcessedException $e) {
+                $this->markProcessed($notification);
+                throw new \InvalidArgumentException('The given notification has been processed');
+            }
+
+            if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+                throw new \InvalidArgumentException('The given notification has not been handled');
+            }
+        }
+
+        if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+            throw new \InvalidArgumentException('The given notification has not been handled');
+        }
+
+        return $notification;
+    }
+
+    /**
+     * @param INotification $notification
+     */
+    public function markProcessed(INotification $notification): void {
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            $app->markProcessed($notification);
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @return int
+     */
+    public function getCount(INotification $notification): int {
+        $apps = $this->getApps();
+
+        $count = 0;
+        foreach ($apps as $app) {
+            $count += $app->getCount($notification);
+        }
+
+        return $count;
+    }
+
+    public function dismissNotification(INotification $notification): void {
+        $notifiers = $this->getNotifiers();
+
+        foreach ($notifiers as $notifier) {
+            if ($notifier instanceof IDismissableNotifier) {
+                try {
+                    $notifier->dismissNotification($notification);
+                } catch (\InvalidArgumentException $e) {
+                    continue;
+                }
+            }
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
 	public function registerNotifier(\Closure $service, \Closure $info) {
 		$infoData = $info();
 		$this->logger->logException(new \InvalidArgumentException(
-			'Notifier ' . $infoData['name'] . ' (id: ' . $infoData['id'] . ') is not considered because it is using the old way to register.'
+			'Notifier '.$infoData['name'].' (id: '.$infoData['id'].') is not considered because it is using the old way to register.'
 		));
 	}
 
@@ -125,14 +125,14 @@ 
 				$app = \OC::$server->query($appClass);
 			} catch (QueryException $e) {
 				$this->logger->logException($e, [
-					'message' => 'Failed to load notification app class: ' . $appClass,
+					'message' => 'Failed to load notification app class: '.$appClass,
 					'app' => 'notifications',
 				]);
 				continue;
 			}
 
 			if (!($app instanceof IApp)) {
-				$this->logger->error('Notification app class ' . $appClass . ' is not implementing ' . IApp::class, [
+				$this->logger->error('Notification app class '.$appClass.' is not implementing '.IApp::class, [
 					'app' => 'notifications',
 				]);
 				continue;
@@ -157,14 +157,14 @@ 
 					$notifier = \OC::$server->query($notifierService->getService());
 				} catch (QueryException $e) {
 					$this->logger->logException($e, [
-						'message' => 'Failed to load notification notifier class: ' . $notifierService->getService(),
+						'message' => 'Failed to load notification notifier class: '.$notifierService->getService(),
 						'app' => 'notifications',
 					]);
 					continue;
 				}
 
 				if (!($notifier instanceof INotifier)) {
-					$this->logger->error('Notification notifier class ' . $notifierService->getService() . ' is not implementing ' . INotifier::class, [
+					$this->logger->error('Notification notifier class '.$notifierService->getService().' is not implementing '.INotifier::class, [
 						'app' => 'notifications',
 					]);
 					continue;
@@ -185,14 +185,14 @@ 
 				$notifier = \OC::$server->query($notifierClass);
 			} catch (QueryException $e) {
 				$this->logger->logException($e, [
-					'message' => 'Failed to load notification notifier class: ' . $notifierClass,
+					'message' => 'Failed to load notification notifier class: '.$notifierClass,
 					'app' => 'notifications',
 				]);
 				continue;
 			}
 
 			if (!($notifier instanceof INotifier)) {
-				$this->logger->error('Notification notifier class ' . $notifierClass . ' is not implementing ' . INotifier::class, [
+				$this->logger->error('Notification notifier class '.$notifierClass.' is not implementing '.INotifier::class, [
 					'app' => 'notifications',
 				]);
 				continue;

lib/private/AppFramework/Bootstrap/RegistrationContext.php

Indentation +427 added lines, -427 removed lines

@@ -52,431 +52,431 @@
 
 class RegistrationContext {
 
-	/** @var ServiceRegistration<ICapability>[] */
-	private $capabilities = [];
-
-	/** @var ServiceRegistration<IReporter>[] */
-	private $crashReporters = [];
-
-	/** @var ServiceRegistration<IWidget>[] */
-	private $dashboardPanels = [];
-
-	/** @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 ILogger */
-	private $logger;
-
-	public function __construct(ILogger $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
-				);
-			}
-		};
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateCapabilityRegistrations(array $apps): void {
-		while (($registration = array_shift($this->capabilities)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerCapability($registration->getService());
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @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->logException($e, [
-					'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @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->logException($e, [
-					'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	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->logException($e, [
-					'message' => "Error during event listener registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateContainerRegistrations(array $apps): void {
-		while (($registration = array_shift($this->services)) !== null) {
-			try {
-				/**
-				 * Register the service and convert the callable into a \Closure if necessary
-				 */
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerService(
-						$registration->getName(),
-						Closure::fromCallable($registration->getFactory()),
-						$registration->isShared()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during service registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->aliases)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerAlias(
-						$registration->getAlias(),
-						$registration->getTarget()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-
-		while (($registration = array_shift($this->parameters)) !== null) {
-			try {
-				$apps[$registration->getAppId()]
-					->getContainer()
-					->registerParameter(
-						$registration->getName(),
-						$registration->getValue()
-					);
-			} catch (Throwable $e) {
-				$appId = $registration->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @param App[] $apps
-	 */
-	public function delegateMiddlewareRegistrations(array $apps): void {
-		while (($middleware = array_shift($this->middlewares)) !== null) {
-			try {
-				$apps[$middleware->getAppId()]
-					->getContainer()
-					->registerMiddleWare($middleware->getService());
-			} catch (Throwable $e) {
-				$appId = $middleware->getAppId();
-				$this->logger->logException($e, [
-					'message' => "Error during capability registration of $appId: " . $e->getMessage(),
-					'level' => ILogger::ERROR,
-				]);
-			}
-		}
-	}
-
-	/**
-	 * @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;
-	}
+    /** @var ServiceRegistration<ICapability>[] */
+    private $capabilities = [];
+
+    /** @var ServiceRegistration<IReporter>[] */
+    private $crashReporters = [];
+
+    /** @var ServiceRegistration<IWidget>[] */
+    private $dashboardPanels = [];
+
+    /** @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 ILogger */
+    private $logger;
+
+    public function __construct(ILogger $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
+                );
+            }
+        };
+    }
+
+    /**
+     * @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);
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateCapabilityRegistrations(array $apps): void {
+        while (($registration = array_shift($this->capabilities)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerCapability($registration->getService());
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @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->logException($e, [
+                    'message' => "Error during crash reporter registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @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->logException($e, [
+                    'message' => "Error during dashboard registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    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->logException($e, [
+                    'message' => "Error during event listener registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateContainerRegistrations(array $apps): void {
+        while (($registration = array_shift($this->services)) !== null) {
+            try {
+                /**
+                 * Register the service and convert the callable into a \Closure if necessary
+                 */
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerService(
+                        $registration->getName(),
+                        Closure::fromCallable($registration->getFactory()),
+                        $registration->isShared()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during service registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->aliases)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerAlias(
+                        $registration->getAlias(),
+                        $registration->getTarget()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+
+        while (($registration = array_shift($this->parameters)) !== null) {
+            try {
+                $apps[$registration->getAppId()]
+                    ->getContainer()
+                    ->registerParameter(
+                        $registration->getName(),
+                        $registration->getValue()
+                    );
+            } catch (Throwable $e) {
+                $appId = $registration->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during service alias registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @param App[] $apps
+     */
+    public function delegateMiddlewareRegistrations(array $apps): void {
+        while (($middleware = array_shift($this->middlewares)) !== null) {
+            try {
+                $apps[$middleware->getAppId()]
+                    ->getContainer()
+                    ->registerMiddleWare($middleware->getService());
+            } catch (Throwable $e) {
+                $appId = $middleware->getAppId();
+                $this->logger->logException($e, [
+                    'message' => "Error during capability registration of $appId: " . $e->getMessage(),
+                    'level' => ILogger::ERROR,
+                ]);
+            }
+        }
+    }
+
+    /**
+     * @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;
+    }
 }

lib/public/Notification/IManager.php

Indentation +66 added lines, -66 removed lines

@@ -32,80 +32,80 @@
  * @since 9.0.0
  */
 interface IManager extends IApp, INotifier {
-	/**
-	 * @param string $appClass The service must implement IApp, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 17.0.0
-	 */
-	public function registerApp(string $appClass): void;
+    /**
+     * @param string $appClass The service must implement IApp, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 17.0.0
+     */
+    public function registerApp(string $appClass): void;
 
-	/**
-	 * @param \Closure $service The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @param \Closure $info    An array with the keys 'id' and 'name' containing
-	 *                          the app id and the app name
-	 * @deprecated 17.0.0 use registerNotifierService instead.
-	 * @since 8.2.0 - Parameter $info was added in 9.0.0
-	 */
-	public function registerNotifier(\Closure $service, \Closure $info);
+    /**
+     * @param \Closure $service The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @param \Closure $info    An array with the keys 'id' and 'name' containing
+     *                          the app id and the app name
+     * @deprecated 17.0.0 use registerNotifierService instead.
+     * @since 8.2.0 - Parameter $info was added in 9.0.0
+     */
+    public function registerNotifier(\Closure $service, \Closure $info);
 
-	/**
-	 * @param string $notifierService The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 17.0.0
-	 * @depreacted 22.0.0 use the IBootStrap registration context
-	 */
-	public function registerNotifierService(string $notifierService): void;
+    /**
+     * @param string $notifierService The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 17.0.0
+     * @depreacted 22.0.0 use the IBootStrap registration context
+     */
+    public function registerNotifierService(string $notifierService): void;
 
-	/**
-	 * @return INotifier[]
-	 * @since 9.0.0
-	 */
-	public function getNotifiers(): array;
+    /**
+     * @return INotifier[]
+     * @since 9.0.0
+     */
+    public function getNotifiers(): array;
 
-	/**
-	 * @return INotification
-	 * @since 9.0.0
-	 */
-	public function createNotification(): INotification;
+    /**
+     * @return INotification
+     * @since 9.0.0
+     */
+    public function createNotification(): INotification;
 
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function hasNotifiers(): bool;
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function hasNotifiers(): bool;
 
-	/**
-	 * @param bool $preparingPushNotification
-	 * @since 14.0.0
-	 */
-	public function setPreparingPushNotification(bool $preparingPushNotification): void;
+    /**
+     * @param bool $preparingPushNotification
+     * @since 14.0.0
+     */
+    public function setPreparingPushNotification(bool $preparingPushNotification): void;
 
-	/**
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isPreparingPushNotification(): bool;
+    /**
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isPreparingPushNotification(): bool;
 
-	/**
-	 * @since 18.0.0
-	 */
-	public function dismissNotification(INotification $notification): void;
+    /**
+     * @since 18.0.0
+     */
+    public function dismissNotification(INotification $notification): void;
 
-	/**
-	 * Start deferring notifications until `flush()` is called
-	 *
-	 * The calling app should only "flush" when it got returned true on the defer call,
-	 * otherwise another app is deferring the sending already.
-	 * @return bool
-	 * @since 20.0.0
-	 */
-	public function defer(): bool;
+    /**
+     * Start deferring notifications until `flush()` is called
+     *
+     * The calling app should only "flush" when it got returned true on the defer call,
+     * otherwise another app is deferring the sending already.
+     * @return bool
+     * @since 20.0.0
+     */
+    public function defer(): bool;
 
-	/**
-	 * Send all deferred notifications that have been stored since `defer()` was called
-	 *
-	 * @since 20.0.0
-	 */
-	public function flush(): void;
+    /**
+     * Send all deferred notifications that have been stored since `defer()` was called
+     *
+     * @since 20.0.0
+     */
+    public function flush(): void;
 }

lib/public/AppFramework/Bootstrap/IRegistrationContext.php

Indentation +175 added lines, -175 removed lines

@@ -44,179 +44,179 @@
  */
 interface IRegistrationContext {
 
-	/**
-	 * @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\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;
-
-	/**
-	 * @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;
-
-	/**
-	 * Register a service listener
-	 *
-	 * This is equivalent to calling IEventDispatcher::addServiceListener
-	 *
-	 * @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<T>> $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;
-
-	/**
-	 * 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 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 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;
+    /**
+     * @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\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;
+
+    /**
+     * @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;
+
+    /**
+     * Register a service listener
+     *
+     * This is equivalent to calling IEventDispatcher::addServiceListener
+     *
+     * @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<T>> $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;
+
+    /**
+     * 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 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 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;
 }

apps/comments/lib/AppInfo/Application.php

Indentation +32 added lines, -32 removed lines

@@ -49,45 +49,45 @@
 use OCP\IServerContainer;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'comments';
+    public const APP_ID = 'comments';
 
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerCapability(Capabilities::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerCapability(Capabilities::class);
 
-		$context->registerServiceAlias('NotificationsController', Notifications::class);
+        $context->registerServiceAlias('NotificationsController', Notifications::class);
 
-		$context->registerEventListener(
-			LoadAdditionalScriptsEvent::class,
-			LoadAdditionalScripts::class
-		);
-		$context->registerEventListener(
-			LoadSidebar::class,
-			LoadSidebarScripts::class
-		);
-		$context->registerEventListener(
-			CommentsEntityEvent::EVENT_ENTITY,
-			CommentsEntityEventListener::class
-		);
-		$context->registerSearchProvider(CommentsSearchProvider::class);
+        $context->registerEventListener(
+            LoadAdditionalScriptsEvent::class,
+            LoadAdditionalScripts::class
+        );
+        $context->registerEventListener(
+            LoadSidebar::class,
+            LoadSidebarScripts::class
+        );
+        $context->registerEventListener(
+            CommentsEntityEvent::EVENT_ENTITY,
+            CommentsEntityEventListener::class
+        );
+        $context->registerSearchProvider(CommentsSearchProvider::class);
 
-		$context->registerInitialStateProvider(MaxAutoCompleteResultsInitialState::class);
+        $context->registerInitialStateProvider(MaxAutoCompleteResultsInitialState::class);
 
-		$context->registerNotifierService(Notifier::class);
-	}
+        $context->registerNotifierService(Notifier::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerCommentsEventHandler']));
 
-		$context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]);
-	}
+        $context->getServerContainer()->get(ISearch::class)->registerProvider(LegacyProvider::class, ['apps' => ['files']]);
+    }
 
-	protected function registerCommentsEventHandler(IServerContainer $container) {
-		$container->getCommentsManager()->registerEventHandler(function () {
-			return $this->getContainer()->query(EventHandler::class);
-		});
-	}
+    protected function registerCommentsEventHandler(IServerContainer $container) {
+        $container->getCommentsManager()->registerEventHandler(function () {
+            return $this->getContainer()->query(EventHandler::class);
+        });
+    }
 }

apps/files/lib/AppInfo/Application.php

Indentation +111 added lines, -111 removed lines

@@ -66,117 +66,117 @@
 use Psr\Container\ContainerInterface;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'files';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-	}
-
-	public function register(IRegistrationContext $context): void {
-		/**
-		 * Controllers
-		 */
-		$context->registerService('APIController', function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-
-			return new ApiController(
-				$c->get('AppName'),
-				$c->get(IRequest::class),
-				$c->get(IUserSession::class),
-				$c->get(TagService::class),
-				$c->get(IPreview::class),
-				$c->get(IShareManager::class),
-				$c->get(IConfig::class),
-				$server->getUserFolder()
-			);
-		});
-
-		/**
-		 * Services
-		 */
-		$context->registerService(TagService::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
-
-			return new TagService(
-				$c->get(IUserSession::class),
-				$c->get(IActivityManager::class),
-				$c->get(ITagManager::class)->load(self::APP_ID),
-				$server->getUserFolder(),
-				$server->getEventDispatcher()
-			);
-		});
-
-		/*
+    public const APP_ID = 'files';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+    }
+
+    public function register(IRegistrationContext $context): void {
+        /**
+         * Controllers
+         */
+        $context->registerService('APIController', function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+
+            return new ApiController(
+                $c->get('AppName'),
+                $c->get(IRequest::class),
+                $c->get(IUserSession::class),
+                $c->get(TagService::class),
+                $c->get(IPreview::class),
+                $c->get(IShareManager::class),
+                $c->get(IConfig::class),
+                $server->getUserFolder()
+            );
+        });
+
+        /**
+         * Services
+         */
+        $context->registerService(TagService::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
+
+            return new TagService(
+                $c->get(IUserSession::class),
+                $c->get(IActivityManager::class),
+                $c->get(ITagManager::class)->load(self::APP_ID),
+                $server->getUserFolder(),
+                $server->getEventDispatcher()
+            );
+        });
+
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
-
-		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
-		$context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
-
-		$context->registerSearchProvider(FilesSearchProvider::class);
-
-		$context->registerNotifierService(Notifier::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
-		$context->injectFn([Listener::class, 'register']);
-		$context->injectFn(Closure::fromCallable([$this, 'registerSearchProvider']));
-		$this->registerTemplates();
-		$context->injectFn(Closure::fromCallable([$this, 'registerNavigation']));
-		$this->registerHooks();
-	}
-
-	private function registerCollaboration(IProviderManager $providerManager): void {
-		$providerManager->registerResourceProvider(ResourceProvider::class);
-	}
-
-	private function registerSearchProvider(ISearch $search): void {
-		$search->registerProvider(File::class, ['apps' => ['files']]);
-	}
-
-	private function registerTemplates(): void {
-		$templateManager = \OC_Helper::getFileTemplateManager();
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
-		$templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
-	}
-
-	private function registerNavigation(IL10N $l10n): void {
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
-			return [
-				'id' => 'files',
-				'appname' => 'files',
-				'script' => 'list.php',
-				'order' => 0,
-				'name' => $l10n->t('All files')
-			];
-		});
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
-			return [
-				'id' => 'recent',
-				'appname' => 'files',
-				'script' => 'recentlist.php',
-				'order' => 2,
-				'name' => $l10n->t('Recent')
-			];
-		});
-		\OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
-			return [
-				'id' => 'favorites',
-				'appname' => 'files',
-				'script' => 'simplelist.php',
-				'order' => 5,
-				'name' => $l10n->t('Favorites'),
-				'expandedState' => 'show_Quick_Access'
-			];
-		});
-	}
-
-	private function registerHooks(): void {
-		Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
-	}
+        $context->registerCapability(Capabilities::class);
+
+        $context->registerEventListener(LoadAdditionalScriptsEvent::class, LegacyLoadAdditionalScriptsAdapter::class);
+        $context->registerEventListener(LoadSidebar::class, LoadSidebarListener::class);
+
+        $context->registerSearchProvider(FilesSearchProvider::class);
+
+        $context->registerNotifierService(Notifier::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerCollaboration']));
+        $context->injectFn([Listener::class, 'register']);
+        $context->injectFn(Closure::fromCallable([$this, 'registerSearchProvider']));
+        $this->registerTemplates();
+        $context->injectFn(Closure::fromCallable([$this, 'registerNavigation']));
+        $this->registerHooks();
+    }
+
+    private function registerCollaboration(IProviderManager $providerManager): void {
+        $providerManager->registerResourceProvider(ResourceProvider::class);
+    }
+
+    private function registerSearchProvider(ISearch $search): void {
+        $search->registerProvider(File::class, ['apps' => ['files']]);
+    }
+
+    private function registerTemplates(): void {
+        $templateManager = \OC_Helper::getFileTemplateManager();
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.presentation', 'core/templates/filetemplates/template.odp');
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt');
+        $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods');
+    }
+
+    private function registerNavigation(IL10N $l10n): void {
+        \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+            return [
+                'id' => 'files',
+                'appname' => 'files',
+                'script' => 'list.php',
+                'order' => 0,
+                'name' => $l10n->t('All files')
+            ];
+        });
+        \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+            return [
+                'id' => 'recent',
+                'appname' => 'files',
+                'script' => 'recentlist.php',
+                'order' => 2,
+                'name' => $l10n->t('Recent')
+            ];
+        });
+        \OCA\Files\App::getNavigationManager()->add(function () use ($l10n) {
+            return [
+                'id' => 'favorites',
+                'appname' => 'files',
+                'script' => 'simplelist.php',
+                'order' => 5,
+                'name' => $l10n->t('Favorites'),
+                'expandedState' => 'show_Quick_Access'
+            ];
+        });
+    }
+
+    private function registerHooks(): void {
+        Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig');
+    }
 }

apps/dav/lib/AppInfo/Application.php

Indentation +317 added lines, -317 removed lines

@@ -80,330 +80,330 @@
 use function strpos;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'dav';
+    public const APP_ID = 'dav';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
-			/** @var IServerContainer $server */
-			$server = $c->get(IServerContainer::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+            /** @var IServerContainer $server */
+            $server = $c->get(IServerContainer::class);
 
-			return new PhotoCache(
-				$server->getAppDataDir('dav-photocache'),
-				$c->get(ILogger::class)
-			);
-		});
+            return new PhotoCache(
+                $server->getAppDataDir('dav-photocache'),
+                $c->get(ILogger::class)
+            );
+        });
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$context->registerCapability(Capabilities::class);
+        $context->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register Search Providers
 		 */
-		$context->registerSearchProvider(ContactsSearchProvider::class);
-		$context->registerSearchProvider(EventsSearchProvider::class);
-		$context->registerSearchProvider(TasksSearchProvider::class);
-
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-
-		$context->registerNotifierService(Notifier::class);
-	}
-
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
-
-		$context->injectFn([$this, 'registerHooks']);
-		$context->injectFn([$this, 'registerContactsManager']);
-		$context->injectFn([$this, 'registerCalendarManager']);
-		$context->injectFn([$this, 'registerCalendarReminders']);
-	}
-
-	public function registerHooks(HookManager $hm,
-								   EventDispatcherInterface $dispatcher,
-								   IAppContainer $container,
-								   IServerContainer $serverContainer) {
-		$hm->setup();
-
-		// first time login event setup
-		$dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
-			if ($event instanceof GenericEvent) {
-				$hm->firstLogin($event->getSubject());
-			}
-		});
-
-		$birthdayListener = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardChanged(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri'),
-					(string) $event->getArgument('cardData')
-				);
-			}
-		};
-
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
-			if ($event instanceof GenericEvent) {
-				/** @var BirthdayService $b */
-				$b = $container->query(BirthdayService::class);
-				$b->onCardDeleted(
-					(int) $event->getArgument('addressBookId'),
-					(string) $event->getArgument('cardUri')
-				);
-			}
-		});
-
-		$clearPhotoCache = function ($event) use ($container): void {
-			if ($event instanceof GenericEvent) {
-				/** @var PhotoCache $p */
-				$p = $container->query(PhotoCache::class);
-				$p->delete(
-					$event->getArgument('addressBookId'),
-					$event->getArgument('cardUri')
-				);
-			}
-		};
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
-		$dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
-
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
-			$user = $event->getSubject();
-			/** @var SyncService $syncService */
-			$syncService = $container->query(SyncService::class);
-			$syncService->updateUser($user);
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarAdd(
-				$event->getArgument('calendarData')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdate(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('propertyMutations')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarDelete(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares')
-			);
-
-			/** @var ReminderBackend $reminderBackend */
-			$reminderBackend = $container->query(ReminderBackend::class);
-			$reminderBackend->cleanRemindersForCalendar(
-				(int) $event->getArgument('calendarId')
-			);
-		});
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarUpdateShares(
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('add'),
-				$event->getArgument('remove')
-			);
-
-			// Here we should recalculate if reminders should be sent to new or old sharees
-		});
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-			$backend->onCalendarPublication(
-				$event->getArgument('calendarData'),
-				$event->getArgument('public')
-			);
-		});
-
-		$listener = function (GenericEvent $event, $eventName) use ($container): void {
-			/** @var Backend $backend */
-			$backend = $container->query(Backend::class);
-
-			$subject = Event::SUBJECT_OBJECT_ADD;
-			if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_UPDATE;
-			} elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
-				$subject = Event::SUBJECT_OBJECT_DELETE;
-			}
-			$backend->onTouchCalendarObject(
-				$subject,
-				$event->getArgument('calendarData'),
-				$event->getArgument('shares'),
-				$event->getArgument('objectData')
-			);
-
-			/** @var ReminderService $reminderBackend */
-			$reminderService = $container->query(ReminderService::class);
-
-			$reminderService->onTouchCalendarObject(
-				$eventName,
-				$event->getArgument('objectData')
-			);
-		};
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
-
-		/**
-		 * In case the user has set their default calendar to this one
-		 */
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
-			/** @var IConfig $config */
-			$config = $serverContainer->getConfig();
-			$principalUri = $event->getArgument('calendarData')['principaluri'];
-			if (strpos($principalUri, 'principals/users') === 0) {
-				[, $UID] = \Sabre\Uri\split($principalUri);
-				$uri = $event->getArgument('calendarData')['uri'];
-				if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
-					$config->deleteUserValue($UID, 'dav', 'defaultCalendar');
-				}
-			}
-		});
-
-		$dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-			function (GenericEvent $event) {
-				/** @var CardDavBackend $cardDavBackend */
-				$cardDavBackend = \OC::$server->query(CardDavBackend::class);
-				$addressBookUri = $event->getSubject();
-				$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-				if (!is_null($addressBook)) {
-					$cardDavBackend->deleteAddressBook($addressBook['id']);
-				}
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				/**
-				 * Initial subscription refetch
-				 *
-				 * @var RefreshWebcalService $refreshWebcalService
-				 */
-				$refreshWebcalService = $container->query(RefreshWebcalService::class);
-				$refreshWebcalService->refreshSubscription(
-					(string) $subscriptionData['principaluri'],
-					(string) $subscriptionData['uri']
-				);
-
-				$jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-			}
-		);
-
-		$dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
-			function (GenericEvent $event) use ($container, $serverContainer) {
-				$jobList = $serverContainer->getJobList();
-				$subscriptionData = $event->getArgument('subscriptionData');
-
-				$jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
-					'principaluri' => $subscriptionData['principaluri'],
-					'uri' => $subscriptionData['uri']
-				]);
-
-				/** @var CalDavBackend $calDavBackend */
-				$calDavBackend = $container->query(CalDavBackend::class);
-				$calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
-			}
-		);
-
-		$eventHandler = function () use ($container, $serverContainer): void {
-			try {
-				/** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
-				$job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
-				$job->run([]);
-				$serverContainer->getJobList()->setLastRun($job);
-			} catch (Exception $ex) {
-				$serverContainer->getLogger()->logException($ex);
-			}
-		};
-
-		$dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
-		$dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
-	}
-
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = \OC::$server->getUserSession()->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
-
-	private function setupContactsProvider(IContactsManager $contactsManager,
-										   IAppContainer $container,
-										   string $userID): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
-	}
-
-	private function setupSystemContactsProvider(IContactsManager $contactsManager,
-												 IAppContainer $container): void {
-		/** @var ContactsManager $cm */
-		$cm = $container->query(ContactsManager::class);
-		$urlGenerator = $container->getServer()->getURLGenerator();
-		$cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
-	}
-
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-											 IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager) {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
-
-	private function setupCalendarProvider(ICalendarManager $calendarManager,
-										   IAppContainer $container,
-										   $userId) {
-		$cm = $container->query(CalendarManager::class);
-		$cm->setupCalendarProvider($calendarManager, $userId);
-	}
-
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-											   ILogger $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->logException($ex);
-		}
-	}
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
+
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+
+        $context->registerNotifierService(Notifier::class);
+    }
+
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
+
+        $context->injectFn([$this, 'registerHooks']);
+        $context->injectFn([$this, 'registerContactsManager']);
+        $context->injectFn([$this, 'registerCalendarManager']);
+        $context->injectFn([$this, 'registerCalendarReminders']);
+    }
+
+    public function registerHooks(HookManager $hm,
+                                    EventDispatcherInterface $dispatcher,
+                                    IAppContainer $container,
+                                    IServerContainer $serverContainer) {
+        $hm->setup();
+
+        // first time login event setup
+        $dispatcher->addListener(IUser::class . '::firstLogin', function ($event) use ($hm) {
+            if ($event instanceof GenericEvent) {
+                $hm->firstLogin($event->getSubject());
+            }
+        });
+
+        $birthdayListener = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardChanged(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri'),
+                    (string) $event->getArgument('cardData')
+                );
+            }
+        };
+
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::createCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $birthdayListener);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', function ($event) use ($container) {
+            if ($event instanceof GenericEvent) {
+                /** @var BirthdayService $b */
+                $b = $container->query(BirthdayService::class);
+                $b->onCardDeleted(
+                    (int) $event->getArgument('addressBookId'),
+                    (string) $event->getArgument('cardUri')
+                );
+            }
+        });
+
+        $clearPhotoCache = function ($event) use ($container): void {
+            if ($event instanceof GenericEvent) {
+                /** @var PhotoCache $p */
+                $p = $container->query(PhotoCache::class);
+                $p->delete(
+                    $event->getArgument('addressBookId'),
+                    $event->getArgument('cardUri')
+                );
+            }
+        };
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::updateCard', $clearPhotoCache);
+        $dispatcher->addListener('\OCA\DAV\CardDAV\CardDavBackend::deleteCard', $clearPhotoCache);
+
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($container) {
+            $user = $event->getSubject();
+            /** @var SyncService $syncService */
+            $syncService = $container->query(SyncService::class);
+            $syncService->updateUser($user);
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarAdd(
+                $event->getArgument('calendarData')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdate(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('propertyMutations')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarDelete(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares')
+            );
+
+            /** @var ReminderBackend $reminderBackend */
+            $reminderBackend = $container->query(ReminderBackend::class);
+            $reminderBackend->cleanRemindersForCalendar(
+                (int) $event->getArgument('calendarId')
+            );
+        });
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateShares', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarUpdateShares(
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('add'),
+                $event->getArgument('remove')
+            );
+
+            // Here we should recalculate if reminders should be sent to new or old sharees
+        });
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::publishCalendar', function (GenericEvent $event) use ($container) {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+            $backend->onCalendarPublication(
+                $event->getArgument('calendarData'),
+                $event->getArgument('public')
+            );
+        });
+
+        $listener = function (GenericEvent $event, $eventName) use ($container): void {
+            /** @var Backend $backend */
+            $backend = $container->query(Backend::class);
+
+            $subject = Event::SUBJECT_OBJECT_ADD;
+            if ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_UPDATE;
+            } elseif ($eventName === '\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject') {
+                $subject = Event::SUBJECT_OBJECT_DELETE;
+            }
+            $backend->onTouchCalendarObject(
+                $subject,
+                $event->getArgument('calendarData'),
+                $event->getArgument('shares'),
+                $event->getArgument('objectData')
+            );
+
+            /** @var ReminderService $reminderBackend */
+            $reminderService = $container->query(ReminderService::class);
+
+            $reminderService->onTouchCalendarObject(
+                $eventName,
+                $event->getArgument('objectData')
+            );
+        };
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::updateCalendarObject', $listener);
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendarObject', $listener);
+
+        /**
+         * In case the user has set their default calendar to this one
+         */
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteCalendar', function (GenericEvent $event) use ($serverContainer) {
+            /** @var IConfig $config */
+            $config = $serverContainer->getConfig();
+            $principalUri = $event->getArgument('calendarData')['principaluri'];
+            if (strpos($principalUri, 'principals/users') === 0) {
+                [, $UID] = \Sabre\Uri\split($principalUri);
+                $uri = $event->getArgument('calendarData')['uri'];
+                if ($config->getUserValue($UID, 'dav', 'defaultCalendar') === $uri) {
+                    $config->deleteUserValue($UID, 'dav', 'defaultCalendar');
+                }
+            }
+        });
+
+        $dispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
+            function (GenericEvent $event) {
+                /** @var CardDavBackend $cardDavBackend */
+                $cardDavBackend = \OC::$server->query(CardDavBackend::class);
+                $addressBookUri = $event->getSubject();
+                $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+                if (!is_null($addressBook)) {
+                    $cardDavBackend->deleteAddressBook($addressBook['id']);
+                }
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::createSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                /**
+                 * Initial subscription refetch
+                 *
+                 * @var RefreshWebcalService $refreshWebcalService
+                 */
+                $refreshWebcalService = $container->query(RefreshWebcalService::class);
+                $refreshWebcalService->refreshSubscription(
+                    (string) $subscriptionData['principaluri'],
+                    (string) $subscriptionData['uri']
+                );
+
+                $jobList->add(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+            }
+        );
+
+        $dispatcher->addListener('\OCA\DAV\CalDAV\CalDavBackend::deleteSubscription',
+            function (GenericEvent $event) use ($container, $serverContainer) {
+                $jobList = $serverContainer->getJobList();
+                $subscriptionData = $event->getArgument('subscriptionData');
+
+                $jobList->remove(\OCA\DAV\BackgroundJob\RefreshWebcalJob::class, [
+                    'principaluri' => $subscriptionData['principaluri'],
+                    'uri' => $subscriptionData['uri']
+                ]);
+
+                /** @var CalDavBackend $calDavBackend */
+                $calDavBackend = $container->query(CalDavBackend::class);
+                $calDavBackend->purgeAllCachedEventsForSubscription($subscriptionData['id']);
+            }
+        );
+
+        $eventHandler = function () use ($container, $serverContainer): void {
+            try {
+                /** @var UpdateCalendarResourcesRoomsBackgroundJob $job */
+                $job = $container->query(UpdateCalendarResourcesRoomsBackgroundJob::class);
+                $job->run([]);
+                $serverContainer->getJobList()->setLastRun($job);
+            } catch (Exception $ex) {
+                $serverContainer->getLogger()->logException($ex);
+            }
+        };
+
+        $dispatcher->addListener('\OCP\Calendar\Resource\ForceRefreshEvent', $eventHandler);
+        $dispatcher->addListener('\OCP\Calendar\Room\ForceRefreshEvent', $eventHandler);
+    }
+
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = \OC::$server->getUserSession()->getUser();
+            if (!is_null($user)) {
+                $this->setupContactsProvider($cm, $container, $user->getUID());
+            } else {
+                $this->setupSystemContactsProvider($cm, $container);
+            }
+        });
+    }
+
+    private function setupContactsProvider(IContactsManager $contactsManager,
+                                            IAppContainer $container,
+                                            string $userID): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupContactsProvider($contactsManager, $userID, $urlGenerator);
+    }
+
+    private function setupSystemContactsProvider(IContactsManager $contactsManager,
+                                                    IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, $urlGenerator);
+    }
+
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+                                                IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager) {
+            $user = \OC::$server->getUserSession()->getUser();
+            if ($user !== null) {
+                $this->setupCalendarProvider($calendarManager, $container, $user->getUID());
+            }
+        });
+    }
+
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+                                            IAppContainer $container,
+                                            $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
+
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+                                                ILogger $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->logException($ex);
+        }
+    }
 }

apps/federatedfilesharing/lib/AppInfo/Application.php

Indentation +18 added lines, -18 removed lines

@@ -40,25 +40,25 @@
 use OCP\Federation\ICloudFederationProviderManager;
 
 class Application extends App implements IBootstrap {
-	public function __construct() {
-		parent::__construct('federatedfilesharing');
-	}
+    public function __construct() {
+        parent::__construct('federatedfilesharing');
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener::class);
-		$context->registerNotifierService(Notifier::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalScriptsListener::class);
+        $context->registerNotifierService(Notifier::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerCloudFederationProvider']));
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerCloudFederationProvider']));
+    }
 
-	private function registerCloudFederationProvider(ICloudFederationProviderManager $manager,
-													 IAppContainer $appContainer): void {
-		$manager->addCloudFederationProvider('file',
-			'Federated Files Sharing',
-			function () use ($appContainer): CloudFederationProviderFiles {
-				return $appContainer->get(CloudFederationProviderFiles::class);
-			});
-	}
+    private function registerCloudFederationProvider(ICloudFederationProviderManager $manager,
+                                                        IAppContainer $appContainer): void {
+        $manager->addCloudFederationProvider('file',
+            'Federated Files Sharing',
+            function () use ($appContainer): CloudFederationProviderFiles {
+                return $appContainer->get(CloudFederationProviderFiles::class);
+            });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 													 IAppContainer $appContainer): void {
 		$manager->addCloudFederationProvider('file',
 			'Federated Files Sharing',
-			function () use ($appContainer): CloudFederationProviderFiles {
+			function() use ($appContainer): CloudFederationProviderFiles {
 				return $appContainer->get(CloudFederationProviderFiles::class);
 			});
 	}

apps/updatenotification/lib/AppInfo/Application.php

Indentation +37 added lines, -37 removed lines

@@ -46,46 +46,46 @@
 use OCP\Util;
 
 class Application extends App implements IBootstrap {
-	public function __construct() {
-		parent::__construct('updatenotification', []);
-	}
+    public function __construct() {
+        parent::__construct('updatenotification', []);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerNotifierService(Notifier::class);
-	}
+    public function register(IRegistrationContext $context): void {
+        $context->registerNotifierService(Notifier::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IConfig $config,
-									 IUserSession $userSession,
-									 IAppManager $appManager,
-									 IGroupManager $groupManager,
-									 IAppContainer $appContainer,
-									 ILogger $logger) {
-			if ($config->getSystemValue('updatechecker', true) !== true) {
-				// Updater check is disabled
-				return;
-			}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (IConfig $config,
+                                        IUserSession $userSession,
+                                        IAppManager $appManager,
+                                        IGroupManager $groupManager,
+                                        IAppContainer $appContainer,
+                                        ILogger $logger) {
+            if ($config->getSystemValue('updatechecker', true) !== true) {
+                // Updater check is disabled
+                return;
+            }
 
-			$user = $userSession->getUser();
-			if (!$user instanceof IUser) {
-				// Nothing to do for guests
-				return;
-			}
+            $user = $userSession->getUser();
+            if (!$user instanceof IUser) {
+                // Nothing to do for guests
+                return;
+            }
 
-			if (!$appManager->isEnabledForUser('notifications') &&
-				$groupManager->isAdmin($user->getUID())) {
-				try {
-					$updateChecker = $appContainer->get(UpdateChecker::class);
-				} catch (QueryException $e) {
-					$logger->logException($e);
-					return;
-				}
+            if (!$appManager->isEnabledForUser('notifications') &&
+                $groupManager->isAdmin($user->getUID())) {
+                try {
+                    $updateChecker = $appContainer->get(UpdateChecker::class);
+                } catch (QueryException $e) {
+                    $logger->logException($e);
+                    return;
+                }
 
-				if ($updateChecker->getUpdateState() !== []) {
-					Util::addScript('updatenotification', 'legacy-notification');
-					\OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables');
-				}
-			}
-		});
-	}
+                if ($updateChecker->getUpdateState() !== []) {
+                    Util::addScript('updatenotification', 'legacy-notification');
+                    \OC_Hook::connect('\OCP\Config', 'js', $updateChecker, 'populateJavaScriptVariables');
+                }
+            }
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	}
 
 	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IConfig $config,
+		$context->injectFn(function(IConfig $config,
 									 IUserSession $userSession,
 									 IAppManager $appManager,
 									 IGroupManager $groupManager,