nextcloud / server

apps/dav/lib/Listener/CalendarShareUpdateListener.php

Indentation +26 added lines, -26 removed lines

@@ -16,30 +16,30 @@
 
 /** @template-implements IEventListener<CalendarShareUpdatedEvent> */
 class CalendarShareUpdateListener implements IEventListener {
-	public function __construct(
-		private Backend $activityBackend,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * In case the user has set their default calendar to the deleted one
-	 */
-	public function handle(Event $event): void {
-		if (!($event instanceof CalendarShareUpdatedEvent)) {
-			// Not what we subscribed to
-			return;
-		}
-
-		$this->logger->debug('Creating activity for Calendar having its shares updated');
-
-		$this->activityBackend->onCalendarUpdateShares(
-			$event->getCalendarData(),
-			$event->getOldShares(),
-			$event->getAdded(),
-			$event->getRemoved()
-		);
-
-		// Here we should recalculate if reminders should be sent to new or old sharees
-	}
+    public function __construct(
+        private Backend $activityBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * In case the user has set their default calendar to the deleted one
+     */
+    public function handle(Event $event): void {
+        if (!($event instanceof CalendarShareUpdatedEvent)) {
+            // Not what we subscribed to
+            return;
+        }
+
+        $this->logger->debug('Creating activity for Calendar having its shares updated');
+
+        $this->activityBackend->onCalendarUpdateShares(
+            $event->getCalendarData(),
+            $event->getOldShares(),
+            $event->getAdded(),
+            $event->getRemoved()
+        );
+
+        // Here we should recalculate if reminders should be sent to new or old sharees
+    }
 }

apps/dav/lib/Listener/UserEventsListener.php

Indentation +129 added lines, -129 removed lines

@@ -33,133 +33,133 @@
 /** @template-implements IEventListener<UserFirstTimeLoggedInEvent|UserIdAssignedEvent|BeforeUserIdUnassignedEvent|UserIdUnassignedEvent|BeforeUserDeletedEvent|UserDeletedEvent|UserCreatedEvent|UserChangedEvent|UserUpdatedEvent> */
 class UserEventsListener implements IEventListener {
 
-	/** @var IUser[] */
-	private array $usersToDelete = [];
-
-	private array $calendarsToDelete = [];
-	private array $subscriptionsToDelete = [];
-	private array $addressBooksToDelete = [];
-
-	public function __construct(
-		private IUserManager $userManager,
-		private SyncService $syncService,
-		private CalDavBackend $calDav,
-		private CardDavBackend $cardDav,
-		private Defaults $themingDefaults,
-		private DefaultContactService $defaultContactService,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof UserCreatedEvent) {
-			$this->postCreateUser($event->getUser());
-		} elseif ($event instanceof UserIdAssignedEvent) {
-			$user = $this->userManager->get($event->getUserId());
-			if ($user !== null) {
-				$this->postCreateUser($user);
-			}
-		} elseif ($event instanceof BeforeUserDeletedEvent) {
-			$this->preDeleteUser($event->getUser());
-		} elseif ($event instanceof BeforeUserIdUnassignedEvent) {
-			$this->preUnassignedUserId($event->getUserId());
-		} elseif ($event instanceof UserDeletedEvent) {
-			$this->postDeleteUser($event->getUid());
-		} elseif ($event instanceof UserIdUnassignedEvent) {
-			$this->postDeleteUser($event->getUserId());
-		} elseif ($event instanceof UserChangedEvent) {
-			$this->changeUser($event->getUser(), $event->getFeature());
-		} elseif ($event instanceof UserFirstTimeLoggedInEvent) {
-			$this->firstLogin($event->getUser());
-		} elseif ($event instanceof UserUpdatedEvent) {
-			$this->updateUser($event->getUser());
-		}
-	}
-
-	public function postCreateUser(IUser $user): void {
-		$this->syncService->updateUser($user);
-	}
-
-	public function updateUser(IUser $user): void {
-		$this->syncService->updateUser($user);
-	}
-
-	public function preDeleteUser(IUser $user): void {
-		$uid = $user->getUID();
-		$userPrincipalUri = 'principals/users/' . $uid;
-		$this->usersToDelete[$uid] = $user;
-		$this->calendarsToDelete[$uid] = $this->calDav->getUsersOwnCalendars($userPrincipalUri);
-		$this->subscriptionsToDelete[$uid] = $this->calDav->getSubscriptionsForUser($userPrincipalUri);
-		$this->addressBooksToDelete[$uid] = $this->cardDav->getUsersOwnAddressBooks($userPrincipalUri);
-	}
-
-	public function preUnassignedUserId(string $uid): void {
-		$user = $this->userManager->get($uid);
-		if ($user !== null) {
-			$this->usersToDelete[$uid] = $user;
-		}
-	}
-
-	public function postDeleteUser(string $uid): void {
-		if (isset($this->usersToDelete[$uid])) {
-			$this->syncService->deleteUser($this->usersToDelete[$uid]);
-		}
-
-		foreach ($this->calendarsToDelete[$uid] as $calendar) {
-			$this->calDav->deleteCalendar(
-				$calendar['id'],
-				true // Make sure the data doesn't go into the trashbin, a new user with the same UID would later see it otherwise
-			);
-		}
-
-		foreach ($this->subscriptionsToDelete[$uid] as $subscription) {
-			$this->calDav->deleteSubscription(
-				$subscription['id'],
-			);
-		}
-		$this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
-
-		foreach ($this->addressBooksToDelete[$uid] as $addressBook) {
-			$this->cardDav->deleteAddressBook($addressBook['id']);
-		}
-
-		unset($this->calendarsToDelete[$uid]);
-		unset($this->subscriptionsToDelete[$uid]);
-		unset($this->addressBooksToDelete[$uid]);
-	}
-
-	public function changeUser(IUser $user, string $feature): void {
-		// This case is already covered by the account manager firing up a signal
-		// later on
-		if ($feature !== 'eMailAddress' && $feature !== 'displayName') {
-			$this->syncService->updateUser($user);
-		}
-	}
-
-	public function firstLogin(IUser $user): void {
-		$principal = 'principals/users/' . $user->getUID();
-		if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
-			try {
-				$this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
-					'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
-					'components' => 'VEVENT'
-				]);
-			} catch (\Exception $e) {
-				Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-			}
-		}
-		$addressBookId = null;
-		if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
-			try {
-				$addressBookId = $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
-					'{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
-				]);
-			} catch (\Exception $e) {
-				Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
-			}
-		}
-		if ($addressBookId) {
-			$this->defaultContactService->createDefaultContact($addressBookId);
-		}
-	}
+    /** @var IUser[] */
+    private array $usersToDelete = [];
+
+    private array $calendarsToDelete = [];
+    private array $subscriptionsToDelete = [];
+    private array $addressBooksToDelete = [];
+
+    public function __construct(
+        private IUserManager $userManager,
+        private SyncService $syncService,
+        private CalDavBackend $calDav,
+        private CardDavBackend $cardDav,
+        private Defaults $themingDefaults,
+        private DefaultContactService $defaultContactService,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof UserCreatedEvent) {
+            $this->postCreateUser($event->getUser());
+        } elseif ($event instanceof UserIdAssignedEvent) {
+            $user = $this->userManager->get($event->getUserId());
+            if ($user !== null) {
+                $this->postCreateUser($user);
+            }
+        } elseif ($event instanceof BeforeUserDeletedEvent) {
+            $this->preDeleteUser($event->getUser());
+        } elseif ($event instanceof BeforeUserIdUnassignedEvent) {
+            $this->preUnassignedUserId($event->getUserId());
+        } elseif ($event instanceof UserDeletedEvent) {
+            $this->postDeleteUser($event->getUid());
+        } elseif ($event instanceof UserIdUnassignedEvent) {
+            $this->postDeleteUser($event->getUserId());
+        } elseif ($event instanceof UserChangedEvent) {
+            $this->changeUser($event->getUser(), $event->getFeature());
+        } elseif ($event instanceof UserFirstTimeLoggedInEvent) {
+            $this->firstLogin($event->getUser());
+        } elseif ($event instanceof UserUpdatedEvent) {
+            $this->updateUser($event->getUser());
+        }
+    }
+
+    public function postCreateUser(IUser $user): void {
+        $this->syncService->updateUser($user);
+    }
+
+    public function updateUser(IUser $user): void {
+        $this->syncService->updateUser($user);
+    }
+
+    public function preDeleteUser(IUser $user): void {
+        $uid = $user->getUID();
+        $userPrincipalUri = 'principals/users/' . $uid;
+        $this->usersToDelete[$uid] = $user;
+        $this->calendarsToDelete[$uid] = $this->calDav->getUsersOwnCalendars($userPrincipalUri);
+        $this->subscriptionsToDelete[$uid] = $this->calDav->getSubscriptionsForUser($userPrincipalUri);
+        $this->addressBooksToDelete[$uid] = $this->cardDav->getUsersOwnAddressBooks($userPrincipalUri);
+    }
+
+    public function preUnassignedUserId(string $uid): void {
+        $user = $this->userManager->get($uid);
+        if ($user !== null) {
+            $this->usersToDelete[$uid] = $user;
+        }
+    }
+
+    public function postDeleteUser(string $uid): void {
+        if (isset($this->usersToDelete[$uid])) {
+            $this->syncService->deleteUser($this->usersToDelete[$uid]);
+        }
+
+        foreach ($this->calendarsToDelete[$uid] as $calendar) {
+            $this->calDav->deleteCalendar(
+                $calendar['id'],
+                true // Make sure the data doesn't go into the trashbin, a new user with the same UID would later see it otherwise
+            );
+        }
+
+        foreach ($this->subscriptionsToDelete[$uid] as $subscription) {
+            $this->calDav->deleteSubscription(
+                $subscription['id'],
+            );
+        }
+        $this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
+
+        foreach ($this->addressBooksToDelete[$uid] as $addressBook) {
+            $this->cardDav->deleteAddressBook($addressBook['id']);
+        }
+
+        unset($this->calendarsToDelete[$uid]);
+        unset($this->subscriptionsToDelete[$uid]);
+        unset($this->addressBooksToDelete[$uid]);
+    }
+
+    public function changeUser(IUser $user, string $feature): void {
+        // This case is already covered by the account manager firing up a signal
+        // later on
+        if ($feature !== 'eMailAddress' && $feature !== 'displayName') {
+            $this->syncService->updateUser($user);
+        }
+    }
+
+    public function firstLogin(IUser $user): void {
+        $principal = 'principals/users/' . $user->getUID();
+        if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
+            try {
+                $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
+                    '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+                    '{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
+                    'components' => 'VEVENT'
+                ]);
+            } catch (\Exception $e) {
+                Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+            }
+        }
+        $addressBookId = null;
+        if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
+            try {
+                $addressBookId = $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
+                    '{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
+                ]);
+            } catch (\Exception $e) {
+                Server::get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+            }
+        }
+        if ($addressBookId) {
+            $this->defaultContactService->createDefaultContact($addressBookId);
+        }
+    }
 }

