nextcloud / server

lib/public/EventDispatcher/IEventDispatcher.php

Indentation +54 added lines, -54 removed lines

@@ -34,62 +34,62 @@
  */
 interface IEventDispatcher {
 
-	/**
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $eventName preferably the fully-qualified class name of the Event sub class
-	 * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
-	 * @param callable $listener the object that is invoked when a matching event is dispatched
-	 * @psalm-param callable(T):void $listener
-	 * @param int $priority
-	 *
-	 * @since 17.0.0
-	 */
-	public function addListener(string $eventName, callable $listener, int $priority = 0): void;
+    /**
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $eventName preferably the fully-qualified class name of the Event sub class
+     * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
+     * @param callable $listener the object that is invoked when a matching event is dispatched
+     * @psalm-param callable(T):void $listener
+     * @param int $priority
+     *
+     * @since 17.0.0
+     */
+    public function addListener(string $eventName, callable $listener, int $priority = 0): void;
 
-	/**
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $eventName preferably the fully-qualified class name of the Event sub class
-	 * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
-	 * @param callable $listener the object that is invoked when a matching event is dispatched
-	 * @psalm-param callable(T):void $listener
-	 *
-	 * @since 19.0.0
-	 */
-	public function removeListener(string $eventName, callable $listener): void;
+    /**
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $eventName preferably the fully-qualified class name of the Event sub class
+     * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class
+     * @param callable $listener the object that is invoked when a matching event is dispatched
+     * @psalm-param callable(T):void $listener
+     *
+     * @since 19.0.0
+     */
+    public function removeListener(string $eventName, callable $listener): void;
 
-	/**
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $eventName preferably the fully-qualified class name of the Event sub class to listen for
-	 * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class to listen for
-	 * @param string $className 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>> $className fully qualified class name that can be built by the DI container
-	 * @param int $priority
-	 *
-	 * @since 17.0.0
-	 */
-	public function addServiceListener(string $eventName, string $className, int $priority = 0): void;
+    /**
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $eventName preferably the fully-qualified class name of the Event sub class to listen for
+     * @psalm-param string|class-string<T> $eventName preferably the fully-qualified class name of the Event sub class to listen for
+     * @param string $className 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>> $className fully qualified class name that can be built by the DI container
+     * @param int $priority
+     *
+     * @since 17.0.0
+     */
+    public function addServiceListener(string $eventName, string $className, int $priority = 0): void;
 
-	/**
-	 * @template T of \OCP\EventDispatcher\Event
-	 * @param string $eventName
-	 * @psalm-param string|class-string<T> $eventName
-	 * @param Event $event
-	 * @psalm-param T $event
-	 *
-	 * @since 17.0.0
-	 * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
-	 */
-	public function dispatch(string $eventName, Event $event): void;
+    /**
+     * @template T of \OCP\EventDispatcher\Event
+     * @param string $eventName
+     * @psalm-param string|class-string<T> $eventName
+     * @param Event $event
+     * @psalm-param T $event
+     *
+     * @since 17.0.0
+     * @deprecated 21.0.0 use \OCP\EventDispatcher\IEventDispatcher::dispatchTyped
+     */
+    public function dispatch(string $eventName, Event $event): void;
 
-	/**
-	 * Dispatch a typed event
-	 *
-	 * Only use this with subclasses of ``\OCP\EventDispatcher\Event``.
-	 * The object's class will determine the event name.
-	 *
-	 * @param Event $event
-	 *
-	 * @since 18.0.0
-	 */
-	public function dispatchTyped(Event $event): void;
+    /**
+     * Dispatch a typed event
+     *
+     * Only use this with subclasses of ``\OCP\EventDispatcher\Event``.
+     * The object's class will determine the event name.
+     *
+     * @param Event $event
+     *
+     * @since 18.0.0
+     */
+    public function dispatchTyped(Event $event): void;
 }

apps/lookup_server_connector/lib/AppInfo/Application.php

Indentation +22 added lines, -22 removed lines

@@ -41,31 +41,31 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'lookup_server_connector';
+    public const APP_ID = 'lookup_server_connector';
 
-	public function __construct() {
-		parent::__construct(self::APP_ID);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_ID);
+    }
 
