nextcloud / server

apps/dav/lib/Listener/CalendarDeletionDefaultUpdaterListener.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 			$this->logger->debug('Default user calendar reset');
 		} catch (Throwable $e) {
 			// Any error with activities shouldn't abort the calendar deletion, so we just log it
-			$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+			$this->logger->error('Error generating activities for a deleted calendar: '.$e->getMessage(), [
 				'exception' => $e,
 			]);
 		}

Indentation +39 added lines, -39 removed lines

@@ -20,43 +20,43 @@
  */
 class CalendarDeletionDefaultUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private IConfig $config,
-		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 CalendarDeletedEvent)) {
-			// Not what we subscribed to
-			return;
-		}
-
-		try {
-			$principalUri = $event->getCalendarData()['principaluri'];
-			if (!str_starts_with($principalUri, 'principals/users')) {
-				$this->logger->debug('Default calendar needs no update because the deleted calendar does not belong to a user principal');
-				return;
-			}
-
-			[, $uid] = \Sabre\Uri\split($principalUri);
-			$uri = $event->getCalendarData()['uri'];
-			if ($this->config->getUserValue($uid, 'dav', 'defaultCalendar') !== $uri) {
-				$this->logger->debug('Default calendar needs no update because the deleted calendar is no the user\'s default one');
-				return;
-			}
-
-			$this->config->deleteUserValue($uid, 'dav', 'defaultCalendar');
-
-			$this->logger->debug('Default user calendar reset');
-		} catch (Throwable $e) {
-			// Any error with activities shouldn't abort the calendar deletion, so we just log it
-			$this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
-				'exception' => $e,
-			]);
-		}
-	}
+    public function __construct(
+        private IConfig $config,
+        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 CalendarDeletedEvent)) {
+            // Not what we subscribed to
+            return;
+        }
+
+        try {
+            $principalUri = $event->getCalendarData()['principaluri'];
+            if (!str_starts_with($principalUri, 'principals/users')) {
+                $this->logger->debug('Default calendar needs no update because the deleted calendar does not belong to a user principal');
+                return;
+            }
+
+            [, $uid] = \Sabre\Uri\split($principalUri);
+            $uri = $event->getCalendarData()['uri'];
+            if ($this->config->getUserValue($uid, 'dav', 'defaultCalendar') !== $uri) {
+                $this->logger->debug('Default calendar needs no update because the deleted calendar is no the user\'s default one');
+                return;
+            }
+
+            $this->config->deleteUserValue($uid, 'dav', 'defaultCalendar');
+
+            $this->logger->debug('Default user calendar reset');
+        } catch (Throwable $e) {
+            // Any error with activities shouldn't abort the calendar deletion, so we just log it
+            $this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [
+                'exception' => $e,
+            ]);
+        }
+    }
 }

apps/settings/lib/BackgroundJobs/VerifyUserData.php

Spacing +8 added lines, -8 removed lines