apps/dav/lib/AppInfo/Application.php

Indentation +152 added lines, -152 removed lines

@@ -104,186 +104,186 @@
 use function is_null;
 
 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) {
-			return new PhotoCache(
-				$c->get(IAppDataFactory::class)->get('dav-photocache'),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
-			return new AppCalendarPlugin(
-				$c->get(ICalendarManager::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
+    public function register(IRegistrationContext $context): void {
+        $context->registerServiceAlias('CardDAVSyncService', SyncService::class);
+        $context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+            return new PhotoCache(
+                $c->get(IAppDataFactory::class)->get('dav-photocache'),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
+            return new AppCalendarPlugin(
+                $c->get(ICalendarManager::class),
+                $c->get(LoggerInterface::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);
+        $context->registerSearchProvider(ContactsSearchProvider::class);
+        $context->registerSearchProvider(EventsSearchProvider::class);
+        $context->registerSearchProvider(TasksSearchProvider::class);
 
-		/**
-		 * Register event listeners
-		 */
-		$context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
+        /**
+         * Register event listeners
+         */
+        $context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
 
-		$context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
-		$context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
-		$context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
+        $context->registerEventListener(CalendarCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarDeletedEvent::class, CalendarDeletionDefaultUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, ActivityUpdaterListener::class);
+        $context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarObjectReminderUpdaterListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarContactInteractionListener::class);
+        $context->registerEventListener(CalendarPublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarUnpublishedEvent::class, CalendarPublicationListener::class);
+        $context->registerEventListener(CalendarShareUpdatedEvent::class, CalendarShareUpdateListener::class);
 
-		$context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
-		$context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
+        $context->registerEventListener(SubscriptionCreatedEvent::class, SubscriptionListener::class);
+        $context->registerEventListener(SubscriptionDeletedEvent::class, SubscriptionListener::class);
 
 
-		$context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, CardListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
-		$context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
-		$context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
-		$context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
+        $context->registerEventListener(AddressBookCreatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookDeletedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(AddressBookShareUpdatedEvent::class, AddressbookListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, CardListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, CardListener::class);
+        $context->registerEventListener(CardCreatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, BirthdayListener::class);
+        $context->registerEventListener(CardDeletedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(CardUpdatedEvent::class, ClearPhotoCacheListener::class);
+        $context->registerEventListener(TrustedServerRemovedEvent::class, TrustedServerRemovedListener::class);
 
-		$context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
-		$context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
+        $context->registerEventListener(BeforePreferenceDeletedEvent::class, UserPreferenceListener::class);
+        $context->registerEventListener(BeforePreferenceSetEvent::class, UserPreferenceListener::class);
 
-		$context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
-		$context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeChangedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeClearedEvent::class, OutOfOfficeListener::class);
+        $context->registerEventListener(OutOfOfficeScheduledEvent::class, OutOfOfficeListener::class);
 
-		$context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
-		$context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserFirstTimeLoggedInEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdAssignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserIdUnassignedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(BeforeUserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserDeletedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserCreatedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserChangedEvent::class, UserEventsListener::class);
+        $context->registerEventListener(UserUpdatedEvent::class, UserEventsListener::class);
 
-		$context->registerNotifierService(Notifier::class);
+        $context->registerNotifierService(Notifier::class);
 
-		$context->registerCalendarProvider(CalendarProvider::class);
-		$context->registerCalendarProvider(CachedSubscriptionProvider::class);
+        $context->registerCalendarProvider(CalendarProvider::class);
+        $context->registerCalendarProvider(CachedSubscriptionProvider::class);
 
-		$context->registerUserMigrator(CalendarMigrator::class);
-		$context->registerUserMigrator(ContactsMigrator::class);
+        $context->registerUserMigrator(CalendarMigrator::class);
+        $context->registerUserMigrator(ContactsMigrator::class);
 
-		$context->registerSetupCheck(NeedsSystemAddressBookSync::class);
-		$context->registerSetupCheck(WebdavEndpoint::class);
+        $context->registerSetupCheck(NeedsSystemAddressBookSync::class);
+        $context->registerSetupCheck(WebdavEndpoint::class);
 
-		// register admin settings form and listener(s)
-		$context->registerDeclarativeSettings(SystemAddressBookSettings::class);
-		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
-		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
+        // register admin settings form and listener(s)
+        $context->registerDeclarativeSettings(SystemAddressBookSettings::class);
+        $context->registerEventListener(DeclarativeSettingsGetValueEvent::class, DavAdminSettingsListener::class);
+        $context->registerEventListener(DeclarativeSettingsSetValueEvent::class, DavAdminSettingsListener::class);
 
-	}
+    }
 
-	public function boot(IBootContext $context): void {
-		// Load all dav apps
-		\OC_App::loadApps(['dav']);
+    public function boot(IBootContext $context): void {
+        // Load all dav apps
+        \OC_App::loadApps(['dav']);
 
-		$context->injectFn($this->registerContactsManager(...));
-		$context->injectFn($this->registerCalendarManager(...));
-		$context->injectFn($this->registerCalendarReminders(...));
-	}
+        $context->injectFn($this->registerContactsManager(...));
+        $context->injectFn($this->registerCalendarManager(...));
+        $context->injectFn($this->registerCalendarReminders(...));
+    }
 
-	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if (!is_null($user)) {
-				$this->setupContactsProvider($cm, $container, $user->getUID());
-			} else {
-				$this->setupSystemContactsProvider($cm, $container);
-			}
-		});
-	}
+    public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
+        $cm->register(function () use ($container, $cm): void {
+            $user = Server::get(IUserSession::class)->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 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, null, $urlGenerator);
-	}
+    private function setupSystemContactsProvider(IContactsManager $contactsManager, IAppContainer $container): void {
+        /** @var ContactsManager $cm */
+        $cm = $container->query(ContactsManager::class);
+        $urlGenerator = $container->getServer()->getURLGenerator();
+        $cm->setupSystemContactsProvider($contactsManager, null, $urlGenerator);
+    }
 
-	public function registerCalendarManager(ICalendarManager $calendarManager,
-		IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager): void {
-			$user = Server::get(IUserSession::class)->getUser();
-			if ($user !== null) {
-				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());
-			}
-		});
-	}
+    public function registerCalendarManager(ICalendarManager $calendarManager,
+        IAppContainer $container): void {
+        $calendarManager->register(function () use ($container, $calendarManager): void {
+            $user = Server::get(IUserSession::class)->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);
-	}
+    private function setupCalendarProvider(ICalendarManager $calendarManager,
+        IAppContainer $container,
+        $userId) {
+        $cm = $container->query(CalendarManager::class);
+        $cm->setupCalendarProvider($calendarManager, $userId);
+    }
 
-	public function registerCalendarReminders(NotificationProviderManager $manager,
-		LoggerInterface $logger): void {
-		try {
-			$manager->registerProvider(AudioProvider::class);
-			$manager->registerProvider(EmailProvider::class);
-			$manager->registerProvider(PushProvider::class);
-		} catch (Throwable $ex) {
-			$logger->error($ex->getMessage(), ['exception' => $ex]);
-		}
-	}
+    public function registerCalendarReminders(NotificationProviderManager $manager,
+        LoggerInterface $logger): void {
+        try {
+            $manager->registerProvider(AudioProvider::class);
+            $manager->registerProvider(EmailProvider::class);
+            $manager->registerProvider(PushProvider::class);
+        } catch (Throwable $ex) {
+            $logger->error($ex->getMessage(), ['exception' => $ex]);
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -112,13 +112,13 @@ 
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerServiceAlias('CardDAVSyncService', SyncService::class);
-		$context->registerService(PhotoCache::class, function (ContainerInterface $c) {
+		$context->registerService(PhotoCache::class, function(ContainerInterface $c) {
 			return new PhotoCache(
 				$c->get(IAppDataFactory::class)->get('dav-photocache'),
 				$c->get(LoggerInterface::class)
 			);
 		});
-		$context->registerService(AppCalendarPlugin::class, function (ContainerInterface $c) {
+		$context->registerService(AppCalendarPlugin::class, function(ContainerInterface $c) {
 			return new AppCalendarPlugin(
 				$c->get(ICalendarManager::class),
 				$c->get(LoggerInterface::class)
@@ -233,7 +233,7 @@ 
 	}
 
 	public function registerContactsManager(IContactsManager $cm, IAppContainer $container): void {
-		$cm->register(function () use ($container, $cm): void {
+		$cm->register(function() use ($container, $cm): void {
 			$user = Server::get(IUserSession::class)->getUser();
 			if (!is_null($user)) {
 				$this->setupContactsProvider($cm, $container, $user->getUID());
@@ -261,7 +261,7 @@ 
 
 	public function registerCalendarManager(ICalendarManager $calendarManager,
 		IAppContainer $container): void {
-		$calendarManager->register(function () use ($container, $calendarManager): void {
+		$calendarManager->register(function() use ($container, $calendarManager): void {
 			$user = Server::get(IUserSession::class)->getUser();
 			if ($user !== null) {
 				$this->setupCalendarProvider($calendarManager, $container, $user->getUID());