-	public function register(IRegistrationContext $context): void {
-	}
+    public function register(IRegistrationContext $context): void {
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerEventListeners']));
-	}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(Closure::fromCallable([$this, 'registerEventListeners']));
+    }
 
-	/**
-	 * @todo move the OCP events and then move the registration to `register`
-	 */
-	private function registerEventListeners(EventDispatcher $dispatcher,
-											IAppContainer $appContainer): void {
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
-			/** @var IUser $user */
-			$user = $event->getSubject();
+    /**
+     * @todo move the OCP events and then move the registration to `register`
+     */
+    private function registerEventListeners(EventDispatcher $dispatcher,
+                                            IAppContainer $appContainer): void {
+        $dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
+            /** @var IUser $user */
+            $user = $event->getSubject();
 
-			/** @var UpdateLookupServer $updateLookupServer */
-			$updateLookupServer = $appContainer->get(UpdateLookupServer::class);
-			$updateLookupServer->userUpdated($user);
-		});
-	}
+            /** @var UpdateLookupServer $updateLookupServer */
+            $updateLookupServer = $appContainer->get(UpdateLookupServer::class);
+            $updateLookupServer->userUpdated($user);
+        });
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	 */
 	private function registerEventListeners(EventDispatcher $dispatcher,
 											IAppContainer $appContainer): void {
-		$dispatcher->addListener('OC\AccountManager::userUpdated', function (GenericEvent $event) use ($appContainer) {
+		$dispatcher->addListener('OC\AccountManager::userUpdated', function(GenericEvent $event) use ($appContainer) {
 			/** @var IUser $user */
 			$user = $event->getSubject();
 

apps/files_sharing/lib/AppInfo/Application.php

Indentation +175 added lines, -175 removed lines

@@ -63,179 +63,179 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Application extends App {
-	public const APP_ID = 'files_sharing';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-
-		/** @var IServerContainer $server */
-		$server = $container->getServer();
-
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = $container->query(IEventDispatcher::class);
-		$oldDispatcher = $container->getServer()->getEventDispatcher();
-		$mountProviderCollection = $server->getMountProviderCollection();
-		$notifications = $server->getNotificationManager();
-
-		/**
-		 * Core class wrappers
-		 */
-		$container->registerService(Manager::class, function (SimpleContainer $c) use ($server) {
-			$user = $server->getUserSession()->getUser();
-			$uid = $user ? $user->getUID() : null;
-			return new \OCA\Files_Sharing\External\Manager(
-				$server->getDatabaseConnection(),
-				\OC\Files\Filesystem::getMountManager(),
-				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPClientService(),
-				$server->getNotificationManager(),
-				$server->query(\OCP\OCS\IDiscoveryService::class),
-				$server->getCloudFederationProviderManager(),
-				$server->getCloudFederationFactory(),
-				$server->getGroupManager(),
-				$server->getUserManager(),
-				$uid,
-				$server->query(IEventDispatcher::class)
-			);
-		});
-
-		/**
-		 * Middleware
-		 */
-		$container->registerMiddleWare(SharingCheckMiddleware::class);
-		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
-		$container->registerMiddleWare(ShareInfoMiddleware::class);
-
-		$container->registerService('ExternalMountProvider', function (ContainerInterface $c) {
-			return new \OCA\Files_Sharing\External\MountProvider(
-				$c->get(IDBConnection::class),
-				function () use ($c) {
-					return $c->get(Manager::class);
-				},
-				$c->get(ICloudIdManager::class)
-			);
-		});
-
-		/**
-		 * Register capabilities
-		 */
-		$container->registerCapability(Capabilities::class);
-
-		$notifications->registerNotifierService(Notifier::class);
-
-		$this->registerMountProviders($mountProviderCollection);
-		$this->registerEventsScripts($dispatcher, $oldDispatcher);
-		$this->setupSharingMenus();
-
-		/**
-		 * Always add main sharing script
-		 */
-		Util::addScript(self::APP_ID, 'dist/main');
-	}
-
-	protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
-		$mountProviderCollection->registerProvider($this->getContainer()->query(MountProvider::class));
-		$mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
-	}
-
-	protected function registerEventsScripts(IEventDispatcher $dispatcher, EventDispatcherInterface $oldDispatcher) {
-		// sidebar and files scripts
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$dispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, LegacyBeforeTemplateRenderedListener::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
-			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
-		});
-		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
-		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
-
-		// notifications api to accept incoming user shares
-		$oldDispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->shareNotification($event);
-		});
-		$oldDispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
-			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
-			$listener->userAddedToGroup($event);
-		});
-	}
-
-	protected function setupSharingMenus() {
-		$config = \OC::$server->getConfig();
-
-		if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
-			return;
-		}
-
-		// show_Quick_Access stored as string
-		\OCA\Files\App::getNavigationManager()->add(function () {
-			$config = \OC::$server->getConfig();
-			$l = \OC::$server->getL10N('files_sharing');
-
-			$sharingSublistArray = [];
-
-			if (\OCP\Util::isSharingDisabledForUser() === false) {
-				$sharingSublistArray[] = [
-					'id' => 'sharingout',
-					'appname' => 'files_sharing',
-					'script' => 'list.php',
-					'order' => 16,
-					'name' => $l->t('Shared with others'),
-				];
-			}
-
-			$sharingSublistArray[] = [
-				'id' => 'sharingin',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 15,
-				'name' => $l->t('Shared with you'),
-			];
-
-			if (\OCP\Util::isSharingDisabledForUser() === false) {
-				// Check if sharing by link is enabled
-				if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-					$sharingSublistArray[] = [
-						'id' => 'sharinglinks',
-						'appname' => 'files_sharing',
-						'script' => 'list.php',
-						'order' => 17,
-						'name' => $l->t('Shared by link'),
-					];
-				}
-			}
-
-			$sharingSublistArray[] = [
-				'id' => 'deletedshares',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 19,
-				'name' => $l->t('Deleted shares'),
-			];
-
-			$sharingSublistArray[] = [
-				'id' => 'pendingshares',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 19,
-				'name' => $l->t('Pending shares'),
-			];
-
-			return [
-				'id' => 'shareoverview',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 18,
-				'name' => $l->t('Shares'),
-				'classes' => 'collapsible',
-				'sublist' => $sharingSublistArray,
-				'expandedState' => 'show_sharing_menu'
-			];
-		});
-	}
+    public const APP_ID = 'files_sharing';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+
+        /** @var IServerContainer $server */
+        $server = $container->getServer();
+
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = $container->query(IEventDispatcher::class);
+        $oldDispatcher = $container->getServer()->getEventDispatcher();
+        $mountProviderCollection = $server->getMountProviderCollection();
+        $notifications = $server->getNotificationManager();
+
+        /**
+         * Core class wrappers
+         */
+        $container->registerService(Manager::class, function (SimpleContainer $c) use ($server) {
+            $user = $server->getUserSession()->getUser();
+            $uid = $user ? $user->getUID() : null;
+            return new \OCA\Files_Sharing\External\Manager(
+                $server->getDatabaseConnection(),
+                \OC\Files\Filesystem::getMountManager(),
+                \OC\Files\Filesystem::getLoader(),
+                $server->getHTTPClientService(),
+                $server->getNotificationManager(),
+                $server->query(\OCP\OCS\IDiscoveryService::class),
+                $server->getCloudFederationProviderManager(),
+                $server->getCloudFederationFactory(),
+                $server->getGroupManager(),
+                $server->getUserManager(),
+                $uid,
+                $server->query(IEventDispatcher::class)
+            );
+        });
+
+        /**
+         * Middleware
+         */
+        $container->registerMiddleWare(SharingCheckMiddleware::class);
+        $container->registerMiddleWare(OCSShareAPIMiddleware::class);
+        $container->registerMiddleWare(ShareInfoMiddleware::class);
+
+        $container->registerService('ExternalMountProvider', function (ContainerInterface $c) {
+            return new \OCA\Files_Sharing\External\MountProvider(
+                $c->get(IDBConnection::class),
+                function () use ($c) {
+                    return $c->get(Manager::class);
+                },
+                $c->get(ICloudIdManager::class)
+            );
+        });
+
+        /**
+         * Register capabilities
+         */
+        $container->registerCapability(Capabilities::class);
+
+        $notifications->registerNotifierService(Notifier::class);
+
+        $this->registerMountProviders($mountProviderCollection);
+        $this->registerEventsScripts($dispatcher, $oldDispatcher);
+        $this->setupSharingMenus();
+
+        /**
+         * Always add main sharing script
+         */
+        Util::addScript(self::APP_ID, 'dist/main');
+    }
+
+    protected function registerMountProviders(IMountProviderCollection $mountProviderCollection) {
+        $mountProviderCollection->registerProvider($this->getContainer()->query(MountProvider::class));
+        $mountProviderCollection->registerProvider($this->getContainer()->query('ExternalMountProvider'));
+    }
+
+    protected function registerEventsScripts(IEventDispatcher $dispatcher, EventDispatcherInterface $oldDispatcher) {
+        // sidebar and files scripts
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $dispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, LegacyBeforeTemplateRenderedListener::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
+        $dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
+            \OCP\Util::addScript('files_sharing', 'dist/collaboration');
+        });
+        $dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
+        $dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
+
+        // notifications api to accept incoming user shares
+        $oldDispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->shareNotification($event);
+        });
+        $oldDispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
+            /** @var Listener $listener */
+            $listener = $this->getContainer()->query(Listener::class);
+            $listener->userAddedToGroup($event);
+        });
+    }
+
+    protected function setupSharingMenus() {
+        $config = \OC::$server->getConfig();
+
+        if ($config->getAppValue('core', 'shareapi_enabled', 'yes') !== 'yes') {
+            return;
+        }
+
+        // show_Quick_Access stored as string
+        \OCA\Files\App::getNavigationManager()->add(function () {
+            $config = \OC::$server->getConfig();
+            $l = \OC::$server->getL10N('files_sharing');
+
+            $sharingSublistArray = [];
+
+            if (\OCP\Util::isSharingDisabledForUser() === false) {
+                $sharingSublistArray[] = [
+                    'id' => 'sharingout',
+                    'appname' => 'files_sharing',
+                    'script' => 'list.php',
+                    'order' => 16,
+                    'name' => $l->t('Shared with others'),
+                ];
+            }
+
+            $sharingSublistArray[] = [
+                'id' => 'sharingin',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 15,
+                'name' => $l->t('Shared with you'),
+            ];
+
+            if (\OCP\Util::isSharingDisabledForUser() === false) {
+                // Check if sharing by link is enabled
+                if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+                    $sharingSublistArray[] = [
+                        'id' => 'sharinglinks',
+                        'appname' => 'files_sharing',
+                        'script' => 'list.php',
+                        'order' => 17,
+                        'name' => $l->t('Shared by link'),
+                    ];
+                }
+            }
+
+            $sharingSublistArray[] = [
+                'id' => 'deletedshares',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 19,
+                'name' => $l->t('Deleted shares'),
+            ];
+
+            $sharingSublistArray[] = [
+                'id' => 'pendingshares',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 19,
+                'name' => $l->t('Pending shares'),
+            ];
+
+            return [
+                'id' => 'shareoverview',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 18,
+                'name' => $l->t('Shares'),
+                'classes' => 'collapsible',
+                'sublist' => $sharingSublistArray,
+                'expandedState' => 'show_sharing_menu'
+            ];
+        });
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -82,7 +82,7 @@ 
 		/**
 		 * Core class wrappers
 		 */