@@ -107,7 +107,7 @@ 
 	}
 
 	protected function run($argument) {
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
 		switch ($argument['type']) {
 			case IAccountManager::PROPERTY_WEBSITE:
@@ -119,7 +119,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -137,7 +137,7 @@ 
 	protected function verifyWebsite(array $argument) {
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -154,7 +154,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userAccount = $this->accountManager->getAccount($user);
@@ -180,7 +180,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->info($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -222,7 +222,7 @@ 
 		try {
 			$client = $this->httpClientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -254,7 +254,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -267,7 +267,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}
 

Indentation +220 added lines, -220 removed lines

@@ -20,224 +20,224 @@
 use Psr\Log\LoggerInterface;
 
 class VerifyUserData extends Job {
-	/** @var bool */
-	private bool $retainJob = true;
-
-	/** @var int max number of attempts to send the request */
-	private int $maxTry = 24;
-
-	/** @var int how much time should be between two tries (1 hour) */
-	private int $interval = 3600;
-	private string $lookupServerUrl;
-
-	public function __construct(
-		private IAccountManager $accountManager,
-		private IUserManager $userManager,
-		private IClientService $httpClientService,
-		private LoggerInterface $logger,
-		ITimeFactory $timeFactory,
-		private IConfig $config,
-	) {
-		parent::__construct($timeFactory);
-
-		$lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$this->lookupServerUrl = rtrim($lookupServerUrl, '/');
-	}
-
-	public function start(IJobList $jobList): void {
-		if ($this->shouldRun($this->argument)) {
-			parent::start($jobList);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			} else {
-				$this->resetVerificationState();
-			}
-		}
-	}
-
-	protected function run($argument) {
-		$try = (int)$argument['try'] + 1;
-
-		switch ($argument['type']) {
-			case IAccountManager::PROPERTY_WEBSITE:
-				$result = $this->verifyWebsite($argument);
-				break;
-			case IAccountManager::PROPERTY_TWITTER:
-			case IAccountManager::PROPERTY_EMAIL:
-				$result = $this->verifyViaLookupServer($argument, $argument['type']);
-				break;
-			default:
-				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
-				$result = true;
-		}
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * verify web page
-	 *
-	 * @param array $argument
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyWebsite(array $argument) {
-		$result = false;
-
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($response->getStatusCode() === Http::STATUS_OK) {
-			$result = true;
-			$publishedCode = $response->getBody();
-			// remove new lines and spaces
-			$publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
-			$user = $this->userManager->get($argument['uid']);
-			// we don't check a valid user -> give up
-			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-				return $result;
-			}
-			$userAccount = $this->accountManager->getAccount($user);
-			$websiteProp = $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE);
-			$websiteProp->setVerified($publishedCodeSanitized === $argument['verificationCode']
-				? IAccountManager::VERIFIED
-				: IAccountManager::NOT_VERIFIED
-			);
-			$this->accountManager->updateAccount($userAccount);
-		}
-
-		return $result;
-	}
-
-	protected function verifyViaLookupServer(array $argument, string $dataType): bool {
-		// TODO: Consider to enable for non-global-scale setups by checking 'files_sharing', 'lookupServerUploadEnabled'
-		if (!$this->config->getSystemValueBool('gs.enabled', false)
-			|| empty($this->lookupServerUrl)
-			|| $this->config->getSystemValue('has_internet_connection', true) === false
-		) {
-			return true;
-		}
-
-		$user = $this->userManager->get($argument['uid']);
-
-		// we don't check a valid user -> give up
-		if ($user === null) {
-			$this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-			return true;
-		}
-
-		$cloudId = $user->getCloudId();
-		$lookupServerData = $this->queryLookupServer($cloudId);
-
-		// for some reasons we couldn't read any data from the lookup server, try again later
-		if (empty($lookupServerData) || empty($lookupServerData[$dataType])) {
-			return false;
-		}
-
-		// lookup server has verification data for wrong user data (e.g. email address), try again later
-		if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
-			return false;
-		}
-
-		// lookup server hasn't verified the email address so far, try again later
-		if ($lookupServerData[$dataType]['verified'] === IAccountManager::NOT_VERIFIED) {
-			return false;
-		}
-
-		try {
-			$userAccount = $this->accountManager->getAccount($user);
-			$property = $userAccount->getProperty($dataType);
-			$property->setVerified(IAccountManager::VERIFIED);
-			$this->accountManager->updateAccount($userAccount);
-		} catch (PropertyDoesNotExistException $e) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function queryLookupServer($cloudId) {
-		try {
-			$client = $this->httpClientService->newClient();
-			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$body = json_decode($response->getBody(), true);
-
-			if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
-				return $body;
-			}
-		} catch (\Exception $e) {
-			// do nothing, we will just re-try later
-		}
-
-		return [];
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add(VerifyUserData::class,
-			[
-				'verificationCode' => $argument['verificationCode'],
-				'data' => $argument['data'],
-				'type' => $argument['type'],
-				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
-
-
-	/**
-	 * reset verification state after max tries are reached
-	 */
-	protected function resetVerificationState(): void {
-		$user = $this->userManager->get($this->argument['uid']);
-		if ($user !== null) {
-			$userAccount = $this->accountManager->getAccount($user);
-			try {
-				$property = $userAccount->getProperty($this->argument['type']);
-				$property->setVerified(IAccountManager::NOT_VERIFIED);
-				$this->accountManager->updateAccount($userAccount);
-			} catch (PropertyDoesNotExistException $e) {
-				return;
-			}
-		}
-	}
+    /** @var bool */
+    private bool $retainJob = true;
+
+    /** @var int max number of attempts to send the request */
+    private int $maxTry = 24;
+
+    /** @var int how much time should be between two tries (1 hour) */
+    private int $interval = 3600;
+    private string $lookupServerUrl;
+
+    public function __construct(
+        private IAccountManager $accountManager,
+        private IUserManager $userManager,
+        private IClientService $httpClientService,
+        private LoggerInterface $logger,
+        ITimeFactory $timeFactory,
+        private IConfig $config,
+    ) {
+        parent::__construct($timeFactory);
+
+        $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $this->lookupServerUrl = rtrim($lookupServerUrl, '/');
+    }
+
+    public function start(IJobList $jobList): void {
+        if ($this->shouldRun($this->argument)) {
+            parent::start($jobList);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            } else {
+                $this->resetVerificationState();
+            }
+        }
+    }
+
+    protected function run($argument) {
+        $try = (int)$argument['try'] + 1;
+
+        switch ($argument['type']) {
+            case IAccountManager::PROPERTY_WEBSITE:
+                $result = $this->verifyWebsite($argument);
+                break;
+            case IAccountManager::PROPERTY_TWITTER:
+            case IAccountManager::PROPERTY_EMAIL:
+                $result = $this->verifyViaLookupServer($argument, $argument['type']);
+                break;
+            default:
+                // no valid type given, no need to retry
+                $this->logger->error($argument['type'] . ' is no valid type for user account data.');
+                $result = true;
+        }
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * verify web page
+     *
+     * @param array $argument
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyWebsite(array $argument) {
+        $result = false;
+
+        $url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($response->getStatusCode() === Http::STATUS_OK) {
+            $result = true;
+            $publishedCode = $response->getBody();
+            // remove new lines and spaces
+            $publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
+            $user = $this->userManager->get($argument['uid']);
+            // we don't check a valid user -> give up
+            if ($user === null) {
+                $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+                return $result;
+            }
+            $userAccount = $this->accountManager->getAccount($user);
+            $websiteProp = $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE);
+            $websiteProp->setVerified($publishedCodeSanitized === $argument['verificationCode']
+                ? IAccountManager::VERIFIED
+                : IAccountManager::NOT_VERIFIED
+            );
+            $this->accountManager->updateAccount($userAccount);
+        }
+
+        return $result;
+    }
+
+    protected function verifyViaLookupServer(array $argument, string $dataType): bool {
+        // TODO: Consider to enable for non-global-scale setups by checking 'files_sharing', 'lookupServerUploadEnabled'
+        if (!$this->config->getSystemValueBool('gs.enabled', false)
+            || empty($this->lookupServerUrl)
+            || $this->config->getSystemValue('has_internet_connection', true) === false
+        ) {
+            return true;
+        }
+
+        $user = $this->userManager->get($argument['uid']);
+
+        // we don't check a valid user -> give up
+        if ($user === null) {
+            $this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+            return true;
+        }
+
+        $cloudId = $user->getCloudId();
+        $lookupServerData = $this->queryLookupServer($cloudId);
+
+        // for some reasons we couldn't read any data from the lookup server, try again later
+        if (empty($lookupServerData) || empty($lookupServerData[$dataType])) {
+            return false;
+        }
+
+        // lookup server has verification data for wrong user data (e.g. email address), try again later
+        if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
+            return false;
+        }
+
+        // lookup server hasn't verified the email address so far, try again later
+        if ($lookupServerData[$dataType]['verified'] === IAccountManager::NOT_VERIFIED) {
+            return false;
+        }
+
+        try {
+            $userAccount = $this->accountManager->getAccount($user);
+            $property = $userAccount->getProperty($dataType);
+            $property->setVerified(IAccountManager::VERIFIED);
+            $this->accountManager->updateAccount($userAccount);
+        } catch (PropertyDoesNotExistException $e) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function queryLookupServer($cloudId) {
+        try {
+            $client = $this->httpClientService->newClient();
+            $response = $client->get(
+                $this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $body = json_decode($response->getBody(), true);
+
+            if (is_array($body) && isset($body['federationId']) && $body['federationId'] === $cloudId) {
+                return $body;
+            }
+        } catch (\Exception $e) {
+            // do nothing, we will just re-try later
+        }
+
+        return [];
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add(VerifyUserData::class,
+            [
+                'verificationCode' => $argument['verificationCode'],
+                'data' => $argument['data'],
+                'type' => $argument['type'],
+                'uid' => $argument['uid'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
+
+
+    /**
+     * reset verification state after max tries are reached
+     */
+    protected function resetVerificationState(): void {
+        $user = $this->userManager->get($this->argument['uid']);
+        if ($user !== null) {
+            $userAccount = $this->accountManager->getAccount($user);
+            try {
+                $property = $userAccount->getProperty($this->argument['type']);
+                $property->setVerified(IAccountManager::NOT_VERIFIED);
+                $this->accountManager->updateAccount($userAccount);
+            } catch (PropertyDoesNotExistException $e) {
+                return;
+            }
+        }
+    }
 }

lib/public/ICertificate.php

Indentation +40 added lines, -40 removed lines

@@ -32,51 +32,51 @@
  * @since 8.0.0
  */
 interface ICertificate {
-	/**
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getName(): string;
+    /**
+     * @return string
+     * @since 8.0.0
+     */
+    public function getName(): string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getCommonName(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getCommonName(): ?string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getOrganization(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getOrganization(): ?string;
 
-	/**
-	 * @return \DateTime
-	 * @since 8.0.0
-	 */
-	public function getIssueDate(): \DateTime;
+    /**
+     * @return \DateTime
+     * @since 8.0.0
+     */
+    public function getIssueDate(): \DateTime;
 
-	/**
-	 * @return \DateTime
-	 * @since 8.0.0
-	 */
-	public function getExpireDate(): \DateTime;
+    /**
+     * @return \DateTime
+     * @since 8.0.0
+     */
+    public function getExpireDate(): \DateTime;
 
-	/**
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isExpired(): bool;
+    /**
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isExpired(): bool;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getIssuerName(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getIssuerName(): ?string;
 
-	/**
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getIssuerOrganization(): ?string;
+    /**
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getIssuerOrganization(): ?string;
 }

lib/public/ICertificateManager.php

Indentation +35 added lines, -35 removed lines

@@ -32,43 +32,43 @@
  * @since 8.0.0
  */
 interface ICertificateManager {
-	/**
-	 * Returns all certificates trusted by the system
-	 *
-	 * @return \OCP\ICertificate[]
-	 * @since 8.0.0
-	 */
-	public function listCertificates(): array;
+    /**
+     * Returns all certificates trusted by the system
+     *
+     * @return \OCP\ICertificate[]
+     * @since 8.0.0
+     */
+    public function listCertificates(): array;
 
-	/**
-	 * @param string $certificate the certificate data
-	 * @param string $name the filename for the certificate
-	 * @return \OCP\ICertificate
-	 * @throws \Exception If the certificate could not get added
-	 * @since 8.0.0 - since 8.1.0 throws exception instead of returning false
-	 */
-	public function addCertificate(string $certificate, string $name): \OCP\ICertificate;
+    /**
+     * @param string $certificate the certificate data
+     * @param string $name the filename for the certificate
+     * @return \OCP\ICertificate
+     * @throws \Exception If the certificate could not get added
+     * @since 8.0.0 - since 8.1.0 throws exception instead of returning false
+     */
+    public function addCertificate(string $certificate, string $name): \OCP\ICertificate;
 
-	/**
-	 * @param string $name
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function removeCertificate(string $name): bool;
+    /**
+     * @param string $name
+     * @return bool
+     * @since 8.0.0
+     */
+    public function removeCertificate(string $name): bool;
 
-	/**
-	 * Get the path to the certificate bundle
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getCertificateBundle(): string;
+    /**
+     * Get the path to the certificate bundle
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getCertificateBundle(): string;
 
-	/**
-	 * Get the full local path to the certificate bundle
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getAbsoluteBundlePath(): string;
+    /**
+     * Get the full local path to the certificate bundle
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function getAbsoluteBundlePath(): string;
 }

core/Command/User/Report.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 				'count-dirs',
 				null,
 				InputOption::VALUE_NONE,
-				'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with ' . self::DEFAULT_COUNT_DIRS_MAX_USERS . '+ users)'
+				'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with '.self::DEFAULT_COUNT_DIRS_MAX_USERS.'+ users)'
 			)
 		;
 	}

Indentation +57 added lines, -57 removed lines

@@ -19,71 +19,71 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Report extends Command {
-	public const DEFAULT_COUNT_DIRS_MAX_USERS = 500;
+    public const DEFAULT_COUNT_DIRS_MAX_USERS = 500;
 
-	public function __construct(
-		protected IUserManager $userManager,
-		private IConfig $config,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        protected IUserManager $userManager,
+        private IConfig $config,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('user:report')
-			->setDescription('shows how many users have access')
-			->addOption(
-				'count-dirs',
-				null,
-				InputOption::VALUE_NONE,
-				'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with ' . self::DEFAULT_COUNT_DIRS_MAX_USERS . '+ users)'
-			)
-		;
-	}
+    protected function configure(): void {
+        $this
+            ->setName('user:report')
+            ->setDescription('shows how many users have access')
+            ->addOption(
+                'count-dirs',
+                null,
+                InputOption::VALUE_NONE,
+                'Also count the number of user directories in the database (could time out on huge installations, therefore defaults to no with ' . self::DEFAULT_COUNT_DIRS_MAX_USERS . '+ users)'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$table = new Table($output);
-		$table->setHeaders(['Account Report', '']);
-		$userCountArray = $this->countUsers();
-		$total = 0;
-		if (!empty($userCountArray)) {
-			$rows = [];
-			foreach ($userCountArray as $classname => $users) {
-				$total += $users;
-				$rows[] = [$classname, $users];
-			}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $table = new Table($output);
+        $table->setHeaders(['Account Report', '']);
+        $userCountArray = $this->countUsers();
+        $total = 0;
+        if (!empty($userCountArray)) {
+            $rows = [];
+            foreach ($userCountArray as $classname => $users) {
+                $total += $users;
+                $rows[] = [$classname, $users];
+            }
 
-			$rows[] = [' '];
-			$rows[] = ['total users', $total];
-		} else {
-			$rows[] = ['No backend enabled that supports user counting', ''];
-		}
-		$rows[] = [' '];
+            $rows[] = [' '];
+            $rows[] = ['total users', $total];
+        } else {
+            $rows[] = ['No backend enabled that supports user counting', ''];
+        }
+        $rows[] = [' '];
 
-		if ($total <= self::DEFAULT_COUNT_DIRS_MAX_USERS || $input->getOption('count-dirs')) {
-			$userDirectoryCount = $this->countUserDirectories();
-			$rows[] = ['user directories', $userDirectoryCount];
-		}
+        if ($total <= self::DEFAULT_COUNT_DIRS_MAX_USERS || $input->getOption('count-dirs')) {
+            $userDirectoryCount = $this->countUserDirectories();
+            $rows[] = ['user directories', $userDirectoryCount];
+        }
 
-		$activeUsers = $this->userManager->countSeenUsers();
-		$rows[] = ['active users', $activeUsers];
+        $activeUsers = $this->userManager->countSeenUsers();
+        $rows[] = ['active users', $activeUsers];
 
-		$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
-		$disabledUsersCount = count($disabledUsers);
-		$rows[] = ['disabled users', $disabledUsersCount];
+        $disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
+        $disabledUsersCount = count($disabledUsers);
+        $rows[] = ['disabled users', $disabledUsersCount];
 
-		$table->setRows($rows);
-		$table->render();
-		return 0;
-	}
+        $table->setRows($rows);
+        $table->render();
+        return 0;
+    }
 
-	private function countUsers(): array {
-		return $this->userManager->countUsers();
-	}
+    private function countUsers(): array {
+        return $this->userManager->countUsers();
+    }
 
-	private function countUserDirectories(): int {
-		$dataview = new View('/');
-		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
-		return count($userDirectories);
-	}
+    private function countUserDirectories(): int {
+        $dataview = new View('/');
+        $userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
+        return count($userDirectories);
+    }
 }

apps/dav/lib/Listener/CardListener.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -81,7 +81,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -99,7 +99,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted card in addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +59 added lines, -59 removed lines

@@ -21,67 +21,67 @@
 
 /** @template-implements IEventListener<CardCreatedEvent|CardUpdatedEvent|CardDeletedEvent> */
 class CardListener implements IEventListener {
-	public function __construct(
-		private ActivityBackend $activityBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private ActivityBackend $activityBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof CardCreatedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_ADD,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof CardCreatedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_ADD,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a new card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CardUpdatedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_UPDATE,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for a new card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for a new card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CardUpdatedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_UPDATE,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a changed card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CardDeletedEvent) {
-			try {
-				$this->activityBackend->triggerCardActivity(
-					Card::SUBJECT_DELETE,
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getCardData()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for a changed card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook update, so we just log it
+                $this->logger->error('Error generating activities for a changed card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CardDeletedEvent) {
+            try {
+                $this->activityBackend->triggerCardActivity(
+                    Card::SUBJECT_DELETE,
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getCardData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for a deleted card in addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Activity generated for a deleted card in addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted card in addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Listener/AddressbookListener.php

Spacing +4 added lines, -4 removed lines

@@ -60,7 +60,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a new addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -77,7 +77,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a changed addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for a deleted addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -111,7 +111,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
+				$this->logger->error('Error generating activities for (un)sharing addressbook: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +70 added lines, -70 removed lines

@@ -21,79 +21,79 @@
 
 /** @template-implements IEventListener<AddressBookCreatedEvent|AddressBookUpdatedEvent|AddressBookDeletedEvent|AddressBookShareUpdatedEvent> */
 class AddressbookListener implements IEventListener {
-	public function __construct(
-		private ActivityBackend $activityBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private ActivityBackend $activityBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof AddressBookCreatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookCreate(
-					$event->getAddressBookData()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof AddressBookCreatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookCreate(
+                    $event->getAddressBookData()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for new addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookUpdatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookUpdate(
-					$event->getAddressBookData(),
-					$event->getShares(),
-					$event->getMutations()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for new addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for a new addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookUpdatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookUpdate(
+                    $event->getAddressBookData(),
+                    $event->getShares(),
+                    $event->getMutations()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for changed addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook update, so we just log it
-				$this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookDeletedEvent) {
-			try {
-				$this->activityBackend->onAddressbookDelete(
-					$event->getAddressBookData(),
-					$event->getShares()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for changed addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook update, so we just log it
+                $this->logger->error('Error generating activities for a changed addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookDeletedEvent) {
+            try {
+                $this->activityBackend->onAddressbookDelete(
+                    $event->getAddressBookData(),
+                    $event->getShares()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for deleted addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook deletion, so we just log it
-				$this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof AddressBookShareUpdatedEvent) {
-			try {
-				$this->activityBackend->onAddressbookUpdateShares(
-					$event->getAddressBookData(),
-					$event->getOldShares(),
-					$event->getAdded(),
-					$event->getRemoved()
-				);
+                $this->logger->debug(
+                    sprintf('Activity generated for deleted addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook deletion, so we just log it
+                $this->logger->error('Error generating activities for a deleted addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof AddressBookShareUpdatedEvent) {
+            try {
+                $this->activityBackend->onAddressbookUpdateShares(
+                    $event->getAddressBookData(),
+                    $event->getOldShares(),
+                    $event->getAdded(),
+                    $event->getRemoved()
+                );
 
-				$this->logger->debug(
-					sprintf('Activity generated for (un)sharing addressbook %d', $event->getAddressBookId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the addressbook creation, so we just log it
-				$this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Activity generated for (un)sharing addressbook %d', $event->getAddressBookId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the addressbook creation, so we just log it
+                $this->logger->error('Error generating activities for (un)sharing addressbook: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Listener/CalendarObjectReminderUpdaterListener.php

Spacing +8 added lines, -8 removed lines

@@ -78,7 +78,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar move, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -93,7 +93,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -114,7 +114,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -129,7 +129,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error creating reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -144,7 +144,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -159,7 +159,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error deleting reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -174,7 +174,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error restoring reminders of a calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}
@@ -189,7 +189,7 @@ 
 				);
 			} catch (Throwable $e) {
 				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
+				$this->logger->error('Error cleaning up reminders of a deleted calendar object: '.$e->getMessage(), [
 					'exception' => $e,
 				]);
 			}

Indentation +128 added lines, -128 removed lines

@@ -28,141 +28,141 @@
 /** @template-implements IEventListener<CalendarMovedToTrashEvent|CalendarDeletedEvent|CalendarRestoredEvent|CalendarObjectCreatedEvent|CalendarObjectUpdatedEvent|CalendarObjectMovedToTrashEvent|CalendarObjectRestoredEvent|CalendarObjectDeletedEvent> */
 class CalendarObjectReminderUpdaterListener implements IEventListener {
 
-	public function __construct(
-		private ReminderBackend $reminderBackend,
-		private ReminderService $reminderService,
-		private CalDavBackend $calDavBackend,
-		private LoggerInterface $logger,
-	) {
-	}
+    public function __construct(
+        private ReminderBackend $reminderBackend,
+        private ReminderService $reminderService,
+        private CalDavBackend $calDavBackend,
+        private LoggerInterface $logger,
+    ) {
+    }
 
-	public function handle(Event $event): void {
-		if ($event instanceof CalendarMovedToTrashEvent) {
-			try {
-				$this->reminderBackend->cleanRemindersForCalendar(
-					$event->getCalendarId()
-				);
+    public function handle(Event $event): void {
+        if ($event instanceof CalendarMovedToTrashEvent) {
+            try {
+                $this->reminderBackend->cleanRemindersForCalendar(
+                    $event->getCalendarId()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d cleaned up after move into trashbin', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar move, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarDeletedEvent) {
-			try {
-				$this->reminderBackend->cleanRemindersForCalendar(
-					$event->getCalendarId()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d cleaned up after move into trashbin', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar move, so we just log it
+                $this->logger->error('Error cleaning up reminders of a calendar moved into trashbin: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarDeletedEvent) {
+            try {
+                $this->reminderBackend->cleanRemindersForCalendar(
+                    $event->getCalendarId()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarRestoredEvent) {
-			try {
-				$objects = $this->calDavBackend->getCalendarObjects($event->getCalendarId());
-				$this->logger->debug(sprintf('Restoring calendar reminder objects for %d items', count($objects)));
-				foreach ($objects as $object) {
-					$fullObject = $this->calDavBackend->getCalendarObject(
-						$event->getCalendarId(),
-						$object['uri']
-					);
-					$this->reminderService->onCalendarObjectCreate($fullObject);
-				}
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a deleted calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarRestoredEvent) {
+            try {
+                $objects = $this->calDavBackend->getCalendarObjects($event->getCalendarId());
+                $this->logger->debug(sprintf('Restoring calendar reminder objects for %d items', count($objects)));
+                foreach ($objects as $object) {
+                    $fullObject = $this->calDavBackend->getCalendarObject(
+                        $event->getCalendarId(),
+                        $object['uri']
+                    );
+                    $this->reminderService->onCalendarObjectCreate($fullObject);
+                }
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar %d restored', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectCreatedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectCreate(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar %d restored', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar deletion, so we just log it
+                $this->logger->error('Error restoring reminders of a calendar: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectCreatedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectCreate(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d created', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object creation, so we just log it
-				$this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectUpdatedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectEdit(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d created', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object creation, so we just log it
+                $this->logger->error('Error creating reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectUpdatedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectEdit(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
-			try {
-				$this->reminderService->onCalendarObjectDelete(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectMovedToTrashEvent) {
+            try {
+                $this->reminderService->onCalendarObjectDelete(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of restored calendar object of calendar %d deleted', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectRestoredEvent) {
-			try {
-				$this->reminderService->onCalendarObjectCreate(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of restored calendar object of calendar %d deleted', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error deleting reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectRestoredEvent) {
+            try {
+                $this->reminderService->onCalendarObjectCreate(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of restored calendar object of calendar %d restored', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with reminders shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		} elseif ($event instanceof CalendarObjectDeletedEvent) {
-			try {
-				$this->reminderService->onCalendarObjectDelete(
-					$event->getObjectData()
-				);
+                $this->logger->debug(
+                    sprintf('Reminders of restored calendar object of calendar %d restored', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with reminders shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error restoring reminders of a calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        } elseif ($event instanceof CalendarObjectDeletedEvent) {
+            try {
+                $this->reminderService->onCalendarObjectDelete(
+                    $event->getObjectData()
+                );
 
-				$this->logger->debug(
-					sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
-				);
-			} catch (Throwable $e) {
-				// Any error with activities shouldn't abort the calendar object deletion, so we just log it
-				$this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
-					'exception' => $e,
-				]);
-			}
-		}
-	}
+                $this->logger->debug(
+                    sprintf('Reminders of calendar object of calendar %d cleaned up', $event->getCalendarId())
+                );
+            } catch (Throwable $e) {
+                // Any error with activities shouldn't abort the calendar object deletion, so we just log it
+                $this->logger->error('Error cleaning up reminders of a deleted calendar object: ' . $e->getMessage(), [
+                    'exception' => $e,
+                ]);
+            }
+        }
+    }
 }

apps/dav/lib/Migration/Version1018Date20210312100735.php

Indentation +30 added lines, -30 removed lines

@@ -12,34 +12,34 @@
 
 class Version1018Date20210312100735 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$calendarsTable = $schema->getTable('calendars');
-		$calendarsTable->addColumn('deleted_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
-		$calendarsTable->addIndex([
-			'principaluri',
-			'deleted_at',
-		], 'cals_princ_del_idx');
-
-		$calendarObjectsTable = $schema->getTable('calendarobjects');
-		$calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [
-			'notnull' => false,
-			'length' => 4,
-			'unsigned' => true,
-		]);
-
-		return $schema;
-	}
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $calendarsTable = $schema->getTable('calendars');
+        $calendarsTable->addColumn('deleted_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
+        $calendarsTable->addIndex([
+            'principaluri',
+            'deleted_at',
+        ], 'cals_princ_del_idx');
+
+        $calendarObjectsTable = $schema->getTable('calendarobjects');
+        $calendarObjectsTable->addColumn('deleted_at', Types::INTEGER, [
+            'notnull' => false,
+            'length' => 4,
+            'unsigned' => true,
+        ]);
+
+        return $schema;
+    }
 }