-		$container->registerService(Manager::class, function (SimpleContainer $c) use ($server) {
+		$container->registerService(Manager::class, function(SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
 			return new \OCA\Files_Sharing\External\Manager(
@@ -108,10 +108,10 @@ 
 		$container->registerMiddleWare(OCSShareAPIMiddleware::class);
 		$container->registerMiddleWare(ShareInfoMiddleware::class);
 
-		$container->registerService('ExternalMountProvider', function (ContainerInterface $c) {
+		$container->registerService('ExternalMountProvider', function(ContainerInterface $c) {
 			return new \OCA\Files_Sharing\External\MountProvider(
 				$c->get(IDBConnection::class),
-				function () use ($c) {
+				function() use ($c) {
 					return $c->get(Manager::class);
 				},
 				$c->get(ICloudIdManager::class)
@@ -146,19 +146,19 @@ 
 		$dispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, LegacyBeforeTemplateRenderedListener::class);
 		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, ShareInteractionListener::class);
-		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
+		$dispatcher->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function() {
 			\OCP\Util::addScript('files_sharing', 'dist/collaboration');
 		});
 		$dispatcher->addServiceListener(ShareCreatedEvent::class, UserShareAcceptanceListener::class);
 		$dispatcher->addServiceListener(UserAddedEvent::class, UserAddedToGroupListener::class);
 
 		// notifications api to accept incoming user shares
-		$oldDispatcher->addListener('OCP\Share::postShare', function (GenericEvent $event) {
+		$oldDispatcher->addListener('OCP\Share::postShare', function(GenericEvent $event) {
 			/** @var Listener $listener */
 			$listener = $this->getContainer()->query(Listener::class);
 			$listener->shareNotification($event);
 		});
-		$oldDispatcher->addListener(IGroup::class . '::postAddUser', function (GenericEvent $event) {
+		$oldDispatcher->addListener(IGroup::class.'::postAddUser', function(GenericEvent $event) {
 			/** @var Listener $listener */
 			$listener = $this->getContainer()->query(Listener::class);
 			$listener->userAddedToGroup($event);
@@ -173,7 +173,7 @@ 
 		}
 
 		// show_Quick_Access stored as string
-		\OCA\Files\App::getNavigationManager()->add(function () {
+		\OCA\Files\App::getNavigationManager()->add(function() {
 			$config = \OC::$server->getConfig();
 			$l = \OC::$server->getL10N('files_sharing');
 

core/Application.php

Indentation +151 added lines, -151 removed lines

@@ -56,155 +56,155 @@
  * @package OC\Core
  */
 class Application extends App {
-	public function __construct() {
-		parent::__construct('core');
-
-		$container = $this->getContainer();
-
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
-
-		$server = $container->getServer();
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $server->query(IEventDispatcher::class);
-
-		$notificationManager = $server->getNotificationManager();
-		$notificationManager->registerNotifierService(RemoveLinkSharesNotifier::class);
-		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
-
-		$oldEventDispatcher = $server->getEventDispatcher();
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
-
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-					if (!$table->hasIndex('owner_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
-					}
-					if (!$table->hasIndex('initiator_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
-					}
-				}
-
-				if ($schema->hasTable('filecache')) {
-					$table = $schema->getTable('filecache');
-
-					if (!$table->hasIndex('fs_mtime')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
-					}
-
-					if (!$table->hasIndex('fs_size')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_size');
-					}
-				}
-
-				if ($schema->hasTable('twofactor_providers')) {
-					$table = $schema->getTable('twofactor_providers');
-
-					if (!$table->hasIndex('twofactor_providers_uid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
-					}
-				}
-
-				if ($schema->hasTable('login_flow_v2')) {
-					$table = $schema->getTable('login_flow_v2');
-
-					if (!$table->hasIndex('poll_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'poll_token');
-					}
-					if (!$table->hasIndex('login_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'login_token');
-					}
-					if (!$table->hasIndex('timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'timestamp');
-					}
-				}
-
-				if ($schema->hasTable('whats_new')) {
-					$table = $schema->getTable('whats_new');
-
-					if (!$table->hasIndex('version')) {
-						$subject->addHintForMissingSubject($table->getName(), 'version');
-					}
-				}
-
-				if ($schema->hasTable('cards')) {
-					$table = $schema->getTable('cards');
-
-					if (!$table->hasIndex('cards_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abid');
-					}
-				}
-
-				if ($schema->hasTable('cards_properties')) {
-					$table = $schema->getTable('cards_properties');
-
-					if (!$table->hasIndex('cards_prop_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
-					}
-				}
-
-				if ($schema->hasTable('calendarobjects_props')) {
-					$table = $schema->getTable('calendarobjects_props');
-
-					if (!$table->hasIndex('calendarobject_calid_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
-					}
-				}
-
-				if ($schema->hasTable('schedulingobjects')) {
-					$table = $schema->getTable('schedulingobjects');
-					if (!$table->hasIndex('schedulobj_principuri_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
-					}
-				}
-
-				if ($schema->hasTable('properties')) {
-					$table = $schema->getTable('properties');
-					if (!$table->hasIndex('properties_path_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
-					}
-				}
-			}
-		);
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingColumnInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(IDBConnection::class));
-
-				if ($schema->hasTable('comments')) {
-					$table = $schema->getTable('comments');
-
-					if (!$table->hasColumn('reference_id')) {
-						$subject->addHintForMissingColumn($table->getName(), 'reference_id');
-					}
-				}
-			}
-		);
-
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
-	}
+    public function __construct() {
+        parent::__construct('core');
+
+        $container = $this->getContainer();
+
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
+
+        $server = $container->getServer();
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $server->query(IEventDispatcher::class);
+
+        $notificationManager = $server->getNotificationManager();
+        $notificationManager->registerNotifierService(RemoveLinkSharesNotifier::class);
+        $notificationManager->registerNotifierService(AuthenticationNotifier::class);
+
+        $oldEventDispatcher = $server->getEventDispatcher();
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
+
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                    if (!$table->hasIndex('owner_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'owner_index');
+                    }
+                    if (!$table->hasIndex('initiator_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'initiator_index');
+                    }
+                }
+
+                if ($schema->hasTable('filecache')) {
+                    $table = $schema->getTable('filecache');
+
+                    if (!$table->hasIndex('fs_mtime')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+                    }
+
+                    if (!$table->hasIndex('fs_size')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_size');
+                    }
+                }
+
+                if ($schema->hasTable('twofactor_providers')) {
+                    $table = $schema->getTable('twofactor_providers');
+
+                    if (!$table->hasIndex('twofactor_providers_uid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+                    }
+                }
+
+                if ($schema->hasTable('login_flow_v2')) {
+                    $table = $schema->getTable('login_flow_v2');
+
+                    if (!$table->hasIndex('poll_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'poll_token');
+                    }
+                    if (!$table->hasIndex('login_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'login_token');
+                    }
+                    if (!$table->hasIndex('timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('whats_new')) {
+                    $table = $schema->getTable('whats_new');
+
+                    if (!$table->hasIndex('version')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'version');
+                    }
+                }
+
+                if ($schema->hasTable('cards')) {
+                    $table = $schema->getTable('cards');
+
+                    if (!$table->hasIndex('cards_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abid');
+                    }
+                }
+
+                if ($schema->hasTable('cards_properties')) {
+                    $table = $schema->getTable('cards_properties');
+
+                    if (!$table->hasIndex('cards_prop_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
+                    }
+                }
+
+                if ($schema->hasTable('calendarobjects_props')) {
+                    $table = $schema->getTable('calendarobjects_props');
+
+                    if (!$table->hasIndex('calendarobject_calid_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
+                    }
+                }
+
+                if ($schema->hasTable('schedulingobjects')) {
+                    $table = $schema->getTable('schedulingobjects');
+                    if (!$table->hasIndex('schedulobj_principuri_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
+                    }
+                }
+
+                if ($schema->hasTable('properties')) {
+                    $table = $schema->getTable('properties');
+                    if (!$table->hasIndex('properties_path_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
+                    }
+                }
+            }
+        );
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingColumnInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(IDBConnection::class));
+
+                if ($schema->hasTable('comments')) {
+                    $table = $schema->getTable('comments');
+
+                    if (!$table->hasColumn('reference_id')) {
+                        $subject->addHintForMissingColumn($table->getName(), 'reference_id');
+                    }
+                }
+            }
+        );
+
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 
 		$container = $this->getContainer();
 
-		$container->registerService('defaultMailAddress', function () {
+		$container->registerService('defaultMailAddress', function() {
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
 		});
 
@@ -76,7 +76,7 @@ 
 		$oldEventDispatcher = $server->getEventDispatcher();
 
 		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
+			function(GenericEvent $event) use ($container) {
 				/** @var MissingIndexInformation $subject */
 				$subject = $event->getSubject();
 
@@ -182,7 +182,7 @@ 
 		);
 
 		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
-			function (GenericEvent $event) use ($container) {
+			function(GenericEvent $event) use ($container) {
 				/** @var MissingColumnInformation $subject */
 				$subject = $event->getSubject();