nextcloud / server

lib/public/IConfig.php

Indentation +221 added lines, -221 removed lines

@@ -15,248 +15,248 @@
  * @since 6.0.0
  */
 interface IConfig {
-	/**
-	 * @since 8.2.0
-	 */
-	public const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
+    /**
+     * @since 8.2.0
+     */
+    public const SENSITIVE_VALUE = '***REMOVED SENSITIVE VALUE***';
 
-	/**
-	 * Sets and deletes system wide values
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 * @throws HintException if config file is read-only
-	 * @since 8.0.0
-	 */
-	public function setSystemValues(array $configs);
+    /**
+     * Sets and deletes system wide values
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     * @throws HintException if config file is read-only
+     * @since 8.0.0
+     */
+    public function setSystemValues(array $configs);
 
-	/**
-	 * Sets a new system wide value
-	 *
-	 * @param string $key the key of the value, under which will be saved
-	 * @param mixed $value the value that should be stored
-	 * @throws HintException if config file is read-only
-	 * @since 8.0.0
-	 */
-	public function setSystemValue($key, $value);
+    /**
+     * Sets a new system wide value
+     *
+     * @param string $key the key of the value, under which will be saved
+     * @param mixed $value the value that should be stored
+     * @throws HintException if config file is read-only
+     * @since 8.0.0
+     */
+    public function setSystemValue($key, $value);
 
-	/**
-	 * Looks up a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 * @since 6.0.0 - parameter $default was added in 7.0.0
-	 */
-	public function getSystemValue($key, $default = '');
+    /**
+     * Looks up a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     * @since 6.0.0 - parameter $default was added in 7.0.0
+     */
+    public function getSystemValue($key, $default = '');
 
-	/**
-	 * Looks up a boolean system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param bool $default the default value to be returned if the value isn't set
-	 * @return bool the value or $default
-	 * @since 16.0.0
-	 */
-	public function getSystemValueBool(string $key, bool $default = false): bool;
+    /**
+     * Looks up a boolean system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param bool $default the default value to be returned if the value isn't set
+     * @return bool the value or $default
+     * @since 16.0.0
+     */
+    public function getSystemValueBool(string $key, bool $default = false): bool;
 
-	/**
-	 * Looks up an integer system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param int $default the default value to be returned if the value isn't set
-	 * @return int the value or $default
-	 * @since 16.0.0
-	 */
-	public function getSystemValueInt(string $key, int $default = 0): int;
+    /**
+     * Looks up an integer system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param int $default the default value to be returned if the value isn't set
+     * @return int the value or $default
+     * @since 16.0.0
+     */
+    public function getSystemValueInt(string $key, int $default = 0): int;
 
-	/**
-	 * Looks up a string system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 * @return string the value or $default
-	 * @since 16.0.0
-	 */
-	public function getSystemValueString(string $key, string $default = ''): string;
+    /**
+     * Looks up a string system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     * @return string the value or $default
+     * @since 16.0.0
+     */
+    public function getSystemValueString(string $key, string $default = ''): string;
 
-	/**
-	 * Looks up a system wide defined value and filters out sensitive data
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 * @since 8.2.0
-	 */
-	public function getFilteredSystemValue($key, $default = '');
+    /**
+     * Looks up a system wide defined value and filters out sensitive data
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     * @since 8.2.0
+     */
+    public function getFilteredSystemValue($key, $default = '');
 
-	/**
-	 * Delete a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @since 8.0.0
-	 */
-	public function deleteSystemValue($key);
+    /**
+     * Delete a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @since 8.0.0
+     */
+    public function deleteSystemValue($key);
 
-	/**
-	 * Get all keys stored for an app
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @return string[] the keys stored for the app
-	 * @since 8.0.0
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function getAppKeys($appName);
+    /**
+     * Get all keys stored for an app
+     *
+     * @param string $appName the appName that we stored the value under
+     * @return string[] the keys stored for the app
+     * @since 8.0.0
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function getAppKeys($appName);
 
-	/**
-	 * Writes a new app wide value
-	 *
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key of the value, under which will be saved
-	 * @param string|float|int $value the value that should be stored
-	 * @return void
-	 * @since 6.0.0
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function setAppValue($appName, $key, $value);
+    /**
+     * Writes a new app wide value
+     *
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key of the value, under which will be saved
+     * @param string|float|int $value the value that should be stored
+     * @return void
+     * @since 6.0.0
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function setAppValue($appName, $key, $value);
 
-	/**
-	 * Looks up an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 *
-	 * @return string the saved value
-	 * @since 6.0.0 - parameter $default was added in 7.0.0
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function getAppValue($appName, $key, $default = '');
+    /**
+     * Looks up an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     *
+     * @return string the saved value
+     * @since 6.0.0 - parameter $default was added in 7.0.0
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function getAppValue($appName, $key, $default = '');
 
-	/**
-	 * Delete an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 * @since 8.0.0
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function deleteAppValue($appName, $key);
+    /**
+     * Delete an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     * @since 8.0.0
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function deleteAppValue($appName, $key);
 
-	/**
-	 * Removes all keys in appconfig belonging to the app
-	 *
-	 * @param string $appName the appName the configs are stored under
-	 * @since 8.0.0
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function deleteAppValues($appName);
+    /**
+     * Removes all keys in appconfig belonging to the app
+     *
+     * @param string $appName the appName the configs are stored under
+     * @since 8.0.0
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function deleteAppValues($appName);
 
 
-	/**
-	 * Set a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param string $value the value that you want to store
-	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
-	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
-	 * @since 6.0.0 - parameter $precondition was added in 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig} directly
-	 */
-	public function setUserValue($userId, $appName, $key, $value, $preCondition = null);
+    /**
+     * Set a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @param string $value the value that you want to store
+     * @param string $preCondition only update if the config value was previously the value passed as $preCondition
+     * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
+     * @throws \UnexpectedValueException when trying to store an unexpected value
+     * @since 6.0.0 - parameter $precondition was added in 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig} directly
+     */
+    public function setUserValue($userId, $appName, $key, $value, $preCondition = null);
 
-	/**
-	 * Shortcut for getting a user defined value
-	 *
-	 * @param ?string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return string
-	 * @since 6.0.0 - parameter $default was added in 7.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig} directly
-	 */
-	public function getUserValue($userId, $appName, $key, $default = '');
+    /**
+     * Shortcut for getting a user defined value
+     *
+     * @param ?string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return string
+     * @since 6.0.0 - parameter $default was added in 7.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig} directly
+     */
+    public function getUserValue($userId, $appName, $key, $default = '');
 
-	/**
-	 * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
-	 *
-	 * @param string $appName app to get the value for
-	 * @param string $key the key to get the value for
-	 * @param array $userIds the user IDs to fetch the values for
-	 * @return array Mapped values: userId => value
-	 * @deprecated 33.0.0 - use {@see IUserConfig::getValuesByUsers} directly
-	 * @since 8.0.0
-	 */
-	public function getUserValueForUsers($appName, $key, $userIds);
+    /**
+     * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
+     *
+     * @param string $appName app to get the value for
+     * @param string $key the key to get the value for
+     * @param array $userIds the user IDs to fetch the values for
+     * @return array Mapped values: userId => value
+     * @deprecated 33.0.0 - use {@see IUserConfig::getValuesByUsers} directly
+     * @since 8.0.0
+     */
+    public function getUserValueForUsers($appName, $key, $userIds);
 
-	/**
-	 * Get the keys of all stored by an app for the user
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @return string[]
-	 * @since 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::getKeys} directly
-	 */
-	public function getUserKeys($userId, $appName);
+    /**
+     * Get the keys of all stored by an app for the user
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @return string[]
+     * @since 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::getKeys} directly
+     */
+    public function getUserKeys($userId, $appName);
 
-	/**
-	 * Get all user configs sorted by app of one user
-	 *
-	 * @param string $userId the userId of the user that we want to get all values from
-	 * @psalm-return array<string, array<string, string>>
-	 * @return array[] - 2 dimensional array with the following structure:
-	 *                 [ $appId =>
-	 *                 [ $key => $value ]
-	 *                 ]
-	 * @since 24.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::getAllValues} directly
-	 */
-	public function getAllUserValues(string $userId): array;
+    /**
+     * Get all user configs sorted by app of one user
+     *
+     * @param string $userId the userId of the user that we want to get all values from
+     * @psalm-return array<string, array<string, string>>
+     * @return array[] - 2 dimensional array with the following structure:
+     *                 [ $appId =>
+     *                 [ $key => $value ]
+     *                 ]
+     * @since 24.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::getAllValues} directly
+     */
+    public function getAllUserValues(string $userId): array;
 
-	/**
-	 * Delete a user value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 * @since 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::deleteUserConfig} directly
-	 */
-	public function deleteUserValue($userId, $appName, $key);
+    /**
+     * Delete a user value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     * @since 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::deleteUserConfig} directly
+     */
+    public function deleteUserValue($userId, $appName, $key);
 
-	/**
-	 * Delete all user values
-	 *
-	 * @param string $userId the userId of the user that we want to remove all values from
-	 * @since 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::deleteAllUserConfig} directly
-	 */
-	public function deleteAllUserValues($userId);
+    /**
+     * Delete all user values
+     *
+     * @param string $userId the userId of the user that we want to remove all values from
+     * @since 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::deleteAllUserConfig} directly
+     */
+    public function deleteAllUserValues($userId);
 
-	/**
-	 * Delete all user related values of one app
-	 *
-	 * @param string $appName the appName of the app that we want to remove all values from
-	 * @since 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::deleteApp} directly
-	 */
-	public function deleteAppFromAllUsers($appName);
+    /**
+     * Delete all user related values of one app
+     *
+     * @param string $appName the appName of the app that we want to remove all values from
+     * @since 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::deleteApp} directly
+     */
+    public function deleteAppFromAllUsers($appName);
 
-	/**
-	 * Determines the users that have the given value set for a specific app-key-pair
-	 *
-	 * @param string $appName the app to get the user for
-	 * @param string $key the key to get the user for
-	 * @param string $value the value to get the user for
-	 * @return list<string> of user IDs
-	 * @since 33.0.0 return type of `list<string>`
-	 * @since 8.0.0
-	 * @deprecated 33.0.0 - use {@see IUserConfig::searchUsersByValueString} directly
-	 */
-	public function getUsersForUserValue($appName, $key, $value);
+    /**
+     * Determines the users that have the given value set for a specific app-key-pair
+     *
+     * @param string $appName the app to get the user for
+     * @param string $key the key to get the user for
+     * @param string $value the value to get the user for
+     * @return list<string> of user IDs
+     * @since 33.0.0 return type of `list<string>`
+     * @since 8.0.0
+     * @deprecated 33.0.0 - use {@see IUserConfig::searchUsersByValueString} directly
+     */
+    public function getUsersForUserValue($appName, $key, $value);
 }

lib/private/AllConfig.php

Indentation +306 added lines, -306 removed lines

@@ -18,337 +18,337 @@
  * Class to combine all the configuration options Nextcloud offers
  */
 class AllConfig implements IConfig {
-	public function __construct(
-		private SystemConfig $systemConfig,
-	) {
-	}
+    public function __construct(
+        private SystemConfig $systemConfig,
+    ) {
+    }
 
-	/**
-	 * Sets and deletes system-wide values
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setSystemValues(array $configs) {
-		$this->systemConfig->setValues($configs);
-	}
+    /**
+     * Sets and deletes system-wide values
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setSystemValues(array $configs) {
+        $this->systemConfig->setValues($configs);
+    }
 
-	/**
-	 * Sets a new system-wide value
-	 *
-	 * @param string $key the key of the value, under which will be saved
-	 * @param mixed $value the value that should be stored
-	 */
-	public function setSystemValue($key, $value) {
-		$this->systemConfig->setValue($key, $value);
-	}
+    /**
+     * Sets a new system-wide value
+     *
+     * @param string $key the key of the value, under which will be saved
+     * @param mixed $value the value that should be stored
+     */
+    public function setSystemValue($key, $value) {
+        $this->systemConfig->setValue($key, $value);
+    }
 
-	/**
-	 * Looks up a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getSystemValue($key, $default = '') {
-		return $this->systemConfig->getValue($key, $default);
-	}
+    /**
+     * Looks up a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getSystemValue($key, $default = '') {
+        return $this->systemConfig->getValue($key, $default);
+    }
 
-	/**
-	 * Looks up a boolean system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param bool $default the default value to be returned if the value isn't set
-	 *
-	 * @return bool
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueBool(string $key, bool $default = false): bool {
-		return (bool)$this->getSystemValue($key, $default);
-	}
+    /**
+     * Looks up a boolean system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param bool $default the default value to be returned if the value isn't set
+     *
+     * @return bool
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueBool(string $key, bool $default = false): bool {
+        return (bool)$this->getSystemValue($key, $default);
+    }
 
-	/**
-	 * Looks up an integer system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param int $default the default value to be returned if the value isn't set
-	 *
-	 * @return int
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueInt(string $key, int $default = 0): int {
-		return (int)$this->getSystemValue($key, $default);
-	}
+    /**
+     * Looks up an integer system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param int $default the default value to be returned if the value isn't set
+     *
+     * @return int
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueInt(string $key, int $default = 0): int {
+        return (int)$this->getSystemValue($key, $default);
+    }
 
-	/**
-	 * Looks up a string system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 *
-	 * @return string
-	 *
-	 * @since 16.0.0
-	 */
-	public function getSystemValueString(string $key, string $default = ''): string {
-		return (string)$this->getSystemValue($key, $default);
-	}
+    /**
+     * Looks up a string system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     *
+     * @return string
+     *
+     * @since 16.0.0
+     */
+    public function getSystemValueString(string $key, string $default = ''): string {
+        return (string)$this->getSystemValue($key, $default);
+    }
 
-	/**
-	 * Looks up a system wide defined value and filters out sensitive data
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 * @return mixed the value or $default
-	 */
-	public function getFilteredSystemValue($key, $default = '') {
-		return $this->systemConfig->getFilteredValue($key, $default);
-	}
+    /**
+     * Looks up a system wide defined value and filters out sensitive data
+     *
+     * @param string $key the key of the value, under which it was saved
+     * @param mixed $default the default value to be returned if the value isn't set
+     * @return mixed the value or $default
+     */
+    public function getFilteredSystemValue($key, $default = '') {
+        return $this->systemConfig->getFilteredValue($key, $default);
+    }
 
-	/**
-	 * Delete a system wide defined value
-	 *
-	 * @param string $key the key of the value, under which it was saved
-	 */
-	public function deleteSystemValue($key) {
-		$this->systemConfig->deleteValue($key);
-	}
+    /**
+     * Delete a system wide defined value
+     *
+     * @param string $key the key of the value, under which it was saved
+     */
+    public function deleteSystemValue($key) {
+        $this->systemConfig->deleteValue($key);
+    }
 
-	/**
-	 * Get all keys stored for an app
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @return string[] the keys stored for the app
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function getAppKeys($appName) {
-		return \OC::$server->get(AppConfig::class)->getKeys($appName);
-	}
+    /**
+     * Get all keys stored for an app
+     *
+     * @param string $appName the appName that we stored the value under
+     * @return string[] the keys stored for the app
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function getAppKeys($appName) {
+        return \OC::$server->get(AppConfig::class)->getKeys($appName);
+    }
 
-	/**
-	 * Writes a new app wide value
-	 *
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key of the value, under which will be saved
-	 * @param string|float|int $value the value that should be stored
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function setAppValue($appName, $key, $value) {
-		\OC::$server->get(AppConfig::class)->setValue($appName, $key, $value);
-	}
+    /**
+     * Writes a new app wide value
+     *
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key of the value, under which will be saved
+     * @param string|float|int $value the value that should be stored
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function setAppValue($appName, $key, $value) {
+        \OC::$server->get(AppConfig::class)->setValue($appName, $key, $value);
+    }
 
-	/**
-	 * Looks up an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
-	 * @return string the saved value
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function getAppValue($appName, $key, $default = '') {
-		return \OC::$server->get(AppConfig::class)->getValue($appName, $key, $default) ?? $default;
-	}
+    /**
+     * Looks up an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     * @param string $default the default value to be returned if the value isn't set
+     * @return string the saved value
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function getAppValue($appName, $key, $default = '') {
+        return \OC::$server->get(AppConfig::class)->getValue($appName, $key, $default) ?? $default;
+    }
 
-	/**
-	 * Delete an app wide defined value
-	 *
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key of the value, under which it was saved
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function deleteAppValue($appName, $key) {
-		\OC::$server->get(AppConfig::class)->deleteKey($appName, $key);
-	}
+    /**
+     * Delete an app wide defined value
+     *
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key of the value, under which it was saved
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function deleteAppValue($appName, $key) {
+        \OC::$server->get(AppConfig::class)->deleteKey($appName, $key);
+    }
 
-	/**
-	 * Removes all keys in appconfig belonging to the app
-	 *
-	 * @param string $appName the appName the configs are stored under
-	 * @deprecated 29.0.0 Use {@see IAppConfig} directly
-	 */
-	public function deleteAppValues($appName) {
-		\OC::$server->get(AppConfig::class)->deleteApp($appName);
-	}
+    /**
+     * Removes all keys in appconfig belonging to the app
+     *
+     * @param string $appName the appName the configs are stored under
+     * @deprecated 29.0.0 Use {@see IAppConfig} directly
+     */
+    public function deleteAppValues($appName) {
+        \OC::$server->get(AppConfig::class)->deleteApp($appName);
+    }
 
 
-	/**
-	 * Set a user defined value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we want to store the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param string|float|int $value the value that you want to store
-	 * @param string $preCondition only update if the config value was previously the value passed as $preCondition
-	 *
-	 * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
-	 * @throws \UnexpectedValueException when trying to store an unexpected value
-	 * @deprecated 31.0.0 - use {@see IUserConfig} directly
-	 * @see IUserConfig::getValueString
-	 * @see IUserConfig::getValueInt
-	 * @see IUserConfig::getValueFloat
-	 * @see IUserConfig::getValueArray
-	 * @see IUserConfig::getValueBool
-	 */
-	public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
-		if (!is_int($value) && !is_float($value) && !is_string($value)) {
-			throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
-		}
+    /**
+     * Set a user defined value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we want to store the value under
+     * @param string $key the key under which the value is being stored
+     * @param string|float|int $value the value that you want to store
+     * @param string $preCondition only update if the config value was previously the value passed as $preCondition
+     *
+     * @throws \OCP\PreConditionNotMetException if a precondition is specified and is not met
+     * @throws \UnexpectedValueException when trying to store an unexpected value
+     * @deprecated 31.0.0 - use {@see IUserConfig} directly
+     * @see IUserConfig::getValueString
+     * @see IUserConfig::getValueInt
+     * @see IUserConfig::getValueFloat
+     * @see IUserConfig::getValueArray
+     * @see IUserConfig::getValueBool
+     */
+    public function setUserValue($userId, $appName, $key, $value, $preCondition = null) {
+        if (!is_int($value) && !is_float($value) && !is_string($value)) {
+            throw new \UnexpectedValueException('Only integers, floats and strings are allowed as value');
+        }
 
-		/** @var UserConfig $userPreferences */
-		$userPreferences = \OCP\Server::get(IUserConfig::class);
-		if ($preCondition !== null) {
-			try {
-				if ($userPreferences->hasKey($userId, $appName, $key) && $userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {
-					throw new PreConditionNotMetException();
-				}
-			} catch (TypeConflictException) {
-			}
-		}
+        /** @var UserConfig $userPreferences */
+        $userPreferences = \OCP\Server::get(IUserConfig::class);
+        if ($preCondition !== null) {
+            try {
+                if ($userPreferences->hasKey($userId, $appName, $key) && $userPreferences->getValueMixed($userId, $appName, $key) !== (string)$preCondition) {
+                    throw new PreConditionNotMetException();
+                }
+            } catch (TypeConflictException) {
+            }
+        }
 
-		$userPreferences->setValueMixed($userId, $appName, $key, (string)$value);
-	}
+        $userPreferences->setValueMixed($userId, $appName, $key, (string)$value);
+    }
 
-	/**
-	 * Getting a user defined value
-	 *
-	 * @param ?string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 * @param mixed $default the default value to be returned if the value isn't set
-	 *
-	 * @return string
-	 * @deprecated 31.0.0 - use {@see IUserConfig} directly
-	 * @see IUserConfig::getValueString
-	 * @see IUserConfig::getValueInt
-	 * @see IUserConfig::getValueFloat
-	 * @see IUserConfig::getValueArray
-	 * @see IUserConfig::getValueBool
-	 */
-	public function getUserValue($userId, $appName, $key, $default = '') {
-		if ($userId === null || $userId === '') {
-			return $default;
-		}
-		/** @var UserConfig $userPreferences */
-		$userPreferences = \OCP\Server::get(IUserConfig::class);
-		// because $default can be null ...
-		if (!$userPreferences->hasKey($userId, $appName, $key)) {
-			return $default;
-		}
-		return $userPreferences->getValueMixed($userId, $appName, $key, $default ?? '');
-	}
+    /**
+     * Getting a user defined value
+     *
+     * @param ?string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     * @param mixed $default the default value to be returned if the value isn't set
+     *
+     * @return string
+     * @deprecated 31.0.0 - use {@see IUserConfig} directly
+     * @see IUserConfig::getValueString
+     * @see IUserConfig::getValueInt
+     * @see IUserConfig::getValueFloat
+     * @see IUserConfig::getValueArray
+     * @see IUserConfig::getValueBool
+     */
+    public function getUserValue($userId, $appName, $key, $default = '') {
+        if ($userId === null || $userId === '') {
+            return $default;
+        }
+        /** @var UserConfig $userPreferences */
+        $userPreferences = \OCP\Server::get(IUserConfig::class);
+        // because $default can be null ...
+        if (!$userPreferences->hasKey($userId, $appName, $key)) {
+            return $default;
+        }
+        return $userPreferences->getValueMixed($userId, $appName, $key, $default ?? '');
+    }
 
-	/**
-	 * Get the keys of all stored by an app for the user
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 *
-	 * @return string[]
-	 * @deprecated 31.0.0 - use {@see IUserConfig::getKeys} directly
-	 */
-	public function getUserKeys($userId, $appName) {
-		return \OCP\Server::get(IUserConfig::class)->getKeys($userId, $appName);
-	}
+    /**
+     * Get the keys of all stored by an app for the user
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     *
+     * @return string[]
+     * @deprecated 31.0.0 - use {@see IUserConfig::getKeys} directly
+     */
+    public function getUserKeys($userId, $appName) {
+        return \OCP\Server::get(IUserConfig::class)->getKeys($userId, $appName);
+    }
 
-	/**
-	 * Delete a user value
-	 *
-	 * @param string $userId the userId of the user that we want to store the value under
-	 * @param string $appName the appName that we stored the value under
-	 * @param string $key the key under which the value is being stored
-	 *
-	 * @deprecated 31.0.0 - use {@see IUserConfig::deleteUserConfig} directly
-	 */
-	public function deleteUserValue($userId, $appName, $key) {
-		\OCP\Server::get(IUserConfig::class)->deleteUserConfig($userId, $appName, $key);
-	}
+    /**
+     * Delete a user value
+     *
+     * @param string $userId the userId of the user that we want to store the value under
+     * @param string $appName the appName that we stored the value under
+     * @param string $key the key under which the value is being stored
+     *
+     * @deprecated 31.0.0 - use {@see IUserConfig::deleteUserConfig} directly
+     */
+    public function deleteUserValue($userId, $appName, $key) {
+        \OCP\Server::get(IUserConfig::class)->deleteUserConfig($userId, $appName, $key);
+    }
 
-	/**
-	 * Delete all user values
-	 *
-	 * @param string $userId the userId of the user that we want to remove all values from
-	 *
-	 * @deprecated 31.0.0 - use {@see IUserConfig::deleteAllUserConfig} directly
-	 */
-	public function deleteAllUserValues($userId) {
-		if ($userId === null) {
-			return;
-		}
-		\OCP\Server::get(IUserConfig::class)->deleteAllUserConfig($userId);
-	}
+    /**
+     * Delete all user values
+     *
+     * @param string $userId the userId of the user that we want to remove all values from
+     *
+     * @deprecated 31.0.0 - use {@see IUserConfig::deleteAllUserConfig} directly
+     */
+    public function deleteAllUserValues($userId) {
+        if ($userId === null) {
+            return;
+        }
+        \OCP\Server::get(IUserConfig::class)->deleteAllUserConfig($userId);
+    }
 
-	/**
-	 * Delete all user related values of one app
-	 *
-	 * @param string $appName the appName of the app that we want to remove all values from
-	 *
-	 * @deprecated 31.0.0 - use {@see IUserConfig::deleteApp} directly
-	 */
-	public function deleteAppFromAllUsers($appName) {
-		\OCP\Server::get(IUserConfig::class)->deleteApp($appName);
-	}
+    /**
+     * Delete all user related values of one app
+     *
+     * @param string $appName the appName of the app that we want to remove all values from
+     *
+     * @deprecated 31.0.0 - use {@see IUserConfig::deleteApp} directly
+     */
+    public function deleteAppFromAllUsers($appName) {
+        \OCP\Server::get(IUserConfig::class)->deleteApp($appName);
+    }
 
-	/**
-	 * Returns all user configs sorted by app of one user
-	 *
-	 * @param ?string $userId the user ID to get the app configs from
-	 *
-	 * @psalm-return array<string, array<string, string>>
-	 * @return array[] - 2 dimensional array with the following structure:
-	 *                 [ $appId =>
-	 *                 [ $key => $value ]
-	 *                 ]
-	 * @deprecated 31.0.0 - use {@see IUserConfig::getAllValues} directly
-	 */
-	public function getAllUserValues(?string $userId): array {
-		if ($userId === null || $userId === '') {
-			return [];
-		}
+    /**
+     * Returns all user configs sorted by app of one user
+     *
+     * @param ?string $userId the user ID to get the app configs from
+     *
+     * @psalm-return array<string, array<string, string>>
+     * @return array[] - 2 dimensional array with the following structure:
+     *                 [ $appId =>
+     *                 [ $key => $value ]
+     *                 ]
+     * @deprecated 31.0.0 - use {@see IUserConfig::getAllValues} directly
+     */
+    public function getAllUserValues(?string $userId): array {
+        if ($userId === null || $userId === '') {
+            return [];
+        }
 
-		$values = \OCP\Server::get(IUserConfig::class)->getAllValues($userId);
-		$result = [];
-		foreach ($values as $app => $list) {
-			foreach ($list as $key => $value) {
-				$result[$app][$key] = (string)$value;
-			}
-		}
-		return $result;
-	}
+        $values = \OCP\Server::get(IUserConfig::class)->getAllValues($userId);
+        $result = [];
+        foreach ($values as $app => $list) {
+            foreach ($list as $key => $value) {
+                $result[$app][$key] = (string)$value;
+            }
+        }
+        return $result;
+    }
 
-	/**
-	 * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
-	 *
-	 * @param string $appName app to get the value for
-	 * @param string $key the key to get the value for
-	 * @param array $userIds the user IDs to fetch the values for
-	 *
-	 * @return array Mapped values: userId => value
-	 * @deprecated 31.0.0 - use {@see IUserConfig::getValuesByUsers} directly
-	 */
-	public function getUserValueForUsers($appName, $key, $userIds) {
-		return \OCP\Server::get(IUserConfig::class)->getValuesByUsers($appName, $key, ValueType::MIXED, $userIds);
-	}
+    /**
+     * Fetches a mapped list of userId -> value, for a specified app and key and a list of user IDs.
+     *
+     * @param string $appName app to get the value for
+     * @param string $key the key to get the value for
+     * @param array $userIds the user IDs to fetch the values for
+     *
+     * @return array Mapped values: userId => value
+     * @deprecated 31.0.0 - use {@see IUserConfig::getValuesByUsers} directly
+     */
+    public function getUserValueForUsers($appName, $key, $userIds) {
+        return \OCP\Server::get(IUserConfig::class)->getValuesByUsers($appName, $key, ValueType::MIXED, $userIds);
+    }
 
-	/**
-	 * Determines the users that have the given value set for a specific app-key-pair
-	 *
-	 * @param string $appName the app to get the user for
-	 * @param string $key the key to get the user for
-	 * @param string $value the value to get the user for
-	 *
-	 * @return list<string> of user IDs
-	 * @deprecated 31.0.0 - use {@see IUserConfig::searchUsersByValueString} directly
-	 */
-	public function getUsersForUserValue($appName, $key, $value) {
-		/** @var list<string> $result */
-		$result = iterator_to_array(\OCP\Server::get(IUserConfig::class)->searchUsersByValueString($appName, $key, $value));
-		return $result;
-	}
+    /**
+     * Determines the users that have the given value set for a specific app-key-pair
+     *
+     * @param string $appName the app to get the user for
+     * @param string $key the key to get the user for
+     * @param string $value the value to get the user for
+     *
+     * @return list<string> of user IDs
+     * @deprecated 31.0.0 - use {@see IUserConfig::searchUsersByValueString} directly
+     */
+    public function getUsersForUserValue($appName, $key, $value) {
+        /** @var list<string> $result */
+        $result = iterator_to_array(\OCP\Server::get(IUserConfig::class)->searchUsersByValueString($appName, $key, $value));
+        return $result;
+    }
 
-	public function getSystemConfig() {
-		return $this->systemConfig;
-	}
+    public function getSystemConfig() {
+        return $this->systemConfig;
+    }
 }

lib/private/Server.php

Indentation +1392 added lines, -1392 removed lines

@@ -259,1436 +259,1436 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
-			return new Watcher(
-				$c->get(\OC\Preview\Storage\StorageFactory::class),
-				$c->get(PreviewMapper::class),
-				$c->get(IDBConnection::class),
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IAppConfig::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$logger = $c->get(LoggerInterface::class);
-			$serverVersion = $c->get(ServerVersion::class);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				return new \OC\Memcache\Factory(
-					$logger,
-					$profiler,
-					$serverVersion,
-					ArrayCache::class,
-					ArrayCache::class,
-					ArrayCache::class
-				);
-			}
-
-			return new \OC\Memcache\Factory(
-				$logger,
-				$profiler,
-				$serverVersion,
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.local', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.distributed', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.locking', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('redis_log_file')
-			);
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n,
-				$c->get(ITimeFactory::class),
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->get(IAppDataFactory::class)->get('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->get(IAppDataFactory::class)->get('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					new AppConfig(
-						$c->get(\OCP\IConfig::class),
-						$c->get(\OCP\IAppConfig::class),
-						'theming',
-					),
-					$c->get(IUserConfig::class),
-					$c->get(IFactory::class)->get('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util(
-						$c->get(ServerVersion::class),
-						$c->get(\OCP\IConfig::class),
-						$this->get(IAppManager::class),
-						$c->get(IAppDataFactory::class)->get('theming'),
-						$imageManager,
-					),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserByMailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
+            return new Watcher(
+                $c->get(\OC\Preview\Storage\StorageFactory::class),
+                $c->get(PreviewMapper::class),
+                $c->get(IDBConnection::class),
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IAppConfig::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerAlias(ICache::class, Cache\File::class);
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $logger = $c->get(LoggerInterface::class);
+            $serverVersion = $c->get(ServerVersion::class);
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                return new \OC\Memcache\Factory(
+                    $logger,
+                    $profiler,
+                    $serverVersion,
+                    ArrayCache::class,
+                    ArrayCache::class,
+                    ArrayCache::class
+                );
+            }
+
+            return new \OC\Memcache\Factory(
+                $logger,
+                $profiler,
+                $serverVersion,
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.local', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.distributed', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.locking', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('redis_log_file')
+            );
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n,
+                $c->get(ITimeFactory::class),
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->get(IAppDataFactory::class)->get('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(IAppDataFactory::class)->get('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    new AppConfig(
+                        $c->get(\OCP\IConfig::class),
+                        $c->get(\OCP\IAppConfig::class),
+                        'theming',
+                    ),
+                    $c->get(IUserConfig::class),
+                    $c->get(IFactory::class)->get('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util(
+                        $c->get(ServerVersion::class),
+                        $c->get(\OCP\IConfig::class),
+                        $this->get(IAppManager::class),
+                        $c->get(IAppDataFactory::class)->get('theming'),
+                        $imageManager,
+                    ),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserByMailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->registerAlias(IGenerator::class, Generator::class);
-		$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
-			if (PHP_SAPI !== 'cli') {
-				$sequence = $c->get(APCuSequence::class);
-				if ($sequence->isAvailable()) {
-					return $sequence;
-				}
-			}
-
-			return $c->get(FileSequence::class);
-		}, false);
-		$this->registerAlias(IDecoder::class, Decoder::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+        $this->registerAlias(IGenerator::class, Generator::class);
+        $this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
+            if (PHP_SAPI !== 'cli') {
+                $sequence = $c->get(APCuSequence::class);
+                if ($sequence->isAvailable()) {
+                    return $sequence;
+                }
+            }
+
+            return $c->get(FileSequence::class);
+        }, false);
+        $this->registerAlias(IDecoder::class, Decoder::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/private/User/Manager.php

Indentation +777 added lines, -777 removed lines

@@ -54,781 +54,781 @@
  * @package OC\User
  */
 class Manager extends PublicEmitter implements IUserManager {
-	/**
-	 * @var UserInterface[] $backends
-	 */
-	private array $backends = [];
-
-	/**
-	 * @var array<string,\OC\User\User> $cachedUsers
-	 */
-	private array $cachedUsers = [];
-
-	private ICache $cache;
-
-	private DisplayNameCache $displayNameCache;
-
-	// This constructor can't autoload any class requiring a DB connection.
-	public function __construct(
-		private IConfig $config,
-		ICacheFactory $cacheFactory,
-		private IEventDispatcher $eventDispatcher,
-		private LoggerInterface $logger,
-	) {
-		$this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
-		$this->listen('\OC\User', 'postDelete', function (IUser $user): void {
-			unset($this->cachedUsers[$user->getUID()]);
-		});
-		$this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
-	}
-
-	/**
-	 * Get the active backends
-	 * @return UserInterface[]
-	 */
-	public function getBackends(): array {
-		return $this->backends;
-	}
-
-	public function registerBackend(UserInterface $backend): void {
-		$this->backends[] = $backend;
-	}
-
-	public function removeBackend(UserInterface $backend): void {
-		$this->cachedUsers = [];
-		if (($i = array_search($backend, $this->backends)) !== false) {
-			unset($this->backends[$i]);
-		}
-	}
-
-	public function clearBackends(): void {
-		$this->cachedUsers = [];
-		$this->backends = [];
-	}
-
-	/**
-	 * get a user by user id
-	 *
-	 * @param string $uid
-	 * @return \OC\User\User|null Either the user or null if the specified user does not exist
-	 */
-	public function get($uid) {
-		if (is_null($uid) || $uid === '' || $uid === false) {
-			return null;
-		}
-		if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
-			return $this->cachedUsers[$uid];
-		}
-
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			return null;
-		}
-
-		$cachedBackend = $this->cache->get(sha1($uid));
-		if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
-			// Cache has the info of the user backend already, so ask that one directly
-			$backend = $this->backends[$cachedBackend];
-			if ($backend->userExists($uid)) {
-				return $this->getUserObject($uid, $backend);
-			}
-		}
-
-		foreach ($this->backends as $i => $backend) {
-			if ($i === $cachedBackend) {
-				// Tried that one already
-				continue;
-			}
-
-			if ($backend->userExists($uid)) {
-				// Hash $uid to ensure that only valid characters are used for the cache key
-				$this->cache->set(sha1($uid), $i, 300);
-				return $this->getUserObject($uid, $backend);
-			}
-		}
-		return null;
-	}
-
-	public function getDisplayName(string $uid): ?string {
-		return $this->displayNameCache->getDisplayName($uid);
-	}
-
-	/**
-	 * get or construct the user object
-	 *
-	 * @param string $uid
-	 * @param \OCP\UserInterface $backend
-	 * @param bool $cacheUser If false the newly created user object will not be cached
-	 * @return \OC\User\User
-	 */
-	public function getUserObject($uid, $backend, $cacheUser = true) {
-		if ($backend instanceof IGetRealUIDBackend) {
-			$uid = $backend->getRealUID($uid);
-		}
-
-		if (isset($this->cachedUsers[$uid])) {
-			return $this->cachedUsers[$uid];
-		}
-
-		$user = new User($uid, $backend, $this->eventDispatcher, $this, $this->config);
-		if ($cacheUser) {
-			$this->cachedUsers[$uid] = $user;
-		}
-		return $user;
-	}
-
-	/**
-	 * check if a user exists
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function userExists($uid) {
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			return false;
-		}
-
-		$user = $this->get($uid);
-		return ($user !== null);
-	}
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @param string $loginName
-	 * @param string $password
-	 * @return IUser|false the User object on success, false otherwise
-	 */
-	public function checkPassword($loginName, $password) {
-		$result = $this->checkPasswordNoLogging($loginName, $password);
-
-		if ($result === false) {
-			$this->logger->warning('Login failed: \'' . $loginName . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Check if the password is valid for the user
-	 *
-	 * @internal
-	 * @param string $loginName
-	 * @param string $password
-	 * @return IUser|false the User object on success, false otherwise
-	 */
-	public function checkPasswordNoLogging($loginName, $password) {
-		$loginName = str_replace("\0", '', $loginName);
-		$password = str_replace("\0", '', $password);
-
-		$cachedBackend = $this->cache->get($loginName);
-		if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
-			$backends = [$this->backends[$cachedBackend]];
-		} else {
-			$backends = $this->backends;
-		}
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
-				/** @var ICheckPasswordBackend $backend */
-				$uid = $backend->checkPassword($loginName, $password);
-				if ($uid !== false) {
-					return $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		// since http basic auth doesn't provide a standard way of handling non ascii password we allow password to be urlencoded
-		// we only do this decoding after using the plain password fails to maintain compatibility with any password that happens
-		// to contain urlencoded patterns by "accident".
-		$password = urldecode($password);
-
-		foreach ($backends as $backend) {
-			if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
-				/** @var ICheckPasswordBackend|UserInterface $backend */
-				$uid = $backend->checkPassword($loginName, $password);
-				if ($uid !== false) {
-					return $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public function search($pattern, $limit = null, $offset = null) {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			$backendUsers = $backend->getUsers($pattern, $limit, $offset);
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid) {
-					$users[$uid] = new LazyUser($uid, $this, null, $backend);
-				}
-			}
-		}
-
-		uasort($users, function (IUser $a, IUser $b) {
-			return strcasecmp($a->getUID(), $b->getUID());
-		});
-		return $users;
-	}
-
-	public function searchDisplayName($pattern, $limit = null, $offset = null) {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid => $displayName) {
-					$users[] = new LazyUser($uid, $this, $displayName, $backend);
-				}
-			}
-		}
-
-		usort($users, function (IUser $a, IUser $b) {
-			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
-		});
-		return $users;
-	}
-
-	/**
-	 * @return IUser[]
-	 */
-	public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
-		$users = $this->config->getUsersForUserValue('core', 'enabled', 'false');
-		$users = array_combine(
-			$users,
-			array_map(
-				fn (string $uid): IUser => new LazyUser($uid, $this),
-				$users
-			)
-		);
-		if ($search !== '') {
-			$users = array_filter(
-				$users,
-				function (IUser $user) use ($search): bool {
-					try {
-						return mb_stripos($user->getUID(), $search) !== false
-						|| mb_stripos($user->getDisplayName(), $search) !== false
-						|| mb_stripos($user->getEMailAddress() ?? '', $search) !== false;
-					} catch (NoUserException $ex) {
-						$this->logger->error('Error while filtering disabled users', ['exception' => $ex, 'userUID' => $user->getUID()]);
-						return false;
-					}
-				});
-		}
-
-		$tempLimit = ($limit === null ? null : $limit + $offset);
-		foreach ($this->backends as $backend) {
-			if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
-				break;
-			}
-			if ($backend instanceof IProvideEnabledStateBackend) {
-				$backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)), 0, $search);
-				foreach ($backendUsers as $uid) {
-					$users[$uid] = new LazyUser($uid, $this, null, $backend);
-				}
-			}
-		}
-
-		return array_slice($users, $offset, $limit);
-	}
-
-	/**
-	 * Search known users (from phonebook sync) by displayName
-	 *
-	 * @param string $searcher
-	 * @param string $pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return IUser[]
-	 */
-	public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array {
-		$users = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof ISearchKnownUsersBackend) {
-				$backendUsers = $backend->searchKnownUsersByDisplayName($searcher, $pattern, $limit, $offset);
-			} else {
-				// Better than nothing, but filtering after pagination can remove lots of results.
-				$backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
-			}
-			if (is_array($backendUsers)) {
-				foreach ($backendUsers as $uid => $displayName) {
-					$users[] = $this->getUserObject($uid, $backend);
-				}
-			}
-		}
-
-		usort($users, function ($a, $b) {
-			/**
-			 * @var IUser $a
-			 * @var IUser $b
-			 */
-			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
-		});
-		return $users;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @return false|IUser the created user or false
-	 * @throws \InvalidArgumentException
-	 * @throws HintException
-	 */
-	public function createUser($uid, $password) {
-		// DI injection is not used here as IRegistry needs the user manager itself for user count and thus it would create a cyclic dependency
-		/** @var IAssertion $assertion */
-		$assertion = \OC::$server->get(IAssertion::class);
-		$assertion->createUserIsLegit();
-
-		$localBackends = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof Database) {
-				// First check if there is another user backend
-				$localBackends[] = $backend;
-				continue;
-			}
-
-			if ($backend->implementsActions(Backend::CREATE_USER)) {
-				return $this->createUserFromBackend($uid, $password, $backend);
-			}
-		}
-
-		foreach ($localBackends as $backend) {
-			if ($backend->implementsActions(Backend::CREATE_USER)) {
-				return $this->createUserFromBackend($uid, $password, $backend);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param string $password
-	 * @param UserInterface $backend
-	 * @return IUser|false
-	 * @throws \InvalidArgumentException
-	 */
-	public function createUserFromBackend($uid, $password, UserInterface $backend) {
-		$l = \OCP\Util::getL10N('lib');
-
-		$this->validateUserId($uid, true);
-
-		// No empty password
-		if (trim($password) === '') {
-			throw new \InvalidArgumentException($l->t('A valid password must be provided'));
-		}
-
-		// Check if user already exists
-		if ($this->userExists($uid)) {
-			throw new \InvalidArgumentException($l->t('The Login is already being used'));
-		}
-
-		/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-		$this->emit('\OC\User', 'preCreateUser', [$uid, $password]);
-		$this->eventDispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
-		$state = $backend->createUser($uid, $password);
-		if ($state === false) {
-			throw new \InvalidArgumentException($l->t('Could not create account'));
-		}
-		$user = $this->getUserObject($uid, $backend);
-		if ($user instanceof IUser) {
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$this->emit('\OC\User', 'postCreateUser', [$user, $password]);
-			$this->eventDispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
-			return $user;
-		}
-		return false;
-	}
-
-	/**
-	 * returns how many users per backend exist (if supported by backend)
-	 *
-	 * @param boolean $hasLoggedIn when true only users that have a lastLogin
-	 *                             entry in the preferences table will be affected
-	 * @return array<string, int> an array of backend class as key and count number as value
-	 */
-	public function countUsers() {
-		$userCountStatistics = [];
-		foreach ($this->backends as $backend) {
-			if ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend|IUserBackend $backend */
-				$backendUsers = $backend->countUsers();
-				if ($backendUsers !== false) {
-					if ($backend instanceof IUserBackend) {
-						$name = $backend->getBackendName();
-					} else {
-						$name = get_class($backend);
-					}
-					if (isset($userCountStatistics[$name])) {
-						$userCountStatistics[$name] += $backendUsers;
-					} else {
-						$userCountStatistics[$name] = $backendUsers;
-					}
-				}
-			}
-		}
-		return $userCountStatistics;
-	}
-
-	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
-		$userCount = false;
-
-		foreach ($this->backends as $backend) {
-			if ($onlyMappedUsers && $backend instanceof ICountMappedUsersBackend) {
-				$backendUsers = $backend->countMappedUsers();
-			} elseif ($backend instanceof ILimitAwareCountUsersBackend) {
-				$backendUsers = $backend->countUsers($limit);
-			} elseif ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
-				/** @var ICountUsersBackend $backend */
-				$backendUsers = $backend->countUsers();
-			} else {
-				$this->logger->debug('Skip backend for user count: ' . get_class($backend));
-				continue;
-			}
-			if ($backendUsers !== false) {
-				$userCount = (int)$userCount + $backendUsers;
-				if ($limit > 0) {
-					if ($userCount >= $limit) {
-						break;
-					}
-					$limit -= $userCount;
-				}
-			} else {
-				$this->logger->warning('Can not determine user count for ' . get_class($backend));
-			}
-		}
-		return $userCount;
-	}
-
-	/**
-	 * returns how many users per backend exist in the requested groups (if supported by backend)
-	 *
-	 * @param IGroup[] $groups an array of groups to search in
-	 * @param int $limit limit to stop counting
-	 * @return array{int,int} total number of users, and number of disabled users in the given groups, below $limit. If limit is reached, -1 is returned for number of disabled users
-	 */
-	public function countUsersAndDisabledUsersOfGroups(array $groups, int $limit): array {
-		$users = [];
-		$disabled = [];
-		foreach ($groups as $group) {
-			foreach ($group->getUsers() as $user) {
-				$users[$user->getUID()] = 1;
-				if (!$user->isEnabled()) {
-					$disabled[$user->getUID()] = 1;
-				}
-				if (count($users) >= $limit) {
-					return [count($users),-1];
-				}
-			}
-		}
-		return [count($users),count($disabled)];
-	}
-
-	/**
-	 * The callback is executed for each user on each backend.
-	 * If the callback returns false no further users will be retrieved.
-	 *
-	 * @psalm-param \Closure(\OCP\IUser):?bool $callback
-	 * @param string $search
-	 * @param boolean $onlySeen when true only users that have a lastLogin entry
-	 *                          in the preferences table will be affected
-	 * @since 9.0.0
-	 */
-	public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = false) {
-		if ($onlySeen) {
-			$this->callForSeenUsers($callback);
-		} else {
-			foreach ($this->getBackends() as $backend) {
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers($search, $limit, $offset);
-					foreach ($users as $uid) {
-						if (!$backend->userExists($uid)) {
-							continue;
-						}
-						$user = $this->getUserObject($uid, $backend, false);
-						$return = $callback($user);
-						if ($return === false) {
-							break;
-						}
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
-
-	/**
-	 * returns how many users are disabled
-	 *
-	 * @return int
-	 * @since 12.0.0
-	 */
-	public function countDisabledUsers(): int {
-		$queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('*'))
-			->from('preferences')
-			->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core')))
-			->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('enabled')))
-			->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR));
-
-
-		$result = $queryBuilder->executeQuery();
-		$count = $result->fetchOne();
-		$result->closeCursor();
-
-		if ($count !== false) {
-			$count = (int)$count;
-		} else {
-			$count = 0;
-		}
-
-		return $count;
-	}
-
-	/**
-	 * returns how many users have logged in once
-	 *
-	 * @return int
-	 * @since 11.0.0
-	 */
-	public function countSeenUsers() {
-		$queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('*'))
-			->from('preferences')
-			->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
-			->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastLogin')));
-
-		$query = $queryBuilder->executeQuery();
-
-		$result = (int)$query->fetchOne();
-		$query->closeCursor();
-
-		return $result;
-	}
-
-	public function callForSeenUsers(\Closure $callback) {
-		$users = $this->getSeenUsers();
-		foreach ($users as $user) {
-			$return = $callback($user);
-			if ($return === false) {
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Getting all userIds that have a lastLogin value requires checking the
-	 * value in php because on oracle you cannot use a clob in a where clause,
-	 * preventing us from doing a not null or length(value) > 0 check.
-	 *
-	 * @param int $limit
-	 * @param int $offset
-	 * @return string[] with user ids
-	 */
-	private function getSeenUserIds($limit = null, $offset = null) {
-		$queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
-		$queryBuilder->select(['userid'])
-			->from('preferences')
-			->where($queryBuilder->expr()->eq(
-				'appid', $queryBuilder->createNamedParameter('login'))
-			)
-			->andWhere($queryBuilder->expr()->eq(
-				'configkey', $queryBuilder->createNamedParameter('lastLogin'))
-			)
-			->andWhere($queryBuilder->expr()->isNotNull('configvalue')
-			);
-
-		if ($limit !== null) {
-			$queryBuilder->setMaxResults($limit);
-		}
-		if ($offset !== null) {
-			$queryBuilder->setFirstResult($offset);
-		}
-		$query = $queryBuilder->executeQuery();
-		$result = [];
-
-		while ($row = $query->fetch()) {
-			$result[] = $row['userid'];
-		}
-
-		$query->closeCursor();
-
-		return $result;
-	}
-
-	/**
-	 * @internal Only for mocks it in unit tests.
-	 */
-	public function getUserConfig(): IUserConfig {
-		return \OCP\Server::get(IUserConfig::class);
-	}
-
-	/**
-	 * @param string $email
-	 * @return IUser[]
-	 * @since 9.1.0
-	 */
-	public function getByEmail($email): array {
-		$users = [];
-		$userConfig = $this->getUserConfig();
-		// looking for 'email' only (and not primary_mail) is intentional
-		$userIds = $userConfig->searchUsersByValueString('settings', 'email', $email, caseInsensitive: true);
-		foreach ($userIds as $userId) {
-			$user = $this->get($userId);
-			if ($user !== null) {
-				$users[] = $user;
-			}
-		}
-		return $users;
-	}
-
-	/**
-	 * @param string $uid
-	 * @param bool $checkDataDirectory
-	 * @throws \InvalidArgumentException Message is an already translated string with a reason why the id is not valid
-	 * @since 26.0.0
-	 */
-	public function validateUserId(string $uid, bool $checkDataDirectory = false): void {
-		$l = Server::get(IFactory::class)->get('lib');
-
-		// Check the ID for bad characters
-		// Allowed are: "a-z", "A-Z", "0-9", spaces and "_.@-'"
-		if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
-			throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an Login:'
-				. ' "a-z", "A-Z", "0-9", spaces and "_.@-\'"'));
-		}
-
-		// No empty user ID
-		if (trim($uid) === '') {
-			throw new \InvalidArgumentException($l->t('A valid Login must be provided'));
-		}
-
-		// No whitespace at the beginning or at the end
-		if (trim($uid) !== $uid) {
-			throw new \InvalidArgumentException($l->t('Login contains whitespace at the beginning or at the end'));
-		}
-
-		// User ID only consists of 1 or 2 dots (directory traversal)
-		if ($uid === '.' || $uid === '..') {
-			throw new \InvalidArgumentException($l->t('Login must not consist of dots only'));
-		}
-
-		// User ID is too long
-		if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
-			// TRANSLATORS User ID is too long
-			throw new \InvalidArgumentException($l->t('Username is too long'));
-		}
-
-		if (!$this->verifyUid($uid, $checkDataDirectory)) {
-			throw new \InvalidArgumentException($l->t('Login is invalid because files already exist for this user'));
-		}
-	}
-
-	/**
-	 * Gets the list of user ids sorted by lastLogin, from most recent to least recent
-	 *
-	 * @param int|null $limit how many users to fetch (default: 25, max: 100)
-	 * @param int $offset from which offset to fetch
-	 * @param string $search search users based on search params
-	 * @return list<string> list of user IDs
-	 */
-	public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
-		// We can't load all users who already logged in
-		$limit = min(100, $limit ?: 25);
-
-		$connection = Server::get(IDBConnection::class);
-		$queryBuilder = $connection->getQueryBuilder();
-		$queryBuilder->select('pref_login.userid')
-			->from('preferences', 'pref_login')
-			->where($queryBuilder->expr()->eq('pref_login.appid', $queryBuilder->expr()->literal('login')))
-			->andWhere($queryBuilder->expr()->eq('pref_login.configkey', $queryBuilder->expr()->literal('lastLogin')))
-			->setFirstResult($offset)
-			->setMaxResults($limit)
-		;
-
-		// Oracle don't want to run ORDER BY on CLOB column
-		$loginOrder = $connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE
-			? $queryBuilder->expr()->castColumn('pref_login.configvalue', IQueryBuilder::PARAM_INT)
-			: 'pref_login.configvalue';
-		$queryBuilder
-			->orderBy($loginOrder, 'DESC')
-			->addOrderBy($queryBuilder->func()->lower('pref_login.userid'), 'ASC');
-
-		if ($search !== '') {
-			$displayNameMatches = $this->searchDisplayName($search);
-			$matchedUids = array_map(static fn (IUser $u): string => $u->getUID(), $displayNameMatches);
-
-			$queryBuilder
-				->leftJoin('pref_login', 'preferences', 'pref_email', $queryBuilder->expr()->andX(
-					$queryBuilder->expr()->eq('pref_login.userid', 'pref_email.userid'),
-					$queryBuilder->expr()->eq('pref_email.appid', $queryBuilder->expr()->literal('settings')),
-					$queryBuilder->expr()->eq('pref_email.configkey', $queryBuilder->expr()->literal('email')),
-				))
-				->andWhere($queryBuilder->expr()->orX(
-					$queryBuilder->expr()->in('pref_login.userid', $queryBuilder->createNamedParameter($matchedUids, IQueryBuilder::PARAM_STR_ARRAY)),
-				));
-		}
-
-		/** @var list<string> */
-		$list = $queryBuilder->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
-
-		return $list;
-	}
-
-	private function verifyUid(string $uid, bool $checkDataDirectory = false): bool {
-		$appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
-
-		if (\in_array($uid, [
-			'.htaccess',
-			'files_external',
-			'__groupfolders',
-			'.ncdata',
-			'owncloud.log',
-			'nextcloud.log',
-			'updater.log',
-			'audit.log',
-			$appdata], true)) {
-			return false;
-		}
-
-		if (!$checkDataDirectory) {
-			return true;
-		}
-
-		$dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
-
-		return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
-	}
-
-	public function getDisplayNameCache(): DisplayNameCache {
-		return $this->displayNameCache;
-	}
-
-	public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator {
-		$maxBatchSize = 1000;
-
-		do {
-			if ($limit !== null) {
-				$batchSize = min($limit, $maxBatchSize);
-				$limit -= $batchSize;
-			} else {
-				$batchSize = $maxBatchSize;
-			}
-
-			$userIds = $this->getSeenUserIds($batchSize, $offset);
-			$offset += $batchSize;
-
-			foreach ($userIds as $userId) {
-				foreach ($this->backends as $backend) {
-					if ($backend->userExists($userId)) {
-						$user = new LazyUser($userId, $this, null, $backend);
-						yield $user;
-						break;
-					}
-				}
-			}
-		} while (count($userIds) === $batchSize && $limit !== 0);
-	}
+    /**
+     * @var UserInterface[] $backends
+     */
+    private array $backends = [];
+
+    /**
+     * @var array<string,\OC\User\User> $cachedUsers
+     */
+    private array $cachedUsers = [];
+
+    private ICache $cache;
+
+    private DisplayNameCache $displayNameCache;
+
+    // This constructor can't autoload any class requiring a DB connection.
+    public function __construct(
+        private IConfig $config,
+        ICacheFactory $cacheFactory,
+        private IEventDispatcher $eventDispatcher,
+        private LoggerInterface $logger,
+    ) {
+        $this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
+        $this->listen('\OC\User', 'postDelete', function (IUser $user): void {
+            unset($this->cachedUsers[$user->getUID()]);
+        });
+        $this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
+    }
+
+    /**
+     * Get the active backends
+     * @return UserInterface[]
+     */
+    public function getBackends(): array {
+        return $this->backends;
+    }
+
+    public function registerBackend(UserInterface $backend): void {
+        $this->backends[] = $backend;
+    }
+
+    public function removeBackend(UserInterface $backend): void {
+        $this->cachedUsers = [];
+        if (($i = array_search($backend, $this->backends)) !== false) {
+            unset($this->backends[$i]);
+        }
+    }
+
+    public function clearBackends(): void {
+        $this->cachedUsers = [];
+        $this->backends = [];
+    }
+
+    /**
+     * get a user by user id
+     *
+     * @param string $uid
+     * @return \OC\User\User|null Either the user or null if the specified user does not exist
+     */
+    public function get($uid) {
+        if (is_null($uid) || $uid === '' || $uid === false) {
+            return null;
+        }
+        if (isset($this->cachedUsers[$uid])) { //check the cache first to prevent having to loop over the backends
+            return $this->cachedUsers[$uid];
+        }
+
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            return null;
+        }
+
+        $cachedBackend = $this->cache->get(sha1($uid));
+        if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
+            // Cache has the info of the user backend already, so ask that one directly
+            $backend = $this->backends[$cachedBackend];
+            if ($backend->userExists($uid)) {
+                return $this->getUserObject($uid, $backend);
+            }
+        }
+
+        foreach ($this->backends as $i => $backend) {
+            if ($i === $cachedBackend) {
+                // Tried that one already
+                continue;
+            }
+
+            if ($backend->userExists($uid)) {
+                // Hash $uid to ensure that only valid characters are used for the cache key
+                $this->cache->set(sha1($uid), $i, 300);
+                return $this->getUserObject($uid, $backend);
+            }
+        }
+        return null;
+    }
+
+    public function getDisplayName(string $uid): ?string {
+        return $this->displayNameCache->getDisplayName($uid);
+    }
+
+    /**
+     * get or construct the user object
+     *
+     * @param string $uid
+     * @param \OCP\UserInterface $backend
+     * @param bool $cacheUser If false the newly created user object will not be cached
+     * @return \OC\User\User
+     */
+    public function getUserObject($uid, $backend, $cacheUser = true) {
+        if ($backend instanceof IGetRealUIDBackend) {
+            $uid = $backend->getRealUID($uid);
+        }
+
+        if (isset($this->cachedUsers[$uid])) {
+            return $this->cachedUsers[$uid];
+        }
+
+        $user = new User($uid, $backend, $this->eventDispatcher, $this, $this->config);
+        if ($cacheUser) {
+            $this->cachedUsers[$uid] = $user;
+        }
+        return $user;
+    }
+
+    /**
+     * check if a user exists
+     *
+     * @param string $uid
+     * @return bool
+     */
+    public function userExists($uid) {
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            return false;
+        }
+
+        $user = $this->get($uid);
+        return ($user !== null);
+    }
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @param string $loginName
+     * @param string $password
+     * @return IUser|false the User object on success, false otherwise
+     */
+    public function checkPassword($loginName, $password) {
+        $result = $this->checkPasswordNoLogging($loginName, $password);
+
+        if ($result === false) {
+            $this->logger->warning('Login failed: \'' . $loginName . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if the password is valid for the user
+     *
+     * @internal
+     * @param string $loginName
+     * @param string $password
+     * @return IUser|false the User object on success, false otherwise
+     */
+    public function checkPasswordNoLogging($loginName, $password) {
+        $loginName = str_replace("\0", '', $loginName);
+        $password = str_replace("\0", '', $password);
+
+        $cachedBackend = $this->cache->get($loginName);
+        if ($cachedBackend !== null && isset($this->backends[$cachedBackend])) {
+            $backends = [$this->backends[$cachedBackend]];
+        } else {
+            $backends = $this->backends;
+        }
+        foreach ($backends as $backend) {
+            if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
+                /** @var ICheckPasswordBackend $backend */
+                $uid = $backend->checkPassword($loginName, $password);
+                if ($uid !== false) {
+                    return $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        // since http basic auth doesn't provide a standard way of handling non ascii password we allow password to be urlencoded
+        // we only do this decoding after using the plain password fails to maintain compatibility with any password that happens
+        // to contain urlencoded patterns by "accident".
+        $password = urldecode($password);
+
+        foreach ($backends as $backend) {
+            if ($backend instanceof ICheckPasswordBackend || $backend->implementsActions(Backend::CHECK_PASSWORD)) {
+                /** @var ICheckPasswordBackend|UserInterface $backend */
+                $uid = $backend->checkPassword($loginName, $password);
+                if ($uid !== false) {
+                    return $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public function search($pattern, $limit = null, $offset = null) {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            $backendUsers = $backend->getUsers($pattern, $limit, $offset);
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid) {
+                    $users[$uid] = new LazyUser($uid, $this, null, $backend);
+                }
+            }
+        }
+
+        uasort($users, function (IUser $a, IUser $b) {
+            return strcasecmp($a->getUID(), $b->getUID());
+        });
+        return $users;
+    }
+
+    public function searchDisplayName($pattern, $limit = null, $offset = null) {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid => $displayName) {
+                    $users[] = new LazyUser($uid, $this, $displayName, $backend);
+                }
+            }
+        }
+
+        usort($users, function (IUser $a, IUser $b) {
+            return strcasecmp($a->getDisplayName(), $b->getDisplayName());
+        });
+        return $users;
+    }
+
+    /**
+     * @return IUser[]
+     */
+    public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
+        $users = $this->config->getUsersForUserValue('core', 'enabled', 'false');
+        $users = array_combine(
+            $users,
+            array_map(
+                fn (string $uid): IUser => new LazyUser($uid, $this),
+                $users
+            )
+        );
+        if ($search !== '') {
+            $users = array_filter(
+                $users,
+                function (IUser $user) use ($search): bool {
+                    try {
+                        return mb_stripos($user->getUID(), $search) !== false
+                        || mb_stripos($user->getDisplayName(), $search) !== false
+                        || mb_stripos($user->getEMailAddress() ?? '', $search) !== false;
+                    } catch (NoUserException $ex) {
+                        $this->logger->error('Error while filtering disabled users', ['exception' => $ex, 'userUID' => $user->getUID()]);
+                        return false;
+                    }
+                });
+        }
+
+        $tempLimit = ($limit === null ? null : $limit + $offset);
+        foreach ($this->backends as $backend) {
+            if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
+                break;
+            }
+            if ($backend instanceof IProvideEnabledStateBackend) {
+                $backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)), 0, $search);
+                foreach ($backendUsers as $uid) {
+                    $users[$uid] = new LazyUser($uid, $this, null, $backend);
+                }
+            }
+        }
+
+        return array_slice($users, $offset, $limit);
+    }
+
+    /**
+     * Search known users (from phonebook sync) by displayName
+     *
+     * @param string $searcher
+     * @param string $pattern
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return IUser[]
+     */
+    public function searchKnownUsersByDisplayName(string $searcher, string $pattern, ?int $limit = null, ?int $offset = null): array {
+        $users = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof ISearchKnownUsersBackend) {
+                $backendUsers = $backend->searchKnownUsersByDisplayName($searcher, $pattern, $limit, $offset);
+            } else {
+                // Better than nothing, but filtering after pagination can remove lots of results.
+                $backendUsers = $backend->getDisplayNames($pattern, $limit, $offset);
+            }
+            if (is_array($backendUsers)) {
+                foreach ($backendUsers as $uid => $displayName) {
+                    $users[] = $this->getUserObject($uid, $backend);
+                }
+            }
+        }
+
+        usort($users, function ($a, $b) {
+            /**
+             * @var IUser $a
+             * @var IUser $b
+             */
+            return strcasecmp($a->getDisplayName(), $b->getDisplayName());
+        });
+        return $users;
+    }
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @return false|IUser the created user or false
+     * @throws \InvalidArgumentException
+     * @throws HintException
+     */
+    public function createUser($uid, $password) {
+        // DI injection is not used here as IRegistry needs the user manager itself for user count and thus it would create a cyclic dependency
+        /** @var IAssertion $assertion */
+        $assertion = \OC::$server->get(IAssertion::class);
+        $assertion->createUserIsLegit();
+
+        $localBackends = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof Database) {
+                // First check if there is another user backend
+                $localBackends[] = $backend;
+                continue;
+            }
+
+            if ($backend->implementsActions(Backend::CREATE_USER)) {
+                return $this->createUserFromBackend($uid, $password, $backend);
+            }
+        }
+
+        foreach ($localBackends as $backend) {
+            if ($backend->implementsActions(Backend::CREATE_USER)) {
+                return $this->createUserFromBackend($uid, $password, $backend);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $uid
+     * @param string $password
+     * @param UserInterface $backend
+     * @return IUser|false
+     * @throws \InvalidArgumentException
+     */
+    public function createUserFromBackend($uid, $password, UserInterface $backend) {
+        $l = \OCP\Util::getL10N('lib');
+
+        $this->validateUserId($uid, true);
+
+        // No empty password
+        if (trim($password) === '') {
+            throw new \InvalidArgumentException($l->t('A valid password must be provided'));
+        }
+
+        // Check if user already exists
+        if ($this->userExists($uid)) {
+            throw new \InvalidArgumentException($l->t('The Login is already being used'));
+        }
+
+        /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+        $this->emit('\OC\User', 'preCreateUser', [$uid, $password]);
+        $this->eventDispatcher->dispatchTyped(new BeforeUserCreatedEvent($uid, $password));
+        $state = $backend->createUser($uid, $password);
+        if ($state === false) {
+            throw new \InvalidArgumentException($l->t('Could not create account'));
+        }
+        $user = $this->getUserObject($uid, $backend);
+        if ($user instanceof IUser) {
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $this->emit('\OC\User', 'postCreateUser', [$user, $password]);
+            $this->eventDispatcher->dispatchTyped(new UserCreatedEvent($user, $password));
+            return $user;
+        }
+        return false;
+    }
+
+    /**
+     * returns how many users per backend exist (if supported by backend)
+     *
+     * @param boolean $hasLoggedIn when true only users that have a lastLogin
+     *                             entry in the preferences table will be affected
+     * @return array<string, int> an array of backend class as key and count number as value
+     */
+    public function countUsers() {
+        $userCountStatistics = [];
+        foreach ($this->backends as $backend) {
+            if ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
+                /** @var ICountUsersBackend|IUserBackend $backend */
+                $backendUsers = $backend->countUsers();
+                if ($backendUsers !== false) {
+                    if ($backend instanceof IUserBackend) {
+                        $name = $backend->getBackendName();
+                    } else {
+                        $name = get_class($backend);
+                    }
+                    if (isset($userCountStatistics[$name])) {
+                        $userCountStatistics[$name] += $backendUsers;
+                    } else {
+                        $userCountStatistics[$name] = $backendUsers;
+                    }
+                }
+            }
+        }
+        return $userCountStatistics;
+    }
+
+    public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
+        $userCount = false;
+
+        foreach ($this->backends as $backend) {
+            if ($onlyMappedUsers && $backend instanceof ICountMappedUsersBackend) {
+                $backendUsers = $backend->countMappedUsers();
+            } elseif ($backend instanceof ILimitAwareCountUsersBackend) {
+                $backendUsers = $backend->countUsers($limit);
+            } elseif ($backend instanceof ICountUsersBackend || $backend->implementsActions(Backend::COUNT_USERS)) {
+                /** @var ICountUsersBackend $backend */
+                $backendUsers = $backend->countUsers();
+            } else {
+                $this->logger->debug('Skip backend for user count: ' . get_class($backend));
+                continue;
+            }
+            if ($backendUsers !== false) {
+                $userCount = (int)$userCount + $backendUsers;
+                if ($limit > 0) {
+                    if ($userCount >= $limit) {
+                        break;
+                    }
+                    $limit -= $userCount;
+                }
+            } else {
+                $this->logger->warning('Can not determine user count for ' . get_class($backend));
+            }
+        }
+        return $userCount;
+    }
+
+    /**
+     * returns how many users per backend exist in the requested groups (if supported by backend)
+     *
+     * @param IGroup[] $groups an array of groups to search in
+     * @param int $limit limit to stop counting
+     * @return array{int,int} total number of users, and number of disabled users in the given groups, below $limit. If limit is reached, -1 is returned for number of disabled users
+     */
+    public function countUsersAndDisabledUsersOfGroups(array $groups, int $limit): array {
+        $users = [];
+        $disabled = [];
+        foreach ($groups as $group) {
+            foreach ($group->getUsers() as $user) {
+                $users[$user->getUID()] = 1;
+                if (!$user->isEnabled()) {
+                    $disabled[$user->getUID()] = 1;
+                }
+                if (count($users) >= $limit) {
+                    return [count($users),-1];
+                }
+            }
+        }
+        return [count($users),count($disabled)];
+    }
+
+    /**
+     * The callback is executed for each user on each backend.
+     * If the callback returns false no further users will be retrieved.
+     *
+     * @psalm-param \Closure(\OCP\IUser):?bool $callback
+     * @param string $search
+     * @param boolean $onlySeen when true only users that have a lastLogin entry
+     *                          in the preferences table will be affected
+     * @since 9.0.0
+     */
+    public function callForAllUsers(\Closure $callback, $search = '', $onlySeen = false) {
+        if ($onlySeen) {
+            $this->callForSeenUsers($callback);
+        } else {
+            foreach ($this->getBackends() as $backend) {
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers($search, $limit, $offset);
+                    foreach ($users as $uid) {
+                        if (!$backend->userExists($uid)) {
+                            continue;
+                        }
+                        $user = $this->getUserObject($uid, $backend, false);
+                        $return = $callback($user);
+                        if ($return === false) {
+                            break;
+                        }
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
+
+    /**
+     * returns how many users are disabled
+     *
+     * @return int
+     * @since 12.0.0
+     */
+    public function countDisabledUsers(): int {
+        $queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('*'))
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core')))
+            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('enabled')))
+            ->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR));
+
+
+        $result = $queryBuilder->executeQuery();
+        $count = $result->fetchOne();
+        $result->closeCursor();
+
+        if ($count !== false) {
+            $count = (int)$count;
+        } else {
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * returns how many users have logged in once
+     *
+     * @return int
+     * @since 11.0.0
+     */
+    public function countSeenUsers() {
+        $queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('*'))
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('login')))
+            ->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('lastLogin')));
+
+        $query = $queryBuilder->executeQuery();
+
+        $result = (int)$query->fetchOne();
+        $query->closeCursor();
+
+        return $result;
+    }
+
+    public function callForSeenUsers(\Closure $callback) {
+        $users = $this->getSeenUsers();
+        foreach ($users as $user) {
+            $return = $callback($user);
+            if ($return === false) {
+                return;
+            }
+        }
+    }
+
+    /**
+     * Getting all userIds that have a lastLogin value requires checking the
+     * value in php because on oracle you cannot use a clob in a where clause,
+     * preventing us from doing a not null or length(value) > 0 check.
+     *
+     * @param int $limit
+     * @param int $offset
+     * @return string[] with user ids
+     */
+    private function getSeenUserIds($limit = null, $offset = null) {
+        $queryBuilder = Server::get(IDBConnection::class)->getQueryBuilder();
+        $queryBuilder->select(['userid'])
+            ->from('preferences')
+            ->where($queryBuilder->expr()->eq(
+                'appid', $queryBuilder->createNamedParameter('login'))
+            )
+            ->andWhere($queryBuilder->expr()->eq(
+                'configkey', $queryBuilder->createNamedParameter('lastLogin'))
+            )
+            ->andWhere($queryBuilder->expr()->isNotNull('configvalue')
+            );
+
+        if ($limit !== null) {
+            $queryBuilder->setMaxResults($limit);
+        }
+        if ($offset !== null) {
+            $queryBuilder->setFirstResult($offset);
+        }
+        $query = $queryBuilder->executeQuery();
+        $result = [];
+
+        while ($row = $query->fetch()) {
+            $result[] = $row['userid'];
+        }
+
+        $query->closeCursor();
+
+        return $result;
+    }
+
+    /**
+     * @internal Only for mocks it in unit tests.
+     */
+    public function getUserConfig(): IUserConfig {
+        return \OCP\Server::get(IUserConfig::class);
+    }
+
+    /**
+     * @param string $email
+     * @return IUser[]
+     * @since 9.1.0
+     */
+    public function getByEmail($email): array {
+        $users = [];
+        $userConfig = $this->getUserConfig();
+        // looking for 'email' only (and not primary_mail) is intentional
+        $userIds = $userConfig->searchUsersByValueString('settings', 'email', $email, caseInsensitive: true);
+        foreach ($userIds as $userId) {
+            $user = $this->get($userId);
+            if ($user !== null) {
+                $users[] = $user;
+            }
+        }
+        return $users;
+    }
+
+    /**
+     * @param string $uid
+     * @param bool $checkDataDirectory
+     * @throws \InvalidArgumentException Message is an already translated string with a reason why the id is not valid
+     * @since 26.0.0
+     */
+    public function validateUserId(string $uid, bool $checkDataDirectory = false): void {
+        $l = Server::get(IFactory::class)->get('lib');
+
+        // Check the ID for bad characters
+        // Allowed are: "a-z", "A-Z", "0-9", spaces and "_.@-'"
+        if (preg_match('/[^a-zA-Z0-9 _.@\-\']/', $uid)) {
+            throw new \InvalidArgumentException($l->t('Only the following characters are allowed in an Login:'
+                . ' "a-z", "A-Z", "0-9", spaces and "_.@-\'"'));
+        }
+
+        // No empty user ID
+        if (trim($uid) === '') {
+            throw new \InvalidArgumentException($l->t('A valid Login must be provided'));
+        }
+
+        // No whitespace at the beginning or at the end
+        if (trim($uid) !== $uid) {
+            throw new \InvalidArgumentException($l->t('Login contains whitespace at the beginning or at the end'));
+        }
+
+        // User ID only consists of 1 or 2 dots (directory traversal)
+        if ($uid === '.' || $uid === '..') {
+            throw new \InvalidArgumentException($l->t('Login must not consist of dots only'));
+        }
+
+        // User ID is too long
+        if (strlen($uid) > IUser::MAX_USERID_LENGTH) {
+            // TRANSLATORS User ID is too long
+            throw new \InvalidArgumentException($l->t('Username is too long'));
+        }
+
+        if (!$this->verifyUid($uid, $checkDataDirectory)) {
+            throw new \InvalidArgumentException($l->t('Login is invalid because files already exist for this user'));
+        }
+    }
+
+    /**
+     * Gets the list of user ids sorted by lastLogin, from most recent to least recent
+     *
+     * @param int|null $limit how many users to fetch (default: 25, max: 100)
+     * @param int $offset from which offset to fetch
+     * @param string $search search users based on search params
+     * @return list<string> list of user IDs
+     */
+    public function getLastLoggedInUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
+        // We can't load all users who already logged in
+        $limit = min(100, $limit ?: 25);
+
+        $connection = Server::get(IDBConnection::class);
+        $queryBuilder = $connection->getQueryBuilder();
+        $queryBuilder->select('pref_login.userid')
+            ->from('preferences', 'pref_login')
+            ->where($queryBuilder->expr()->eq('pref_login.appid', $queryBuilder->expr()->literal('login')))
+            ->andWhere($queryBuilder->expr()->eq('pref_login.configkey', $queryBuilder->expr()->literal('lastLogin')))
+            ->setFirstResult($offset)
+            ->setMaxResults($limit)
+        ;
+
+        // Oracle don't want to run ORDER BY on CLOB column
+        $loginOrder = $connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE
+            ? $queryBuilder->expr()->castColumn('pref_login.configvalue', IQueryBuilder::PARAM_INT)
+            : 'pref_login.configvalue';
+        $queryBuilder
+            ->orderBy($loginOrder, 'DESC')
+            ->addOrderBy($queryBuilder->func()->lower('pref_login.userid'), 'ASC');
+
+        if ($search !== '') {
+            $displayNameMatches = $this->searchDisplayName($search);
+            $matchedUids = array_map(static fn (IUser $u): string => $u->getUID(), $displayNameMatches);
+
+            $queryBuilder
+                ->leftJoin('pref_login', 'preferences', 'pref_email', $queryBuilder->expr()->andX(
+                    $queryBuilder->expr()->eq('pref_login.userid', 'pref_email.userid'),
+                    $queryBuilder->expr()->eq('pref_email.appid', $queryBuilder->expr()->literal('settings')),
+                    $queryBuilder->expr()->eq('pref_email.configkey', $queryBuilder->expr()->literal('email')),
+                ))
+                ->andWhere($queryBuilder->expr()->orX(
+                    $queryBuilder->expr()->in('pref_login.userid', $queryBuilder->createNamedParameter($matchedUids, IQueryBuilder::PARAM_STR_ARRAY)),
+                ));
+        }
+
+        /** @var list<string> */
+        $list = $queryBuilder->executeQuery()->fetchAll(\PDO::FETCH_COLUMN);
+
+        return $list;
+    }
+
+    private function verifyUid(string $uid, bool $checkDataDirectory = false): bool {
+        $appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
+
+        if (\in_array($uid, [
+            '.htaccess',
+            'files_external',
+            '__groupfolders',
+            '.ncdata',
+            'owncloud.log',
+            'nextcloud.log',
+            'updater.log',
+            'audit.log',
+            $appdata], true)) {
+            return false;
+        }
+
+        if (!$checkDataDirectory) {
+            return true;
+        }
+
+        $dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
+
+        return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
+    }
+
+    public function getDisplayNameCache(): DisplayNameCache {
+        return $this->displayNameCache;
+    }
+
+    public function getSeenUsers(int $offset = 0, ?int $limit = null): \Iterator {
+        $maxBatchSize = 1000;
+
+        do {
+            if ($limit !== null) {
+                $batchSize = min($limit, $maxBatchSize);
+                $limit -= $batchSize;
+            } else {
+                $batchSize = $maxBatchSize;
+            }
+
+            $userIds = $this->getSeenUserIds($batchSize, $offset);
+            $offset += $batchSize;
+
+            foreach ($userIds as $userId) {
+                foreach ($this->backends as $backend) {
+                    if ($backend->userExists($userId)) {
+                        $user = new LazyUser($userId, $this, null, $backend);
+                        yield $user;
+                        break;
+                    }
+                }
+            }
+        } while (count($userIds) === $batchSize && $limit !== 0);
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -76,7 +76,7 @@ 
 		private LoggerInterface $logger,
 	) {
 		$this->cache = new WithLocalCache($cacheFactory->createDistributed('user_backend_map'));
-		$this->listen('\OC\User', 'postDelete', function (IUser $user): void {
+		$this->listen('\OC\User', 'postDelete', function(IUser $user): void {
 			unset($this->cachedUsers[$user->getUID()]);
 		});
 		$this->displayNameCache = new DisplayNameCache($cacheFactory, $this);
@@ -202,7 +202,7 @@ 
 		$result = $this->checkPasswordNoLogging($loginName, $password);
 
 		if ($result === false) {
-			$this->logger->warning('Login failed: \'' . $loginName . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']);
+			$this->logger->warning('Login failed: \''.$loginName.'\' (Remote IP: \''.\OC::$server->getRequest()->getRemoteAddress().'\')', ['app' => 'core']);
 		}
 
 		return $result;
@@ -265,7 +265,7 @@ 
 			}
 		}
 
-		uasort($users, function (IUser $a, IUser $b) {
+		uasort($users, function(IUser $a, IUser $b) {
 			return strcasecmp($a->getUID(), $b->getUID());
 		});
 		return $users;
@@ -282,7 +282,7 @@ 
 			}
 		}
 
-		usort($users, function (IUser $a, IUser $b) {
+		usort($users, function(IUser $a, IUser $b) {
 			return strcasecmp($a->getDisplayName(), $b->getDisplayName());
 		});
 		return $users;
@@ -303,7 +303,7 @@ 
 		if ($search !== '') {
 			$users = array_filter(
 				$users,
-				function (IUser $user) use ($search): bool {
+				function(IUser $user) use ($search): bool {
 					try {
 						return mb_stripos($user->getUID(), $search) !== false
 						|| mb_stripos($user->getDisplayName(), $search) !== false
@@ -356,7 +356,7 @@ 
 			}
 		}
 
-		usort($users, function ($a, $b) {
+		usort($users, function($a, $b) {
 			/**
 			 * @var IUser $a
 			 * @var IUser $b
@@ -470,7 +470,7 @@ 
 		return $userCountStatistics;
 	}
 
-	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int|false {
+	public function countUsersTotal(int $limit = 0, bool $onlyMappedUsers = false): int | false {
 		$userCount = false;
 
 		foreach ($this->backends as $backend) {
@@ -482,11 +482,11 @@ 
 				/** @var ICountUsersBackend $backend */
 				$backendUsers = $backend->countUsers();
 			} else {
-				$this->logger->debug('Skip backend for user count: ' . get_class($backend));
+				$this->logger->debug('Skip backend for user count: '.get_class($backend));
 				continue;
 			}
 			if ($backendUsers !== false) {
-				$userCount = (int)$userCount + $backendUsers;
+				$userCount = (int) $userCount + $backendUsers;
 				if ($limit > 0) {
 					if ($userCount >= $limit) {
 						break;
@@ -494,7 +494,7 @@ 
 					$limit -= $userCount;
 				}
 			} else {
-				$this->logger->warning('Can not determine user count for ' . get_class($backend));
+				$this->logger->warning('Can not determine user count for '.get_class($backend));
 			}
 		}
 		return $userCount;
@@ -517,11 +517,11 @@ 
 					$disabled[$user->getUID()] = 1;
 				}
 				if (count($users) >= $limit) {
-					return [count($users),-1];
+					return [count($users), -1];
 				}
 			}
 		}
-		return [count($users),count($disabled)];
+		return [count($users), count($disabled)];
 	}
 
 	/**
@@ -579,7 +579,7 @@ 
 		$result->closeCursor();
 
 		if ($count !== false) {
-			$count = (int)$count;
+			$count = (int) $count;
 		} else {
 			$count = 0;
 		}
@@ -602,7 +602,7 @@ 
 
 		$query = $queryBuilder->executeQuery();
 
-		$result = (int)$query->fetchOne();
+		$result = (int) $query->fetchOne();
 		$query->closeCursor();
 
 		return $result;
@@ -778,7 +778,7 @@ 
 	}
 
 	private function verifyUid(string $uid, bool $checkDataDirectory = false): bool {
-		$appdata = 'appdata_' . $this->config->getSystemValueString('instanceid');
+		$appdata = 'appdata_'.$this->config->getSystemValueString('instanceid');
 
 		if (\in_array($uid, [
 			'.htaccess',
@@ -797,9 +797,9 @@ 
 			return true;
 		}
 
-		$dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDirectory = $this->config->getSystemValueString('datadirectory', \OC::$SERVERROOT.'/data');
 
-		return !file_exists(rtrim($dataDirectory, '/') . '/' . $uid);
+		return !file_exists(rtrim($dataDirectory, '/').'/'.$uid);
 	}
 
 	public function getDisplayNameCache(): DisplayNameCache {

lib/base.php

Indentation +1182 added lines, -1182 removed lines

@@ -40,1188 +40,1188 @@
  * OC_autoload!
  */
 class OC {
-	/**
-	 * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
-	 */
-	public static string $SERVERROOT = '';
-	/**
-	 * the current request path relative to the Nextcloud root (e.g. files/index.php)
-	 */
-	private static string $SUBURI = '';
-	/**
-	 * the Nextcloud root path for http requests (e.g. /nextcloud)
-	 */
-	public static string $WEBROOT = '';
-	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
-	 * web path in 'url'
-	 */
-	public static array $APPSROOTS = [];
-
-	public static string $configDir;
-
-	/**
-	 * requested app
-	 */
-	public static string $REQUESTEDAPP = '';
-
-	/**
-	 * check if Nextcloud runs in cli mode
-	 */
-	public static bool $CLI = false;
-
-	public static \Composer\Autoload\ClassLoader $composerAutoloader;
-
-	public static \OC\Server $server;
-
-	private static \OC\Config $config;
-
-	/**
-	 * @throws \RuntimeException when the 3rdparty directory is missing or
-	 *                           the app path list is empty or contains an invalid path
-	 */
-	public static function initPaths(): void {
-		if (defined('PHPUNIT_CONFIG_DIR')) {
-			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
-		} elseif (defined('PHPUNIT_RUN') && PHPUNIT_RUN && is_dir(OC::$SERVERROOT . '/tests/config/')) {
-			self::$configDir = OC::$SERVERROOT . '/tests/config/';
-		} elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
-			self::$configDir = rtrim($dir, '/') . '/';
-		} else {
-			self::$configDir = OC::$SERVERROOT . '/config/';
-		}
-		self::$config = new \OC\Config(self::$configDir);
-
-		OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT)));
-		/**
-		 * FIXME: The following lines are required because we can't yet instantiate
-		 *        Server::get(\OCP\IRequest::class) since \OC::$server does not yet exist.
-		 */
-		$params = [
-			'server' => [
-				'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'] ?? null,
-				'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'] ?? null,
-			],
-		];
-		if (isset($_SERVER['REMOTE_ADDR'])) {
-			$params['server']['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
-		}
-		$fakeRequest = new \OC\AppFramework\Http\Request(
-			$params,
-			new \OC\AppFramework\Http\RequestId($_SERVER['UNIQUE_ID'] ?? '', new \OC\Security\SecureRandom()),
-			new \OC\AllConfig(new \OC\SystemConfig(self::$config))
-		);
-		$scriptName = $fakeRequest->getScriptName();
-		if (substr($scriptName, -1) == '/') {
-			$scriptName .= 'index.php';
-			//make sure suburi follows the same rules as scriptName
-			if (substr(OC::$SUBURI, -9) != 'index.php') {
-				if (substr(OC::$SUBURI, -1) != '/') {
-					OC::$SUBURI = OC::$SUBURI . '/';
-				}
-				OC::$SUBURI = OC::$SUBURI . 'index.php';
-			}
-		}
-
-		if (OC::$CLI) {
-			OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-		} else {
-			if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
-				OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
-
-				if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
-					OC::$WEBROOT = '/' . OC::$WEBROOT;
-				}
-			} else {
-				// The scriptName is not ending with OC::$SUBURI
-				// This most likely means that we are calling from CLI.
-				// However some cron jobs still need to generate
-				// a web URL, so we use overwritewebroot as a fallback.
-				OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
-			}
-
-			// Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
-			// slash which is required by URL generation.
-			if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT
-					&& substr($_SERVER['REQUEST_URI'], -1) !== '/') {
-				header('Location: ' . \OC::$WEBROOT . '/');
-				exit();
-			}
-		}
-
-		// search the apps folder
-		$config_paths = self::$config->getValue('apps_paths', []);
-		if (!empty($config_paths)) {
-			foreach ($config_paths as $paths) {
-				if (isset($paths['url']) && isset($paths['path'])) {
-					$paths['url'] = rtrim($paths['url'], '/');
-					$paths['path'] = rtrim($paths['path'], '/');
-					OC::$APPSROOTS[] = $paths;
-				}
-			}
-		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-			OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
-		}
-
-		if (empty(OC::$APPSROOTS)) {
-			throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
-				. '. You can also configure the location in the config.php file.');
-		}
-		$paths = [];
-		foreach (OC::$APPSROOTS as $path) {
-			$paths[] = $path['path'];
-			if (!is_dir($path['path'])) {
-				throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
-					. ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path']));
-			}
-		}
-
-		// set the right include path
-		set_include_path(
-			implode(PATH_SEPARATOR, $paths)
-		);
-	}
-
-	public static function checkConfig(): void {
-		// Create config if it does not already exist
-		$configFilePath = self::$configDir . '/config.php';
-		if (!file_exists($configFilePath)) {
-			@touch($configFilePath);
-		}
-
-		// Check if config is writable
-		$configFileWritable = is_writable($configFilePath);
-		$configReadOnly = Server::get(IConfig::class)->getSystemValueBool('config_is_read_only');
-		if (!$configFileWritable && !$configReadOnly
-			|| !$configFileWritable && \OCP\Util::needUpgrade()) {
-			$urlGenerator = Server::get(IURLGenerator::class);
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-
-			if (self::$CLI) {
-				echo $l->t('Cannot write into "config" directory!') . "\n";
-				echo $l->t('This can usually be fixed by giving the web server write access to the config directory.') . "\n";
-				echo "\n";
-				echo $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . "\n";
-				echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]) . "\n";
-				exit;
-			} else {
-				Server::get(ITemplateManager::class)->printErrorPage(
-					$l->t('Cannot write into "config" directory!'),
-					$l->t('This can usually be fixed by giving the web server write access to the config directory.') . ' '
-					. $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . ' '
-					. $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]),
-					503
-				);
-			}
-		}
-	}
-
-	public static function checkInstalled(\OC\SystemConfig $systemConfig): void {
-		if (defined('OC_CONSOLE')) {
-			return;
-		}
-		// Redirect to installer if not installed
-		if (!$systemConfig->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
-			if (OC::$CLI) {
-				throw new Exception('Not installed');
-			} else {
-				$url = OC::$WEBROOT . '/index.php';
-				header('Location: ' . $url);
-			}
-			exit();
-		}
-	}
-
-	public static function checkMaintenanceMode(\OC\SystemConfig $systemConfig): void {
-		// Allow ajax update script to execute without being stopped
-		if (((bool)$systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') {
-			// send http status 503
-			http_response_code(503);
-			header('X-Nextcloud-Maintenance-Mode: 1');
-			header('Retry-After: 120');
-
-			// render error page
-			$template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest');
-			\OCP\Util::addScript('core', 'maintenance');
-			\OCP\Util::addScript('core', 'common');
-			\OCP\Util::addStyle('core', 'guest');
-			$template->printPage();
-			die();
-		}
-	}
-
-	/**
-	 * Prints the upgrade page
-	 */
-	private static function printUpgradePage(\OC\SystemConfig $systemConfig): void {
-		$cliUpgradeLink = $systemConfig->getValue('upgrade.cli-upgrade-link', '');
-		$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
-		$tooBig = false;
-		if (!$disableWebUpdater) {
-			$apps = Server::get(\OCP\App\IAppManager::class);
-			if ($apps->isEnabledForAnyone('user_ldap')) {
-				$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
-
-				$result = $qb->select($qb->func()->count('*', 'user_count'))
-					->from('ldap_user_mapping')
-					->executeQuery();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig && $apps->isEnabledForAnyone('user_saml')) {
-				$qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
-
-				$result = $qb->select($qb->func()->count('*', 'user_count'))
-					->from('user_saml_users')
-					->executeQuery();
-				$row = $result->fetch();
-				$result->closeCursor();
-
-				$tooBig = ($row['user_count'] > 50);
-			}
-			if (!$tooBig) {
-				// count users
-				$totalUsers = Server::get(\OCP\IUserManager::class)->countUsersTotal(51);
-				$tooBig = ($totalUsers > 50);
-			}
-		}
-		$ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'])
-			&& $_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
-
-		if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
-			// send http status 503
-			http_response_code(503);
-			header('Retry-After: 120');
-
-			$serverVersion = \OCP\Server::get(\OCP\ServerVersion::class);
-
-			// render error page
-			$template = Server::get(ITemplateManager::class)->getTemplate('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'nextcloud'); // for now
-			$template->assign('version', $serverVersion->getVersionString());
-			$template->assign('tooBig', $tooBig);
-			$template->assign('cliUpgradeLink', $cliUpgradeLink);
-
-			$template->printPage();
-			die();
-		}
-
-		// check whether this is a core update or apps update
-		$installedVersion = $systemConfig->getValue('version', '0.0.0');
-		$currentVersion = implode('.', \OCP\Util::getVersion());
-
-		// if not a core upgrade, then it's apps upgrade
-		$isAppsOnlyUpgrade = version_compare($currentVersion, $installedVersion, '=');
-
-		$oldTheme = $systemConfig->getValue('theme');
-		$systemConfig->setValue('theme', '');
-		\OCP\Util::addScript('core', 'common');
-		\OCP\Util::addScript('core', 'main');
-		\OCP\Util::addTranslations('core');
-		\OCP\Util::addScript('core', 'update');
-
-		/** @var \OC\App\AppManager $appManager */
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-
-		$tmpl = Server::get(ITemplateManager::class)->getTemplate('', 'update.admin', 'guest');
-		$tmpl->assign('version', \OCP\Server::get(\OCP\ServerVersion::class)->getVersionString());
-		$tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
-
-		// get third party apps
-		$ocVersion = \OCP\Util::getVersion();
-		$ocVersion = implode('.', $ocVersion);
-		$incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
-		$incompatibleOverwrites = $systemConfig->getValue('app_install_overwrite', []);
-		$incompatibleShippedApps = [];
-		$incompatibleDisabledApps = [];
-		foreach ($incompatibleApps as $appInfo) {
-			if ($appManager->isShipped($appInfo['id'])) {
-				$incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
-			}
-			if (!in_array($appInfo['id'], $incompatibleOverwrites)) {
-				$incompatibleDisabledApps[] = $appInfo;
-			}
-		}
-
-		if (!empty($incompatibleShippedApps)) {
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('core');
-			$hint = $l->t('Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory.', [implode(', ', $incompatibleShippedApps)]);
-			throw new \OCP\HintException('Application ' . implode(', ', $incompatibleShippedApps) . ' is not present or has a non-compatible version with this server. Please check the apps directory.', $hint);
-		}
-
-		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
-		$tmpl->assign('incompatibleAppsList', $incompatibleDisabledApps);
-		try {
-			$defaults = new \OC_Defaults();
-			$tmpl->assign('productName', $defaults->getName());
-		} catch (Throwable $error) {
-			$tmpl->assign('productName', 'Nextcloud');
-		}
-		$tmpl->assign('oldTheme', $oldTheme);
-		$tmpl->printPage();
-	}
-
-	public static function initSession(): void {
-		$request = Server::get(IRequest::class);
-
-		// TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
-		// TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
-		// TODO: for further information.
-		// $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
-		// if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
-		// setcookie('cookie_test', 'test', time() + 3600);
-		// // Do not initialize the session if a request is authenticated directly
-		// // unless there is a session cookie already sent along
-		// return;
-		// }
-
-		if ($request->getServerProtocol() === 'https') {
-			ini_set('session.cookie_secure', 'true');
-		}
-
-		// prevents javascript from accessing php session cookies
-		ini_set('session.cookie_httponly', 'true');
-
-		// set the cookie path to the Nextcloud directory
-		$cookie_path = OC::$WEBROOT ? : '/';
-		ini_set('session.cookie_path', $cookie_path);
-
-		// set the cookie domain to the Nextcloud domain
-		$cookie_domain = self::$config->getValue('cookie_domain', '');
-		if ($cookie_domain) {
-			ini_set('session.cookie_domain', $cookie_domain);
-		}
-
-		// Do not initialize sessions for 'status.php' requests
-		// Monitoring endpoints can quickly flood session handlers
-		// and 'status.php' doesn't require sessions anyway
-		// We still need to run the ini_set above so that same-site cookies use the correct configuration.
-		if (str_ends_with($request->getScriptName(), '/status.php')) {
-			return;
-		}
-
-		// Let the session name be changed in the initSession Hook
-		$sessionName = OC_Util::getInstanceId();
-
-		try {
-			$logger = null;
-			if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) {
-				$logger = logger('core');
-			}
-
-			// set the session name to the instance id - which is unique
-			$session = new \OC\Session\Internal(
-				$sessionName,
-				$logger,
-			);
-
-			$cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);
-			$session = $cryptoWrapper->wrapSession($session);
-			self::$server->setSession($session);
-
-			// if session can't be started break with http 500 error
-		} catch (Exception $e) {
-			Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'base','exception' => $e]);
-			//show the user a detailed error page
-			Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
-			die();
-		}
-
-		//try to set the session lifetime
-		$sessionLifeTime = self::getSessionLifeTime();
-
-		// session timeout
-		if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
-			if (isset($_COOKIE[session_name()])) {
-				setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
-			}
-			Server::get(IUserSession::class)->logout();
-		}
-
-		if (!self::hasSessionRelaxedExpiry()) {
-			$session->set('LAST_ACTIVITY', time());
-		}
-		$session->close();
-	}
-
-	private static function getSessionLifeTime(): int {
-		return Server::get(IConfig::class)->getSystemValueInt('session_lifetime', 60 * 60 * 24);
-	}
-
-	/**
-	 * @return bool true if the session expiry should only be done by gc instead of an explicit timeout
-	 */
-	public static function hasSessionRelaxedExpiry(): bool {
-		return Server::get(IConfig::class)->getSystemValueBool('session_relaxed_expiry', false);
-	}
-
-	/**
-	 * Try to set some values to the required Nextcloud default
-	 */
-	public static function setRequiredIniValues(): void {
-		// Don't display errors and log them
-		@ini_set('display_errors', '0');
-		@ini_set('log_errors', '1');
-
-		// Try to configure php to enable big file uploads.
-		// This doesn't work always depending on the webserver and php configuration.
-		// Let's try to overwrite some defaults if they are smaller than 1 hour
-
-		if (intval(@ini_get('max_execution_time') ?: 0) < 3600) {
-			@ini_set('max_execution_time', strval(3600));
-		}
-
-		if (intval(@ini_get('max_input_time') ?: 0) < 3600) {
-			@ini_set('max_input_time', strval(3600));
-		}
-
-		// Try to set the maximum execution time to the largest time limit we have
-		if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-			@set_time_limit(max(intval(@ini_get('max_execution_time')), intval(@ini_get('max_input_time'))));
-		}
-
-		@ini_set('default_charset', 'UTF-8');
-		@ini_set('gd.jpeg_ignore_warning', '1');
-	}
-
-	/**
-	 * Send the same site cookies
-	 */
-	private static function sendSameSiteCookies(): void {
-		$cookieParams = session_get_cookie_params();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach ($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
-
-	/**
-	 * Same Site cookie to further mitigate CSRF attacks. This cookie has to
-	 * be set in every request if cookies are sent to add a second level of
-	 * defense against CSRF.
-	 *
-	 * If the cookie is not sent this will set the cookie and reload the page.
-	 * We use an additional cookie since we want to protect logout CSRF and
-	 * also we can't directly interfere with PHP's session mechanism.
-	 */
-	private static function performSameSiteCookieProtection(IConfig $config): void {
-		$request = Server::get(IRequest::class);
-
-		// Some user agents are notorious and don't really properly follow HTTP
-		// specifications. For those, have an automated opt-out. Since the protection
-		// for remote.php is applied in base.php as starting point we need to opt out
-		// here.
-		$incompatibleUserAgents = $config->getSystemValue('csrf.optout');
-
-		// Fallback, if csrf.optout is unset
-		if (!is_array($incompatibleUserAgents)) {
-			$incompatibleUserAgents = [
-				// OS X Finder
-				'/^WebDAVFS/',
-				// Windows webdav drive
-				'/^Microsoft-WebDAV-MiniRedir/',
-			];
-		}
-
-		if ($request->isUserAgent($incompatibleUserAgents)) {
-			return;
-		}
-
-		if (count($_COOKIE) > 0) {
-			$requestUri = $request->getScriptName();
-			$processingScript = explode('/', $requestUri);
-			$processingScript = $processingScript[count($processingScript) - 1];
-
-			if ($processingScript === 'index.php' // index.php routes are handled in the middleware
-				|| $processingScript === 'cron.php' // and cron.php does not need any authentication at all
-				|| $processingScript === 'public.php' // For public.php, auth for password protected shares is done in the PublicAuth plugin
-			) {
-				return;
-			}
-
-			// All other endpoints require the lax and the strict cookie
-			if (!$request->passesStrictCookieCheck()) {
-				logger('core')->warning('Request does not pass strict cookie check');
-				self::sendSameSiteCookies();
-				// Debug mode gets access to the resources without strict cookie
-				// due to the fact that the SabreDAV browser also lives there.
-				if (!$config->getSystemValueBool('debug', false)) {
-					http_response_code(\OCP\AppFramework\Http::STATUS_PRECONDITION_FAILED);
-					header('Content-Type: application/json');
-					echo json_encode(['error' => 'Strict Cookie has not been found in request']);
-					exit();
-				}
-			}
-		} elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
-			self::sendSameSiteCookies();
-		}
-	}
-
-	/**
-	 * This function adds some security related headers to all requests served via base.php
-	 * The implementation of this function has to happen here to ensure that all third-party
-	 * components (e.g. SabreDAV) also benefit from this headers.
-	 */
-	private static function addSecurityHeaders(): void {
-		/**
-		 * FIXME: Content Security Policy for legacy components. This
-		 * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
-		 * is used everywhere.
-		 * @see \OCP\AppFramework\Http\Response::getHeaders
-		 */
-		$policy = 'default-src \'self\'; '
-			. 'script-src \'self\' \'nonce-' . \OC::$server->getContentSecurityPolicyNonceManager()->getNonce() . '\'; '
-			. 'style-src \'self\' \'unsafe-inline\'; '
-			. 'frame-src *; '
-			. 'img-src * data: blob:; '
-			. 'font-src \'self\' data:; '
-			. 'media-src *; '
-			. 'connect-src *; '
-			. 'object-src \'none\'; '
-			. 'base-uri \'self\'; ';
-		header('Content-Security-Policy:' . $policy);
-
-		// Send fallback headers for installations that don't have the possibility to send
-		// custom headers on the webserver side
-		if (getenv('modHeadersAvailable') !== 'true') {
-			header('Referrer-Policy: no-referrer'); // https://www.w3.org/TR/referrer-policy/
-			header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
-			header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
-			header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
-			header('X-Robots-Tag: noindex, nofollow'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
-		}
-	}
-
-	public static function init(): void {
-		// First handle PHP configuration and copy auth headers to the expected
-		// $_SERVER variable before doing anything Server object related
-		self::setRequiredIniValues();
-		self::handleAuthHeaders();
-
-		// prevent any XML processing from loading external entities
-		libxml_set_external_entity_loader(static function () {
-			return null;
-		});
-
-		// Set default timezone before the Server object is booted
-		if (!date_default_timezone_set('UTC')) {
-			throw new \RuntimeException('Could not set timezone to UTC');
-		}
-
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace('\\', '/', substr(__DIR__, 0, -4));
-
-		// register autoloader
-		$loaderStart = microtime(true);
-
-		self::$CLI = (php_sapi_name() == 'cli');
-
-		// Add default composer PSR-4 autoloader, ensure apcu to be disabled
-		self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
-		self::$composerAutoloader->setApcuPrefix(null);
-
-
-		try {
-			self::initPaths();
-			// setup 3rdparty autoloader
-			$vendorAutoLoad = OC::$SERVERROOT . '/3rdparty/autoload.php';
-			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
-			}
-			require_once $vendorAutoLoad;
-		} catch (\RuntimeException $e) {
-			if (!self::$CLI) {
-				http_response_code(503);
-			}
-			// we can't use the template error page here, because this needs the
-			// DI container which isn't available yet
-			print($e->getMessage());
-			exit();
-		}
-		$loaderEnd = microtime(true);
-
-		// Enable lazy loading if activated
-		\OC\AppFramework\Utility\SimpleContainer::$useLazyObjects = (bool)self::$config->getValue('enable_lazy_objects', true);
-
-		// setup the basic server
-		self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
-		self::$server->boot();
-
-		try {
-			$profiler = new BuiltInProfiler(
-				Server::get(IConfig::class),
-				Server::get(IRequest::class),
-			);
-			$profiler->start();
-		} catch (\Throwable $e) {
-			logger('core')->error('Failed to start profiler: ' . $e->getMessage(), ['app' => 'base']);
-		}
-
-		if (self::$CLI && in_array('--' . \OCP\Console\ReservedOptions::DEBUG_LOG, $_SERVER['argv'])) {
-			\OC\Core\Listener\BeforeMessageLoggedEventListener::setup();
-		}
-
-		$eventLogger = Server::get(\OCP\Diagnostics\IEventLogger::class);
-		$eventLogger->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
-		$eventLogger->start('boot', 'Initialize');
-
-		// Override php.ini and log everything if we're troubleshooting
-		if (self::$config->getValue('loglevel') === ILogger::DEBUG) {
-			error_reporting(E_ALL);
-		}
-
-		// initialize intl fallback if necessary
-		OC_Util::isSetLocaleWorking();
-
-		$config = Server::get(IConfig::class);
-		if (!defined('PHPUNIT_RUN')) {
-			$errorHandler = new OC\Log\ErrorHandler(
-				\OCP\Server::get(\Psr\Log\LoggerInterface::class),
-			);
-			$exceptionHandler = [$errorHandler, 'onException'];
-			if ($config->getSystemValueBool('debug', false)) {
-				set_error_handler([$errorHandler, 'onAll'], E_ALL);
-				if (\OC::$CLI) {
-					$exceptionHandler = [Server::get(ITemplateManager::class), 'printExceptionErrorPage'];
-				}
-			} else {
-				set_error_handler([$errorHandler, 'onError']);
-			}
-			register_shutdown_function([$errorHandler, 'onShutdown']);
-			set_exception_handler($exceptionHandler);
-		}
-
-		/** @var \OC\AppFramework\Bootstrap\Coordinator $bootstrapCoordinator */
-		$bootstrapCoordinator = Server::get(\OC\AppFramework\Bootstrap\Coordinator::class);
-		$bootstrapCoordinator->runInitialRegistration();
-
-		$eventLogger->start('init_session', 'Initialize session');
-
-		// Check for PHP SimpleXML extension earlier since we need it before our other checks and want to provide a useful hint for web users
-		// see https://github.com/nextcloud/server/pull/2619
-		if (!function_exists('simplexml_load_file')) {
-			throw new \OCP\HintException('The PHP SimpleXML/PHP-XML extension is not installed.', 'Install the extension or make sure it is enabled.');
-		}
-
-		$systemConfig = Server::get(\OC\SystemConfig::class);
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-		if ($systemConfig->getValue('installed', false)) {
-			$appManager->loadApps(['session']);
-		}
-		if (!self::$CLI) {
-			self::initSession();
-		}
-		$eventLogger->end('init_session');
-		self::checkConfig();
-		self::checkInstalled($systemConfig);
-
-		self::addSecurityHeaders();
-
-		self::performSameSiteCookieProtection($config);
-
-		if (!defined('OC_CONSOLE')) {
-			$eventLogger->start('check_server', 'Run a few configuration checks');
-			$errors = OC_Util::checkServer($systemConfig);
-			if (count($errors) > 0) {
-				if (!self::$CLI) {
-					http_response_code(503);
-					Util::addStyle('guest');
-					try {
-						Server::get(ITemplateManager::class)->printGuestPage('', 'error', ['errors' => $errors]);
-						exit;
-					} catch (\Exception $e) {
-						// In case any error happens when showing the error page, we simply fall back to posting the text.
-						// This might be the case when e.g. the data directory is broken and we can not load/write SCSS to/from it.
-					}
-				}
-
-				// Convert l10n string into regular string for usage in database
-				$staticErrors = [];
-				foreach ($errors as $error) {
-					echo $error['error'] . "\n";
-					echo $error['hint'] . "\n\n";
-					$staticErrors[] = [
-						'error' => (string)$error['error'],
-						'hint' => (string)$error['hint'],
-					];
-				}
-
-				try {
-					$config->setAppValue('core', 'cronErrors', json_encode($staticErrors));
-				} catch (\Exception $e) {
-					echo('Writing to database failed');
-				}
-				exit(1);
-			} elseif (self::$CLI && $config->getSystemValueBool('installed', false)) {
-				$config->deleteAppValue('core', 'cronErrors');
-			}
-			$eventLogger->end('check_server');
-		}
-
-		// User and Groups
-		if (!$systemConfig->getValue('installed', false)) {
-			self::$server->getSession()->set('user_id', '');
-		}
-
-		$eventLogger->start('setup_backends', 'Setup group and user backends');
-		Server::get(\OCP\IUserManager::class)->registerBackend(new \OC\User\Database());
-		Server::get(\OCP\IGroupManager::class)->addBackend(new \OC\Group\Database());
-
-		// Subscribe to the hook
-		\OCP\Util::connectHook(
-			'\OCA\Files_Sharing\API\Server2Server',
-			'preLoginNameUsedAsUserName',
-			'\OC\User\Database',
-			'preLoginNameUsedAsUserName'
-		);
-
-		//setup extra user backends
-		if (!\OCP\Util::needUpgrade()) {
-			OC_User::setupBackends();
-		} else {
-			// Run upgrades in incognito mode
-			OC_User::setIncognitoMode(true);
-		}
-		$eventLogger->end('setup_backends');
-
-		self::registerCleanupHooks($systemConfig);
-		self::registerShareHooks($systemConfig);
-		self::registerEncryptionWrapperAndHooks();
-		self::registerAccountHooks();
-		self::registerResourceCollectionHooks();
-		self::registerFileReferenceEventListener();
-		self::registerRenderReferenceEventListener();
-		self::registerAppRestrictionsHooks();
-
-		// Make sure that the application class is not loaded before the database is setup
-		if ($systemConfig->getValue('installed', false)) {
-			$appManager->loadApp('settings');
-		}
-
-		//make sure temporary files are cleaned up
-		$tmpManager = Server::get(\OCP\ITempManager::class);
-		register_shutdown_function([$tmpManager, 'clean']);
-		$lockProvider = Server::get(\OCP\Lock\ILockingProvider::class);
-		register_shutdown_function([$lockProvider, 'releaseAll']);
-
-		// Check whether the sample configuration has been copied
-		if ($systemConfig->getValue('copied_sample_config', false)) {
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-			Server::get(ITemplateManager::class)->printErrorPage(
-				$l->t('Sample configuration detected'),
-				$l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php'),
-				503
-			);
-			return;
-		}
-
-		$request = Server::get(IRequest::class);
-		$host = $request->getInsecureServerHost();
-		/**
-		 * if the host passed in headers isn't trusted
-		 * FIXME: Should not be in here at all :see_no_evil:
-		 */
-		if (!OC::$CLI
-			&& !Server::get(\OC\Security\TrustedDomainHelper::class)->isTrustedDomain($host)
-			&& $config->getSystemValueBool('installed', false)
-		) {
-			// Allow access to CSS resources
-			$isScssRequest = false;
-			if (strpos($request->getPathInfo() ?: '', '/css/') === 0) {
-				$isScssRequest = true;
-			}
-
-			if (substr($request->getRequestUri(), -11) === '/status.php') {
-				http_response_code(400);
-				header('Content-Type: application/json');
-				echo '{"error": "Trusted domain error.", "code": 15}';
-				exit();
-			}
-
-			if (!$isScssRequest) {
-				http_response_code(400);
-				Server::get(LoggerInterface::class)->info(
-					'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
-					[
-						'app' => 'core',
-						'remoteAddress' => $request->getRemoteAddress(),
-						'host' => $host,
-					]
-				);
-
-				$tmpl = Server::get(ITemplateManager::class)->getTemplate('core', 'untrustedDomain', 'guest');
-				$tmpl->assign('docUrl', Server::get(IURLGenerator::class)->linkToDocs('admin-trusted-domains'));
-				$tmpl->printPage();
-
-				exit();
-			}
-		}
-		$eventLogger->end('boot');
-		$eventLogger->log('init', 'OC::init', $loaderStart, microtime(true));
-		$eventLogger->start('runtime', 'Runtime');
-		$eventLogger->start('request', 'Full request after boot');
-		register_shutdown_function(function () use ($eventLogger) {
-			$eventLogger->end('request');
-		});
-
-		register_shutdown_function(function () {
-			$memoryPeak = memory_get_peak_usage();
-			$logLevel = match (true) {
-				$memoryPeak > 500_000_000 => ILogger::FATAL,
-				$memoryPeak > 400_000_000 => ILogger::ERROR,
-				$memoryPeak > 300_000_000 => ILogger::WARN,
-				default => null,
-			};
-			if ($logLevel !== null) {
-				$message = 'Request used more than 300 MB of RAM: ' . Util::humanFileSize($memoryPeak);
-				$logger = Server::get(LoggerInterface::class);
-				$logger->log($logLevel, $message, ['app' => 'core']);
-			}
-		});
-	}
-
-	/**
-	 * register hooks for the cleanup of cache and bruteforce protection
-	 */
-	public static function registerCleanupHooks(\OC\SystemConfig $systemConfig): void {
-		//don't try to do this before we are properly setup
-		if ($systemConfig->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
-			// NOTE: This will be replaced to use OCP
-			$userSession = Server::get(\OC\User\Session::class);
-			$userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
-				if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
-					// reset brute force delay for this IP address and username
-					$uid = $userSession->getUser()->getUID();
-					$request = Server::get(IRequest::class);
-					$throttler = Server::get(IThrottler::class);
-					$throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
-				}
-
-				try {
-					$cache = new \OC\Cache\File();
-					$cache->gc();
-				} catch (\OC\ServerNotAvailableException $e) {
-					// not a GC exception, pass it on
-					throw $e;
-				} catch (\OC\ForbiddenException $e) {
-					// filesystem blocked for this request, ignore
-				} catch (\Exception $e) {
-					// a GC exception should not prevent users from using OC,
-					// so log the exception
-					Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [
-						'app' => 'core',
-						'exception' => $e,
-					]);
-				}
-			});
-		}
-	}
-
-	private static function registerEncryptionWrapperAndHooks(): void {
-		/** @var \OC\Encryption\Manager */
-		$manager = Server::get(\OCP\Encryption\IManager::class);
-		Server::get(IEventDispatcher::class)->addListener(
-			BeforeFileSystemSetupEvent::class,
-			$manager->setupStorage(...),
-		);
-
-		$enabled = $manager->isEnabled();
-		if ($enabled) {
-			\OC\Encryption\EncryptionEventListener::register(Server::get(IEventDispatcher::class));
-		}
-	}
-
-	private static function registerAccountHooks(): void {
-		/** @var IEventDispatcher $dispatcher */
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$dispatcher->addServiceListener(UserChangedEvent::class, \OC\Accounts\Hooks::class);
-	}
-
-	private static function registerAppRestrictionsHooks(): void {
-		/** @var \OC\Group\Manager $groupManager */
-		$groupManager = Server::get(\OCP\IGroupManager::class);
-		$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
-			$appManager = Server::get(\OCP\App\IAppManager::class);
-			$apps = $appManager->getEnabledAppsForGroup($group);
-			foreach ($apps as $appId) {
-				$restrictions = $appManager->getAppRestriction($appId);
-				if (empty($restrictions)) {
-					continue;
-				}
-				$key = array_search($group->getGID(), $restrictions);
-				unset($restrictions[$key]);
-				$restrictions = array_values($restrictions);
-				if (empty($restrictions)) {
-					$appManager->disableApp($appId);
-				} else {
-					$appManager->enableAppForGroups($appId, $restrictions);
-				}
-			}
-		});
-	}
-
-	private static function registerResourceCollectionHooks(): void {
-		\OC\Collaboration\Resources\Listener::register(Server::get(IEventDispatcher::class));
-	}
-
-	private static function registerFileReferenceEventListener(): void {
-		\OC\Collaboration\Reference\File\FileReferenceEventListener::register(Server::get(IEventDispatcher::class));
-	}
-
-	private static function registerRenderReferenceEventListener() {
-		\OC\Collaboration\Reference\RenderReferenceEventListener::register(Server::get(IEventDispatcher::class));
-	}
-
-	/**
-	 * register hooks for sharing
-	 */
-	public static function registerShareHooks(\OC\SystemConfig $systemConfig): void {
-		if ($systemConfig->getValue('installed')) {
-
-			$dispatcher = Server::get(IEventDispatcher::class);
-			$dispatcher->addServiceListener(UserRemovedEvent::class, UserRemovedListener::class);
-			$dispatcher->addServiceListener(GroupDeletedEvent::class, GroupDeletedListener::class);
-			$dispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class);
-		}
-	}
-
-	/**
-	 * Handle the request
-	 */
-	public static function handleRequest(): void {
-		Server::get(\OCP\Diagnostics\IEventLogger::class)->start('handle_request', 'Handle request');
-		$systemConfig = Server::get(\OC\SystemConfig::class);
-
-		// Check if Nextcloud is installed or in maintenance (update) mode
-		if (!$systemConfig->getValue('installed', false)) {
-			\OC::$server->getSession()->clear();
-			$controller = Server::get(\OC\Core\Controller\SetupController::class);
-			$controller->run($_POST);
-			exit();
-		}
-
-		$request = Server::get(IRequest::class);
-		$request->throwDecodingExceptionIfAny();
-		$requestPath = $request->getRawPathInfo();
-		if ($requestPath === '/heartbeat') {
-			return;
-		}
-		if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
-			self::checkMaintenanceMode($systemConfig);
-
-			if (\OCP\Util::needUpgrade()) {
-				if (function_exists('opcache_reset')) {
-					opcache_reset();
-				}
-				if (!((bool)$systemConfig->getValue('maintenance', false))) {
-					self::printUpgradePage($systemConfig);
-					exit();
-				}
-			}
-		}
-
-		$appManager = Server::get(\OCP\App\IAppManager::class);
-
-		// Always load authentication apps
-		$appManager->loadApps(['authentication']);
-		$appManager->loadApps(['extended_authentication']);
-
-		// Load minimum set of apps
-		if (!\OCP\Util::needUpgrade()
-			&& !((bool)$systemConfig->getValue('maintenance', false))) {
-			// For logged-in users: Load everything
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
-				$appManager->loadApps();
-			} else {
-				// For guests: Load only filesystem and logging
-				$appManager->loadApps(['filesystem', 'logging']);
-
-				// Don't try to login when a client is trying to get a OAuth token.
-				// OAuth needs to support basic auth too, so the login is not valid
-				// inside Nextcloud and the Login exception would ruin it.
-				if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
-					try {
-						self::handleLogin($request);
-					} catch (DisabledUserException $e) {
-						// Disabled users would not be seen as logged in and
-						// trying to log them in would fail, so the login
-						// exception is ignored for the themed stylesheets and
-						// images.
-						if ($request->getRawPathInfo() !== '/apps/theming/theme/default.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/light.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/dark.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/light-highcontrast.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/dark-highcontrast.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/theme/opendyslexic.css'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/background'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/logo'
-							&& $request->getRawPathInfo() !== '/apps/theming/image/logoheader'
-							&& !str_starts_with($request->getRawPathInfo(), '/apps/theming/favicon')
-							&& !str_starts_with($request->getRawPathInfo(), '/apps/theming/icon')) {
-							throw $e;
-						}
-					}
-				}
-			}
-		}
-
-		if (!self::$CLI) {
-			try {
-				if (!\OCP\Util::needUpgrade()) {
-					$appManager->loadApps(['filesystem', 'logging']);
-					$appManager->loadApps();
-				}
-				Server::get(\OC\Route\Router::class)->match($request->getRawPathInfo());
-				return;
-			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-				//header('HTTP/1.0 404 Not Found');
-			} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-				http_response_code(405);
-				return;
-			}
-		}
-
-		// Handle WebDAV
-		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
-			// not allowed any more to prevent people
-			// mounting this root directly.
-			// Users need to mount remote.php/webdav instead.
-			http_response_code(405);
-			return;
-		}
-
-		// Handle requests for JSON or XML
-		$acceptHeader = $request->getHeader('Accept');
-		if (in_array($acceptHeader, ['application/json', 'application/xml'], true)) {
-			http_response_code(404);
-			return;
-		}
-
-		// Handle resources that can't be found
-		// This prevents browsers from redirecting to the default page and then
-		// attempting to parse HTML as CSS and similar.
-		$destinationHeader = $request->getHeader('Sec-Fetch-Dest');
-		if (in_array($destinationHeader, ['font', 'script', 'style'])) {
-			http_response_code(404);
-			return;
-		}
-
-		// Redirect to the default app or login only as an entry point
-		if ($requestPath === '') {
-			// Someone is logged in
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
-				header('Location: ' . Server::get(IURLGenerator::class)->linkToDefaultPageUrl());
-			} else {
-				// Not handled and not logged in
-				header('Location: ' . Server::get(IURLGenerator::class)->linkToRouteAbsolute('core.login.showLoginForm'));
-			}
-			return;
-		}
-
-		try {
-			Server::get(\OC\Route\Router::class)->match('/error/404');
-		} catch (\Exception $e) {
-			if (!$e instanceof MethodNotAllowedException) {
-				logger('core')->emergency($e->getMessage(), ['exception' => $e]);
-			}
-			$l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
-			Server::get(ITemplateManager::class)->printErrorPage(
-				'404',
-				$l->t('The page could not be found on the server.'),
-				404
-			);
-		}
-	}
-
-	/**
-	 * Check login: apache auth, auth token, basic auth
-	 */
-	public static function handleLogin(OCP\IRequest $request): bool {
-		if ($request->getHeader('X-Nextcloud-Federation')) {
-			return false;
-		}
-		$userSession = Server::get(\OC\User\Session::class);
-		if (OC_User::handleApacheAuth()) {
-			return true;
-		}
-		if (self::tryAppAPILogin($request)) {
-			return true;
-		}
-		if ($userSession->tryTokenLogin($request)) {
-			return true;
-		}
-		if (isset($_COOKIE['nc_username'])
-			&& isset($_COOKIE['nc_token'])
-			&& isset($_COOKIE['nc_session_id'])
-			&& $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
-			return true;
-		}
-		if ($userSession->tryBasicAuthLogin($request, Server::get(IThrottler::class))) {
-			return true;
-		}
-		return false;
-	}
-
-	protected static function handleAuthHeaders(): void {
-		//copy http auth headers for apache+php-fcgid work around
-		if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
-			$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
-		}
-
-		// Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
-		$vars = [
-			'HTTP_AUTHORIZATION', // apache+php-cgi work around
-			'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
-		];
-		foreach ($vars as $var) {
-			if (isset($_SERVER[$var]) && is_string($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
-				$credentials = explode(':', base64_decode($matches[1]), 2);
-				if (count($credentials) === 2) {
-					$_SERVER['PHP_AUTH_USER'] = $credentials[0];
-					$_SERVER['PHP_AUTH_PW'] = $credentials[1];
-					break;
-				}
-			}
-		}
-	}
-
-	protected static function tryAppAPILogin(OCP\IRequest $request): bool {
-		if (!$request->getHeader('AUTHORIZATION-APP-API')) {
-			return false;
-		}
-		$appManager = Server::get(OCP\App\IAppManager::class);
-		if (!$appManager->isEnabledForAnyone('app_api')) {
-			return false;
-		}
-		try {
-			$appAPIService = Server::get(OCA\AppAPI\Service\AppAPIService::class);
-			return $appAPIService->validateExAppRequestToNC($request);
-		} catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) {
-			return false;
-		}
-	}
+    /**
+     * The installation path for Nextcloud  on the server (e.g. /srv/http/nextcloud)
+     */
+    public static string $SERVERROOT = '';
+    /**
+     * the current request path relative to the Nextcloud root (e.g. files/index.php)
+     */
+    private static string $SUBURI = '';
+    /**
+     * the Nextcloud root path for http requests (e.g. /nextcloud)
+     */
+    public static string $WEBROOT = '';
+    /**
+     * The installation path array of the apps folder on the server (e.g. /srv/http/nextcloud) 'path' and
+     * web path in 'url'
+     */
+    public static array $APPSROOTS = [];
+
+    public static string $configDir;
+
+    /**
+     * requested app
+     */
+    public static string $REQUESTEDAPP = '';
+
+    /**
+     * check if Nextcloud runs in cli mode
+     */
+    public static bool $CLI = false;
+
+    public static \Composer\Autoload\ClassLoader $composerAutoloader;
+
+    public static \OC\Server $server;
+
+    private static \OC\Config $config;
+
+    /**
+     * @throws \RuntimeException when the 3rdparty directory is missing or
+     *                           the app path list is empty or contains an invalid path
+     */
+    public static function initPaths(): void {
+        if (defined('PHPUNIT_CONFIG_DIR')) {
+            self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
+        } elseif (defined('PHPUNIT_RUN') && PHPUNIT_RUN && is_dir(OC::$SERVERROOT . '/tests/config/')) {
+            self::$configDir = OC::$SERVERROOT . '/tests/config/';
+        } elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
+            self::$configDir = rtrim($dir, '/') . '/';
+        } else {
+            self::$configDir = OC::$SERVERROOT . '/config/';
+        }
+        self::$config = new \OC\Config(self::$configDir);
+
+        OC::$SUBURI = str_replace('\\', '/', substr(realpath($_SERVER['SCRIPT_FILENAME'] ?? ''), strlen(OC::$SERVERROOT)));
+        /**
+         * FIXME: The following lines are required because we can't yet instantiate
+         *        Server::get(\OCP\IRequest::class) since \OC::$server does not yet exist.
+         */
+        $params = [
+            'server' => [
+                'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'] ?? null,
+                'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'] ?? null,
+            ],
+        ];
+        if (isset($_SERVER['REMOTE_ADDR'])) {
+            $params['server']['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR'];
+        }
+        $fakeRequest = new \OC\AppFramework\Http\Request(
+            $params,
+            new \OC\AppFramework\Http\RequestId($_SERVER['UNIQUE_ID'] ?? '', new \OC\Security\SecureRandom()),
+            new \OC\AllConfig(new \OC\SystemConfig(self::$config))
+        );
+        $scriptName = $fakeRequest->getScriptName();
+        if (substr($scriptName, -1) == '/') {
+            $scriptName .= 'index.php';
+            //make sure suburi follows the same rules as scriptName
+            if (substr(OC::$SUBURI, -9) != 'index.php') {
+                if (substr(OC::$SUBURI, -1) != '/') {
+                    OC::$SUBURI = OC::$SUBURI . '/';
+                }
+                OC::$SUBURI = OC::$SUBURI . 'index.php';
+            }
+        }
+
+        if (OC::$CLI) {
+            OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+        } else {
+            if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
+                OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
+
+                if (OC::$WEBROOT != '' && OC::$WEBROOT[0] !== '/') {
+                    OC::$WEBROOT = '/' . OC::$WEBROOT;
+                }
+            } else {
+                // The scriptName is not ending with OC::$SUBURI
+                // This most likely means that we are calling from CLI.
+                // However some cron jobs still need to generate
+                // a web URL, so we use overwritewebroot as a fallback.
+                OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
+            }
+
+            // Resolve /nextcloud to /nextcloud/ to ensure to always have a trailing
+            // slash which is required by URL generation.
+            if (isset($_SERVER['REQUEST_URI']) && $_SERVER['REQUEST_URI'] === \OC::$WEBROOT
+                    && substr($_SERVER['REQUEST_URI'], -1) !== '/') {
+                header('Location: ' . \OC::$WEBROOT . '/');
+                exit();
+            }
+        }
+
+        // search the apps folder
+        $config_paths = self::$config->getValue('apps_paths', []);
+        if (!empty($config_paths)) {
+            foreach ($config_paths as $paths) {
+                if (isset($paths['url']) && isset($paths['path'])) {
+                    $paths['url'] = rtrim($paths['url'], '/');
+                    $paths['path'] = rtrim($paths['path'], '/');
+                    OC::$APPSROOTS[] = $paths;
+                }
+            }
+        } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+            OC::$APPSROOTS[] = ['path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true];
+        }
+
+        if (empty(OC::$APPSROOTS)) {
+            throw new \RuntimeException('apps directory not found! Please put the Nextcloud apps folder in the Nextcloud folder'
+                . '. You can also configure the location in the config.php file.');
+        }
+        $paths = [];
+        foreach (OC::$APPSROOTS as $path) {
+            $paths[] = $path['path'];
+            if (!is_dir($path['path'])) {
+                throw new \RuntimeException(sprintf('App directory "%s" not found! Please put the Nextcloud apps folder in the'
+                    . ' Nextcloud folder. You can also configure the location in the config.php file.', $path['path']));
+            }
+        }
+
+        // set the right include path
+        set_include_path(
+            implode(PATH_SEPARATOR, $paths)
+        );
+    }
+
+    public static function checkConfig(): void {
+        // Create config if it does not already exist
+        $configFilePath = self::$configDir . '/config.php';
+        if (!file_exists($configFilePath)) {
+            @touch($configFilePath);
+        }
+
+        // Check if config is writable
+        $configFileWritable = is_writable($configFilePath);
+        $configReadOnly = Server::get(IConfig::class)->getSystemValueBool('config_is_read_only');
+        if (!$configFileWritable && !$configReadOnly
+            || !$configFileWritable && \OCP\Util::needUpgrade()) {
+            $urlGenerator = Server::get(IURLGenerator::class);
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+
+            if (self::$CLI) {
+                echo $l->t('Cannot write into "config" directory!') . "\n";
+                echo $l->t('This can usually be fixed by giving the web server write access to the config directory.') . "\n";
+                echo "\n";
+                echo $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . "\n";
+                echo $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]) . "\n";
+                exit;
+            } else {
+                Server::get(ITemplateManager::class)->printErrorPage(
+                    $l->t('Cannot write into "config" directory!'),
+                    $l->t('This can usually be fixed by giving the web server write access to the config directory.') . ' '
+                    . $l->t('But, if you prefer to keep config.php file read only, set the option "config_is_read_only" to true in it.') . ' '
+                    . $l->t('See %s', [ $urlGenerator->linkToDocs('admin-config') ]),
+                    503
+                );
+            }
+        }
+    }
+
+    public static function checkInstalled(\OC\SystemConfig $systemConfig): void {
+        if (defined('OC_CONSOLE')) {
+            return;
+        }
+        // Redirect to installer if not installed
+        if (!$systemConfig->getValue('installed', false) && OC::$SUBURI !== '/index.php' && OC::$SUBURI !== '/status.php') {
+            if (OC::$CLI) {
+                throw new Exception('Not installed');
+            } else {
+                $url = OC::$WEBROOT . '/index.php';
+                header('Location: ' . $url);
+            }
+            exit();
+        }
+    }
+
+    public static function checkMaintenanceMode(\OC\SystemConfig $systemConfig): void {
+        // Allow ajax update script to execute without being stopped
+        if (((bool)$systemConfig->getValue('maintenance', false)) && OC::$SUBURI != '/core/ajax/update.php') {
+            // send http status 503
+            http_response_code(503);
+            header('X-Nextcloud-Maintenance-Mode: 1');
+            header('Retry-After: 120');
+
+            // render error page
+            $template = Server::get(ITemplateManager::class)->getTemplate('', 'update.user', 'guest');
+            \OCP\Util::addScript('core', 'maintenance');
+            \OCP\Util::addScript('core', 'common');
+            \OCP\Util::addStyle('core', 'guest');
+            $template->printPage();
+            die();
+        }
+    }
+
+    /**
+     * Prints the upgrade page
+     */
+    private static function printUpgradePage(\OC\SystemConfig $systemConfig): void {
+        $cliUpgradeLink = $systemConfig->getValue('upgrade.cli-upgrade-link', '');
+        $disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
+        $tooBig = false;
+        if (!$disableWebUpdater) {
+            $apps = Server::get(\OCP\App\IAppManager::class);
+            if ($apps->isEnabledForAnyone('user_ldap')) {
+                $qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
+
+                $result = $qb->select($qb->func()->count('*', 'user_count'))
+                    ->from('ldap_user_mapping')
+                    ->executeQuery();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig && $apps->isEnabledForAnyone('user_saml')) {
+                $qb = Server::get(\OCP\IDBConnection::class)->getQueryBuilder();
+
+                $result = $qb->select($qb->func()->count('*', 'user_count'))
+                    ->from('user_saml_users')
+                    ->executeQuery();
+                $row = $result->fetch();
+                $result->closeCursor();
+
+                $tooBig = ($row['user_count'] > 50);
+            }
+            if (!$tooBig) {
+                // count users
+                $totalUsers = Server::get(\OCP\IUserManager::class)->countUsersTotal(51);
+                $tooBig = ($totalUsers > 50);
+            }
+        }
+        $ignoreTooBigWarning = isset($_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'])
+            && $_GET['IKnowThatThisIsABigInstanceAndTheUpdateRequestCouldRunIntoATimeoutAndHowToRestoreABackup'] === 'IAmSuperSureToDoThis';
+
+        if ($disableWebUpdater || ($tooBig && !$ignoreTooBigWarning)) {
+            // send http status 503
+            http_response_code(503);
+            header('Retry-After: 120');
+
+            $serverVersion = \OCP\Server::get(\OCP\ServerVersion::class);
+
+            // render error page
+            $template = Server::get(ITemplateManager::class)->getTemplate('', 'update.use-cli', 'guest');
+            $template->assign('productName', 'nextcloud'); // for now
+            $template->assign('version', $serverVersion->getVersionString());
+            $template->assign('tooBig', $tooBig);
+            $template->assign('cliUpgradeLink', $cliUpgradeLink);
+
+            $template->printPage();
+            die();
+        }
+
+        // check whether this is a core update or apps update
+        $installedVersion = $systemConfig->getValue('version', '0.0.0');
+        $currentVersion = implode('.', \OCP\Util::getVersion());
+
+        // if not a core upgrade, then it's apps upgrade
+        $isAppsOnlyUpgrade = version_compare($currentVersion, $installedVersion, '=');
+
+        $oldTheme = $systemConfig->getValue('theme');
+        $systemConfig->setValue('theme', '');
+        \OCP\Util::addScript('core', 'common');
+        \OCP\Util::addScript('core', 'main');
+        \OCP\Util::addTranslations('core');
+        \OCP\Util::addScript('core', 'update');
+
+        /** @var \OC\App\AppManager $appManager */
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+
+        $tmpl = Server::get(ITemplateManager::class)->getTemplate('', 'update.admin', 'guest');
+        $tmpl->assign('version', \OCP\Server::get(\OCP\ServerVersion::class)->getVersionString());
+        $tmpl->assign('isAppsOnlyUpgrade', $isAppsOnlyUpgrade);
+
+        // get third party apps
+        $ocVersion = \OCP\Util::getVersion();
+        $ocVersion = implode('.', $ocVersion);
+        $incompatibleApps = $appManager->getIncompatibleApps($ocVersion);
+        $incompatibleOverwrites = $systemConfig->getValue('app_install_overwrite', []);
+        $incompatibleShippedApps = [];
+        $incompatibleDisabledApps = [];
+        foreach ($incompatibleApps as $appInfo) {
+            if ($appManager->isShipped($appInfo['id'])) {
+                $incompatibleShippedApps[] = $appInfo['name'] . ' (' . $appInfo['id'] . ')';
+            }
+            if (!in_array($appInfo['id'], $incompatibleOverwrites)) {
+                $incompatibleDisabledApps[] = $appInfo;
+            }
+        }
+
+        if (!empty($incompatibleShippedApps)) {
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('core');
+            $hint = $l->t('Application %1$s is not present or has a non-compatible version with this server. Please check the apps directory.', [implode(', ', $incompatibleShippedApps)]);
+            throw new \OCP\HintException('Application ' . implode(', ', $incompatibleShippedApps) . ' is not present or has a non-compatible version with this server. Please check the apps directory.', $hint);
+        }
+
+        $tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
+        $tmpl->assign('incompatibleAppsList', $incompatibleDisabledApps);
+        try {
+            $defaults = new \OC_Defaults();
+            $tmpl->assign('productName', $defaults->getName());
+        } catch (Throwable $error) {
+            $tmpl->assign('productName', 'Nextcloud');
+        }
+        $tmpl->assign('oldTheme', $oldTheme);
+        $tmpl->printPage();
+    }
+
+    public static function initSession(): void {
+        $request = Server::get(IRequest::class);
+
+        // TODO: Temporary disabled again to solve issues with CalDAV/CardDAV clients like DAVx5 that use cookies
+        // TODO: See https://github.com/nextcloud/server/issues/37277#issuecomment-1476366147 and the other comments
+        // TODO: for further information.
+        // $isDavRequest = strpos($request->getRequestUri(), '/remote.php/dav') === 0 || strpos($request->getRequestUri(), '/remote.php/webdav') === 0;
+        // if ($request->getHeader('Authorization') !== '' && is_null($request->getCookie('cookie_test')) && $isDavRequest && !isset($_COOKIE['nc_session_id'])) {
+        // setcookie('cookie_test', 'test', time() + 3600);
+        // // Do not initialize the session if a request is authenticated directly
+        // // unless there is a session cookie already sent along
+        // return;
+        // }
+
+        if ($request->getServerProtocol() === 'https') {
+            ini_set('session.cookie_secure', 'true');
+        }
+
+        // prevents javascript from accessing php session cookies
+        ini_set('session.cookie_httponly', 'true');
+
+        // set the cookie path to the Nextcloud directory
+        $cookie_path = OC::$WEBROOT ? : '/';
+        ini_set('session.cookie_path', $cookie_path);
+
+        // set the cookie domain to the Nextcloud domain
+        $cookie_domain = self::$config->getValue('cookie_domain', '');
+        if ($cookie_domain) {
+            ini_set('session.cookie_domain', $cookie_domain);
+        }
+
+        // Do not initialize sessions for 'status.php' requests
+        // Monitoring endpoints can quickly flood session handlers
+        // and 'status.php' doesn't require sessions anyway
+        // We still need to run the ini_set above so that same-site cookies use the correct configuration.
+        if (str_ends_with($request->getScriptName(), '/status.php')) {
+            return;
+        }
+
+        // Let the session name be changed in the initSession Hook
+        $sessionName = OC_Util::getInstanceId();
+
+        try {
+            $logger = null;
+            if (Server::get(\OC\SystemConfig::class)->getValue('installed', false)) {
+                $logger = logger('core');
+            }
+
+            // set the session name to the instance id - which is unique
+            $session = new \OC\Session\Internal(
+                $sessionName,
+                $logger,
+            );
+
+            $cryptoWrapper = Server::get(\OC\Session\CryptoWrapper::class);
+            $session = $cryptoWrapper->wrapSession($session);
+            self::$server->setSession($session);
+
+            // if session can't be started break with http 500 error
+        } catch (Exception $e) {
+            Server::get(LoggerInterface::class)->error($e->getMessage(), ['app' => 'base','exception' => $e]);
+            //show the user a detailed error page
+            Server::get(ITemplateManager::class)->printExceptionErrorPage($e, 500);
+            die();
+        }
+
+        //try to set the session lifetime
+        $sessionLifeTime = self::getSessionLifeTime();
+
+        // session timeout
+        if ($session->exists('LAST_ACTIVITY') && (time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime)) {
+            if (isset($_COOKIE[session_name()])) {
+                setcookie(session_name(), '', -1, self::$WEBROOT ? : '/');
+            }
+            Server::get(IUserSession::class)->logout();
+        }
+
+        if (!self::hasSessionRelaxedExpiry()) {
+            $session->set('LAST_ACTIVITY', time());
+        }
+        $session->close();
+    }
+
+    private static function getSessionLifeTime(): int {
+        return Server::get(IConfig::class)->getSystemValueInt('session_lifetime', 60 * 60 * 24);
+    }
+
+    /**
+     * @return bool true if the session expiry should only be done by gc instead of an explicit timeout
+     */
+    public static function hasSessionRelaxedExpiry(): bool {
+        return Server::get(IConfig::class)->getSystemValueBool('session_relaxed_expiry', false);
+    }
+
+    /**
+     * Try to set some values to the required Nextcloud default
+     */
+    public static function setRequiredIniValues(): void {
+        // Don't display errors and log them
+        @ini_set('display_errors', '0');
+        @ini_set('log_errors', '1');
+
+        // Try to configure php to enable big file uploads.
+        // This doesn't work always depending on the webserver and php configuration.
+        // Let's try to overwrite some defaults if they are smaller than 1 hour
+
+        if (intval(@ini_get('max_execution_time') ?: 0) < 3600) {
+            @ini_set('max_execution_time', strval(3600));
+        }
+
+        if (intval(@ini_get('max_input_time') ?: 0) < 3600) {
+            @ini_set('max_input_time', strval(3600));
+        }
+
+        // Try to set the maximum execution time to the largest time limit we have
+        if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
+            @set_time_limit(max(intval(@ini_get('max_execution_time')), intval(@ini_get('max_input_time'))));
+        }
+
+        @ini_set('default_charset', 'UTF-8');
+        @ini_set('gd.jpeg_ignore_warning', '1');
+    }
+
+    /**
+     * Send the same site cookies
+     */
+    private static function sendSameSiteCookies(): void {
+        $cookieParams = session_get_cookie_params();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach ($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
+
+    /**
+     * Same Site cookie to further mitigate CSRF attacks. This cookie has to
+     * be set in every request if cookies are sent to add a second level of
+     * defense against CSRF.
+     *
+     * If the cookie is not sent this will set the cookie and reload the page.
+     * We use an additional cookie since we want to protect logout CSRF and
+     * also we can't directly interfere with PHP's session mechanism.
+     */
+    private static function performSameSiteCookieProtection(IConfig $config): void {
+        $request = Server::get(IRequest::class);
+
+        // Some user agents are notorious and don't really properly follow HTTP
+        // specifications. For those, have an automated opt-out. Since the protection
+        // for remote.php is applied in base.php as starting point we need to opt out
+        // here.
+        $incompatibleUserAgents = $config->getSystemValue('csrf.optout');
+
+        // Fallback, if csrf.optout is unset
+        if (!is_array($incompatibleUserAgents)) {
+            $incompatibleUserAgents = [
+                // OS X Finder
+                '/^WebDAVFS/',
+                // Windows webdav drive
+                '/^Microsoft-WebDAV-MiniRedir/',
+            ];
+        }
+
+        if ($request->isUserAgent($incompatibleUserAgents)) {
+            return;
+        }
+
+        if (count($_COOKIE) > 0) {
+            $requestUri = $request->getScriptName();
+            $processingScript = explode('/', $requestUri);
+            $processingScript = $processingScript[count($processingScript) - 1];
+
+            if ($processingScript === 'index.php' // index.php routes are handled in the middleware
+                || $processingScript === 'cron.php' // and cron.php does not need any authentication at all
+                || $processingScript === 'public.php' // For public.php, auth for password protected shares is done in the PublicAuth plugin
+            ) {
+                return;
+            }
+
+            // All other endpoints require the lax and the strict cookie
+            if (!$request->passesStrictCookieCheck()) {
+                logger('core')->warning('Request does not pass strict cookie check');
+                self::sendSameSiteCookies();
+                // Debug mode gets access to the resources without strict cookie
+                // due to the fact that the SabreDAV browser also lives there.
+                if (!$config->getSystemValueBool('debug', false)) {
+                    http_response_code(\OCP\AppFramework\Http::STATUS_PRECONDITION_FAILED);
+                    header('Content-Type: application/json');
+                    echo json_encode(['error' => 'Strict Cookie has not been found in request']);
+                    exit();
+                }
+            }
+        } elseif (!isset($_COOKIE['nc_sameSiteCookielax']) || !isset($_COOKIE['nc_sameSiteCookiestrict'])) {
+            self::sendSameSiteCookies();
+        }
+    }
+
+    /**
+     * This function adds some security related headers to all requests served via base.php
+     * The implementation of this function has to happen here to ensure that all third-party
+     * components (e.g. SabreDAV) also benefit from this headers.
+     */
+    private static function addSecurityHeaders(): void {
+        /**
+         * FIXME: Content Security Policy for legacy components. This
+         * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
+         * is used everywhere.
+         * @see \OCP\AppFramework\Http\Response::getHeaders
+         */
+        $policy = 'default-src \'self\'; '
+            . 'script-src \'self\' \'nonce-' . \OC::$server->getContentSecurityPolicyNonceManager()->getNonce() . '\'; '
+            . 'style-src \'self\' \'unsafe-inline\'; '
+            . 'frame-src *; '
+            . 'img-src * data: blob:; '
+            . 'font-src \'self\' data:; '
+            . 'media-src *; '
+            . 'connect-src *; '
+            . 'object-src \'none\'; '
+            . 'base-uri \'self\'; ';
+        header('Content-Security-Policy:' . $policy);
+
+        // Send fallback headers for installations that don't have the possibility to send
+        // custom headers on the webserver side
+        if (getenv('modHeadersAvailable') !== 'true') {
+            header('Referrer-Policy: no-referrer'); // https://www.w3.org/TR/referrer-policy/
+            header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+            header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
+            header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
+            header('X-Robots-Tag: noindex, nofollow'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+        }
+    }
+
+    public static function init(): void {
+        // First handle PHP configuration and copy auth headers to the expected
+        // $_SERVER variable before doing anything Server object related
+        self::setRequiredIniValues();
+        self::handleAuthHeaders();
+
+        // prevent any XML processing from loading external entities
+        libxml_set_external_entity_loader(static function () {
+            return null;
+        });
+
+        // Set default timezone before the Server object is booted
+        if (!date_default_timezone_set('UTC')) {
+            throw new \RuntimeException('Could not set timezone to UTC');
+        }
+
+        // calculate the root directories
+        OC::$SERVERROOT = str_replace('\\', '/', substr(__DIR__, 0, -4));
+
+        // register autoloader
+        $loaderStart = microtime(true);
+
+        self::$CLI = (php_sapi_name() == 'cli');
+
+        // Add default composer PSR-4 autoloader, ensure apcu to be disabled
+        self::$composerAutoloader = require_once OC::$SERVERROOT . '/lib/composer/autoload.php';
+        self::$composerAutoloader->setApcuPrefix(null);
+
+
+        try {
+            self::initPaths();
+            // setup 3rdparty autoloader
+            $vendorAutoLoad = OC::$SERVERROOT . '/3rdparty/autoload.php';
+            if (!file_exists($vendorAutoLoad)) {
+                throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
+            }
+            require_once $vendorAutoLoad;
+        } catch (\RuntimeException $e) {
+            if (!self::$CLI) {
+                http_response_code(503);
+            }
+            // we can't use the template error page here, because this needs the
+            // DI container which isn't available yet
+            print($e->getMessage());
+            exit();
+        }
+        $loaderEnd = microtime(true);
+
+        // Enable lazy loading if activated
+        \OC\AppFramework\Utility\SimpleContainer::$useLazyObjects = (bool)self::$config->getValue('enable_lazy_objects', true);
+
+        // setup the basic server
+        self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
+        self::$server->boot();
+
+        try {
+            $profiler = new BuiltInProfiler(
+                Server::get(IConfig::class),
+                Server::get(IRequest::class),
+            );
+            $profiler->start();
+        } catch (\Throwable $e) {
+            logger('core')->error('Failed to start profiler: ' . $e->getMessage(), ['app' => 'base']);
+        }
+
+        if (self::$CLI && in_array('--' . \OCP\Console\ReservedOptions::DEBUG_LOG, $_SERVER['argv'])) {
+            \OC\Core\Listener\BeforeMessageLoggedEventListener::setup();
+        }
+
+        $eventLogger = Server::get(\OCP\Diagnostics\IEventLogger::class);
+        $eventLogger->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
+        $eventLogger->start('boot', 'Initialize');
+
+        // Override php.ini and log everything if we're troubleshooting
+        if (self::$config->getValue('loglevel') === ILogger::DEBUG) {
+            error_reporting(E_ALL);
+        }
+
+        // initialize intl fallback if necessary
+        OC_Util::isSetLocaleWorking();
+
+        $config = Server::get(IConfig::class);
+        if (!defined('PHPUNIT_RUN')) {
+            $errorHandler = new OC\Log\ErrorHandler(
+                \OCP\Server::get(\Psr\Log\LoggerInterface::class),
+            );
+            $exceptionHandler = [$errorHandler, 'onException'];
+            if ($config->getSystemValueBool('debug', false)) {
+                set_error_handler([$errorHandler, 'onAll'], E_ALL);
+                if (\OC::$CLI) {
+                    $exceptionHandler = [Server::get(ITemplateManager::class), 'printExceptionErrorPage'];
+                }
+            } else {
+                set_error_handler([$errorHandler, 'onError']);
+            }
+            register_shutdown_function([$errorHandler, 'onShutdown']);
+            set_exception_handler($exceptionHandler);
+        }
+
+        /** @var \OC\AppFramework\Bootstrap\Coordinator $bootstrapCoordinator */
+        $bootstrapCoordinator = Server::get(\OC\AppFramework\Bootstrap\Coordinator::class);
+        $bootstrapCoordinator->runInitialRegistration();
+
+        $eventLogger->start('init_session', 'Initialize session');
+
+        // Check for PHP SimpleXML extension earlier since we need it before our other checks and want to provide a useful hint for web users
+        // see https://github.com/nextcloud/server/pull/2619
+        if (!function_exists('simplexml_load_file')) {
+            throw new \OCP\HintException('The PHP SimpleXML/PHP-XML extension is not installed.', 'Install the extension or make sure it is enabled.');
+        }
+
+        $systemConfig = Server::get(\OC\SystemConfig::class);
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+        if ($systemConfig->getValue('installed', false)) {
+            $appManager->loadApps(['session']);
+        }
+        if (!self::$CLI) {
+            self::initSession();
+        }
+        $eventLogger->end('init_session');
+        self::checkConfig();
+        self::checkInstalled($systemConfig);
+
+        self::addSecurityHeaders();
+
+        self::performSameSiteCookieProtection($config);
+
+        if (!defined('OC_CONSOLE')) {
+            $eventLogger->start('check_server', 'Run a few configuration checks');
+            $errors = OC_Util::checkServer($systemConfig);
+            if (count($errors) > 0) {
+                if (!self::$CLI) {
+                    http_response_code(503);
+                    Util::addStyle('guest');
+                    try {
+                        Server::get(ITemplateManager::class)->printGuestPage('', 'error', ['errors' => $errors]);
+                        exit;
+                    } catch (\Exception $e) {
+                        // In case any error happens when showing the error page, we simply fall back to posting the text.
+                        // This might be the case when e.g. the data directory is broken and we can not load/write SCSS to/from it.
+                    }
+                }
+
+                // Convert l10n string into regular string for usage in database
+                $staticErrors = [];
+                foreach ($errors as $error) {
+                    echo $error['error'] . "\n";
+                    echo $error['hint'] . "\n\n";
+                    $staticErrors[] = [
+                        'error' => (string)$error['error'],
+                        'hint' => (string)$error['hint'],
+                    ];
+                }
+
+                try {
+                    $config->setAppValue('core', 'cronErrors', json_encode($staticErrors));
+                } catch (\Exception $e) {
+                    echo('Writing to database failed');
+                }
+                exit(1);
+            } elseif (self::$CLI && $config->getSystemValueBool('installed', false)) {
+                $config->deleteAppValue('core', 'cronErrors');
+            }
+            $eventLogger->end('check_server');
+        }
+
+        // User and Groups
+        if (!$systemConfig->getValue('installed', false)) {
+            self::$server->getSession()->set('user_id', '');
+        }
+
+        $eventLogger->start('setup_backends', 'Setup group and user backends');
+        Server::get(\OCP\IUserManager::class)->registerBackend(new \OC\User\Database());
+        Server::get(\OCP\IGroupManager::class)->addBackend(new \OC\Group\Database());
+
+        // Subscribe to the hook
+        \OCP\Util::connectHook(
+            '\OCA\Files_Sharing\API\Server2Server',
+            'preLoginNameUsedAsUserName',
+            '\OC\User\Database',
+            'preLoginNameUsedAsUserName'
+        );
+
+        //setup extra user backends
+        if (!\OCP\Util::needUpgrade()) {
+            OC_User::setupBackends();
+        } else {
+            // Run upgrades in incognito mode
+            OC_User::setIncognitoMode(true);
+        }
+        $eventLogger->end('setup_backends');
+
+        self::registerCleanupHooks($systemConfig);
+        self::registerShareHooks($systemConfig);
+        self::registerEncryptionWrapperAndHooks();
+        self::registerAccountHooks();
+        self::registerResourceCollectionHooks();
+        self::registerFileReferenceEventListener();
+        self::registerRenderReferenceEventListener();
+        self::registerAppRestrictionsHooks();
+
+        // Make sure that the application class is not loaded before the database is setup
+        if ($systemConfig->getValue('installed', false)) {
+            $appManager->loadApp('settings');
+        }
+
+        //make sure temporary files are cleaned up
+        $tmpManager = Server::get(\OCP\ITempManager::class);
+        register_shutdown_function([$tmpManager, 'clean']);
+        $lockProvider = Server::get(\OCP\Lock\ILockingProvider::class);
+        register_shutdown_function([$lockProvider, 'releaseAll']);
+
+        // Check whether the sample configuration has been copied
+        if ($systemConfig->getValue('copied_sample_config', false)) {
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+            Server::get(ITemplateManager::class)->printErrorPage(
+                $l->t('Sample configuration detected'),
+                $l->t('It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php'),
+                503
+            );
+            return;
+        }
+
+        $request = Server::get(IRequest::class);
+        $host = $request->getInsecureServerHost();
+        /**
+         * if the host passed in headers isn't trusted
+         * FIXME: Should not be in here at all :see_no_evil:
+         */
+        if (!OC::$CLI
+            && !Server::get(\OC\Security\TrustedDomainHelper::class)->isTrustedDomain($host)
+            && $config->getSystemValueBool('installed', false)
+        ) {
+            // Allow access to CSS resources
+            $isScssRequest = false;
+            if (strpos($request->getPathInfo() ?: '', '/css/') === 0) {
+                $isScssRequest = true;
+            }
+
+            if (substr($request->getRequestUri(), -11) === '/status.php') {
+                http_response_code(400);
+                header('Content-Type: application/json');
+                echo '{"error": "Trusted domain error.", "code": 15}';
+                exit();
+            }
+
+            if (!$isScssRequest) {
+                http_response_code(400);
+                Server::get(LoggerInterface::class)->info(
+                    'Trusted domain error. "{remoteAddress}" tried to access using "{host}" as host.',
+                    [
+                        'app' => 'core',
+                        'remoteAddress' => $request->getRemoteAddress(),
+                        'host' => $host,
+                    ]
+                );
+
+                $tmpl = Server::get(ITemplateManager::class)->getTemplate('core', 'untrustedDomain', 'guest');
+                $tmpl->assign('docUrl', Server::get(IURLGenerator::class)->linkToDocs('admin-trusted-domains'));
+                $tmpl->printPage();
+
+                exit();
+            }
+        }
+        $eventLogger->end('boot');
+        $eventLogger->log('init', 'OC::init', $loaderStart, microtime(true));
+        $eventLogger->start('runtime', 'Runtime');
+        $eventLogger->start('request', 'Full request after boot');
+        register_shutdown_function(function () use ($eventLogger) {
+            $eventLogger->end('request');
+        });
+
+        register_shutdown_function(function () {
+            $memoryPeak = memory_get_peak_usage();
+            $logLevel = match (true) {
+                $memoryPeak > 500_000_000 => ILogger::FATAL,
+                $memoryPeak > 400_000_000 => ILogger::ERROR,
+                $memoryPeak > 300_000_000 => ILogger::WARN,
+                default => null,
+            };
+            if ($logLevel !== null) {
+                $message = 'Request used more than 300 MB of RAM: ' . Util::humanFileSize($memoryPeak);
+                $logger = Server::get(LoggerInterface::class);
+                $logger->log($logLevel, $message, ['app' => 'core']);
+            }
+        });
+    }
+
+    /**
+     * register hooks for the cleanup of cache and bruteforce protection
+     */
+    public static function registerCleanupHooks(\OC\SystemConfig $systemConfig): void {
+        //don't try to do this before we are properly setup
+        if ($systemConfig->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
+            // NOTE: This will be replaced to use OCP
+            $userSession = Server::get(\OC\User\Session::class);
+            $userSession->listen('\OC\User', 'postLogin', function () use ($userSession) {
+                if (!defined('PHPUNIT_RUN') && $userSession->isLoggedIn()) {
+                    // reset brute force delay for this IP address and username
+                    $uid = $userSession->getUser()->getUID();
+                    $request = Server::get(IRequest::class);
+                    $throttler = Server::get(IThrottler::class);
+                    $throttler->resetDelay($request->getRemoteAddress(), 'login', ['user' => $uid]);
+                }
+
+                try {
+                    $cache = new \OC\Cache\File();
+                    $cache->gc();
+                } catch (\OC\ServerNotAvailableException $e) {
+                    // not a GC exception, pass it on
+                    throw $e;
+                } catch (\OC\ForbiddenException $e) {
+                    // filesystem blocked for this request, ignore
+                } catch (\Exception $e) {
+                    // a GC exception should not prevent users from using OC,
+                    // so log the exception
+                    Server::get(LoggerInterface::class)->warning('Exception when running cache gc.', [
+                        'app' => 'core',
+                        'exception' => $e,
+                    ]);
+                }
+            });
+        }
+    }
+
+    private static function registerEncryptionWrapperAndHooks(): void {
+        /** @var \OC\Encryption\Manager */
+        $manager = Server::get(\OCP\Encryption\IManager::class);
+        Server::get(IEventDispatcher::class)->addListener(
+            BeforeFileSystemSetupEvent::class,
+            $manager->setupStorage(...),
+        );
+
+        $enabled = $manager->isEnabled();
+        if ($enabled) {
+            \OC\Encryption\EncryptionEventListener::register(Server::get(IEventDispatcher::class));
+        }
+    }
+
+    private static function registerAccountHooks(): void {
+        /** @var IEventDispatcher $dispatcher */
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $dispatcher->addServiceListener(UserChangedEvent::class, \OC\Accounts\Hooks::class);
+    }
+
+    private static function registerAppRestrictionsHooks(): void {
+        /** @var \OC\Group\Manager $groupManager */
+        $groupManager = Server::get(\OCP\IGroupManager::class);
+        $groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
+            $appManager = Server::get(\OCP\App\IAppManager::class);
+            $apps = $appManager->getEnabledAppsForGroup($group);
+            foreach ($apps as $appId) {
+                $restrictions = $appManager->getAppRestriction($appId);
+                if (empty($restrictions)) {
+                    continue;
+                }
+                $key = array_search($group->getGID(), $restrictions);
+                unset($restrictions[$key]);
+                $restrictions = array_values($restrictions);
+                if (empty($restrictions)) {
+                    $appManager->disableApp($appId);
+                } else {
+                    $appManager->enableAppForGroups($appId, $restrictions);
+                }
+            }
+        });
+    }
+
+    private static function registerResourceCollectionHooks(): void {
+        \OC\Collaboration\Resources\Listener::register(Server::get(IEventDispatcher::class));
+    }
+
+    private static function registerFileReferenceEventListener(): void {
+        \OC\Collaboration\Reference\File\FileReferenceEventListener::register(Server::get(IEventDispatcher::class));
+    }
+
+    private static function registerRenderReferenceEventListener() {
+        \OC\Collaboration\Reference\RenderReferenceEventListener::register(Server::get(IEventDispatcher::class));
+    }
+
+    /**
+     * register hooks for sharing
+     */
+    public static function registerShareHooks(\OC\SystemConfig $systemConfig): void {
+        if ($systemConfig->getValue('installed')) {
+
+            $dispatcher = Server::get(IEventDispatcher::class);
+            $dispatcher->addServiceListener(UserRemovedEvent::class, UserRemovedListener::class);
+            $dispatcher->addServiceListener(GroupDeletedEvent::class, GroupDeletedListener::class);
+            $dispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedListener::class);
+        }
+    }
+
+    /**
+     * Handle the request
+     */
+    public static function handleRequest(): void {
+        Server::get(\OCP\Diagnostics\IEventLogger::class)->start('handle_request', 'Handle request');
+        $systemConfig = Server::get(\OC\SystemConfig::class);
+
+        // Check if Nextcloud is installed or in maintenance (update) mode
+        if (!$systemConfig->getValue('installed', false)) {
+            \OC::$server->getSession()->clear();
+            $controller = Server::get(\OC\Core\Controller\SetupController::class);
+            $controller->run($_POST);
+            exit();
+        }
+
+        $request = Server::get(IRequest::class);
+        $request->throwDecodingExceptionIfAny();
+        $requestPath = $request->getRawPathInfo();
+        if ($requestPath === '/heartbeat') {
+            return;
+        }
+        if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade
+            self::checkMaintenanceMode($systemConfig);
+
+            if (\OCP\Util::needUpgrade()) {
+                if (function_exists('opcache_reset')) {
+                    opcache_reset();
+                }
+                if (!((bool)$systemConfig->getValue('maintenance', false))) {
+                    self::printUpgradePage($systemConfig);
+                    exit();
+                }
+            }
+        }
+
+        $appManager = Server::get(\OCP\App\IAppManager::class);
+
+        // Always load authentication apps
+        $appManager->loadApps(['authentication']);
+        $appManager->loadApps(['extended_authentication']);
+
+        // Load minimum set of apps
+        if (!\OCP\Util::needUpgrade()
+            && !((bool)$systemConfig->getValue('maintenance', false))) {
+            // For logged-in users: Load everything
+            if (Server::get(IUserSession::class)->isLoggedIn()) {
+                $appManager->loadApps();
+            } else {
+                // For guests: Load only filesystem and logging
+                $appManager->loadApps(['filesystem', 'logging']);
+
+                // Don't try to login when a client is trying to get a OAuth token.
+                // OAuth needs to support basic auth too, so the login is not valid
+                // inside Nextcloud and the Login exception would ruin it.
+                if ($request->getRawPathInfo() !== '/apps/oauth2/api/v1/token') {
+                    try {
+                        self::handleLogin($request);
+                    } catch (DisabledUserException $e) {
+                        // Disabled users would not be seen as logged in and
+                        // trying to log them in would fail, so the login
+                        // exception is ignored for the themed stylesheets and
+                        // images.
+                        if ($request->getRawPathInfo() !== '/apps/theming/theme/default.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/light.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/dark.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/light-highcontrast.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/dark-highcontrast.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/theme/opendyslexic.css'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/background'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/logo'
+                            && $request->getRawPathInfo() !== '/apps/theming/image/logoheader'
+                            && !str_starts_with($request->getRawPathInfo(), '/apps/theming/favicon')
+                            && !str_starts_with($request->getRawPathInfo(), '/apps/theming/icon')) {
+                            throw $e;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!self::$CLI) {
+            try {
+                if (!\OCP\Util::needUpgrade()) {
+                    $appManager->loadApps(['filesystem', 'logging']);
+                    $appManager->loadApps();
+                }
+                Server::get(\OC\Route\Router::class)->match($request->getRawPathInfo());
+                return;
+            } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+                //header('HTTP/1.0 404 Not Found');
+            } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+                http_response_code(405);
+                return;
+            }
+        }
+
+        // Handle WebDAV
+        if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND') {
+            // not allowed any more to prevent people
+            // mounting this root directly.
+            // Users need to mount remote.php/webdav instead.
+            http_response_code(405);
+            return;
+        }
+
+        // Handle requests for JSON or XML
+        $acceptHeader = $request->getHeader('Accept');
+        if (in_array($acceptHeader, ['application/json', 'application/xml'], true)) {
+            http_response_code(404);
+            return;
+        }
+
+        // Handle resources that can't be found
+        // This prevents browsers from redirecting to the default page and then
+        // attempting to parse HTML as CSS and similar.
+        $destinationHeader = $request->getHeader('Sec-Fetch-Dest');
+        if (in_array($destinationHeader, ['font', 'script', 'style'])) {
+            http_response_code(404);
+            return;
+        }
+
+        // Redirect to the default app or login only as an entry point
+        if ($requestPath === '') {
+            // Someone is logged in
+            if (Server::get(IUserSession::class)->isLoggedIn()) {
+                header('Location: ' . Server::get(IURLGenerator::class)->linkToDefaultPageUrl());
+            } else {
+                // Not handled and not logged in
+                header('Location: ' . Server::get(IURLGenerator::class)->linkToRouteAbsolute('core.login.showLoginForm'));
+            }
+            return;
+        }
+
+        try {
+            Server::get(\OC\Route\Router::class)->match('/error/404');
+        } catch (\Exception $e) {
+            if (!$e instanceof MethodNotAllowedException) {
+                logger('core')->emergency($e->getMessage(), ['exception' => $e]);
+            }
+            $l = Server::get(\OCP\L10N\IFactory::class)->get('lib');
+            Server::get(ITemplateManager::class)->printErrorPage(
+                '404',
+                $l->t('The page could not be found on the server.'),
+                404
+            );
+        }
+    }
+
+    /**
+     * Check login: apache auth, auth token, basic auth
+     */
+    public static function handleLogin(OCP\IRequest $request): bool {
+        if ($request->getHeader('X-Nextcloud-Federation')) {
+            return false;
+        }
+        $userSession = Server::get(\OC\User\Session::class);
+        if (OC_User::handleApacheAuth()) {
+            return true;
+        }
+        if (self::tryAppAPILogin($request)) {
+            return true;
+        }
+        if ($userSession->tryTokenLogin($request)) {
+            return true;
+        }
+        if (isset($_COOKIE['nc_username'])
+            && isset($_COOKIE['nc_token'])
+            && isset($_COOKIE['nc_session_id'])
+            && $userSession->loginWithCookie($_COOKIE['nc_username'], $_COOKIE['nc_token'], $_COOKIE['nc_session_id'])) {
+            return true;
+        }
+        if ($userSession->tryBasicAuthLogin($request, Server::get(IThrottler::class))) {
+            return true;
+        }
+        return false;
+    }
+
+    protected static function handleAuthHeaders(): void {
+        //copy http auth headers for apache+php-fcgid work around
+        if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+        }
+
+        // Extract PHP_AUTH_USER/PHP_AUTH_PW from other headers if necessary.
+        $vars = [
+            'HTTP_AUTHORIZATION', // apache+php-cgi work around
+            'REDIRECT_HTTP_AUTHORIZATION', // apache+php-cgi alternative
+        ];
+        foreach ($vars as $var) {
+            if (isset($_SERVER[$var]) && is_string($_SERVER[$var]) && preg_match('/Basic\s+(.*)$/i', $_SERVER[$var], $matches)) {
+                $credentials = explode(':', base64_decode($matches[1]), 2);
+                if (count($credentials) === 2) {
+                    $_SERVER['PHP_AUTH_USER'] = $credentials[0];
+                    $_SERVER['PHP_AUTH_PW'] = $credentials[1];
+                    break;
+                }
+            }
+        }
+    }
+
+    protected static function tryAppAPILogin(OCP\IRequest $request): bool {
+        if (!$request->getHeader('AUTHORIZATION-APP-API')) {
+            return false;
+        }
+        $appManager = Server::get(OCP\App\IAppManager::class);
+        if (!$appManager->isEnabledForAnyone('app_api')) {
+            return false;
+        }
+        try {
+            $appAPIService = Server::get(OCA\AppAPI\Service\AppAPIService::class);
+            return $appAPIService->validateExAppRequestToNC($request);
+        } catch (\Psr\Container\NotFoundExceptionInterface|\Psr\Container\ContainerExceptionInterface $e) {
+            return false;
+        }
+    }
 }
 
 OC::init();

apps/files_trashbin/lib/Trashbin.php

Indentation +1165 added lines, -1165 removed lines

@@ -56,1169 +56,1169 @@
 
 /** @template-implements IEventListener<BeforeNodeDeletedEvent> */
 class Trashbin implements IEventListener {
-	// unit: percentage; 50% of available disk space/quota
-	public const DEFAULTMAXSIZE = 50;
-
-	/**
-	 * Ensure we don't need to scan the file during the move to trash
-	 * by triggering the scan in the pre-hook
-	 */
-	public static function ensureFileScannedHook(Node $node): void {
-		try {
-			self::getUidAndFilename($node->getPath());
-		} catch (NotFoundException $e) {
-			// Nothing to scan for non existing files
-		}
-	}
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param string $filename
-	 * @return array
-	 * @throws NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = Server::get(IUserManager::class);
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to move the file to the right trash bin
-		if (!$userManager->userExists($uid)) {
-			$uid = OC_User::getUser();
-		}
-		if (!$uid) {
-			// no owner, usually because of share link from ext storage
-			return [null, null];
-		}
-		Filesystem::initMountPoints($uid);
-		if ($uid !== OC_User::getUser()) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/' . $uid . '/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * get original location and deleted by of files for user
-	 *
-	 * @param string $user
-	 * @return array<string, array<string, array{location: string, deletedBy: string}>>
-	 */
-	public static function getExtraData($user) {
-		$query = Server::get(IDBConnection::class)->getQueryBuilder();
-		$query->select('id', 'timestamp', 'location', 'deleted_by')
-			->from('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)));
-		$result = $query->executeQuery();
-		$array = [];
-		foreach ($result->iterateAssociative() as $row) {
-			$array[$row['id']][$row['timestamp']] = [
-				'location' => (string)$row['location'],
-				'deletedBy' => (string)$row['deleted_by'],
-			];
-		}
-		$result->closeCursor();
-		return $array;
-	}
-
-	/**
-	 * get original location of file
-	 *
-	 * @param string $user
-	 * @param string $filename
-	 * @param string $timestamp
-	 * @return string|false original location
-	 */
-	public static function getLocation($user, $filename, $timestamp) {
-		$query = Server::get(IDBConnection::class)->getQueryBuilder();
-		$query->select('location')
-			->from('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-			->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-			->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-
-		$result = $query->executeQuery();
-		$row = $result->fetchAssociative();
-		$result->closeCursor();
-
-		if (isset($row['location'])) {
-			return $row['location'];
-		} else {
-			return false;
-		}
-	}
-
-	/** @param string $user */
-	private static function setUpTrash($user): void {
-		$view = new View('/' . $user);
-		if (!$view->is_dir('files_trashbin')) {
-			$view->mkdir('files_trashbin');
-		}
-		if (!$view->is_dir('files_trashbin/files')) {
-			$view->mkdir('files_trashbin/files');
-		}
-		if (!$view->is_dir('files_trashbin/versions')) {
-			$view->mkdir('files_trashbin/versions');
-		}
-		if (!$view->is_dir('files_trashbin/keys')) {
-			$view->mkdir('files_trashbin/keys');
-		}
-	}
-
-
-	/**
-	 * copy file to owners trash
-	 *
-	 * @param string $sourcePath
-	 * @param string $owner
-	 * @param string $targetPath
-	 * @param string $user
-	 * @param int $timestamp
-	 */
-	private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user, $timestamp): void {
-		self::setUpTrash($owner);
-
-		$targetFilename = basename($targetPath);
-		$targetLocation = dirname($targetPath);
-
-		$sourceFilename = basename($sourcePath);
-
-		$view = new View('/');
-
-		$target = $user . '/files_trashbin/files/' . static::getTrashFilename($targetFilename, $timestamp);
-		$source = $owner . '/files_trashbin/files/' . static::getTrashFilename($sourceFilename, $timestamp);
-		$free = $view->free_space($target);
-		$isUnknownOrUnlimitedFreeSpace = $free < 0;
-		$isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
-		if ($isUnknownOrUnlimitedFreeSpace || $isEnoughFreeSpaceLeft) {
-			self::copy_recursive($source, $target, $view);
-		}
-
-
-		if ($view->file_exists($target)) {
-			$query = Server::get(IDBConnection::class)->getQueryBuilder();
-			$query->insert('files_trash')
-				->setValue('id', $query->createNamedParameter($targetFilename))
-				->setValue('timestamp', $query->createNamedParameter($timestamp))
-				->setValue('location', $query->createNamedParameter($targetLocation))
-				->setValue('user', $query->createNamedParameter($user))
-				->setValue('deleted_by', $query->createNamedParameter($user));
-			$result = $query->executeStatement();
-			if (!$result) {
-				Server::get(LoggerInterface::class)->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']);
-			}
-		}
-	}
-
-
-	/**
-	 * move file to the trash bin
-	 *
-	 * @param string $file_path path to the deleted file/directory relative to the files root directory
-	 * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
-	 *
-	 * @return bool
-	 */
-	public static function move2trash($file_path, $ownerOnly = false) {
-		// get the user for which the filesystem is setup
-		$root = Filesystem::getRoot();
-		[, $user] = explode('/', $root);
-		[$owner, $ownerPath] = self::getUidAndFilename($file_path);
-
-		// if no owner found (ex: ext storage + share link), will use the current user's trashbin then
-		if (is_null($owner)) {
-			$owner = $user;
-			$ownerPath = $file_path;
-		}
-
-		$ownerView = new View('/' . $owner);
-
-		// file has been deleted in between
-		if (is_null($ownerPath) || $ownerPath === '') {
-			return true;
-		}
-
-		$sourceInfo = $ownerView->getFileInfo('/files/' . $ownerPath);
-
-		if ($sourceInfo === false) {
-			return true;
-		}
-
-		self::setUpTrash($user);
-		if ($owner !== $user) {
-			// also setup for owner
-			self::setUpTrash($owner);
-		}
-
-		$path_parts = pathinfo($ownerPath);
-
-		$filename = $path_parts['basename'];
-		$location = $path_parts['dirname'];
-		/** @var ITimeFactory $timeFactory */
-		$timeFactory = Server::get(ITimeFactory::class);
-		$timestamp = $timeFactory->getTime();
-
-		$lockingProvider = Server::get(ILockingProvider::class);
-
-		// disable proxy to prevent recursive calls
-		$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
-		$gotLock = false;
-
-		do {
-			/** @var ILockingStorage & IStorage $trashStorage */
-			[$trashStorage, $trashInternalPath] = $ownerView->resolvePath($trashPath);
-			try {
-				$trashStorage->acquireLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
-				$gotLock = true;
-			} catch (LockedException $e) {
-				// a file with the same name is being deleted concurrently
-				// nudge the timestamp a bit to resolve the conflict
-
-				$timestamp = $timestamp + 1;
-
-				$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
-			}
-		} while (!$gotLock);
-
-		$sourceStorage = $sourceInfo->getStorage();
-		$sourceInternalPath = $sourceInfo->getInternalPath();
-
-		if ($trashStorage->file_exists($trashInternalPath)) {
-			$trashStorage->unlink($trashInternalPath);
-		}
-
-		$configuredTrashbinSize = static::getConfiguredTrashbinSize($owner);
-		if ($configuredTrashbinSize >= 0 && $sourceInfo->getSize() >= $configuredTrashbinSize) {
-			return false;
-		}
-
-		try {
-			$moveSuccessful = true;
-
-			$inCache = $sourceStorage->getCache()->inCache($sourceInternalPath);
-			$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
-			if ($inCache) {
-				$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
-			}
-		} catch (CopyRecursiveException $e) {
-			$moveSuccessful = false;
-			if ($trashStorage->file_exists($trashInternalPath)) {
-				$trashStorage->unlink($trashInternalPath);
-			}
-			Server::get(LoggerInterface::class)->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
-		}
-
-		if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
-			if ($sourceStorage->is_dir($sourceInternalPath)) {
-				$sourceStorage->rmdir($sourceInternalPath);
-			} else {
-				$sourceStorage->unlink($sourceInternalPath);
-			}
-
-			if ($sourceStorage->file_exists($sourceInternalPath)) {
-				// undo the cache move
-				$sourceStorage->getUpdater()->renameFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath);
-			} else {
-				$trashStorage->getUpdater()->remove($trashInternalPath);
-			}
-			return false;
-		}
-
-		if ($moveSuccessful) {
-			// there is still a possibility that the file has been deleted by a remote user
-			$deletedBy = self::overwriteDeletedBy($user);
-
-			$query = Server::get(IDBConnection::class)->getQueryBuilder();
-			$query->insert('files_trash')
-				->setValue('id', $query->createNamedParameter($filename))
-				->setValue('timestamp', $query->createNamedParameter($timestamp))
-				->setValue('location', $query->createNamedParameter($location))
-				->setValue('user', $query->createNamedParameter($owner))
-				->setValue('deleted_by', $query->createNamedParameter($deletedBy));
-			$result = $query->executeStatement();
-			if (!$result) {
-				Server::get(LoggerInterface::class)->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']);
-			}
-			Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', ['filePath' => Filesystem::normalizePath($file_path),
-				'trashPath' => Filesystem::normalizePath(static::getTrashFilename($filename, $timestamp))]);
-
-			self::retainVersions($filename, $owner, $ownerPath, $timestamp);
-
-			// if owner !== user we need to also add a copy to the users trash
-			if ($user !== $owner && $ownerOnly === false) {
-				self::copyFilesToUser($ownerPath, $owner, $file_path, $user, $timestamp);
-			}
-		}
-
-		$trashStorage->releaseLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
-
-		self::scheduleExpire($user);
-
-		// if owner !== user we also need to update the owners trash size
-		if ($owner !== $user) {
-			self::scheduleExpire($owner);
-		}
-
-		return $moveSuccessful;
-	}
-
-	private static function getConfiguredTrashbinSize(string $user): int|float {
-		$userConfig = Server::get(IUserConfig::class);
-		$userTrashbinSize = $userConfig->getValueString($user, 'files_trashbin', 'trashbin_size', '-1');
-		if (is_numeric($userTrashbinSize) && ($userTrashbinSize > -1)) {
-			return Util::numericToNumber($userTrashbinSize);
-		}
-
-		$appConfig = Server::get(IAppConfig::class);
-		$systemTrashbinSize = $appConfig->getValueString('files_trashbin', 'trashbin_size', '-1');
-		if (is_numeric($systemTrashbinSize)) {
-			return Util::numericToNumber($systemTrashbinSize);
-		}
-		return -1;
-	}
-
-	/**
-	 * Move file versions to trash so that they can be restored later
-	 *
-	 * @param string $filename of deleted file
-	 * @param string $owner owner user id
-	 * @param string $ownerPath path relative to the owner's home storage
-	 * @param int $timestamp when the file was deleted
-	 */
-	private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
-		if (Server::get(IAppManager::class)->isEnabledForUser('files_versions') && !empty($ownerPath)) {
-			$user = OC_User::getUser();
-			$rootView = new View('/');
-
-			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
-				if ($owner !== $user) {
-					self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
-				}
-				self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . static::getTrashFilename($filename, $timestamp));
-			} elseif ($versions = Storage::getVersions($owner, $ownerPath)) {
-				foreach ($versions as $v) {
-					if ($owner !== $user) {
-						self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . static::getTrashFilename($v['name'] . '.v' . $v['version'], $timestamp));
-					}
-					self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Move a file or folder on storage level
-	 *
-	 * @param View $view
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	private static function move(View $view, $source, $target) {
-		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		[$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
-		/** @var \OC\Files\Storage\Storage $targetStorage */
-		[$targetStorage, $targetInternalPath] = $view->resolvePath($target);
-		/** @var \OC\Files\Storage\Storage $ownerTrashStorage */
-
-		$result = $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		if ($result) {
-			$targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		}
-		return $result;
-	}
-
-	/**
-	 * Copy a file or folder on storage level
-	 *
-	 * @param View $view
-	 * @param string $source
-	 * @param string $target
-	 * @return bool
-	 */
-	private static function copy(View $view, $source, $target) {
-		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		[$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
-		/** @var \OC\Files\Storage\Storage $targetStorage */
-		[$targetStorage, $targetInternalPath] = $view->resolvePath($target);
-		/** @var \OC\Files\Storage\Storage $ownerTrashStorage */
-
-		$result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		if ($result) {
-			$targetStorage->getUpdater()->update($targetInternalPath);
-		}
-		return $result;
-	}
-
-	/**
-	 * Restore a file or folder from trash bin
-	 *
-	 * @param string $file path to the deleted file/folder relative to "files_trashbin/files/",
-	 *                     including the timestamp suffix ".d12345678"
-	 * @param string $filename name of the file/folder
-	 * @param int $timestamp time when the file/folder was deleted
-	 *
-	 * @return bool true on success, false otherwise
-	 */
-	public static function restore($file, $filename, $timestamp) {
-		$user = OC_User::getUser();
-		if (!$user) {
-			throw new \Exception('Tried to restore a file while not logged in');
-		}
-		$view = new View('/' . $user);
-
-		$location = '';
-		if ($timestamp) {
-			$location = self::getLocation($user, $filename, $timestamp);
-			if ($location === false) {
-				Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
-			} else {
-				// if location no longer exists, restore file in the root directory
-				if ($location !== '/'
-					&& (!$view->is_dir('files/' . $location)
-						|| !$view->isCreatable('files/' . $location))
-				) {
-					$location = '';
-				}
-			}
-		}
-
-		// we need a  extension in case a file/dir with the same name already exists
-		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
-
-		$source = Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
-		if (!$view->file_exists($source)) {
-			return false;
-		}
-		$mtime = $view->filemtime($source);
-
-		// restore file
-		if (!$view->isCreatable(dirname($target))) {
-			throw new NotPermittedException("Can't restore trash item because the target folder is not writable");
-		}
-
-		$sourcePath = Filesystem::normalizePath($file);
-		$targetPath = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
-
-		$sourceNode = self::getNodeForPath($user, $sourcePath);
-		$targetNode = self::getNodeForPath($user, $targetPath, 'files');
-		$run = true;
-		$event = new BeforeNodeRestoredEvent($sourceNode, $targetNode, $run);
-		$dispatcher = Server::get(IEventDispatcher::class);
-		$dispatcher->dispatchTyped($event);
-
-		if (!$run) {
-			return false;
-		}
-
-		$restoreResult = $view->rename($source, $target);
-
-		// handle the restore result
-		if ($restoreResult) {
-			$fakeRoot = $view->getRoot();
-			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
-			$view->chroot($fakeRoot);
-			Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
-
-			$sourceNode = self::getNodeForPath($user, $sourcePath);
-			$targetNode = self::getNodeForPath($user, $targetPath, 'files');
-			$event = new NodeRestoredEvent($sourceNode, $targetNode);
-			$dispatcher = Server::get(IEventDispatcher::class);
-			$dispatcher->dispatchTyped($event);
-
-			self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
-
-			if ($timestamp) {
-				$query = Server::get(IDBConnection::class)->getQueryBuilder();
-				$query->delete('files_trash')
-					->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-					->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-					->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-				$query->executeStatement();
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * restore versions from trash bin
-	 *
-	 * @param View $view file view
-	 * @param string $file complete path to file
-	 * @param string $filename name of file once it was deleted
-	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
-	 * @param string $location location if file
-	 * @param int $timestamp deletion time
-	 * @return false|null
-	 */
-	private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
-		if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
-			$user = OC_User::getUser();
-			$rootView = new View('/');
-
-			$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
-
-			[$owner, $ownerPath] = self::getUidAndFilename($target);
-
-			// file has been deleted in between
-			if (empty($ownerPath)) {
-				return false;
-			}
-
-			if ($timestamp) {
-				$versionedFile = $filename;
-			} else {
-				$versionedFile = $file;
-			}
-
-			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
-			} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
-				foreach ($versions as $v) {
-					if ($timestamp) {
-						$rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);
-					} else {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * delete all files from the trash
-	 */
-	public static function deleteAll() {
-		$user = OC_User::getUser();
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
-		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
-
-		try {
-			$trash = $userRoot->get('files_trashbin');
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
-		$filePaths = [];
-		foreach ($fileInfos as $fileInfo) {
-			$filePaths[] = $view->getRelativePath($fileInfo->getPath());
-		}
-		unset($fileInfos); // save memory
-
-		// Bulk PreDelete-Hook
-		\OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', ['paths' => $filePaths]);
-
-		// Single-File Hooks
-		foreach ($filePaths as $path) {
-			self::emitTrashbinPreDelete($path);
-		}
-
-		// actual file deletion
-		$trash->delete();
-
-		$query = Server::get(IDBConnection::class)->getQueryBuilder();
-		$query->delete('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($user)));
-		$query->executeStatement();
-
-		// Bulk PostDelete-Hook
-		\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
-
-		// Single-File Hooks
-		foreach ($filePaths as $path) {
-			self::emitTrashbinPostDelete($path);
-		}
-
-		$trash = $userRoot->newFolder('files_trashbin');
-		$trash->newFolder('files');
-
-		return true;
-	}
-
-	/**
-	 * wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
-	 *
-	 * @param string $path
-	 */
-	protected static function emitTrashbinPreDelete($path) {
-		\OC_Hook::emit('\OCP\Trashbin', 'preDelete', ['path' => $path]);
-	}
-
-	/**
-	 * wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
-	 *
-	 * @param string $path
-	 */
-	protected static function emitTrashbinPostDelete($path) {
-		\OC_Hook::emit('\OCP\Trashbin', 'delete', ['path' => $path]);
-	}
-
-	/**
-	 * delete file from trash bin permanently
-	 *
-	 * @param string $filename path to the file
-	 * @param string $user
-	 * @param int $timestamp of deletion time
-	 *
-	 * @return int|float size of deleted files
-	 */
-	public static function delete($filename, $user, $timestamp = null) {
-		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
-		$size = 0;
-
-		if ($timestamp) {
-			$query = Server::get(IDBConnection::class)->getQueryBuilder();
-			$query->delete('files_trash')
-				->where($query->expr()->eq('user', $query->createNamedParameter($user)))
-				->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
-				->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
-			$query->executeStatement();
-
-			$file = static::getTrashFilename($filename, $timestamp);
-		} else {
-			$file = $filename;
-		}
-
-		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
-
-		try {
-			$node = $userRoot->get('/files_trashbin/files/' . $file);
-		} catch (NotFoundException $e) {
-			return $size;
-		}
-
-		if ($node instanceof Folder) {
-			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
-		} elseif ($node instanceof File) {
-			$size += $view->filesize('/files_trashbin/files/' . $file);
-		}
-
-		self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
-		$node->delete();
-		self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
-
-		return $size;
-	}
-
-	/**
-	 * @param string $file
-	 * @param string $filename
-	 * @param ?int $timestamp
-	 */
-	private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int|float {
-		$size = 0;
-		if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
-			if ($view->is_dir('files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
-				$view->unlink('files_trashbin/versions/' . $file);
-			} elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
-				foreach ($versions as $v) {
-					if ($timestamp) {
-						$size += $view->filesize('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
-						$view->unlink('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
-					} else {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
-					}
-				}
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * check to see whether a file exists in trashbin
-	 *
-	 * @param string $filename path to the file
-	 * @param int $timestamp of deletion time
-	 * @return bool true if file exists, otherwise false
-	 */
-	public static function file_exists($filename, $timestamp = null) {
-		$user = OC_User::getUser();
-		$view = new View('/' . $user);
-
-		if ($timestamp) {
-			$filename = static::getTrashFilename($filename, $timestamp);
-		}
-
-		$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
-		return $view->file_exists($target);
-	}
-
-	/**
-	 * deletes used space for trash bin in db if user was deleted
-	 *
-	 * @param string $uid id of deleted user
-	 * @return bool result of db delete operation
-	 */
-	public static function deleteUser($uid) {
-		$query = Server::get(IDBConnection::class)->getQueryBuilder();
-		$query->delete('files_trash')
-			->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
-		return (bool)$query->executeStatement();
-	}
-
-	/**
-	 * calculate remaining free space for trash bin
-	 *
-	 * @param int|float $trashbinSize current size of the trash bin
-	 * @param string $user
-	 * @return int|float available free space for trash bin
-	 */
-	private static function calculateFreeSpace(int|float $trashbinSize, string $user): int|float {
-		$configuredTrashbinSize = static::getConfiguredTrashbinSize($user);
-		if ($configuredTrashbinSize > -1) {
-			return $configuredTrashbinSize - $trashbinSize;
-		}
-
-		$userObject = Server::get(IUserManager::class)->get($user);
-		if (is_null($userObject)) {
-			return 0;
-		}
-		$softQuota = true;
-		$quota = $userObject->getQuota();
-		if ($quota === null || $quota === 'none') {
-			$quota = Filesystem::free_space('/');
-			$softQuota = false;
-			// inf or unknown free space
-			if ($quota < 0) {
-				$quota = PHP_INT_MAX;
-			}
-		} else {
-			$quota = Util::computerFileSize($quota);
-			// invalid quota
-			if ($quota === false) {
-				$quota = PHP_INT_MAX;
-			}
-		}
-
-		// calculate available space for trash bin
-		// subtract size of files and current trash bin size from quota
-		if ($softQuota) {
-			$userFolder = \OC::$server->getUserFolder($user);
-			if (is_null($userFolder)) {
-				return 0;
-			}
-			$free = $quota - $userFolder->getSize(false); // remaining free space for user
-			if ($free > 0) {
-				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
-			} else {
-				$availableSpace = $free - $trashbinSize;
-			}
-		} else {
-			$availableSpace = $quota;
-		}
-
-		return Util::numericToNumber($availableSpace);
-	}
-
-	/**
-	 * resize trash bin if necessary after a new file was added to Nextcloud
-	 *
-	 * @param string $user user id
-	 */
-	public static function resizeTrash($user) {
-		$size = self::getTrashbinSize($user);
-
-		$freeSpace = self::calculateFreeSpace($size, $user);
-
-		if ($freeSpace < 0) {
-			self::scheduleExpire($user);
-		}
-	}
-
-	/**
-	 * clean up the trash bin
-	 *
-	 * @param string $user
-	 */
-	public static function expire($user) {
-		$trashBinSize = self::getTrashbinSize($user);
-		$availableSpace = self::calculateFreeSpace($trashBinSize, $user);
-
-		$dirContent = Helper::getTrashFiles('/', $user, 'mtime');
-
-		// delete all files older then $retention_obligation
-		[$delSize, $count] = self::deleteExpiredFiles($dirContent, $user);
-
-		$availableSpace += $delSize;
-
-		// delete files from trash until we meet the trash bin size limit again
-		self::deleteFiles(array_slice($dirContent, $count), $user, $availableSpace);
-	}
-
-	/**
-	 * @param string $user
-	 */
-	private static function scheduleExpire($user) {
-		// let the admin disable auto expire
-		$expiration = Server::get(Expiration::class);
-		if ($expiration->isEnabled()) {
-			Server::get(IBus::class)->push(new Expire($user));
-		}
-	}
-
-	/**
-	 * if the size limit for the trash bin is reached, we delete the oldest
-	 * files in the trash bin until we meet the limit again
-	 *
-	 * @param array $files
-	 * @param string $user
-	 * @param int|float $availableSpace available disc space
-	 * @return int|float size of deleted files
-	 */
-	protected static function deleteFiles(array $files, string $user, int|float $availableSpace): int|float {
-		$expiration = Server::get(Expiration::class);
-		$size = 0;
-
-		if ($availableSpace <= 0) {
-			foreach ($files as $file) {
-				if ($availableSpace <= 0 && $expiration->isExpired($file['mtime'], true)) {
-					$tmp = self::delete($file['name'], $user, $file['mtime']);
-					Server::get(LoggerInterface::class)->info(
-						'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
-						[
-							'app' => 'files_trashbin',
-							'user' => $user,
-						]
-					);
-					$availableSpace += $tmp;
-					$size += $tmp;
-				} else {
-					break;
-				}
-			}
-		}
-		return $size;
-	}
-
-	/**
-	 * delete files older then max storage time
-	 *
-	 * @param array $files list of files sorted by mtime
-	 * @param string $user
-	 * @return array{int|float, int} size of deleted files and number of deleted files
-	 */
-	public static function deleteExpiredFiles($files, $user) {
-		$expiration = Server::get(Expiration::class);
-		$size = 0;
-		$count = 0;
-		foreach ($files as $file) {
-			$timestamp = $file['mtime'];
-			$filename = $file['name'];
-			if ($expiration->isExpired($timestamp)) {
-				try {
-					$size += self::delete($filename, $user, $timestamp);
-					$count++;
-				} catch (NotPermittedException $e) {
-					Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
-						[
-							'exception' => $e,
-							'app' => 'files_trashbin',
-							'user' => $user,
-						]
-					);
-				}
-				Server::get(LoggerInterface::class)->info(
-					'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
-					[
-						'app' => 'files_trashbin',
-						'user' => $user,
-					],
-				);
-			} else {
-				break;
-			}
-		}
-
-		return [$size, $count];
-	}
-
-	/**
-	 * recursive copy to copy a whole directory
-	 *
-	 * @param string $source source path, relative to the users files directory
-	 * @param string $destination destination path relative to the users root directory
-	 * @param View $view file view for the users root directory
-	 * @return int|float
-	 * @throws Exceptions\CopyRecursiveException
-	 */
-	private static function copy_recursive($source, $destination, View $view): int|float {
-		$size = 0;
-		if ($view->is_dir($source)) {
-			$view->mkdir($destination);
-			$view->touch($destination, $view->filemtime($source));
-			foreach ($view->getDirectoryContent($source) as $i) {
-				$pathDir = $source . '/' . $i['name'];
-				if ($view->is_dir($pathDir)) {
-					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
-				} else {
-					$size += $view->filesize($pathDir);
-					$result = $view->copy($pathDir, $destination . '/' . $i['name']);
-					if (!$result) {
-						throw new CopyRecursiveException();
-					}
-					$view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
-				}
-			}
-		} else {
-			$size += $view->filesize($source);
-			$result = $view->copy($source, $destination);
-			if (!$result) {
-				throw new CopyRecursiveException();
-			}
-			$view->touch($destination, $view->filemtime($source));
-		}
-		return $size;
-	}
-
-	/**
-	 * find all versions which belong to the file we want to restore
-	 *
-	 * @param string $filename name of the file which should be restored
-	 * @param int $timestamp timestamp when the file was deleted
-	 */
-	private static function getVersionsFromTrash($filename, $timestamp, string $user): array {
-		$view = new View('/' . $user . '/files_trashbin/versions');
-		$versions = [];
-
-		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage,] = $view->resolvePath('/');
-
-		$pattern = Server::get(IDBConnection::class)->escapeLikeParameter(basename($filename));
-		if ($timestamp) {
-			// fetch for old versions
-			$escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string)$timestamp);
-			$pattern .= '.v%.d' . $escapedTimestamp;
-			$offset = -strlen($escapedTimestamp) - 2;
-		} else {
-			$pattern .= '.v%';
-		}
-
-		// Manually fetch all versions from the file cache to be able to filter them by their parent
-		$cache = $storage->getCache('');
-		$query = new CacheQueryBuilder(
-			Server::get(IDBConnection::class)->getQueryBuilder(),
-			Server::get(IFilesMetadataManager::class),
-		);
-		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/' . $filename)), '/');
-		$parentId = $cache->getId($normalizedParentPath);
-		if ($parentId === -1) {
-			return [];
-		}
-
-		$query->selectFileCache()
-			->whereStorageId($cache->getNumericStorageId())
-			->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId)))
-			->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern)));
-
-		$result = $query->executeQuery();
-		$entries = $result->fetchAllAssociative();
-		$result->closeCursor();
-
-		/** @var CacheEntry[] $matches */
-		$matches = array_map(function (array $data) {
-			return Cache::cacheEntryFromData($data, Server::get(IMimeTypeLoader::class));
-		}, $entries);
-
-		foreach ($matches as $ma) {
-			if ($timestamp) {
-				$parts = explode('.v', substr($ma['path'], 0, $offset));
-				$versions[] = end($parts);
-			} else {
-				$parts = explode('.v', $ma['path']);
-				$versions[] = end($parts);
-			}
-		}
-
-		return $versions;
-	}
-
-	/**
-	 * find unique extension for restored file if a file with the same name already exists
-	 *
-	 * @param string $location where the file should be restored
-	 * @param string $filename name of the file
-	 * @param View $view filesystem view relative to users root directory
-	 * @return string with unique extension
-	 */
-	private static function getUniqueFilename($location, $filename, View $view) {
-		$ext = pathinfo($filename, PATHINFO_EXTENSION);
-		$name = pathinfo($filename, PATHINFO_FILENAME);
-		$l = Util::getL10N('files_trashbin');
-
-		$location = '/' . trim($location, '/');
-
-		// if extension is not empty we set a dot in front of it
-		if ($ext !== '') {
-			$ext = '.' . $ext;
-		}
-
-		if ($view->file_exists('files' . $location . '/' . $filename)) {
-			$i = 2;
-			$uniqueName = $name . ' (' . $l->t('restored') . ')' . $ext;
-			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . ' (' . $l->t('restored') . ' ' . $i . ')' . $ext;
-				$i++;
-			}
-
-			return $uniqueName;
-		}
-
-		return $filename;
-	}
-
-	/**
-	 * get the size from a given root folder
-	 *
-	 * @param View $view file view on the root folder
-	 * @return int|float size of the folder
-	 */
-	private static function calculateSize(View $view): int|float {
-		$root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
-		if (!file_exists($root)) {
-			return 0;
-		}
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
-		$size = 0;
-
-		/**
-		 * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
-		 * This bug is fixed in PHP 5.5.9 or before
-		 * See #8376
-		 */
-		$iterator->rewind();
-		while ($iterator->valid()) {
-			$path = $iterator->current();
-			$relpath = substr($path, strlen($root) - 1);
-			if (!$view->is_dir($relpath)) {
-				$size += $view->filesize($relpath);
-			}
-			$iterator->next();
-		}
-		return $size;
-	}
-
-	/**
-	 * get current size of trash bin from a given user
-	 *
-	 * @param string $user user who owns the trash bin
-	 * @return int|float trash bin size
-	 */
-	private static function getTrashbinSize(string $user): int|float {
-		$view = new View('/' . $user);
-		$fileInfo = $view->getFileInfo('/files_trashbin');
-		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
-	}
-
-	/**
-	 * check if trash bin is empty for a given user
-	 *
-	 * @param string $user
-	 * @return bool
-	 */
-	public static function isEmpty($user) {
-		$view = new View('/' . $user . '/files_trashbin');
-		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
-			while (($file = readdir($dh)) !== false) {
-				if (!Filesystem::isIgnoredDir($file)) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param $path
-	 * @return string
-	 */
-	public static function preview_icon($path) {
-		return Server::get(IURLGenerator::class)->linkToRoute('core_ajax_trashbin_preview', ['x' => 32, 'y' => 32, 'file' => $path]);
-	}
-
-	/**
-	 * Return the filename used in the trash bin
-	 */
-	public static function getTrashFilename(string $filename, int $timestamp): string {
-		$trashFilename = $filename . '.d' . $timestamp;
-		$length = strlen($trashFilename);
-		// oc_filecache `name` column has a limit of 250 chars
-		$maxLength = 250;
-		if ($length > $maxLength) {
-			$trashFilename = substr_replace(
-				$trashFilename,
-				'',
-				$maxLength / 2,
-				$length - $maxLength
-			);
-		}
-		return $trashFilename;
-	}
-
-	private static function getNodeForPath(string $user, string $path, string $baseDir = 'files_trashbin/files'): Node {
-		$rootFolder = Server::get(IRootFolder::class);
-		$path = ltrim($path, '/');
-
-		$userFolder = $rootFolder->getUserFolder($user);
-		/** @var Folder $trashFolder */
-		$trashFolder = $userFolder->getParent()->get($baseDir);
-		try {
-			return $trashFolder->get($path);
-		} catch (NotFoundException $ex) {
-		}
-
-		$view = Server::get(View::class);
-		$fullPath = '/' . $user . '/' . $baseDir . '/' . $path;
-
-		if (Filesystem::is_dir($path)) {
-			return new NonExistingFolder($rootFolder, $view, $fullPath);
-		} else {
-			return new NonExistingFile($rootFolder, $view, $fullPath);
-		}
-	}
-
-	/**
-	 * in case the request is authed, and user token is from a federated share
-	 * we use shared_with as initiator of the deletion
-	 */
-	private static function overwriteDeletedBy(string $user) {
-		try {
-			$request = Server::get(IRequest::class);
-			/** @psalm-suppress NoInterfaceProperties */
-			$token = $request->server['PHP_AUTH_USER'] ?? '';
-			if ($token === '') {
-				return $user;
-			}
-
-			$federatedShareProvider = Server::get(\OCA\FederatedFileSharing\FederatedShareProvider::class);
-			$share = $federatedShareProvider->getShareByToken($token);
-
-			return $share->getSharedWith();
-		} catch (NotFoundExceptionInterface|ContainerExceptionInterface|ShareNotFound) {
-		}
-
-		return $user;
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof BeforeNodeDeletedEvent) {
-			self::ensureFileScannedHook($event->getNode());
-		}
-	}
+    // unit: percentage; 50% of available disk space/quota
+    public const DEFAULTMAXSIZE = 50;
+
+    /**
+     * Ensure we don't need to scan the file during the move to trash
+     * by triggering the scan in the pre-hook
+     */
+    public static function ensureFileScannedHook(Node $node): void {
+        try {
+            self::getUidAndFilename($node->getPath());
+        } catch (NotFoundException $e) {
+            // Nothing to scan for non existing files
+        }
+    }
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param string $filename
+     * @return array
+     * @throws NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = Server::get(IUserManager::class);
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to move the file to the right trash bin
+        if (!$userManager->userExists($uid)) {
+            $uid = OC_User::getUser();
+        }
+        if (!$uid) {
+            // no owner, usually because of share link from ext storage
+            return [null, null];
+        }
+        Filesystem::initMountPoints($uid);
+        if ($uid !== OC_User::getUser()) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/' . $uid . '/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * get original location and deleted by of files for user
+     *
+     * @param string $user
+     * @return array<string, array<string, array{location: string, deletedBy: string}>>
+     */
+    public static function getExtraData($user) {
+        $query = Server::get(IDBConnection::class)->getQueryBuilder();
+        $query->select('id', 'timestamp', 'location', 'deleted_by')
+            ->from('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)));
+        $result = $query->executeQuery();
+        $array = [];
+        foreach ($result->iterateAssociative() as $row) {
+            $array[$row['id']][$row['timestamp']] = [
+                'location' => (string)$row['location'],
+                'deletedBy' => (string)$row['deleted_by'],
+            ];
+        }
+        $result->closeCursor();
+        return $array;
+    }
+
+    /**
+     * get original location of file
+     *
+     * @param string $user
+     * @param string $filename
+     * @param string $timestamp
+     * @return string|false original location
+     */
+    public static function getLocation($user, $filename, $timestamp) {
+        $query = Server::get(IDBConnection::class)->getQueryBuilder();
+        $query->select('location')
+            ->from('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+            ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+            ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+
+        $result = $query->executeQuery();
+        $row = $result->fetchAssociative();
+        $result->closeCursor();
+
+        if (isset($row['location'])) {
+            return $row['location'];
+        } else {
+            return false;
+        }
+    }
+
+    /** @param string $user */
+    private static function setUpTrash($user): void {
+        $view = new View('/' . $user);
+        if (!$view->is_dir('files_trashbin')) {
+            $view->mkdir('files_trashbin');
+        }
+        if (!$view->is_dir('files_trashbin/files')) {
+            $view->mkdir('files_trashbin/files');
+        }
+        if (!$view->is_dir('files_trashbin/versions')) {
+            $view->mkdir('files_trashbin/versions');
+        }
+        if (!$view->is_dir('files_trashbin/keys')) {
+            $view->mkdir('files_trashbin/keys');
+        }
+    }
+
+
+    /**
+     * copy file to owners trash
+     *
+     * @param string $sourcePath
+     * @param string $owner
+     * @param string $targetPath
+     * @param string $user
+     * @param int $timestamp
+     */
+    private static function copyFilesToUser($sourcePath, $owner, $targetPath, $user, $timestamp): void {
+        self::setUpTrash($owner);
+
+        $targetFilename = basename($targetPath);
+        $targetLocation = dirname($targetPath);
+
+        $sourceFilename = basename($sourcePath);
+
+        $view = new View('/');
+
+        $target = $user . '/files_trashbin/files/' . static::getTrashFilename($targetFilename, $timestamp);
+        $source = $owner . '/files_trashbin/files/' . static::getTrashFilename($sourceFilename, $timestamp);
+        $free = $view->free_space($target);
+        $isUnknownOrUnlimitedFreeSpace = $free < 0;
+        $isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
+        if ($isUnknownOrUnlimitedFreeSpace || $isEnoughFreeSpaceLeft) {
+            self::copy_recursive($source, $target, $view);
+        }
+
+
+        if ($view->file_exists($target)) {
+            $query = Server::get(IDBConnection::class)->getQueryBuilder();
+            $query->insert('files_trash')
+                ->setValue('id', $query->createNamedParameter($targetFilename))
+                ->setValue('timestamp', $query->createNamedParameter($timestamp))
+                ->setValue('location', $query->createNamedParameter($targetLocation))
+                ->setValue('user', $query->createNamedParameter($user))
+                ->setValue('deleted_by', $query->createNamedParameter($user));
+            $result = $query->executeStatement();
+            if (!$result) {
+                Server::get(LoggerInterface::class)->error('trash bin database couldn\'t be updated for the files owner', ['app' => 'files_trashbin']);
+            }
+        }
+    }
+
+
+    /**
+     * move file to the trash bin
+     *
+     * @param string $file_path path to the deleted file/directory relative to the files root directory
+     * @param bool $ownerOnly delete for owner only (if file gets moved out of a shared folder)
+     *
+     * @return bool
+     */
+    public static function move2trash($file_path, $ownerOnly = false) {
+        // get the user for which the filesystem is setup
+        $root = Filesystem::getRoot();
+        [, $user] = explode('/', $root);
+        [$owner, $ownerPath] = self::getUidAndFilename($file_path);
+
+        // if no owner found (ex: ext storage + share link), will use the current user's trashbin then
+        if (is_null($owner)) {
+            $owner = $user;
+            $ownerPath = $file_path;
+        }
+
+        $ownerView = new View('/' . $owner);
+
+        // file has been deleted in between
+        if (is_null($ownerPath) || $ownerPath === '') {
+            return true;
+        }
+
+        $sourceInfo = $ownerView->getFileInfo('/files/' . $ownerPath);
+
+        if ($sourceInfo === false) {
+            return true;
+        }
+
+        self::setUpTrash($user);
+        if ($owner !== $user) {
+            // also setup for owner
+            self::setUpTrash($owner);
+        }
+
+        $path_parts = pathinfo($ownerPath);
+
+        $filename = $path_parts['basename'];
+        $location = $path_parts['dirname'];
+        /** @var ITimeFactory $timeFactory */
+        $timeFactory = Server::get(ITimeFactory::class);
+        $timestamp = $timeFactory->getTime();
+
+        $lockingProvider = Server::get(ILockingProvider::class);
+
+        // disable proxy to prevent recursive calls
+        $trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+        $gotLock = false;
+
+        do {
+            /** @var ILockingStorage & IStorage $trashStorage */
+            [$trashStorage, $trashInternalPath] = $ownerView->resolvePath($trashPath);
+            try {
+                $trashStorage->acquireLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+                $gotLock = true;
+            } catch (LockedException $e) {
+                // a file with the same name is being deleted concurrently
+                // nudge the timestamp a bit to resolve the conflict
+
+                $timestamp = $timestamp + 1;
+
+                $trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+            }
+        } while (!$gotLock);
+
+        $sourceStorage = $sourceInfo->getStorage();
+        $sourceInternalPath = $sourceInfo->getInternalPath();
+
+        if ($trashStorage->file_exists($trashInternalPath)) {
+            $trashStorage->unlink($trashInternalPath);
+        }
+
+        $configuredTrashbinSize = static::getConfiguredTrashbinSize($owner);
+        if ($configuredTrashbinSize >= 0 && $sourceInfo->getSize() >= $configuredTrashbinSize) {
+            return false;
+        }
+
+        try {
+            $moveSuccessful = true;
+
+            $inCache = $sourceStorage->getCache()->inCache($sourceInternalPath);
+            $trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
+            if ($inCache) {
+                $trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
+            }
+        } catch (CopyRecursiveException $e) {
+            $moveSuccessful = false;
+            if ($trashStorage->file_exists($trashInternalPath)) {
+                $trashStorage->unlink($trashInternalPath);
+            }
+            Server::get(LoggerInterface::class)->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
+        }
+
+        if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
+            if ($sourceStorage->is_dir($sourceInternalPath)) {
+                $sourceStorage->rmdir($sourceInternalPath);
+            } else {
+                $sourceStorage->unlink($sourceInternalPath);
+            }
+
+            if ($sourceStorage->file_exists($sourceInternalPath)) {
+                // undo the cache move
+                $sourceStorage->getUpdater()->renameFromStorage($trashStorage, $trashInternalPath, $sourceInternalPath);
+            } else {
+                $trashStorage->getUpdater()->remove($trashInternalPath);
+            }
+            return false;
+        }
+
+        if ($moveSuccessful) {
+            // there is still a possibility that the file has been deleted by a remote user
+            $deletedBy = self::overwriteDeletedBy($user);
+
+            $query = Server::get(IDBConnection::class)->getQueryBuilder();
+            $query->insert('files_trash')
+                ->setValue('id', $query->createNamedParameter($filename))
+                ->setValue('timestamp', $query->createNamedParameter($timestamp))
+                ->setValue('location', $query->createNamedParameter($location))
+                ->setValue('user', $query->createNamedParameter($owner))
+                ->setValue('deleted_by', $query->createNamedParameter($deletedBy));
+            $result = $query->executeStatement();
+            if (!$result) {
+                Server::get(LoggerInterface::class)->error('trash bin database couldn\'t be updated', ['app' => 'files_trashbin']);
+            }
+            Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', ['filePath' => Filesystem::normalizePath($file_path),
+                'trashPath' => Filesystem::normalizePath(static::getTrashFilename($filename, $timestamp))]);
+
+            self::retainVersions($filename, $owner, $ownerPath, $timestamp);
+
+            // if owner !== user we need to also add a copy to the users trash
+            if ($user !== $owner && $ownerOnly === false) {
+                self::copyFilesToUser($ownerPath, $owner, $file_path, $user, $timestamp);
+            }
+        }
+
+        $trashStorage->releaseLock($trashInternalPath, ILockingProvider::LOCK_EXCLUSIVE, $lockingProvider);
+
+        self::scheduleExpire($user);
+
+        // if owner !== user we also need to update the owners trash size
+        if ($owner !== $user) {
+            self::scheduleExpire($owner);
+        }
+
+        return $moveSuccessful;
+    }
+
+    private static function getConfiguredTrashbinSize(string $user): int|float {
+        $userConfig = Server::get(IUserConfig::class);
+        $userTrashbinSize = $userConfig->getValueString($user, 'files_trashbin', 'trashbin_size', '-1');
+        if (is_numeric($userTrashbinSize) && ($userTrashbinSize > -1)) {
+            return Util::numericToNumber($userTrashbinSize);
+        }
+
+        $appConfig = Server::get(IAppConfig::class);
+        $systemTrashbinSize = $appConfig->getValueString('files_trashbin', 'trashbin_size', '-1');
+        if (is_numeric($systemTrashbinSize)) {
+            return Util::numericToNumber($systemTrashbinSize);
+        }
+        return -1;
+    }
+
+    /**
+     * Move file versions to trash so that they can be restored later
+     *
+     * @param string $filename of deleted file
+     * @param string $owner owner user id
+     * @param string $ownerPath path relative to the owner's home storage
+     * @param int $timestamp when the file was deleted
+     */
+    private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
+        if (Server::get(IAppManager::class)->isEnabledForUser('files_versions') && !empty($ownerPath)) {
+            $user = OC_User::getUser();
+            $rootView = new View('/');
+
+            if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+                if ($owner !== $user) {
+                    self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
+                }
+                self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . static::getTrashFilename($filename, $timestamp));
+            } elseif ($versions = Storage::getVersions($owner, $ownerPath)) {
+                foreach ($versions as $v) {
+                    if ($owner !== $user) {
+                        self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . static::getTrashFilename($v['name'] . '.v' . $v['version'], $timestamp));
+                    }
+                    self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));
+                }
+            }
+        }
+    }
+
+    /**
+     * Move a file or folder on storage level
+     *
+     * @param View $view
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    private static function move(View $view, $source, $target) {
+        /** @var \OC\Files\Storage\Storage $sourceStorage */
+        [$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
+        /** @var \OC\Files\Storage\Storage $targetStorage */
+        [$targetStorage, $targetInternalPath] = $view->resolvePath($target);
+        /** @var \OC\Files\Storage\Storage $ownerTrashStorage */
+
+        $result = $targetStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        if ($result) {
+            $targetStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        }
+        return $result;
+    }
+
+    /**
+     * Copy a file or folder on storage level
+     *
+     * @param View $view
+     * @param string $source
+     * @param string $target
+     * @return bool
+     */
+    private static function copy(View $view, $source, $target) {
+        /** @var \OC\Files\Storage\Storage $sourceStorage */
+        [$sourceStorage, $sourceInternalPath] = $view->resolvePath($source);
+        /** @var \OC\Files\Storage\Storage $targetStorage */
+        [$targetStorage, $targetInternalPath] = $view->resolvePath($target);
+        /** @var \OC\Files\Storage\Storage $ownerTrashStorage */
+
+        $result = $targetStorage->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+        if ($result) {
+            $targetStorage->getUpdater()->update($targetInternalPath);
+        }
+        return $result;
+    }
+
+    /**
+     * Restore a file or folder from trash bin
+     *
+     * @param string $file path to the deleted file/folder relative to "files_trashbin/files/",
+     *                     including the timestamp suffix ".d12345678"
+     * @param string $filename name of the file/folder
+     * @param int $timestamp time when the file/folder was deleted
+     *
+     * @return bool true on success, false otherwise
+     */
+    public static function restore($file, $filename, $timestamp) {
+        $user = OC_User::getUser();
+        if (!$user) {
+            throw new \Exception('Tried to restore a file while not logged in');
+        }
+        $view = new View('/' . $user);
+
+        $location = '';
+        if ($timestamp) {
+            $location = self::getLocation($user, $filename, $timestamp);
+            if ($location === false) {
+                Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
+            } else {
+                // if location no longer exists, restore file in the root directory
+                if ($location !== '/'
+                    && (!$view->is_dir('files/' . $location)
+                        || !$view->isCreatable('files/' . $location))
+                ) {
+                    $location = '';
+                }
+            }
+        }
+
+        // we need a  extension in case a file/dir with the same name already exists
+        $uniqueFilename = self::getUniqueFilename($location, $filename, $view);
+
+        $source = Filesystem::normalizePath('files_trashbin/files/' . $file);
+        $target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
+        if (!$view->file_exists($source)) {
+            return false;
+        }
+        $mtime = $view->filemtime($source);
+
+        // restore file
+        if (!$view->isCreatable(dirname($target))) {
+            throw new NotPermittedException("Can't restore trash item because the target folder is not writable");
+        }
+
+        $sourcePath = Filesystem::normalizePath($file);
+        $targetPath = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+
+        $sourceNode = self::getNodeForPath($user, $sourcePath);
+        $targetNode = self::getNodeForPath($user, $targetPath, 'files');
+        $run = true;
+        $event = new BeforeNodeRestoredEvent($sourceNode, $targetNode, $run);
+        $dispatcher = Server::get(IEventDispatcher::class);
+        $dispatcher->dispatchTyped($event);
+
+        if (!$run) {
+            return false;
+        }
+
+        $restoreResult = $view->rename($source, $target);
+
+        // handle the restore result
+        if ($restoreResult) {
+            $fakeRoot = $view->getRoot();
+            $view->chroot('/' . $user . '/files');
+            $view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
+            $view->chroot($fakeRoot);
+            Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
+
+            $sourceNode = self::getNodeForPath($user, $sourcePath);
+            $targetNode = self::getNodeForPath($user, $targetPath, 'files');
+            $event = new NodeRestoredEvent($sourceNode, $targetNode);
+            $dispatcher = Server::get(IEventDispatcher::class);
+            $dispatcher->dispatchTyped($event);
+
+            self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+
+            if ($timestamp) {
+                $query = Server::get(IDBConnection::class)->getQueryBuilder();
+                $query->delete('files_trash')
+                    ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+                    ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+                    ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+                $query->executeStatement();
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * restore versions from trash bin
+     *
+     * @param View $view file view
+     * @param string $file complete path to file
+     * @param string $filename name of file once it was deleted
+     * @param string $uniqueFilename new file name to restore the file without overwriting existing files
+     * @param string $location location if file
+     * @param int $timestamp deletion time
+     * @return false|null
+     */
+    private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
+        if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
+            $user = OC_User::getUser();
+            $rootView = new View('/');
+
+            $target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+
+            [$owner, $ownerPath] = self::getUidAndFilename($target);
+
+            // file has been deleted in between
+            if (empty($ownerPath)) {
+                return false;
+            }
+
+            if ($timestamp) {
+                $versionedFile = $filename;
+            } else {
+                $versionedFile = $file;
+            }
+
+            if ($view->is_dir('/files_trashbin/versions/' . $file)) {
+                $rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+            } elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
+                foreach ($versions as $v) {
+                    if ($timestamp) {
+                        $rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+                    } else {
+                        $rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * delete all files from the trash
+     */
+    public static function deleteAll() {
+        $user = OC_User::getUser();
+        $userRoot = \OC::$server->getUserFolder($user)->getParent();
+        $view = new View('/' . $user);
+        $fileInfos = $view->getDirectoryContent('files_trashbin/files');
+
+        try {
+            $trash = $userRoot->get('files_trashbin');
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        // Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
+        $filePaths = [];
+        foreach ($fileInfos as $fileInfo) {
+            $filePaths[] = $view->getRelativePath($fileInfo->getPath());
+        }
+        unset($fileInfos); // save memory
+
+        // Bulk PreDelete-Hook
+        \OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', ['paths' => $filePaths]);
+
+        // Single-File Hooks
+        foreach ($filePaths as $path) {
+            self::emitTrashbinPreDelete($path);
+        }
+
+        // actual file deletion
+        $trash->delete();
+
+        $query = Server::get(IDBConnection::class)->getQueryBuilder();
+        $query->delete('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($user)));
+        $query->executeStatement();
+
+        // Bulk PostDelete-Hook
+        \OC_Hook::emit('\OCP\Trashbin', 'deleteAll', ['paths' => $filePaths]);
+
+        // Single-File Hooks
+        foreach ($filePaths as $path) {
+            self::emitTrashbinPostDelete($path);
+        }
+
+        $trash = $userRoot->newFolder('files_trashbin');
+        $trash->newFolder('files');
+
+        return true;
+    }
+
+    /**
+     * wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
+     *
+     * @param string $path
+     */
+    protected static function emitTrashbinPreDelete($path) {
+        \OC_Hook::emit('\OCP\Trashbin', 'preDelete', ['path' => $path]);
+    }
+
+    /**
+     * wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
+     *
+     * @param string $path
+     */
+    protected static function emitTrashbinPostDelete($path) {
+        \OC_Hook::emit('\OCP\Trashbin', 'delete', ['path' => $path]);
+    }
+
+    /**
+     * delete file from trash bin permanently
+     *
+     * @param string $filename path to the file
+     * @param string $user
+     * @param int $timestamp of deletion time
+     *
+     * @return int|float size of deleted files
+     */
+    public static function delete($filename, $user, $timestamp = null) {
+        $userRoot = \OC::$server->getUserFolder($user)->getParent();
+        $view = new View('/' . $user);
+        $size = 0;
+
+        if ($timestamp) {
+            $query = Server::get(IDBConnection::class)->getQueryBuilder();
+            $query->delete('files_trash')
+                ->where($query->expr()->eq('user', $query->createNamedParameter($user)))
+                ->andWhere($query->expr()->eq('id', $query->createNamedParameter($filename)))
+                ->andWhere($query->expr()->eq('timestamp', $query->createNamedParameter($timestamp)));
+            $query->executeStatement();
+
+            $file = static::getTrashFilename($filename, $timestamp);
+        } else {
+            $file = $filename;
+        }
+
+        $size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
+
+        try {
+            $node = $userRoot->get('/files_trashbin/files/' . $file);
+        } catch (NotFoundException $e) {
+            return $size;
+        }
+
+        if ($node instanceof Folder) {
+            $size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
+        } elseif ($node instanceof File) {
+            $size += $view->filesize('/files_trashbin/files/' . $file);
+        }
+
+        self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
+        $node->delete();
+        self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
+
+        return $size;
+    }
+
+    /**
+     * @param string $file
+     * @param string $filename
+     * @param ?int $timestamp
+     */
+    private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int|float {
+        $size = 0;
+        if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
+            if ($view->is_dir('files_trashbin/versions/' . $file)) {
+                $size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
+                $view->unlink('files_trashbin/versions/' . $file);
+            } elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
+                foreach ($versions as $v) {
+                    if ($timestamp) {
+                        $size += $view->filesize('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
+                        $view->unlink('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
+                    } else {
+                        $size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
+                        $view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
+                    }
+                }
+            }
+        }
+        return $size;
+    }
+
+    /**
+     * check to see whether a file exists in trashbin
+     *
+     * @param string $filename path to the file
+     * @param int $timestamp of deletion time
+     * @return bool true if file exists, otherwise false
+     */
+    public static function file_exists($filename, $timestamp = null) {
+        $user = OC_User::getUser();
+        $view = new View('/' . $user);
+
+        if ($timestamp) {
+            $filename = static::getTrashFilename($filename, $timestamp);
+        }
+
+        $target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
+        return $view->file_exists($target);
+    }
+
+    /**
+     * deletes used space for trash bin in db if user was deleted
+     *
+     * @param string $uid id of deleted user
+     * @return bool result of db delete operation
+     */
+    public static function deleteUser($uid) {
+        $query = Server::get(IDBConnection::class)->getQueryBuilder();
+        $query->delete('files_trash')
+            ->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
+        return (bool)$query->executeStatement();
+    }
+
+    /**
+     * calculate remaining free space for trash bin
+     *
+     * @param int|float $trashbinSize current size of the trash bin
+     * @param string $user
+     * @return int|float available free space for trash bin
+     */
+    private static function calculateFreeSpace(int|float $trashbinSize, string $user): int|float {
+        $configuredTrashbinSize = static::getConfiguredTrashbinSize($user);
+        if ($configuredTrashbinSize > -1) {
+            return $configuredTrashbinSize - $trashbinSize;
+        }
+
+        $userObject = Server::get(IUserManager::class)->get($user);
+        if (is_null($userObject)) {
+            return 0;
+        }
+        $softQuota = true;
+        $quota = $userObject->getQuota();
+        if ($quota === null || $quota === 'none') {
+            $quota = Filesystem::free_space('/');
+            $softQuota = false;
+            // inf or unknown free space
+            if ($quota < 0) {
+                $quota = PHP_INT_MAX;
+            }
+        } else {
+            $quota = Util::computerFileSize($quota);
+            // invalid quota
+            if ($quota === false) {
+                $quota = PHP_INT_MAX;
+            }
+        }
+
+        // calculate available space for trash bin
+        // subtract size of files and current trash bin size from quota
+        if ($softQuota) {
+            $userFolder = \OC::$server->getUserFolder($user);
+            if (is_null($userFolder)) {
+                return 0;
+            }
+            $free = $quota - $userFolder->getSize(false); // remaining free space for user
+            if ($free > 0) {
+                $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
+            } else {
+                $availableSpace = $free - $trashbinSize;
+            }
+        } else {
+            $availableSpace = $quota;
+        }
+
+        return Util::numericToNumber($availableSpace);
+    }
+
+    /**
+     * resize trash bin if necessary after a new file was added to Nextcloud
+     *
+     * @param string $user user id
+     */
+    public static function resizeTrash($user) {
+        $size = self::getTrashbinSize($user);
+
+        $freeSpace = self::calculateFreeSpace($size, $user);
+
+        if ($freeSpace < 0) {
+            self::scheduleExpire($user);
+        }
+    }
+
+    /**
+     * clean up the trash bin
+     *
+     * @param string $user
+     */
+    public static function expire($user) {
+        $trashBinSize = self::getTrashbinSize($user);
+        $availableSpace = self::calculateFreeSpace($trashBinSize, $user);
+
+        $dirContent = Helper::getTrashFiles('/', $user, 'mtime');
+
+        // delete all files older then $retention_obligation
+        [$delSize, $count] = self::deleteExpiredFiles($dirContent, $user);
+
+        $availableSpace += $delSize;
+
+        // delete files from trash until we meet the trash bin size limit again
+        self::deleteFiles(array_slice($dirContent, $count), $user, $availableSpace);
+    }
+
+    /**
+     * @param string $user
+     */
+    private static function scheduleExpire($user) {
+        // let the admin disable auto expire
+        $expiration = Server::get(Expiration::class);
+        if ($expiration->isEnabled()) {
+            Server::get(IBus::class)->push(new Expire($user));
+        }
+    }
+
+    /**
+     * if the size limit for the trash bin is reached, we delete the oldest
+     * files in the trash bin until we meet the limit again
+     *
+     * @param array $files
+     * @param string $user
+     * @param int|float $availableSpace available disc space
+     * @return int|float size of deleted files
+     */
+    protected static function deleteFiles(array $files, string $user, int|float $availableSpace): int|float {
+        $expiration = Server::get(Expiration::class);
+        $size = 0;
+
+        if ($availableSpace <= 0) {
+            foreach ($files as $file) {
+                if ($availableSpace <= 0 && $expiration->isExpired($file['mtime'], true)) {
+                    $tmp = self::delete($file['name'], $user, $file['mtime']);
+                    Server::get(LoggerInterface::class)->info(
+                        'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
+                        [
+                            'app' => 'files_trashbin',
+                            'user' => $user,
+                        ]
+                    );
+                    $availableSpace += $tmp;
+                    $size += $tmp;
+                } else {
+                    break;
+                }
+            }
+        }
+        return $size;
+    }
+
+    /**
+     * delete files older then max storage time
+     *
+     * @param array $files list of files sorted by mtime
+     * @param string $user
+     * @return array{int|float, int} size of deleted files and number of deleted files
+     */
+    public static function deleteExpiredFiles($files, $user) {
+        $expiration = Server::get(Expiration::class);
+        $size = 0;
+        $count = 0;
+        foreach ($files as $file) {
+            $timestamp = $file['mtime'];
+            $filename = $file['name'];
+            if ($expiration->isExpired($timestamp)) {
+                try {
+                    $size += self::delete($filename, $user, $timestamp);
+                    $count++;
+                } catch (NotPermittedException $e) {
+                    Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
+                        [
+                            'exception' => $e,
+                            'app' => 'files_trashbin',
+                            'user' => $user,
+                        ]
+                    );
+                }
+                Server::get(LoggerInterface::class)->info(
+                    'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
+                    [
+                        'app' => 'files_trashbin',
+                        'user' => $user,
+                    ],
+                );
+            } else {
+                break;
+            }
+        }
+
+        return [$size, $count];
+    }
+
+    /**
+     * recursive copy to copy a whole directory
+     *
+     * @param string $source source path, relative to the users files directory
+     * @param string $destination destination path relative to the users root directory
+     * @param View $view file view for the users root directory
+     * @return int|float
+     * @throws Exceptions\CopyRecursiveException
+     */
+    private static function copy_recursive($source, $destination, View $view): int|float {
+        $size = 0;
+        if ($view->is_dir($source)) {
+            $view->mkdir($destination);
+            $view->touch($destination, $view->filemtime($source));
+            foreach ($view->getDirectoryContent($source) as $i) {
+                $pathDir = $source . '/' . $i['name'];
+                if ($view->is_dir($pathDir)) {
+                    $size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
+                } else {
+                    $size += $view->filesize($pathDir);
+                    $result = $view->copy($pathDir, $destination . '/' . $i['name']);
+                    if (!$result) {
+                        throw new CopyRecursiveException();
+                    }
+                    $view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
+                }
+            }
+        } else {
+            $size += $view->filesize($source);
+            $result = $view->copy($source, $destination);
+            if (!$result) {
+                throw new CopyRecursiveException();
+            }
+            $view->touch($destination, $view->filemtime($source));
+        }
+        return $size;
+    }
+
+    /**
+     * find all versions which belong to the file we want to restore
+     *
+     * @param string $filename name of the file which should be restored
+     * @param int $timestamp timestamp when the file was deleted
+     */
+    private static function getVersionsFromTrash($filename, $timestamp, string $user): array {
+        $view = new View('/' . $user . '/files_trashbin/versions');
+        $versions = [];
+
+        /** @var \OC\Files\Storage\Storage $storage */
+        [$storage,] = $view->resolvePath('/');
+
+        $pattern = Server::get(IDBConnection::class)->escapeLikeParameter(basename($filename));
+        if ($timestamp) {
+            // fetch for old versions
+            $escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string)$timestamp);
+            $pattern .= '.v%.d' . $escapedTimestamp;
+            $offset = -strlen($escapedTimestamp) - 2;
+        } else {
+            $pattern .= '.v%';
+        }
+
+        // Manually fetch all versions from the file cache to be able to filter them by their parent
+        $cache = $storage->getCache('');
+        $query = new CacheQueryBuilder(
+            Server::get(IDBConnection::class)->getQueryBuilder(),
+            Server::get(IFilesMetadataManager::class),
+        );
+        $normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/' . $filename)), '/');
+        $parentId = $cache->getId($normalizedParentPath);
+        if ($parentId === -1) {
+            return [];
+        }
+
+        $query->selectFileCache()
+            ->whereStorageId($cache->getNumericStorageId())
+            ->andWhere($query->expr()->eq('parent', $query->createNamedParameter($parentId)))
+            ->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern)));
+
+        $result = $query->executeQuery();
+        $entries = $result->fetchAllAssociative();
+        $result->closeCursor();
+
+        /** @var CacheEntry[] $matches */
+        $matches = array_map(function (array $data) {
+            return Cache::cacheEntryFromData($data, Server::get(IMimeTypeLoader::class));
+        }, $entries);
+
+        foreach ($matches as $ma) {
+            if ($timestamp) {
+                $parts = explode('.v', substr($ma['path'], 0, $offset));
+                $versions[] = end($parts);
+            } else {
+                $parts = explode('.v', $ma['path']);
+                $versions[] = end($parts);
+            }
+        }
+
+        return $versions;
+    }
+
+    /**
+     * find unique extension for restored file if a file with the same name already exists
+     *
+     * @param string $location where the file should be restored
+     * @param string $filename name of the file
+     * @param View $view filesystem view relative to users root directory
+     * @return string with unique extension
+     */
+    private static function getUniqueFilename($location, $filename, View $view) {
+        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+        $name = pathinfo($filename, PATHINFO_FILENAME);
+        $l = Util::getL10N('files_trashbin');
+
+        $location = '/' . trim($location, '/');
+
+        // if extension is not empty we set a dot in front of it
+        if ($ext !== '') {
+            $ext = '.' . $ext;
+        }
+
+        if ($view->file_exists('files' . $location . '/' . $filename)) {
+            $i = 2;
+            $uniqueName = $name . ' (' . $l->t('restored') . ')' . $ext;
+            while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
+                $uniqueName = $name . ' (' . $l->t('restored') . ' ' . $i . ')' . $ext;
+                $i++;
+            }
+
+            return $uniqueName;
+        }
+
+        return $filename;
+    }
+
+    /**
+     * get the size from a given root folder
+     *
+     * @param View $view file view on the root folder
+     * @return int|float size of the folder
+     */
+    private static function calculateSize(View $view): int|float {
+        $root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
+        if (!file_exists($root)) {
+            return 0;
+        }
+        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
+        $size = 0;
+
+        /**
+         * RecursiveDirectoryIterator on an NFS path isn't iterable with foreach
+         * This bug is fixed in PHP 5.5.9 or before
+         * See #8376
+         */
+        $iterator->rewind();
+        while ($iterator->valid()) {
+            $path = $iterator->current();
+            $relpath = substr($path, strlen($root) - 1);
+            if (!$view->is_dir($relpath)) {
+                $size += $view->filesize($relpath);
+            }
+            $iterator->next();
+        }
+        return $size;
+    }
+
+    /**
+     * get current size of trash bin from a given user
+     *
+     * @param string $user user who owns the trash bin
+     * @return int|float trash bin size
+     */
+    private static function getTrashbinSize(string $user): int|float {
+        $view = new View('/' . $user);
+        $fileInfo = $view->getFileInfo('/files_trashbin');
+        return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
+    }
+
+    /**
+     * check if trash bin is empty for a given user
+     *
+     * @param string $user
+     * @return bool
+     */
+    public static function isEmpty($user) {
+        $view = new View('/' . $user . '/files_trashbin');
+        if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
+            while (($file = readdir($dh)) !== false) {
+                if (!Filesystem::isIgnoredDir($file)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param $path
+     * @return string
+     */
+    public static function preview_icon($path) {
+        return Server::get(IURLGenerator::class)->linkToRoute('core_ajax_trashbin_preview', ['x' => 32, 'y' => 32, 'file' => $path]);
+    }
+
+    /**
+     * Return the filename used in the trash bin
+     */
+    public static function getTrashFilename(string $filename, int $timestamp): string {
+        $trashFilename = $filename . '.d' . $timestamp;
+        $length = strlen($trashFilename);
+        // oc_filecache `name` column has a limit of 250 chars
+        $maxLength = 250;
+        if ($length > $maxLength) {
+            $trashFilename = substr_replace(
+                $trashFilename,
+                '',
+                $maxLength / 2,
+                $length - $maxLength
+            );
+        }
+        return $trashFilename;
+    }
+
+    private static function getNodeForPath(string $user, string $path, string $baseDir = 'files_trashbin/files'): Node {
+        $rootFolder = Server::get(IRootFolder::class);
+        $path = ltrim($path, '/');
+
+        $userFolder = $rootFolder->getUserFolder($user);
+        /** @var Folder $trashFolder */
+        $trashFolder = $userFolder->getParent()->get($baseDir);
+        try {
+            return $trashFolder->get($path);
+        } catch (NotFoundException $ex) {
+        }
+
+        $view = Server::get(View::class);
+        $fullPath = '/' . $user . '/' . $baseDir . '/' . $path;
+
+        if (Filesystem::is_dir($path)) {
+            return new NonExistingFolder($rootFolder, $view, $fullPath);
+        } else {
+            return new NonExistingFile($rootFolder, $view, $fullPath);
+        }
+    }
+
+    /**
+     * in case the request is authed, and user token is from a federated share
+     * we use shared_with as initiator of the deletion
+     */
+    private static function overwriteDeletedBy(string $user) {
+        try {
+            $request = Server::get(IRequest::class);
+            /** @psalm-suppress NoInterfaceProperties */
+            $token = $request->server['PHP_AUTH_USER'] ?? '';
+            if ($token === '') {
+                return $user;
+            }
+
+            $federatedShareProvider = Server::get(\OCA\FederatedFileSharing\FederatedShareProvider::class);
+            $share = $federatedShareProvider->getShareByToken($token);
+
+            return $share->getSharedWith();
+        } catch (NotFoundExceptionInterface|ContainerExceptionInterface|ShareNotFound) {
+        }
+
+        return $user;
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof BeforeNodeDeletedEvent) {
+            self::ensureFileScannedHook($event->getNode());
+        }
+    }
 }

Spacing +79 added lines, -79 removed lines

@@ -95,7 +95,7 @@ 
 		Filesystem::initMountPoints($uid);
 		if ($uid !== OC_User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/' . $uid . '/files');
+			$ownerView = new View('/'.$uid.'/files');
 			try {
 				$filename = $ownerView->getPath($info['fileid']);
 			} catch (NotFoundException $e) {
@@ -120,8 +120,8 @@ 
 		$array = [];
 		foreach ($result->iterateAssociative() as $row) {
 			$array[$row['id']][$row['timestamp']] = [
-				'location' => (string)$row['location'],
-				'deletedBy' => (string)$row['deleted_by'],
+				'location' => (string) $row['location'],
+				'deletedBy' => (string) $row['deleted_by'],
 			];
 		}
 		$result->closeCursor();
@@ -157,7 +157,7 @@ 
 
 	/** @param string $user */
 	private static function setUpTrash($user): void {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
 		}
@@ -192,8 +192,8 @@ 
 
 		$view = new View('/');
 
-		$target = $user . '/files_trashbin/files/' . static::getTrashFilename($targetFilename, $timestamp);
-		$source = $owner . '/files_trashbin/files/' . static::getTrashFilename($sourceFilename, $timestamp);
+		$target = $user.'/files_trashbin/files/'.static::getTrashFilename($targetFilename, $timestamp);
+		$source = $owner.'/files_trashbin/files/'.static::getTrashFilename($sourceFilename, $timestamp);
 		$free = $view->free_space($target);
 		$isUnknownOrUnlimitedFreeSpace = $free < 0;
 		$isEnoughFreeSpaceLeft = $view->filesize($source) < $free;
@@ -238,14 +238,14 @@ 
 			$ownerPath = $file_path;
 		}
 
-		$ownerView = new View('/' . $owner);
+		$ownerView = new View('/'.$owner);
 
 		// file has been deleted in between
 		if (is_null($ownerPath) || $ownerPath === '') {
 			return true;
 		}
 
-		$sourceInfo = $ownerView->getFileInfo('/files/' . $ownerPath);
+		$sourceInfo = $ownerView->getFileInfo('/files/'.$ownerPath);
 
 		if ($sourceInfo === false) {
 			return true;
@@ -268,7 +268,7 @@ 
 		$lockingProvider = Server::get(ILockingProvider::class);
 
 		// disable proxy to prevent recursive calls
-		$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+		$trashPath = '/files_trashbin/files/'.static::getTrashFilename($filename, $timestamp);
 		$gotLock = false;
 
 		do {
@@ -283,7 +283,7 @@ 
 
 				$timestamp = $timestamp + 1;
 
-				$trashPath = '/files_trashbin/files/' . static::getTrashFilename($filename, $timestamp);
+				$trashPath = '/files_trashbin/files/'.static::getTrashFilename($filename, $timestamp);
 			}
 		} while (!$gotLock);
 
@@ -312,7 +312,7 @@ 
 			if ($trashStorage->file_exists($trashInternalPath)) {
 				$trashStorage->unlink($trashInternalPath);
 			}
-			Server::get(LoggerInterface::class)->error('Couldn\'t move ' . $file_path . ' to the trash bin', ['app' => 'files_trashbin']);
+			Server::get(LoggerInterface::class)->error('Couldn\'t move '.$file_path.' to the trash bin', ['app' => 'files_trashbin']);
 		}
 
 		if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
@@ -369,7 +369,7 @@ 
 		return $moveSuccessful;
 	}
 
-	private static function getConfiguredTrashbinSize(string $user): int|float {
+	private static function getConfiguredTrashbinSize(string $user): int | float {
 		$userConfig = Server::get(IUserConfig::class);
 		$userTrashbinSize = $userConfig->getValueString($user, 'files_trashbin', 'trashbin_size', '-1');
 		if (is_numeric($userTrashbinSize) && ($userTrashbinSize > -1)) {
@@ -397,17 +397,17 @@ 
 			$user = OC_User::getUser();
 			$rootView = new View('/');
 
-			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+			if ($rootView->is_dir($owner.'/files_versions/'.$ownerPath)) {
 				if ($owner !== $user) {
-					self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
+					self::copy_recursive($owner.'/files_versions/'.$ownerPath, $owner.'/files_trashbin/versions/'.static::getTrashFilename(basename($ownerPath), $timestamp), $rootView);
 				}
-				self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . static::getTrashFilename($filename, $timestamp));
+				self::move($rootView, $owner.'/files_versions/'.$ownerPath, $user.'/files_trashbin/versions/'.static::getTrashFilename($filename, $timestamp));
 			} elseif ($versions = Storage::getVersions($owner, $ownerPath)) {
 				foreach ($versions as $v) {
 					if ($owner !== $user) {
-						self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . static::getTrashFilename($v['name'] . '.v' . $v['version'], $timestamp));
+						self::copy($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $owner.'/files_trashbin/versions/'.static::getTrashFilename($v['name'].'.v'.$v['version'], $timestamp));
 					}
-					self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v['version'], $timestamp));
+					self::move($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $user.'/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v['version'], $timestamp));
 				}
 			}
 		}
@@ -472,18 +472,18 @@ 
 		if (!$user) {
 			throw new \Exception('Tried to restore a file while not logged in');
 		}
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		$location = '';
 		if ($timestamp) {
 			$location = self::getLocation($user, $filename, $timestamp);
 			if ($location === false) {
-				Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', ['app' => 'files_trashbin']);
+				Server::get(LoggerInterface::class)->error('trash bin database inconsistent! ($user: '.$user.' $filename: '.$filename.', $timestamp: '.$timestamp.')', ['app' => 'files_trashbin']);
 			} else {
 				// if location no longer exists, restore file in the root directory
 				if ($location !== '/'
-					&& (!$view->is_dir('files/' . $location)
-						|| !$view->isCreatable('files/' . $location))
+					&& (!$view->is_dir('files/'.$location)
+						|| !$view->isCreatable('files/'.$location))
 				) {
 					$location = '';
 				}
@@ -493,8 +493,8 @@ 
 		// we need a  extension in case a file/dir with the same name already exists
 		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
 
-		$source = Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
+		$source = Filesystem::normalizePath('files_trashbin/files/'.$file);
+		$target = Filesystem::normalizePath('files/'.$location.'/'.$uniqueFilename);
 		if (!$view->file_exists($source)) {
 			return false;
 		}
@@ -506,7 +506,7 @@ 
 		}
 
 		$sourcePath = Filesystem::normalizePath($file);
-		$targetPath = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+		$targetPath = Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename);
 
 		$sourceNode = self::getNodeForPath($user, $sourcePath);
 		$targetNode = self::getNodeForPath($user, $targetPath, 'files');
@@ -524,8 +524,8 @@ 
 		// handle the restore result
 		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
-			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
+			$view->chroot('/'.$user.'/files');
+			$view->touch('/'.$location.'/'.$uniqueFilename, $mtime);
 			$view->chroot($fakeRoot);
 			Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
 
@@ -568,7 +568,7 @@ 
 			$user = OC_User::getUser();
 			$rootView = new View('/');
 
-			$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+			$target = Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename);
 
 			[$owner, $ownerPath] = self::getUidAndFilename($target);
 
@@ -583,14 +583,14 @@ 
 				$versionedFile = $file;
 			}
 
-			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+			if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+				$rootView->rename(Filesystem::normalizePath($user.'/files_trashbin/versions/'.$file), Filesystem::normalizePath($owner.'/files_versions/'.$ownerPath));
 			} elseif ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$rootView->rename($user . '/files_trashbin/versions/' . static::getTrashFilename($versionedFile . '.v' . $v, $timestamp), $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.static::getTrashFilename($versionedFile.'.v'.$v, $timestamp), $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					} else {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.$versionedFile.'.v'.$v, $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					}
 				}
 			}
@@ -603,7 +603,7 @@ 
 	public static function deleteAll() {
 		$user = OC_User::getUser();
 		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
 
 		try {
@@ -678,7 +678,7 @@ 
 	 */
 	public static function delete($filename, $user, $timestamp = null) {
 		$userRoot = \OC::$server->getUserFolder($user)->getParent();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$size = 0;
 
 		if ($timestamp) {
@@ -697,20 +697,20 @@ 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
 
 		try {
-			$node = $userRoot->get('/files_trashbin/files/' . $file);
+			$node = $userRoot->get('/files_trashbin/files/'.$file);
 		} catch (NotFoundException $e) {
 			return $size;
 		}
 
 		if ($node instanceof Folder) {
-			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
+			$size += self::calculateSize(new View('/'.$user.'/files_trashbin/files/'.$file));
 		} elseif ($node instanceof File) {
-			$size += $view->filesize('/files_trashbin/files/' . $file);
+			$size += $view->filesize('/files_trashbin/files/'.$file);
 		}
 
-		self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
+		self::emitTrashbinPreDelete('/files_trashbin/files/'.$file);
 		$node->delete();
-		self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
+		self::emitTrashbinPostDelete('/files_trashbin/files/'.$file);
 
 		return $size;
 	}
@@ -720,20 +720,20 @@ 
 	 * @param string $filename
 	 * @param ?int $timestamp
 	 */
-	private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int|float {
+	private static function deleteVersions(View $view, $file, $filename, $timestamp, string $user): int | float {
 		$size = 0;
 		if (Server::get(IAppManager::class)->isEnabledForUser('files_versions')) {
-			if ($view->is_dir('files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
-				$view->unlink('files_trashbin/versions/' . $file);
+			if ($view->is_dir('files_trashbin/versions/'.$file)) {
+				$size += self::calculateSize(new View('/'.$user.'/files_trashbin/versions/'.$file));
+				$view->unlink('files_trashbin/versions/'.$file);
 			} elseif ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$size += $view->filesize('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
-						$view->unlink('/files_trashbin/versions/' . static::getTrashFilename($filename . '.v' . $v, $timestamp));
+						$size += $view->filesize('/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v, $timestamp));
+						$view->unlink('/files_trashbin/versions/'.static::getTrashFilename($filename.'.v'.$v, $timestamp));
 					} else {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
 					}
 				}
 			}
@@ -750,13 +750,13 @@ 
 	 */
 	public static function file_exists($filename, $timestamp = null) {
 		$user = OC_User::getUser();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		if ($timestamp) {
 			$filename = static::getTrashFilename($filename, $timestamp);
 		}
 
-		$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
+		$target = Filesystem::normalizePath('files_trashbin/files/'.$filename);
 		return $view->file_exists($target);
 	}
 
@@ -770,7 +770,7 @@ 
 		$query = Server::get(IDBConnection::class)->getQueryBuilder();
 		$query->delete('files_trash')
 			->where($query->expr()->eq('user', $query->createNamedParameter($uid)));
-		return (bool)$query->executeStatement();
+		return (bool) $query->executeStatement();
 	}
 
 	/**
@@ -780,7 +780,7 @@ 
 	 * @param string $user
 	 * @return int|float available free space for trash bin
 	 */
-	private static function calculateFreeSpace(int|float $trashbinSize, string $user): int|float {
+	private static function calculateFreeSpace(int | float $trashbinSize, string $user): int | float {
 		$configuredTrashbinSize = static::getConfiguredTrashbinSize($user);
 		if ($configuredTrashbinSize > -1) {
 			return $configuredTrashbinSize - $trashbinSize;
@@ -882,7 +882,7 @@ 
 	 * @param int|float $availableSpace available disc space
 	 * @return int|float size of deleted files
 	 */
-	protected static function deleteFiles(array $files, string $user, int|float $availableSpace): int|float {
+	protected static function deleteFiles(array $files, string $user, int | float $availableSpace): int | float {
 		$expiration = Server::get(Expiration::class);
 		$size = 0;
 
@@ -891,7 +891,7 @@ 
 				if ($availableSpace <= 0 && $expiration->isExpired($file['mtime'], true)) {
 					$tmp = self::delete($file['name'], $user, $file['mtime']);
 					Server::get(LoggerInterface::class)->info(
-						'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
+						'remove "'.$file['name'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota) for user "{user}"',
 						[
 							'app' => 'files_trashbin',
 							'user' => $user,
@@ -926,7 +926,7 @@ 
 					$size += self::delete($filename, $user, $timestamp);
 					$count++;
 				} catch (NotPermittedException $e) {
-					Server::get(LoggerInterface::class)->warning('Removing "' . $filename . '" from trashbin failed for user "{user}"',
+					Server::get(LoggerInterface::class)->warning('Removing "'.$filename.'" from trashbin failed for user "{user}"',
 						[
 							'exception' => $e,
 							'app' => 'files_trashbin',
@@ -935,7 +935,7 @@ 
 					);
 				}
 				Server::get(LoggerInterface::class)->info(
-					'Remove "' . $filename . '" from trashbin for user "{user}" because it exceeds max retention obligation term.',
+					'Remove "'.$filename.'" from trashbin for user "{user}" because it exceeds max retention obligation term.',
 					[
 						'app' => 'files_trashbin',
 						'user' => $user,
@@ -958,22 +958,22 @@ 
 	 * @return int|float
 	 * @throws Exceptions\CopyRecursiveException
 	 */
-	private static function copy_recursive($source, $destination, View $view): int|float {
+	private static function copy_recursive($source, $destination, View $view): int | float {
 		$size = 0;
 		if ($view->is_dir($source)) {
 			$view->mkdir($destination);
 			$view->touch($destination, $view->filemtime($source));
 			foreach ($view->getDirectoryContent($source) as $i) {
-				$pathDir = $source . '/' . $i['name'];
+				$pathDir = $source.'/'.$i['name'];
 				if ($view->is_dir($pathDir)) {
-					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
+					$size += self::copy_recursive($pathDir, $destination.'/'.$i['name'], $view);
 				} else {
 					$size += $view->filesize($pathDir);
-					$result = $view->copy($pathDir, $destination . '/' . $i['name']);
+					$result = $view->copy($pathDir, $destination.'/'.$i['name']);
 					if (!$result) {
 						throw new CopyRecursiveException();
 					}
-					$view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
+					$view->touch($destination.'/'.$i['name'], $view->filemtime($pathDir));
 				}
 			}
 		} else {
@@ -994,17 +994,17 @@ 
 	 * @param int $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp, string $user): array {
-		$view = new View('/' . $user . '/files_trashbin/versions');
+		$view = new View('/'.$user.'/files_trashbin/versions');
 		$versions = [];
 
 		/** @var \OC\Files\Storage\Storage $storage */
-		[$storage,] = $view->resolvePath('/');
+		[$storage, ] = $view->resolvePath('/');
 
 		$pattern = Server::get(IDBConnection::class)->escapeLikeParameter(basename($filename));
 		if ($timestamp) {
 			// fetch for old versions
-			$escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string)$timestamp);
-			$pattern .= '.v%.d' . $escapedTimestamp;
+			$escapedTimestamp = Server::get(IDBConnection::class)->escapeLikeParameter((string) $timestamp);
+			$pattern .= '.v%.d'.$escapedTimestamp;
 			$offset = -strlen($escapedTimestamp) - 2;
 		} else {
 			$pattern .= '.v%';
@@ -1016,7 +1016,7 @@ 
 			Server::get(IDBConnection::class)->getQueryBuilder(),
 			Server::get(IFilesMetadataManager::class),
 		);
-		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/' . $filename)), '/');
+		$normalizedParentPath = ltrim(Filesystem::normalizePath(dirname('files_trashbin/versions/'.$filename)), '/');
 		$parentId = $cache->getId($normalizedParentPath);
 		if ($parentId === -1) {
 			return [];
@@ -1032,7 +1032,7 @@ 
 		$result->closeCursor();
 
 		/** @var CacheEntry[] $matches */
-		$matches = array_map(function (array $data) {
+		$matches = array_map(function(array $data) {
 			return Cache::cacheEntryFromData($data, Server::get(IMimeTypeLoader::class));
 		}, $entries);
 
@@ -1062,18 +1062,18 @@ 
 		$name = pathinfo($filename, PATHINFO_FILENAME);
 		$l = Util::getL10N('files_trashbin');
 
-		$location = '/' . trim($location, '/');
+		$location = '/'.trim($location, '/');
 
 		// if extension is not empty we set a dot in front of it
 		if ($ext !== '') {
-			$ext = '.' . $ext;
+			$ext = '.'.$ext;
 		}
 
-		if ($view->file_exists('files' . $location . '/' . $filename)) {
+		if ($view->file_exists('files'.$location.'/'.$filename)) {
 			$i = 2;
-			$uniqueName = $name . ' (' . $l->t('restored') . ')' . $ext;
-			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . ' (' . $l->t('restored') . ' ' . $i . ')' . $ext;
+			$uniqueName = $name.' ('.$l->t('restored').')'.$ext;
+			while ($view->file_exists('files'.$location.'/'.$uniqueName)) {
+				$uniqueName = $name.' ('.$l->t('restored').' '.$i.')'.$ext;
 				$i++;
 			}
 
@@ -1089,8 +1089,8 @@ 
 	 * @param View $view file view on the root folder
 	 * @return int|float size of the folder
 	 */
-	private static function calculateSize(View $view): int|float {
-		$root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
+	private static function calculateSize(View $view): int | float {
+		$root = Server::get(IConfig::class)->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').$view->getAbsolutePath('');
 		if (!file_exists($root)) {
 			return 0;
 		}
@@ -1120,8 +1120,8 @@ 
 	 * @param string $user user who owns the trash bin
 	 * @return int|float trash bin size
 	 */
-	private static function getTrashbinSize(string $user): int|float {
-		$view = new View('/' . $user);
+	private static function getTrashbinSize(string $user): int | float {
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_trashbin');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -1133,7 +1133,7 @@ 
 	 * @return bool
 	 */
 	public static function isEmpty($user) {
-		$view = new View('/' . $user . '/files_trashbin');
+		$view = new View('/'.$user.'/files_trashbin');
 		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
 			while (($file = readdir($dh)) !== false) {
 				if (!Filesystem::isIgnoredDir($file)) {
@@ -1156,7 +1156,7 @@ 
 	 * Return the filename used in the trash bin
 	 */
 	public static function getTrashFilename(string $filename, int $timestamp): string {
-		$trashFilename = $filename . '.d' . $timestamp;
+		$trashFilename = $filename.'.d'.$timestamp;
 		$length = strlen($trashFilename);
 		// oc_filecache `name` column has a limit of 250 chars
 		$maxLength = 250;
@@ -1184,7 +1184,7 @@ 
 		}
 
 		$view = Server::get(View::class);
-		$fullPath = '/' . $user . '/' . $baseDir . '/' . $path;
+		$fullPath = '/'.$user.'/'.$baseDir.'/'.$path;
 
 		if (Filesystem::is_dir($path)) {
 			return new NonExistingFolder($rootFolder, $view, $fullPath);
@@ -1210,7 +1210,7 @@ 
 			$share = $federatedShareProvider->getShareByToken($token);
 
 			return $share->getSharedWith();
-		} catch (NotFoundExceptionInterface|ContainerExceptionInterface|ShareNotFound) {
+		} catch (NotFoundExceptionInterface | ContainerExceptionInterface | ShareNotFound) {
 		}
 
 		return $user;

apps/dav/lib/CalDAV/TimezoneService.php

Indentation +64 added lines, -64 removed lines

@@ -21,75 +21,75 @@
 
 class TimezoneService {
 
-	public function __construct(
-		private IConfig $config,
-		private IUserConfig $userConfig,
-		private PropertyMapper $propertyMapper,
-		private IManager $calendarManager,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+        private IUserConfig $userConfig,
+        private PropertyMapper $propertyMapper,
+        private IManager $calendarManager,
+    ) {
+    }
 
-	public function getUserTimezone(string $userId): ?string {
-		$fromConfig = $this->userConfig->getValueString(
-			$userId,
-			'core',
-			'timezone',
-		);
-		if ($fromConfig !== '') {
-			return $fromConfig;
-		}
+    public function getUserTimezone(string $userId): ?string {
+        $fromConfig = $this->userConfig->getValueString(
+            $userId,
+            'core',
+            'timezone',
+        );
+        if ($fromConfig !== '') {
+            return $fromConfig;
+        }
 
-		$availabilityPropPath = 'calendars/' . $userId . '/inbox';
-		$availabilityProp = '{' . Plugin::NS_CALDAV . '}calendar-availability';
-		$availabilities = $this->propertyMapper->findPropertyByPathAndName($userId, $availabilityPropPath, $availabilityProp);
-		if (!empty($availabilities)) {
-			$availability = $availabilities[0]->getPropertyvalue();
-			/** @var VCalendar $vCalendar */
-			$vCalendar = Reader::read($availability);
-			/** @var VTimeZone $vTimezone */
-			$vTimezone = $vCalendar->VTIMEZONE;
-			// Sabre has a fallback to date_default_timezone_get
-			return $vTimezone->getTimeZone()->getName();
-		}
+        $availabilityPropPath = 'calendars/' . $userId . '/inbox';
+        $availabilityProp = '{' . Plugin::NS_CALDAV . '}calendar-availability';
+        $availabilities = $this->propertyMapper->findPropertyByPathAndName($userId, $availabilityPropPath, $availabilityProp);
+        if (!empty($availabilities)) {
+            $availability = $availabilities[0]->getPropertyvalue();
+            /** @var VCalendar $vCalendar */
+            $vCalendar = Reader::read($availability);
+            /** @var VTimeZone $vTimezone */
+            $vTimezone = $vCalendar->VTIMEZONE;
+            // Sabre has a fallback to date_default_timezone_get
+            return $vTimezone->getTimeZone()->getName();
+        }
 
-		$principal = 'principals/users/' . $userId;
-		$uri = $this->userConfig->getValueString($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
-		$calendars = $this->calendarManager->getCalendarsForPrincipal($principal);
+        $principal = 'principals/users/' . $userId;
+        $uri = $this->userConfig->getValueString($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
+        $calendars = $this->calendarManager->getCalendarsForPrincipal($principal);
 
-		/** @var ?VTimeZone $personalCalendarTimezone */
-		$personalCalendarTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) use ($uri) {
-			if ($acc !== null) {
-				return $acc;
-			}
-			if ($calendar->getUri() === $uri && !$calendar->isDeleted() && $calendar instanceof CalendarImpl) {
-				return $calendar->getSchedulingTimezone();
-			}
-			return null;
-		});
-		if ($personalCalendarTimezone !== null) {
-			return $personalCalendarTimezone->getTimeZone()->getName();
-		}
+        /** @var ?VTimeZone $personalCalendarTimezone */
+        $personalCalendarTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) use ($uri) {
+            if ($acc !== null) {
+                return $acc;
+            }
+            if ($calendar->getUri() === $uri && !$calendar->isDeleted() && $calendar instanceof CalendarImpl) {
+                return $calendar->getSchedulingTimezone();
+            }
+            return null;
+        });
+        if ($personalCalendarTimezone !== null) {
+            return $personalCalendarTimezone->getTimeZone()->getName();
+        }
 
-		// No timezone in the personalCalendarTimezone calendar or no personalCalendarTimezone calendar
-		// Loop through all calendars until we find a timezone.
-		/** @var ?VTimeZone $firstTimezone */
-		$firstTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) {
-			if ($acc !== null) {
-				return $acc;
-			}
-			if (!$calendar->isDeleted() && $calendar instanceof CalendarImpl) {
-				return $calendar->getSchedulingTimezone();
-			}
-			return null;
-		});
-		if ($firstTimezone !== null) {
-			return $firstTimezone->getTimeZone()->getName();
-		}
-		return null;
-	}
+        // No timezone in the personalCalendarTimezone calendar or no personalCalendarTimezone calendar
+        // Loop through all calendars until we find a timezone.
+        /** @var ?VTimeZone $firstTimezone */
+        $firstTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) {
+            if ($acc !== null) {
+                return $acc;
+            }
+            if (!$calendar->isDeleted() && $calendar instanceof CalendarImpl) {
+                return $calendar->getSchedulingTimezone();
+            }
+            return null;
+        });
+        if ($firstTimezone !== null) {
+            return $firstTimezone->getTimeZone()->getName();
+        }
+        return null;
+    }
 
-	public function getDefaultTimezone(): string {
-		return $this->config->getSystemValueString('default_timezone', 'UTC');
-	}
+    public function getDefaultTimezone(): string {
+        return $this->config->getSystemValueString('default_timezone', 'UTC');
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -39,8 +39,8 @@ 
 			return $fromConfig;
 		}
 
-		$availabilityPropPath = 'calendars/' . $userId . '/inbox';
-		$availabilityProp = '{' . Plugin::NS_CALDAV . '}calendar-availability';
+		$availabilityPropPath = 'calendars/'.$userId.'/inbox';
+		$availabilityProp = '{'.Plugin::NS_CALDAV.'}calendar-availability';
 		$availabilities = $this->propertyMapper->findPropertyByPathAndName($userId, $availabilityPropPath, $availabilityProp);
 		if (!empty($availabilities)) {
 			$availability = $availabilities[0]->getPropertyvalue();
@@ -52,12 +52,12 @@ 
 			return $vTimezone->getTimeZone()->getName();
 		}
 
-		$principal = 'principals/users/' . $userId;
+		$principal = 'principals/users/'.$userId;
 		$uri = $this->userConfig->getValueString($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
 		$calendars = $this->calendarManager->getCalendarsForPrincipal($principal);
 
 		/** @var ?VTimeZone $personalCalendarTimezone */
-		$personalCalendarTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) use ($uri) {
+		$personalCalendarTimezone = array_reduce($calendars, function(?VTimeZone $acc, ICalendar $calendar) use ($uri) {
 			if ($acc !== null) {
 				return $acc;
 			}
@@ -73,7 +73,7 @@ 
 		// No timezone in the personalCalendarTimezone calendar or no personalCalendarTimezone calendar
 		// Loop through all calendars until we find a timezone.
 		/** @var ?VTimeZone $firstTimezone */
-		$firstTimezone = array_reduce($calendars, function (?VTimeZone $acc, ICalendar $calendar) {
+		$firstTimezone = array_reduce($calendars, function(?VTimeZone $acc, ICalendar $calendar) {
 			if ($acc !== null) {
 				return $acc;
 			}

apps/dav/lib/CalDAV/Schedule/IMipService.php

Indentation +1290 added lines, -1290 removed lines

@@ -30,1294 +30,1294 @@
 
 class IMipService {
 
-	private IL10N $l10n;
-
-	/** @var string[] */
-	private const STRING_DIFF = [
-		'meeting_title' => 'SUMMARY',
-		'meeting_description' => 'DESCRIPTION',
-		'meeting_url' => 'URL',
-		'meeting_location' => 'LOCATION'
-	];
-
-	public function __construct(
-		private URLGenerator $urlGenerator,
-		private IDBConnection $db,
-		private ISecureRandom $random,
-		private L10NFactory $l10nFactory,
-		private ITimeFactory $timeFactory,
-		private readonly IUserManager $userManager,
-		private readonly IUserConfig $userConfig,
-		private readonly IAppConfig $appConfig,
-	) {
-		$language = $this->l10nFactory->findGenericLanguage();
-		$locale = $this->l10nFactory->findLocale($language);
-		$this->l10n = $this->l10nFactory->get('dav', $language, $locale);
-	}
-
-	/**
-	 * @param string|null $senderName
-	 * @param string $default
-	 * @return string
-	 */
-	public function getFrom(?string $senderName, string $default): string {
-		if ($senderName === null) {
-			return $default;
-		}
-
-		return $this->l10n->t('%1$s via %2$s', [$senderName, $default]);
-	}
-
-	public static function readPropertyWithDefault(VEvent $vevent, string $property, string $default) {
-		if (isset($vevent->$property)) {
-			$value = $vevent->$property->getValue();
-			if (!empty($value)) {
-				return $value;
-			}
-		}
-		return $default;
-	}
-
-	private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
-		$strikethrough = "<span style='text-decoration: line-through'>%s</span><br />%s";
-		if (!isset($vevent->$property)) {
-			return $default;
-		}
-		$value = $vevent->$property->getValue();
-		$newstring = $value === null ? null : htmlspecialchars($value);
-		if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
-			$oldstring = $oldVEvent->$property->getValue();
-			return sprintf($strikethrough, htmlspecialchars($oldstring), $newstring);
-		}
-		return $newstring;
-	}
-
-	/**
-	 * Like generateDiffString() but linkifies the property values if they are urls.
-	 */
-	private function generateLinkifiedDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
-		if (!isset($vevent->$property)) {
-			return $default;
-		}
-		/** @var string|null $newString */
-		$newString = htmlspecialchars($vevent->$property->getValue());
-		$oldString = isset($oldVEvent->$property) ? htmlspecialchars($oldVEvent->$property->getValue()) : null;
-		if ($oldString !== $newString) {
-			return sprintf(
-				"<span style='text-decoration: line-through'>%s</span><br />%s",
-				$this->linkify($oldString) ?? $oldString ?? '',
-				$this->linkify($newString) ?? $newString ?? ''
-			);
-		}
-		return $this->linkify($newString) ?? $newString;
-	}
-
-	/**
-	 * Convert a given url to a html link element or return null otherwise.
-	 */
-	private function linkify(?string $url): ?string {
-		if ($url === null) {
-			return null;
-		}
-		if (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://')) {
-			return null;
-		}
-
-		return sprintf('<a href="%1$s">%1$s</a>', htmlspecialchars($url));
-	}
-
-	/**
-	 * @param VEvent $vEvent
-	 * @param VEvent|null $oldVEvent
-	 * @return array
-	 */
-	public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array {
-
-		// construct event reader
-		$eventReaderCurrent = new EventReader($vEvent);
-		$eventReaderPrevious = !empty($oldVEvent) ? new EventReader($oldVEvent) : null;
-		$defaultVal = '';
-		$data = [];
-		$data['meeting_when'] = $this->generateWhenString($eventReaderCurrent);
-
-		foreach (self::STRING_DIFF as $key => $property) {
-			$data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
-		}
-
-		$data['meeting_url_html'] = self::readPropertyWithDefault($vEvent, 'URL', $defaultVal);
-
-		if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
-			$data['meeting_location_html'] = $locationHtml;
-		}
-
-		if (!empty($oldVEvent)) {
-			$oldMeetingWhen = $this->generateWhenString($eventReaderPrevious);
-			$data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
-			$data['meeting_description_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'DESCRIPTION', $data['meeting_description']);
-			$data['meeting_location_html'] = $this->generateLinkifiedDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
-
-			$oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal);
-			$data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
-
-			$data['meeting_when_html'] = $oldMeetingWhen !== $data['meeting_when'] ? sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", $oldMeetingWhen, $data['meeting_when']) : $data['meeting_when'];
-		}
-		// generate occurring next string
-		if ($eventReaderCurrent->recurs()) {
-			$data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
-		}
-		return $data;
-	}
-
-	/**
-	 * @param VEvent $vEvent
-	 * @return array
-	 */
-	public function buildReplyBodyData(VEvent $vEvent): array {
-		// construct event reader
-		$eventReader = new EventReader($vEvent);
-		$defaultVal = '';
-		$data = [];
-		$data['meeting_when'] = $this->generateWhenString($eventReader);
-
-		foreach (self::STRING_DIFF as $key => $property) {
-			$data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
-		}
-
-		if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
-			$data['meeting_location_html'] = $locationHtml;
-		}
-
-		$data['meeting_url_html'] = $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $data['meeting_url']) : '';
-
-		// generate occurring next string
-		if ($eventReader->recurs()) {
-			$data['meeting_occurring'] = $this->generateOccurringString($eventReader);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * generates a when string based on if a event has an recurrence or not
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenString(EventReader $er): string {
-		return match ($er->recurs()) {
-			true => $this->generateWhenStringRecurring($er),
-			false => $this->generateWhenStringSingular($er)
-		};
-	}
-
-	/**
-	 * generates a when string for a non recurring event
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringSingular(EventReader $er): string {
-		// initialize
-		$startTime = null;
-		$endTime = null;
-		// calculate time difference from now to start of event
-		$occurring = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
-		// extract start date
-		$startDate = $this->l10n->l('date', $er->startDateTime(), ['width' => 'full']);
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// In 1 minute/hour/day/week/month/year on July 1, 2024 for the entire day
-		// In 1 minute/hour/day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 for the entire day
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
-		return match ([$occurring['scale'], $endTime !== null]) {
-			['past', false] => $this->l10n->t(
-				'In the past on %1$s for the entire day',
-				[$startDate]
-			),
-			['minute', false] => $this->l10n->n(
-				'In %n minute on %1$s for the entire day',
-				'In %n minutes on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['hour', false] => $this->l10n->n(
-				'In %n hour on %1$s for the entire day',
-				'In %n hours on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['day', false] => $this->l10n->n(
-				'In %n day on %1$s for the entire day',
-				'In %n days on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['week', false] => $this->l10n->n(
-				'In %n week on %1$s for the entire day',
-				'In %n weeks on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['month', false] => $this->l10n->n(
-				'In %n month on %1$s for the entire day',
-				'In %n months on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['year', false] => $this->l10n->n(
-				'In %n year on %1$s for the entire day',
-				'In %n years on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['past', true] => $this->l10n->t(
-				'In the past on %1$s between %2$s - %3$s',
-				[$startDate, $startTime, $endTime]
-			),
-			['minute', true] => $this->l10n->n(
-				'In %n minute on %1$s between %2$s - %3$s',
-				'In %n minutes on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['hour', true] => $this->l10n->n(
-				'In %n hour on %1$s between %2$s - %3$s',
-				'In %n hours on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['day', true] => $this->l10n->n(
-				'In %n day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['week', true] => $this->l10n->n(
-				'In %n week on %1$s between %2$s - %3$s',
-				'In %n weeks on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['month', true] => $this->l10n->n(
-				'In %n month on %1$s between %2$s - %3$s',
-				'In %n months on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['year', true] => $this->l10n->n(
-				'In %n year on %1$s between %2$s - %3$s',
-				'In %n years on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			default => $this->l10n->t('Could not generate when statement')
-		};
-	}
-
-	/**
-	 * generates a when string based on recurrence precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurring(EventReader $er): string {
-		return match ($er->recurringPrecision()) {
-			'daily' => $this->generateWhenStringRecurringDaily($er),
-			'weekly' => $this->generateWhenStringRecurringWeekly($er),
-			'monthly' => $this->generateWhenStringRecurringMonthly($er),
-			'yearly' => $this->generateWhenStringRecurringYearly($er),
-			'fixed' => $this->generateWhenStringRecurringFixed($er),
-		};
-	}
-
-	/**
-	 * generates a when string for a daily precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringDaily(EventReader $er): string {
-
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// Every Day for the entire day
-		// Every Day for the entire day until July 13, 2024
-		// Every Day between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		// Every 3 Days for the entire day
-		// Every 3 Days for the entire day until July 13, 2024
-		// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Day for the entire day'),
-			[false, false, true] => $this->l10n->t('Every Day for the entire day until %1$s', [$conclusion]),
-			[false, true, false] => $this->l10n->t('Every Day between %1$s - %2$s', [$startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Day between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Days for the entire day', [$interval]),
-			[true, false, true] => $this->l10n->t('Every %1$d Days for the entire day until %2$s', [$interval, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Days between %2$s - %3$s', [$interval, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Days between %2$s - %3$s until %4$s', [$interval, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-
-	}
-
-	/**
-	 * generates a when string for a weekly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringWeekly(EventReader $er): string {
-
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// days of the week
-		$days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// Every Week on Monday, Wednesday, Friday for the entire day
-		// Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024
-		// Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		// Every 2 Weeks on Monday, Wednesday, Friday for the entire day
-		// Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024
-		// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Week on %1$s for the entire day', [$days]),
-			[false, false, true] => $this->l10n->t('Every Week on %1$s for the entire day until %2$s', [$days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day', [$interval, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-
-	}
-
-	/**
-	 * generates a when string for a monthly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringMonthly(EventReader $er): string {
-
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// days of month
-		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
-					. implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		} else {
-			$days = implode(', ', $er->recurringDaysOfMonth());
-		}
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order, output varies depending on if the event is absolute or releative:
-		// Absolute: Every Month on the 1, 8 for the entire day
-		// Relative: Every Month on the First Sunday, Saturday for the entire day
-		// Absolute: Every Month on the 1, 8 for the entire day until December 31, 2024
-		// Relative: Every Month on the First Sunday, Saturday for the entire day until December 31, 2024
-		// Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Absolute: Every 2 Months on the 1, 8 for the entire day
-		// Relative: Every 2 Months on the First Sunday, Saturday for the entire day
-		// Absolute: Every 2 Months on the 1, 8 for the entire day until December 31, 2024
-		// Relative: Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024
-		// Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Month on the %1$s for the entire day', [$days]),
-			[false, false, true] => $this->l10n->t('Every Month on the %1$s for the entire day until %2$s', [$days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day', [$interval, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-	}
-
-	/**
-	 * generates a when string for a yearly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringYearly(EventReader $er): string {
-
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// months of year
-		$months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
-		// days of month
-		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
-					. implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		} else {
-			$days = $er->startDateTime()->format('jS');
-		}
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order, output varies depending on if the event is absolute or releative:
-		// Absolute: Every Year in July on the 1st for the entire day
-		// Relative: Every Year in July on the First Sunday, Saturday for the entire day
-		// Absolute: Every Year in July on the 1st for the entire day until July 31, 2026
-		// Relative: Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026
-		// Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Absolute: Every 2 Years in July on the 1st for the entire day
-		// Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day
-		// Absolute: Every 2 Years in July on the 1st for the entire day until July 31, 2026
-		// Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026
-		// Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day', [$months, $days]),
-			[false, false, true] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day until %3$s', [$months, $days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', [$months, $days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day', [$interval, $months, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months,  $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [$interval, $months, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [$interval, $months, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-	}
-
-	/**
-	 * generates a when string for a fixed precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringFixed(EventReader $er): string {
-		// initialize
-		$startTime = null;
-		$conclusion = null;
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// On specific dates for the entire day until July 13, 2024
-		// On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ($startTime !== null) {
-			false => $this->l10n->t('On specific dates for the entire day until %1$s', [$conclusion]),
-			true => $this->l10n->t('On specific dates between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
-		};
-	}
-
-	/**
-	 * generates a occurring next string for a recurring event
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateOccurringString(EventReader $er): string {
-
-		// initialize
-		$occurrence = null;
-		$occurrence2 = null;
-		$occurrence3 = null;
-		// reset to initial occurrence
-		$er->recurrenceRewind();
-		// forward to current date
-		$er->recurrenceAdvanceTo($this->timeFactory->getDateTime());
-		// calculate time difference from now to start of next event occurrence and minimize it
-		$occurrenceIn = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
-		// store next occurrence value
-		$occurrence = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-		// forward one occurrence
-		$er->recurrenceAdvance();
-		// evaluate if occurrence is valid
-		if ($er->recurrenceDate() !== null) {
-			// store following occurrence value
-			$occurrence2 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-			// forward one occurrence
-			$er->recurrenceAdvance();
-			// evaluate if occurrence is valid
-			if ($er->recurrenceDate()) {
-				// store following occurrence value
-				$occurrence3 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-			}
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// In 1 minute/hour/day/week/month/year on July 1, 2024
-		// In 1 minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024
-		// In 1 minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
-		return match ([$occurrenceIn['scale'], $occurrence2 !== null, $occurrence3 !== null]) {
-			['past', false, false] => $this->l10n->t(
-				'In the past on %1$s',
-				[$occurrence]
-			),
-			['minute', false, false] => $this->l10n->n(
-				'In %n minute on %1$s',
-				'In %n minutes on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['hour', false, false] => $this->l10n->n(
-				'In %n hour on %1$s',
-				'In %n hours on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['day', false, false] => $this->l10n->n(
-				'In %n day on %1$s',
-				'In %n days on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['week', false, false] => $this->l10n->n(
-				'In %n week on %1$s',
-				'In %n weeks on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['month', false, false] => $this->l10n->n(
-				'In %n month on %1$s',
-				'In %n months on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['year', false, false] => $this->l10n->n(
-				'In %n year on %1$s',
-				'In %n years on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['past', true, false] => $this->l10n->t(
-				'In the past on %1$s then on %2$s',
-				[$occurrence, $occurrence2]
-			),
-			['minute', true, false] => $this->l10n->n(
-				'In %n minute on %1$s then on %2$s',
-				'In %n minutes on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['hour', true, false] => $this->l10n->n(
-				'In %n hour on %1$s then on %2$s',
-				'In %n hours on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['day', true, false] => $this->l10n->n(
-				'In %n day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['week', true, false] => $this->l10n->n(
-				'In %n week on %1$s then on %2$s',
-				'In %n weeks on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['month', true, false] => $this->l10n->n(
-				'In %n month on %1$s then on %2$s',
-				'In %n months on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['year', true, false] => $this->l10n->n(
-				'In %n year on %1$s then on %2$s',
-				'In %n years on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['past', true, true] => $this->l10n->t(
-				'In the past on %1$s then on %2$s and %3$s',
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['minute', true, true] => $this->l10n->n(
-				'In %n minute on %1$s then on %2$s and %3$s',
-				'In %n minutes on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['hour', true, true] => $this->l10n->n(
-				'In %n hour on %1$s then on %2$s and %3$s',
-				'In %n hours on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['day', true, true] => $this->l10n->n(
-				'In %n day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['week', true, true] => $this->l10n->n(
-				'In %n week on %1$s then on %2$s and %3$s',
-				'In %n weeks on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['month', true, true] => $this->l10n->n(
-				'In %n month on %1$s then on %2$s and %3$s',
-				'In %n months on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['year', true, true] => $this->l10n->n(
-				'In %n year on %1$s then on %2$s and %3$s',
-				'In %n years on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			default => $this->l10n->t('Could not generate next recurrence statement')
-		};
-
-	}
-
-	/**
-	 * @param VEvent $vEvent
-	 * @return array
-	 */
-	public function buildCancelledBodyData(VEvent $vEvent): array {
-		// construct event reader
-		$eventReaderCurrent = new EventReader($vEvent);
-		$defaultVal = '';
-		$strikethrough = "<span style='text-decoration: line-through'>%s</span>";
-
-		$newMeetingWhen = $this->generateWhenString($eventReaderCurrent);
-		$newSummary = htmlspecialchars(isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event'));
-		$newDescription = htmlspecialchars(isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal);
-		$newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
-		$newLocation = htmlspecialchars(isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal);
-		$newLocationHtml = $this->linkify($newLocation) ?? $newLocation;
-
-		$data = [];
-		$data['meeting_when_html'] = $newMeetingWhen === '' ?: sprintf($strikethrough, $newMeetingWhen);
-		$data['meeting_when'] = $newMeetingWhen;
-		$data['meeting_title_html'] = sprintf($strikethrough, $newSummary);
-		$data['meeting_title'] = $newSummary !== '' ? $newSummary: $this->l10n->t('Untitled event');
-		$data['meeting_description_html'] = $newDescription !== '' ? sprintf($strikethrough, $newDescription) : '';
-		$data['meeting_description'] = $newDescription;
-		$data['meeting_url_html'] = $newUrl !== '' ? sprintf($strikethrough, $newUrl) : '';
-		$data['meeting_url'] = isset($vEvent->URL) ? (string)$vEvent->URL : '';
-		$data['meeting_location_html'] = $newLocationHtml !== '' ? sprintf($strikethrough, $newLocationHtml) : '';
-		$data['meeting_location'] = $newLocation;
-		return $data;
-	}
-
-	/**
-	 * Check if event took place in the past
-	 *
-	 * @param VCalendar $vObject
-	 * @return int
-	 */
-	public function getLastOccurrence(VCalendar $vObject) {
-		/** @var VEvent $component */
-		$component = $vObject->VEVENT;
-
-		if (isset($component->RRULE)) {
-			$it = new EventIterator($vObject, (string)$component->UID);
-			$maxDate = new \DateTime(IMipPlugin::MAX_DATE);
-			if ($it->isInfinite()) {
-				return $maxDate->getTimestamp();
-			}
-
-			$end = $it->getDtEnd();
-			while ($it->valid() && $end < $maxDate) {
-				$end = $it->getDtEnd();
-				$it->next();
-			}
-			return $end->getTimestamp();
-		}
-
-		/** @var Property\ICalendar\DateTime $dtStart */
-		$dtStart = $component->DTSTART;
-
-		if (isset($component->DTEND)) {
-			/** @var Property\ICalendar\DateTime $dtEnd */
-			$dtEnd = $component->DTEND;
-			return $dtEnd->getDateTime()->getTimeStamp();
-		}
-
-		if (isset($component->DURATION)) {
-			/** @var \DateTime $endDate */
-			$endDate = clone $dtStart->getDateTime();
-			// $component->DTEND->getDateTime() returns DateTimeImmutable
-			$endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-			return $endDate->getTimestamp();
-		}
-
-		if (!$dtStart->hasTime()) {
-			/** @var \DateTime $endDate */
-			// $component->DTSTART->getDateTime() returns DateTimeImmutable
-			$endDate = clone $dtStart->getDateTime();
-			$endDate = $endDate->modify('+1 day');
-			return $endDate->getTimestamp();
-		}
-
-		// No computation of end time possible - return start date
-		return $dtStart->getDateTime()->getTimeStamp();
-	}
-
-	/**
-	 * @param Property $attendee
-	 */
-	public function setL10nFromAttendee(Property $attendee) {
-		$language = null;
-		$locale = null;
-		// check if the attendee is a system user
-		$userAddress = $attendee->getValue();
-		if (str_starts_with($userAddress, 'mailto:')) {
-			$userAddress = substr($userAddress, 7);
-		}
-		$users = $this->userManager->getByEmail($userAddress);
-		if ($users !== []) {
-			$user = array_shift($users);
-			$language = $this->userConfig->getValueString($user->getUID(), 'core', 'lang', '') ?: null;
-			$locale = $this->userConfig->getValueString($user->getUID(), 'core', 'locale', '') ?: null;
-		}
-		// fallback to attendee LANGUAGE parameter if language not set
-		if ($language === null && isset($attendee['LANGUAGE']) && $attendee['LANGUAGE'] instanceof Parameter) {
-			$language = $attendee['LANGUAGE']->getValue();
-		}
-		// fallback to system language if language not set
-		if ($language === null) {
-			$language = $this->l10nFactory->findGenericLanguage();
-		}
-		// fallback to system locale if locale not set
-		if ($locale === null) {
-			$locale = $this->l10nFactory->findLocale($language);
-		}
-		$this->l10n = $this->l10nFactory->get('dav', $language, $locale);
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 * @return bool
-	 */
-	public function getAttendeeRsvpOrReqForParticipant(?Property $attendee = null) {
-		if ($attendee === null) {
-			return false;
-		}
-
-		$rsvp = $attendee->offsetGet('RSVP');
-		if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
-			return true;
-		}
-		$role = $attendee->offsetGet('ROLE');
-		// @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
-		// Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
-		if ($role === null
-			|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
-			|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
-		) {
-			return true;
-		}
-
-		// RFC 5545 3.2.17: default RSVP is false
-		return false;
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param string $method
-	 * @param string $sender
-	 * @param string $summary
-	 * @param string|null $partstat
-	 * @param bool $isModified
-	 */
-	public function addSubjectAndHeading(IEMailTemplate $template,
-		string $method, string $sender, string $summary, bool $isModified, ?Property $replyingAttendee = null): void {
-		if ($method === IMipPlugin::METHOD_CANCEL) {
-			// TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Cancelled: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('"%1$s" has been canceled', [$summary]));
-		} elseif ($method === IMipPlugin::METHOD_REPLY) {
-			// TRANSLATORS Subject for email, when an invitation is replied to. Ex: "Re: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Re: %1$s', [$summary]));
-			// Build the strings
-			$partstat = (isset($replyingAttendee)) ? $replyingAttendee->offsetGet('PARTSTAT') : null;
-			$partstat = ($partstat instanceof Parameter) ? $partstat->getValue() : null;
-			switch ($partstat) {
-				case 'ACCEPTED':
-					$template->addHeading($this->l10n->t('%1$s has accepted your invitation', [$sender]));
-					break;
-				case 'TENTATIVE':
-					$template->addHeading($this->l10n->t('%1$s has tentatively accepted your invitation', [$sender]));
-					break;
-				case 'DECLINED':
-					$template->addHeading($this->l10n->t('%1$s has declined your invitation', [$sender]));
-					break;
-				case null:
-				default:
-					$template->addHeading($this->l10n->t('%1$s has responded to your invitation', [$sender]));
-					break;
-			}
-		} elseif ($method === IMipPlugin::METHOD_REQUEST && $isModified) {
-			// TRANSLATORS Subject for email, when an invitation is updated. Ex: "Invitation updated: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Invitation updated: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('%1$s updated the event "%2$s"', [$sender, $summary]));
-		} else {
-			// TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Invitation: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('%1$s would like to invite you to "%2$s"', [$sender, $summary]));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getAbsoluteImagePath($path): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * addAttendees: add organizer and attendee names/emails to iMip mail.
-	 *
-	 * Enable with DAV setting: invitation_list_attendees (default: no)
-	 *
-	 * The default is 'no', which matches old behavior, and is privacy preserving.
-	 *
-	 * To enable including attendees in invitation emails:
-	 *   % php occ config:app:set dav invitation_list_attendees --value yes --type bool
-	 *
-	 * @param IEMailTemplate $template
-	 * @param IL10N $this->l10n
-	 * @param VEvent $vevent
-	 * @author brad2014 on github.com
-	 */
-	public function addAttendees(IEMailTemplate $template, VEvent $vevent) {
-		if (!$this->appConfig->getValueBool('dav', 'invitation_list_attendees')) {
-			return;
-		}
-
-		if (isset($vevent->ORGANIZER)) {
-			/** @var Property&Property\ICalendar\CalAddress $organizer */
-			$organizer = $vevent->ORGANIZER;
-			$organizerEmail = substr($organizer->getNormalizedValue(), 7);
-			/** @var string|null $organizerName */
-			$organizerName = isset($organizer->CN) ? $organizer->CN->getValue() : null;
-			$organizerHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($organizer->getNormalizedValue()),
-				htmlspecialchars($organizerName ?: $organizerEmail));
-			$organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
-			if (isset($organizer['PARTSTAT'])) {
-				/** @var Parameter $partstat */
-				$partstat = $organizer['PARTSTAT'];
-				if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
-					$organizerHTML .= ' ✔︎';
-					$organizerText .= ' ✔︎';
-				}
-			}
-			$template->addBodyListItem($organizerHTML, $this->l10n->t('Organizer:'),
-				$this->getAbsoluteImagePath('caldav/organizer.png'),
-				$organizerText, '', IMipPlugin::IMIP_INDENT);
-		}
-
-		$attendees = $vevent->select('ATTENDEE');
-		if (count($attendees) === 0) {
-			return;
-		}
-
-		$attendeesHTML = [];
-		$attendeesText = [];
-		foreach ($attendees as $attendee) {
-			/** @var Property&Property\ICalendar\CalAddress $attendee */
-			$attendeeEmail = substr($attendee->getNormalizedValue(), 7);
-			$attendeeName = null;
-			if (isset($attendee['CN'])) {
-				/** @var Parameter $cn */
-				$cn = $attendee['CN'];
-				$attendeeName = $cn->getValue();
-			}
-			$attendeeHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($attendee->getNormalizedValue()),
-				htmlspecialchars($attendeeName ?: $attendeeEmail));
-			$attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
-			if (isset($attendee['PARTSTAT'])) {
-				/** @var Parameter $partstat */
-				$partstat = $attendee['PARTSTAT'];
-				if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
-					$attendeeHTML .= ' ✔︎';
-					$attendeeText .= ' ✔︎';
-				}
-			}
-			$attendeesHTML[] = $attendeeHTML;
-			$attendeesText[] = $attendeeText;
-		}
-
-		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $this->l10n->t('Attendees:'),
-			$this->getAbsoluteImagePath('caldav/attendees.png'),
-			implode("\n", $attendeesText), '', IMipPlugin::IMIP_INDENT);
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param VEVENT $vevent
-	 * @param $data
-	 */
-	public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) {
-		$template->addBodyListItem(
-			$data['meeting_title_html'] ?? htmlspecialchars($data['meeting_title']), $this->l10n->t('Title:'),
-			$this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT);
-		if ($data['meeting_when'] !== '') {
-			$template->addBodyListItem($data['meeting_when_html'] ?? htmlspecialchars($data['meeting_when']), $this->l10n->t('When:'),
-				$this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_when'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if ($data['meeting_location'] !== '') {
-			$template->addBodyListItem($data['meeting_location_html'] ?? htmlspecialchars($data['meeting_location']), $this->l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.png'), $data['meeting_location'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if ($data['meeting_url'] !== '') {
-			$template->addBodyListItem($data['meeting_url_html'] ?? htmlspecialchars($data['meeting_url']), $this->l10n->t('Link:'),
-				$this->getAbsoluteImagePath('caldav/link.png'), $data['meeting_url'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if (isset($data['meeting_occurring'])) {
-			$template->addBodyListItem($data['meeting_occurring_html'] ?? htmlspecialchars($data['meeting_occurring']), $this->l10n->t('Occurring:'),
-				$this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_occurring'], '', IMipPlugin::IMIP_INDENT);
-		}
-
-		$this->addAttendees($template, $vevent);
-
-		/* Put description last, like an email body, since it can be arbitrarily long */
-		if ($data['meeting_description']) {
-			$template->addBodyListItem($data['meeting_description_html'] ?? htmlspecialchars($data['meeting_description']), $this->l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.png'), $data['meeting_description'], '', IMipPlugin::IMIP_INDENT);
-		}
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @return null|Property
-	 */
-	public function getCurrentAttendee(Message $iTipMessage): ?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			if ($iTipMessage->method === 'REPLY' && strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
-				/** @var Property $attendee */
-				return $attendee;
-			} elseif (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
-				/** @var Property $attendee */
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @param VEvent $vevent
-	 * @param int $lastOccurrence
-	 * @return string
-	 */
-	public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int $lastOccurrence): string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
-
-		$attendee = $iTipMessage->recipient;
-		$organizer = $iTipMessage->sender;
-		$sequence = $iTipMessage->sequence;
-		$recurrenceId = isset($vevent->{'RECURRENCE-ID'})
-			? $vevent->{'RECURRENCE-ID'}->serialize() : null;
-		$uid = $vevent->{'UID'}?->getValue();
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_invitations')
-			->values([
-				'token' => $query->createNamedParameter($token),
-				'attendee' => $query->createNamedParameter($attendee),
-				'organizer' => $query->createNamedParameter($organizer),
-				'sequence' => $query->createNamedParameter($sequence),
-				'recurrenceid' => $query->createNamedParameter($recurrenceId),
-				'expiration' => $query->createNamedParameter($lastOccurrence),
-				'uid' => $query->createNamedParameter($uid)
-			])
-			->executeStatement();
-
-		return $token;
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param $token
-	 */
-	public function addResponseButtons(IEMailTemplate $template, $token) {
-		$template->addBodyButtonGroup(
-			$this->l10n->t('Accept'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
-				'token' => $token,
-			]),
-			$this->l10n->t('Decline'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
-				'token' => $token,
-			])
-		);
-	}
-
-	public function addMoreOptionsButton(IEMailTemplate $template, $token) {
-		$moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
-			'token' => $token,
-		]);
-		$html = vsprintf('<small><a href="%s">%s</a></small>', [
-			$moreOptionsURL, $this->l10n->t('More options …')
-		]);
-		$text = $this->l10n->t('More options at %s', [$moreOptionsURL]);
-
-		$template->addBodyText($html, $text);
-	}
-
-	public function getReplyingAttendee(Message $iTipMessage): ?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			/** @var Property $attendee */
-			if (strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	public function isRoomOrResource(Property $attendee): bool {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if (!$cuType instanceof Parameter) {
-			return false;
-		}
-		$type = $cuType->getValue() ?? 'INDIVIDUAL';
-		if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM'], true)) {
-			// Don't send emails to things
-			return true;
-		}
-		return false;
-	}
-
-	public function isCircle(Property $attendee): bool {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if (!$cuType instanceof Parameter) {
-			return false;
-		}
-
-		$uri = $attendee->getValue();
-		if (!$uri) {
-			return false;
-		}
-
-		$cuTypeValue = $cuType->getValue();
-		return $cuTypeValue === 'GROUP' && str_starts_with($uri, 'mailto:circle+');
-	}
-
-	public function minimizeInterval(\DateInterval $dateInterval): array {
-		// evaluate if time interval is in the past
-		if ($dateInterval->invert == 1) {
-			return ['interval' => 1, 'scale' => 'past'];
-		}
-		// evaluate interval parts and return smallest time period
-		if ($dateInterval->y > 0) {
-			$interval = $dateInterval->y;
-			$scale = 'year';
-		} elseif ($dateInterval->m > 0) {
-			$interval = $dateInterval->m;
-			$scale = 'month';
-		} elseif ($dateInterval->d >= 7) {
-			$interval = (int)($dateInterval->d / 7);
-			$scale = 'week';
-		} elseif ($dateInterval->d > 0) {
-			$interval = $dateInterval->d;
-			$scale = 'day';
-		} elseif ($dateInterval->h > 0) {
-			$interval = $dateInterval->h;
-			$scale = 'hour';
-		} else {
-			$interval = $dateInterval->i;
-			$scale = 'minute';
-		}
-
-		return ['interval' => $interval, 'scale' => $scale];
-	}
-
-	/**
-	 * Localizes week day names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeDayName(string $value): string {
-		return match ($value) {
-			'Monday' => $this->l10n->t('Monday'),
-			'Tuesday' => $this->l10n->t('Tuesday'),
-			'Wednesday' => $this->l10n->t('Wednesday'),
-			'Thursday' => $this->l10n->t('Thursday'),
-			'Friday' => $this->l10n->t('Friday'),
-			'Saturday' => $this->l10n->t('Saturday'),
-			'Sunday' => $this->l10n->t('Sunday'),
-		};
-	}
-
-	/**
-	 * Localizes month names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeMonthName(string $value): string {
-		return match ($value) {
-			'January' => $this->l10n->t('January'),
-			'February' => $this->l10n->t('February'),
-			'March' => $this->l10n->t('March'),
-			'April' => $this->l10n->t('April'),
-			'May' => $this->l10n->t('May'),
-			'June' => $this->l10n->t('June'),
-			'July' => $this->l10n->t('July'),
-			'August' => $this->l10n->t('August'),
-			'September' => $this->l10n->t('September'),
-			'October' => $this->l10n->t('October'),
-			'November' => $this->l10n->t('November'),
-			'December' => $this->l10n->t('December'),
-		};
-	}
-
-	/**
-	 * Localizes relative position names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeRelativePositionName(string $value): string {
-		return match ($value) {
-			'First' => $this->l10n->t('First'),
-			'Second' => $this->l10n->t('Second'),
-			'Third' => $this->l10n->t('Third'),
-			'Fourth' => $this->l10n->t('Fourth'),
-			'Fifth' => $this->l10n->t('Fifth'),
-			'Last' => $this->l10n->t('Last'),
-			'Second Last' => $this->l10n->t('Second Last'),
-			'Third Last' => $this->l10n->t('Third Last'),
-			'Fourth Last' => $this->l10n->t('Fourth Last'),
-			'Fifth Last' => $this->l10n->t('Fifth Last'),
-		};
-	}
+    private IL10N $l10n;
+
+    /** @var string[] */
+    private const STRING_DIFF = [
+        'meeting_title' => 'SUMMARY',
+        'meeting_description' => 'DESCRIPTION',
+        'meeting_url' => 'URL',
+        'meeting_location' => 'LOCATION'
+    ];
+
+    public function __construct(
+        private URLGenerator $urlGenerator,
+        private IDBConnection $db,
+        private ISecureRandom $random,
+        private L10NFactory $l10nFactory,
+        private ITimeFactory $timeFactory,
+        private readonly IUserManager $userManager,
+        private readonly IUserConfig $userConfig,
+        private readonly IAppConfig $appConfig,
+    ) {
+        $language = $this->l10nFactory->findGenericLanguage();
+        $locale = $this->l10nFactory->findLocale($language);
+        $this->l10n = $this->l10nFactory->get('dav', $language, $locale);
+    }
+
+    /**
+     * @param string|null $senderName
+     * @param string $default
+     * @return string
+     */
+    public function getFrom(?string $senderName, string $default): string {
+        if ($senderName === null) {
+            return $default;
+        }
+
+        return $this->l10n->t('%1$s via %2$s', [$senderName, $default]);
+    }
+
+    public static function readPropertyWithDefault(VEvent $vevent, string $property, string $default) {
+        if (isset($vevent->$property)) {
+            $value = $vevent->$property->getValue();
+            if (!empty($value)) {
+                return $value;
+            }
+        }
+        return $default;
+    }
+
+    private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
+        $strikethrough = "<span style='text-decoration: line-through'>%s</span><br />%s";
+        if (!isset($vevent->$property)) {
+            return $default;
+        }
+        $value = $vevent->$property->getValue();
+        $newstring = $value === null ? null : htmlspecialchars($value);
+        if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
+            $oldstring = $oldVEvent->$property->getValue();
+            return sprintf($strikethrough, htmlspecialchars($oldstring), $newstring);
+        }
+        return $newstring;
+    }
+
+    /**
+     * Like generateDiffString() but linkifies the property values if they are urls.
+     */
+    private function generateLinkifiedDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
+        if (!isset($vevent->$property)) {
+            return $default;
+        }
+        /** @var string|null $newString */
+        $newString = htmlspecialchars($vevent->$property->getValue());
+        $oldString = isset($oldVEvent->$property) ? htmlspecialchars($oldVEvent->$property->getValue()) : null;
+        if ($oldString !== $newString) {
+            return sprintf(
+                "<span style='text-decoration: line-through'>%s</span><br />%s",
+                $this->linkify($oldString) ?? $oldString ?? '',
+                $this->linkify($newString) ?? $newString ?? ''
+            );
+        }
+        return $this->linkify($newString) ?? $newString;
+    }
+
+    /**
+     * Convert a given url to a html link element or return null otherwise.
+     */
+    private function linkify(?string $url): ?string {
+        if ($url === null) {
+            return null;
+        }
+        if (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://')) {
+            return null;
+        }
+
+        return sprintf('<a href="%1$s">%1$s</a>', htmlspecialchars($url));
+    }
+
+    /**
+     * @param VEvent $vEvent
+     * @param VEvent|null $oldVEvent
+     * @return array
+     */
+    public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array {
+
+        // construct event reader
+        $eventReaderCurrent = new EventReader($vEvent);
+        $eventReaderPrevious = !empty($oldVEvent) ? new EventReader($oldVEvent) : null;
+        $defaultVal = '';
+        $data = [];
+        $data['meeting_when'] = $this->generateWhenString($eventReaderCurrent);
+
+        foreach (self::STRING_DIFF as $key => $property) {
+            $data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
+        }
+
+        $data['meeting_url_html'] = self::readPropertyWithDefault($vEvent, 'URL', $defaultVal);
+
+        if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
+            $data['meeting_location_html'] = $locationHtml;
+        }
+
+        if (!empty($oldVEvent)) {
+            $oldMeetingWhen = $this->generateWhenString($eventReaderPrevious);
+            $data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
+            $data['meeting_description_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'DESCRIPTION', $data['meeting_description']);
+            $data['meeting_location_html'] = $this->generateLinkifiedDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
+
+            $oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal);
+            $data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
+
+            $data['meeting_when_html'] = $oldMeetingWhen !== $data['meeting_when'] ? sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", $oldMeetingWhen, $data['meeting_when']) : $data['meeting_when'];
+        }
+        // generate occurring next string
+        if ($eventReaderCurrent->recurs()) {
+            $data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
+        }
+        return $data;
+    }
+
+    /**
+     * @param VEvent $vEvent
+     * @return array
+     */
+    public function buildReplyBodyData(VEvent $vEvent): array {
+        // construct event reader
+        $eventReader = new EventReader($vEvent);
+        $defaultVal = '';
+        $data = [];
+        $data['meeting_when'] = $this->generateWhenString($eventReader);
+
+        foreach (self::STRING_DIFF as $key => $property) {
+            $data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
+        }
+
+        if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
+            $data['meeting_location_html'] = $locationHtml;
+        }
+
+        $data['meeting_url_html'] = $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $data['meeting_url']) : '';
+
+        // generate occurring next string
+        if ($eventReader->recurs()) {
+            $data['meeting_occurring'] = $this->generateOccurringString($eventReader);
+        }
+
+        return $data;
+    }
+
+    /**
+     * generates a when string based on if a event has an recurrence or not
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenString(EventReader $er): string {
+        return match ($er->recurs()) {
+            true => $this->generateWhenStringRecurring($er),
+            false => $this->generateWhenStringSingular($er)
+        };
+    }
+
+    /**
+     * generates a when string for a non recurring event
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringSingular(EventReader $er): string {
+        // initialize
+        $startTime = null;
+        $endTime = null;
+        // calculate time difference from now to start of event
+        $occurring = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
+        // extract start date
+        $startDate = $this->l10n->l('date', $er->startDateTime(), ['width' => 'full']);
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // In 1 minute/hour/day/week/month/year on July 1, 2024 for the entire day
+        // In 1 minute/hour/day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 for the entire day
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+        return match ([$occurring['scale'], $endTime !== null]) {
+            ['past', false] => $this->l10n->t(
+                'In the past on %1$s for the entire day',
+                [$startDate]
+            ),
+            ['minute', false] => $this->l10n->n(
+                'In %n minute on %1$s for the entire day',
+                'In %n minutes on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['hour', false] => $this->l10n->n(
+                'In %n hour on %1$s for the entire day',
+                'In %n hours on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['day', false] => $this->l10n->n(
+                'In %n day on %1$s for the entire day',
+                'In %n days on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['week', false] => $this->l10n->n(
+                'In %n week on %1$s for the entire day',
+                'In %n weeks on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['month', false] => $this->l10n->n(
+                'In %n month on %1$s for the entire day',
+                'In %n months on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['year', false] => $this->l10n->n(
+                'In %n year on %1$s for the entire day',
+                'In %n years on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['past', true] => $this->l10n->t(
+                'In the past on %1$s between %2$s - %3$s',
+                [$startDate, $startTime, $endTime]
+            ),
+            ['minute', true] => $this->l10n->n(
+                'In %n minute on %1$s between %2$s - %3$s',
+                'In %n minutes on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['hour', true] => $this->l10n->n(
+                'In %n hour on %1$s between %2$s - %3$s',
+                'In %n hours on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['day', true] => $this->l10n->n(
+                'In %n day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['week', true] => $this->l10n->n(
+                'In %n week on %1$s between %2$s - %3$s',
+                'In %n weeks on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['month', true] => $this->l10n->n(
+                'In %n month on %1$s between %2$s - %3$s',
+                'In %n months on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['year', true] => $this->l10n->n(
+                'In %n year on %1$s between %2$s - %3$s',
+                'In %n years on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            default => $this->l10n->t('Could not generate when statement')
+        };
+    }
+
+    /**
+     * generates a when string based on recurrence precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurring(EventReader $er): string {
+        return match ($er->recurringPrecision()) {
+            'daily' => $this->generateWhenStringRecurringDaily($er),
+            'weekly' => $this->generateWhenStringRecurringWeekly($er),
+            'monthly' => $this->generateWhenStringRecurringMonthly($er),
+            'yearly' => $this->generateWhenStringRecurringYearly($er),
+            'fixed' => $this->generateWhenStringRecurringFixed($er),
+        };
+    }
+
+    /**
+     * generates a when string for a daily precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringDaily(EventReader $er): string {
+
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // Every Day for the entire day
+        // Every Day for the entire day until July 13, 2024
+        // Every Day between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        // Every 3 Days for the entire day
+        // Every 3 Days for the entire day until July 13, 2024
+        // Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Day for the entire day'),
+            [false, false, true] => $this->l10n->t('Every Day for the entire day until %1$s', [$conclusion]),
+            [false, true, false] => $this->l10n->t('Every Day between %1$s - %2$s', [$startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Day between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Days for the entire day', [$interval]),
+            [true, false, true] => $this->l10n->t('Every %1$d Days for the entire day until %2$s', [$interval, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Days between %2$s - %3$s', [$interval, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Days between %2$s - %3$s until %4$s', [$interval, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+
+    }
+
+    /**
+     * generates a when string for a weekly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringWeekly(EventReader $er): string {
+
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // days of the week
+        $days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // Every Week on Monday, Wednesday, Friday for the entire day
+        // Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024
+        // Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        // Every 2 Weeks on Monday, Wednesday, Friday for the entire day
+        // Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024
+        // Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Week on %1$s for the entire day', [$days]),
+            [false, false, true] => $this->l10n->t('Every Week on %1$s for the entire day until %2$s', [$days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day', [$interval, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+
+    }
+
+    /**
+     * generates a when string for a monthly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringMonthly(EventReader $er): string {
+
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // days of month
+        if ($er->recurringPattern() === 'R') {
+            $days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
+                    . implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        } else {
+            $days = implode(', ', $er->recurringDaysOfMonth());
+        }
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order, output varies depending on if the event is absolute or releative:
+        // Absolute: Every Month on the 1, 8 for the entire day
+        // Relative: Every Month on the First Sunday, Saturday for the entire day
+        // Absolute: Every Month on the 1, 8 for the entire day until December 31, 2024
+        // Relative: Every Month on the First Sunday, Saturday for the entire day until December 31, 2024
+        // Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Absolute: Every 2 Months on the 1, 8 for the entire day
+        // Relative: Every 2 Months on the First Sunday, Saturday for the entire day
+        // Absolute: Every 2 Months on the 1, 8 for the entire day until December 31, 2024
+        // Relative: Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024
+        // Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Month on the %1$s for the entire day', [$days]),
+            [false, false, true] => $this->l10n->t('Every Month on the %1$s for the entire day until %2$s', [$days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day', [$interval, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+    }
+
+    /**
+     * generates a when string for a yearly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringYearly(EventReader $er): string {
+
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // months of year
+        $months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
+        // days of month
+        if ($er->recurringPattern() === 'R') {
+            $days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' '
+                    . implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        } else {
+            $days = $er->startDateTime()->format('jS');
+        }
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order, output varies depending on if the event is absolute or releative:
+        // Absolute: Every Year in July on the 1st for the entire day
+        // Relative: Every Year in July on the First Sunday, Saturday for the entire day
+        // Absolute: Every Year in July on the 1st for the entire day until July 31, 2026
+        // Relative: Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026
+        // Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Absolute: Every 2 Years in July on the 1st for the entire day
+        // Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day
+        // Absolute: Every 2 Years in July on the 1st for the entire day until July 31, 2026
+        // Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026
+        // Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day', [$months, $days]),
+            [false, false, true] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day until %3$s', [$months, $days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', [$months, $days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day', [$interval, $months, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months,  $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [$interval, $months, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [$interval, $months, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+    }
+
+    /**
+     * generates a when string for a fixed precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringFixed(EventReader $er): string {
+        // initialize
+        $startTime = null;
+        $conclusion = null;
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // On specific dates for the entire day until July 13, 2024
+        // On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ($startTime !== null) {
+            false => $this->l10n->t('On specific dates for the entire day until %1$s', [$conclusion]),
+            true => $this->l10n->t('On specific dates between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
+        };
+    }
+
+    /**
+     * generates a occurring next string for a recurring event
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateOccurringString(EventReader $er): string {
+
+        // initialize
+        $occurrence = null;
+        $occurrence2 = null;
+        $occurrence3 = null;
+        // reset to initial occurrence
+        $er->recurrenceRewind();
+        // forward to current date
+        $er->recurrenceAdvanceTo($this->timeFactory->getDateTime());
+        // calculate time difference from now to start of next event occurrence and minimize it
+        $occurrenceIn = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
+        // store next occurrence value
+        $occurrence = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+        // forward one occurrence
+        $er->recurrenceAdvance();
+        // evaluate if occurrence is valid
+        if ($er->recurrenceDate() !== null) {
+            // store following occurrence value
+            $occurrence2 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+            // forward one occurrence
+            $er->recurrenceAdvance();
+            // evaluate if occurrence is valid
+            if ($er->recurrenceDate()) {
+                // store following occurrence value
+                $occurrence3 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+            }
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // In 1 minute/hour/day/week/month/year on July 1, 2024
+        // In 1 minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024
+        // In 1 minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
+        return match ([$occurrenceIn['scale'], $occurrence2 !== null, $occurrence3 !== null]) {
+            ['past', false, false] => $this->l10n->t(
+                'In the past on %1$s',
+                [$occurrence]
+            ),
+            ['minute', false, false] => $this->l10n->n(
+                'In %n minute on %1$s',
+                'In %n minutes on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['hour', false, false] => $this->l10n->n(
+                'In %n hour on %1$s',
+                'In %n hours on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['day', false, false] => $this->l10n->n(
+                'In %n day on %1$s',
+                'In %n days on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['week', false, false] => $this->l10n->n(
+                'In %n week on %1$s',
+                'In %n weeks on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['month', false, false] => $this->l10n->n(
+                'In %n month on %1$s',
+                'In %n months on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['year', false, false] => $this->l10n->n(
+                'In %n year on %1$s',
+                'In %n years on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['past', true, false] => $this->l10n->t(
+                'In the past on %1$s then on %2$s',
+                [$occurrence, $occurrence2]
+            ),
+            ['minute', true, false] => $this->l10n->n(
+                'In %n minute on %1$s then on %2$s',
+                'In %n minutes on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['hour', true, false] => $this->l10n->n(
+                'In %n hour on %1$s then on %2$s',
+                'In %n hours on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['day', true, false] => $this->l10n->n(
+                'In %n day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['week', true, false] => $this->l10n->n(
+                'In %n week on %1$s then on %2$s',
+                'In %n weeks on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['month', true, false] => $this->l10n->n(
+                'In %n month on %1$s then on %2$s',
+                'In %n months on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['year', true, false] => $this->l10n->n(
+                'In %n year on %1$s then on %2$s',
+                'In %n years on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['past', true, true] => $this->l10n->t(
+                'In the past on %1$s then on %2$s and %3$s',
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['minute', true, true] => $this->l10n->n(
+                'In %n minute on %1$s then on %2$s and %3$s',
+                'In %n minutes on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['hour', true, true] => $this->l10n->n(
+                'In %n hour on %1$s then on %2$s and %3$s',
+                'In %n hours on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['day', true, true] => $this->l10n->n(
+                'In %n day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['week', true, true] => $this->l10n->n(
+                'In %n week on %1$s then on %2$s and %3$s',
+                'In %n weeks on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['month', true, true] => $this->l10n->n(
+                'In %n month on %1$s then on %2$s and %3$s',
+                'In %n months on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['year', true, true] => $this->l10n->n(
+                'In %n year on %1$s then on %2$s and %3$s',
+                'In %n years on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            default => $this->l10n->t('Could not generate next recurrence statement')
+        };
+
+    }
+
+    /**
+     * @param VEvent $vEvent
+     * @return array
+     */
+    public function buildCancelledBodyData(VEvent $vEvent): array {
+        // construct event reader
+        $eventReaderCurrent = new EventReader($vEvent);
+        $defaultVal = '';
+        $strikethrough = "<span style='text-decoration: line-through'>%s</span>";
+
+        $newMeetingWhen = $this->generateWhenString($eventReaderCurrent);
+        $newSummary = htmlspecialchars(isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event'));
+        $newDescription = htmlspecialchars(isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal);
+        $newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
+        $newLocation = htmlspecialchars(isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal);
+        $newLocationHtml = $this->linkify($newLocation) ?? $newLocation;
+
+        $data = [];
+        $data['meeting_when_html'] = $newMeetingWhen === '' ?: sprintf($strikethrough, $newMeetingWhen);
+        $data['meeting_when'] = $newMeetingWhen;
+        $data['meeting_title_html'] = sprintf($strikethrough, $newSummary);
+        $data['meeting_title'] = $newSummary !== '' ? $newSummary: $this->l10n->t('Untitled event');
+        $data['meeting_description_html'] = $newDescription !== '' ? sprintf($strikethrough, $newDescription) : '';
+        $data['meeting_description'] = $newDescription;
+        $data['meeting_url_html'] = $newUrl !== '' ? sprintf($strikethrough, $newUrl) : '';
+        $data['meeting_url'] = isset($vEvent->URL) ? (string)$vEvent->URL : '';
+        $data['meeting_location_html'] = $newLocationHtml !== '' ? sprintf($strikethrough, $newLocationHtml) : '';
+        $data['meeting_location'] = $newLocation;
+        return $data;
+    }
+
+    /**
+     * Check if event took place in the past
+     *
+     * @param VCalendar $vObject
+     * @return int
+     */
+    public function getLastOccurrence(VCalendar $vObject) {
+        /** @var VEvent $component */
+        $component = $vObject->VEVENT;
+
+        if (isset($component->RRULE)) {
+            $it = new EventIterator($vObject, (string)$component->UID);
+            $maxDate = new \DateTime(IMipPlugin::MAX_DATE);
+            if ($it->isInfinite()) {
+                return $maxDate->getTimestamp();
+            }
+
+            $end = $it->getDtEnd();
+            while ($it->valid() && $end < $maxDate) {
+                $end = $it->getDtEnd();
+                $it->next();
+            }
+            return $end->getTimestamp();
+        }
+
+        /** @var Property\ICalendar\DateTime $dtStart */
+        $dtStart = $component->DTSTART;
+
+        if (isset($component->DTEND)) {
+            /** @var Property\ICalendar\DateTime $dtEnd */
+            $dtEnd = $component->DTEND;
+            return $dtEnd->getDateTime()->getTimeStamp();
+        }
+
+        if (isset($component->DURATION)) {
+            /** @var \DateTime $endDate */
+            $endDate = clone $dtStart->getDateTime();
+            // $component->DTEND->getDateTime() returns DateTimeImmutable
+            $endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+            return $endDate->getTimestamp();
+        }
+
+        if (!$dtStart->hasTime()) {
+            /** @var \DateTime $endDate */
+            // $component->DTSTART->getDateTime() returns DateTimeImmutable
+            $endDate = clone $dtStart->getDateTime();
+            $endDate = $endDate->modify('+1 day');
+            return $endDate->getTimestamp();
+        }
+
+        // No computation of end time possible - return start date
+        return $dtStart->getDateTime()->getTimeStamp();
+    }
+
+    /**
+     * @param Property $attendee
+     */
+    public function setL10nFromAttendee(Property $attendee) {
+        $language = null;
+        $locale = null;
+        // check if the attendee is a system user
+        $userAddress = $attendee->getValue();
+        if (str_starts_with($userAddress, 'mailto:')) {
+            $userAddress = substr($userAddress, 7);
+        }
+        $users = $this->userManager->getByEmail($userAddress);
+        if ($users !== []) {
+            $user = array_shift($users);
+            $language = $this->userConfig->getValueString($user->getUID(), 'core', 'lang', '') ?: null;
+            $locale = $this->userConfig->getValueString($user->getUID(), 'core', 'locale', '') ?: null;
+        }
+        // fallback to attendee LANGUAGE parameter if language not set
+        if ($language === null && isset($attendee['LANGUAGE']) && $attendee['LANGUAGE'] instanceof Parameter) {
+            $language = $attendee['LANGUAGE']->getValue();
+        }
+        // fallback to system language if language not set
+        if ($language === null) {
+            $language = $this->l10nFactory->findGenericLanguage();
+        }
+        // fallback to system locale if locale not set
+        if ($locale === null) {
+            $locale = $this->l10nFactory->findLocale($language);
+        }
+        $this->l10n = $this->l10nFactory->get('dav', $language, $locale);
+    }
+
+    /**
+     * @param Property|null $attendee
+     * @return bool
+     */
+    public function getAttendeeRsvpOrReqForParticipant(?Property $attendee = null) {
+        if ($attendee === null) {
+            return false;
+        }
+
+        $rsvp = $attendee->offsetGet('RSVP');
+        if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+            return true;
+        }
+        $role = $attendee->offsetGet('ROLE');
+        // @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
+        // Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
+        if ($role === null
+            || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
+            || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
+        ) {
+            return true;
+        }
+
+        // RFC 5545 3.2.17: default RSVP is false
+        return false;
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param string $method
+     * @param string $sender
+     * @param string $summary
+     * @param string|null $partstat
+     * @param bool $isModified
+     */
+    public function addSubjectAndHeading(IEMailTemplate $template,
+        string $method, string $sender, string $summary, bool $isModified, ?Property $replyingAttendee = null): void {
+        if ($method === IMipPlugin::METHOD_CANCEL) {
+            // TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Cancelled: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('"%1$s" has been canceled', [$summary]));
+        } elseif ($method === IMipPlugin::METHOD_REPLY) {
+            // TRANSLATORS Subject for email, when an invitation is replied to. Ex: "Re: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Re: %1$s', [$summary]));
+            // Build the strings
+            $partstat = (isset($replyingAttendee)) ? $replyingAttendee->offsetGet('PARTSTAT') : null;
+            $partstat = ($partstat instanceof Parameter) ? $partstat->getValue() : null;
+            switch ($partstat) {
+                case 'ACCEPTED':
+                    $template->addHeading($this->l10n->t('%1$s has accepted your invitation', [$sender]));
+                    break;
+                case 'TENTATIVE':
+                    $template->addHeading($this->l10n->t('%1$s has tentatively accepted your invitation', [$sender]));
+                    break;
+                case 'DECLINED':
+                    $template->addHeading($this->l10n->t('%1$s has declined your invitation', [$sender]));
+                    break;
+                case null:
+                default:
+                    $template->addHeading($this->l10n->t('%1$s has responded to your invitation', [$sender]));
+                    break;
+            }
+        } elseif ($method === IMipPlugin::METHOD_REQUEST && $isModified) {
+            // TRANSLATORS Subject for email, when an invitation is updated. Ex: "Invitation updated: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Invitation updated: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('%1$s updated the event "%2$s"', [$sender, $summary]));
+        } else {
+            // TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Invitation: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('%1$s would like to invite you to "%2$s"', [$sender, $summary]));
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getAbsoluteImagePath($path): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * addAttendees: add organizer and attendee names/emails to iMip mail.
+     *
+     * Enable with DAV setting: invitation_list_attendees (default: no)
+     *
+     * The default is 'no', which matches old behavior, and is privacy preserving.
+     *
+     * To enable including attendees in invitation emails:
+     *   % php occ config:app:set dav invitation_list_attendees --value yes --type bool
+     *
+     * @param IEMailTemplate $template
+     * @param IL10N $this->l10n
+     * @param VEvent $vevent
+     * @author brad2014 on github.com
+     */
+    public function addAttendees(IEMailTemplate $template, VEvent $vevent) {
+        if (!$this->appConfig->getValueBool('dav', 'invitation_list_attendees')) {
+            return;
+        }
+
+        if (isset($vevent->ORGANIZER)) {
+            /** @var Property&Property\ICalendar\CalAddress $organizer */
+            $organizer = $vevent->ORGANIZER;
+            $organizerEmail = substr($organizer->getNormalizedValue(), 7);
+            /** @var string|null $organizerName */
+            $organizerName = isset($organizer->CN) ? $organizer->CN->getValue() : null;
+            $organizerHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($organizer->getNormalizedValue()),
+                htmlspecialchars($organizerName ?: $organizerEmail));
+            $organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
+            if (isset($organizer['PARTSTAT'])) {
+                /** @var Parameter $partstat */
+                $partstat = $organizer['PARTSTAT'];
+                if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
+                    $organizerHTML .= ' ✔︎';
+                    $organizerText .= ' ✔︎';
+                }
+            }
+            $template->addBodyListItem($organizerHTML, $this->l10n->t('Organizer:'),
+                $this->getAbsoluteImagePath('caldav/organizer.png'),
+                $organizerText, '', IMipPlugin::IMIP_INDENT);
+        }
+
+        $attendees = $vevent->select('ATTENDEE');
+        if (count($attendees) === 0) {
+            return;
+        }
+
+        $attendeesHTML = [];
+        $attendeesText = [];
+        foreach ($attendees as $attendee) {
+            /** @var Property&Property\ICalendar\CalAddress $attendee */
+            $attendeeEmail = substr($attendee->getNormalizedValue(), 7);
+            $attendeeName = null;
+            if (isset($attendee['CN'])) {
+                /** @var Parameter $cn */
+                $cn = $attendee['CN'];
+                $attendeeName = $cn->getValue();
+            }
+            $attendeeHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($attendee->getNormalizedValue()),
+                htmlspecialchars($attendeeName ?: $attendeeEmail));
+            $attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
+            if (isset($attendee['PARTSTAT'])) {
+                /** @var Parameter $partstat */
+                $partstat = $attendee['PARTSTAT'];
+                if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
+                    $attendeeHTML .= ' ✔︎';
+                    $attendeeText .= ' ✔︎';
+                }
+            }
+            $attendeesHTML[] = $attendeeHTML;
+            $attendeesText[] = $attendeeText;
+        }
+
+        $template->addBodyListItem(implode('<br/>', $attendeesHTML), $this->l10n->t('Attendees:'),
+            $this->getAbsoluteImagePath('caldav/attendees.png'),
+            implode("\n", $attendeesText), '', IMipPlugin::IMIP_INDENT);
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param VEVENT $vevent
+     * @param $data
+     */
+    public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) {
+        $template->addBodyListItem(
+            $data['meeting_title_html'] ?? htmlspecialchars($data['meeting_title']), $this->l10n->t('Title:'),
+            $this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT);
+        if ($data['meeting_when'] !== '') {
+            $template->addBodyListItem($data['meeting_when_html'] ?? htmlspecialchars($data['meeting_when']), $this->l10n->t('When:'),
+                $this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_when'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if ($data['meeting_location'] !== '') {
+            $template->addBodyListItem($data['meeting_location_html'] ?? htmlspecialchars($data['meeting_location']), $this->l10n->t('Location:'),
+                $this->getAbsoluteImagePath('caldav/location.png'), $data['meeting_location'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if ($data['meeting_url'] !== '') {
+            $template->addBodyListItem($data['meeting_url_html'] ?? htmlspecialchars($data['meeting_url']), $this->l10n->t('Link:'),
+                $this->getAbsoluteImagePath('caldav/link.png'), $data['meeting_url'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if (isset($data['meeting_occurring'])) {
+            $template->addBodyListItem($data['meeting_occurring_html'] ?? htmlspecialchars($data['meeting_occurring']), $this->l10n->t('Occurring:'),
+                $this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_occurring'], '', IMipPlugin::IMIP_INDENT);
+        }
+
+        $this->addAttendees($template, $vevent);
+
+        /* Put description last, like an email body, since it can be arbitrarily long */
+        if ($data['meeting_description']) {
+            $template->addBodyListItem($data['meeting_description_html'] ?? htmlspecialchars($data['meeting_description']), $this->l10n->t('Description:'),
+                $this->getAbsoluteImagePath('caldav/description.png'), $data['meeting_description'], '', IMipPlugin::IMIP_INDENT);
+        }
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @return null|Property
+     */
+    public function getCurrentAttendee(Message $iTipMessage): ?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            if ($iTipMessage->method === 'REPLY' && strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
+                /** @var Property $attendee */
+                return $attendee;
+            } elseif (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
+                /** @var Property $attendee */
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @param VEvent $vevent
+     * @param int $lastOccurrence
+     * @return string
+     */
+    public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int $lastOccurrence): string {
+        $token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
+
+        $attendee = $iTipMessage->recipient;
+        $organizer = $iTipMessage->sender;
+        $sequence = $iTipMessage->sequence;
+        $recurrenceId = isset($vevent->{'RECURRENCE-ID'})
+            ? $vevent->{'RECURRENCE-ID'}->serialize() : null;
+        $uid = $vevent->{'UID'}?->getValue();
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_invitations')
+            ->values([
+                'token' => $query->createNamedParameter($token),
+                'attendee' => $query->createNamedParameter($attendee),
+                'organizer' => $query->createNamedParameter($organizer),
+                'sequence' => $query->createNamedParameter($sequence),
+                'recurrenceid' => $query->createNamedParameter($recurrenceId),
+                'expiration' => $query->createNamedParameter($lastOccurrence),
+                'uid' => $query->createNamedParameter($uid)
+            ])
+            ->executeStatement();
+
+        return $token;
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param $token
+     */
+    public function addResponseButtons(IEMailTemplate $template, $token) {
+        $template->addBodyButtonGroup(
+            $this->l10n->t('Accept'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
+                'token' => $token,
+            ]),
+            $this->l10n->t('Decline'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
+                'token' => $token,
+            ])
+        );
+    }
+
+    public function addMoreOptionsButton(IEMailTemplate $template, $token) {
+        $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
+            'token' => $token,
+        ]);
+        $html = vsprintf('<small><a href="%s">%s</a></small>', [
+            $moreOptionsURL, $this->l10n->t('More options …')
+        ]);
+        $text = $this->l10n->t('More options at %s', [$moreOptionsURL]);
+
+        $template->addBodyText($html, $text);
+    }
+
+    public function getReplyingAttendee(Message $iTipMessage): ?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            /** @var Property $attendee */
+            if (strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    public function isRoomOrResource(Property $attendee): bool {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if (!$cuType instanceof Parameter) {
+            return false;
+        }
+        $type = $cuType->getValue() ?? 'INDIVIDUAL';
+        if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM'], true)) {
+            // Don't send emails to things
+            return true;
+        }
+        return false;
+    }
+
+    public function isCircle(Property $attendee): bool {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if (!$cuType instanceof Parameter) {
+            return false;
+        }
+
+        $uri = $attendee->getValue();
+        if (!$uri) {
+            return false;
+        }
+
+        $cuTypeValue = $cuType->getValue();
+        return $cuTypeValue === 'GROUP' && str_starts_with($uri, 'mailto:circle+');
+    }
+
+    public function minimizeInterval(\DateInterval $dateInterval): array {
+        // evaluate if time interval is in the past
+        if ($dateInterval->invert == 1) {
+            return ['interval' => 1, 'scale' => 'past'];
+        }
+        // evaluate interval parts and return smallest time period
+        if ($dateInterval->y > 0) {
+            $interval = $dateInterval->y;
+            $scale = 'year';
+        } elseif ($dateInterval->m > 0) {
+            $interval = $dateInterval->m;
+            $scale = 'month';
+        } elseif ($dateInterval->d >= 7) {
+            $interval = (int)($dateInterval->d / 7);
+            $scale = 'week';
+        } elseif ($dateInterval->d > 0) {
+            $interval = $dateInterval->d;
+            $scale = 'day';
+        } elseif ($dateInterval->h > 0) {
+            $interval = $dateInterval->h;
+            $scale = 'hour';
+        } else {
+            $interval = $dateInterval->i;
+            $scale = 'minute';
+        }
+
+        return ['interval' => $interval, 'scale' => $scale];
+    }
+
+    /**
+     * Localizes week day names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeDayName(string $value): string {
+        return match ($value) {
+            'Monday' => $this->l10n->t('Monday'),
+            'Tuesday' => $this->l10n->t('Tuesday'),
+            'Wednesday' => $this->l10n->t('Wednesday'),
+            'Thursday' => $this->l10n->t('Thursday'),
+            'Friday' => $this->l10n->t('Friday'),
+            'Saturday' => $this->l10n->t('Saturday'),
+            'Sunday' => $this->l10n->t('Sunday'),
+        };
+    }
+
+    /**
+     * Localizes month names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeMonthName(string $value): string {
+        return match ($value) {
+            'January' => $this->l10n->t('January'),
+            'February' => $this->l10n->t('February'),
+            'March' => $this->l10n->t('March'),
+            'April' => $this->l10n->t('April'),
+            'May' => $this->l10n->t('May'),
+            'June' => $this->l10n->t('June'),
+            'July' => $this->l10n->t('July'),
+            'August' => $this->l10n->t('August'),
+            'September' => $this->l10n->t('September'),
+            'October' => $this->l10n->t('October'),
+            'November' => $this->l10n->t('November'),
+            'December' => $this->l10n->t('December'),
+        };
+    }
+
+    /**
+     * Localizes relative position names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeRelativePositionName(string $value): string {
+        return match ($value) {
+            'First' => $this->l10n->t('First'),
+            'Second' => $this->l10n->t('Second'),
+            'Third' => $this->l10n->t('Third'),
+            'Fourth' => $this->l10n->t('Fourth'),
+            'Fifth' => $this->l10n->t('Fifth'),
+            'Last' => $this->l10n->t('Last'),
+            'Second Last' => $this->l10n->t('Second Last'),
+            'Third Last' => $this->l10n->t('Third Last'),
+            'Fourth Last' => $this->l10n->t('Fourth Last'),
+            'Fifth Last' => $this->l10n->t('Fifth Last'),
+        };
+    }
 }

apps/dav/tests/unit/CalDAV/TimezoneServiceTest.php

Indentation +115 added lines, -115 removed lines

@@ -23,125 +23,125 @@
 use Test\TestCase;
 
 class TimezoneServiceTest extends TestCase {
-	private IConfig&MockObject $config;
-	private IUserConfig&MockObject $userConfig;
-	private PropertyMapper&MockObject $propertyMapper;
-	private IManager&MockObject $calendarManager;
-	private TimezoneService $service;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->config = $this->createMock(IConfig::class);
-		$this->userConfig = $this->createMock(IUserConfig::class);
-		$this->propertyMapper = $this->createMock(PropertyMapper::class);
-		$this->calendarManager = $this->createMock(IManager::class);
-
-		$this->service = new TimezoneService(
-			$this->config,
-			$this->userConfig,
-			$this->propertyMapper,
-			$this->calendarManager,
-		);
-	}
-
-	public function testGetUserTimezoneFromSettings(): void {
-		$this->userConfig->expects(self::once())
-			->method('getValueString')
-			->with('test123', 'core', 'timezone', '')
-			->willReturn('Europe/Warsaw');
-
-		$timezone = $this->service->getUserTimezone('test123');
-
-		self::assertSame('Europe/Warsaw', $timezone);
-	}
-
-	public function testGetUserTimezoneFromAvailability(): void {
-		$this->userConfig->expects(self::once())
-			->method('getValueString')
-			->with('test123', 'core', 'timezone', '')
-			->willReturn('');
-		$property = new Property();
-		$property->setPropertyvalue('BEGIN:VCALENDAR
+    private IConfig&MockObject $config;
+    private IUserConfig&MockObject $userConfig;
+    private PropertyMapper&MockObject $propertyMapper;
+    private IManager&MockObject $calendarManager;
+    private TimezoneService $service;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->config = $this->createMock(IConfig::class);
+        $this->userConfig = $this->createMock(IUserConfig::class);
+        $this->propertyMapper = $this->createMock(PropertyMapper::class);
+        $this->calendarManager = $this->createMock(IManager::class);
+
+        $this->service = new TimezoneService(
+            $this->config,
+            $this->userConfig,
+            $this->propertyMapper,
+            $this->calendarManager,
+        );
+    }
+
+    public function testGetUserTimezoneFromSettings(): void {
+        $this->userConfig->expects(self::once())
+            ->method('getValueString')
+            ->with('test123', 'core', 'timezone', '')
+            ->willReturn('Europe/Warsaw');
+
+        $timezone = $this->service->getUserTimezone('test123');
+
+        self::assertSame('Europe/Warsaw', $timezone);
+    }
+
+    public function testGetUserTimezoneFromAvailability(): void {
+        $this->userConfig->expects(self::once())
+            ->method('getValueString')
+            ->with('test123', 'core', 'timezone', '')
+            ->willReturn('');
+        $property = new Property();
+        $property->setPropertyvalue('BEGIN:VCALENDAR
 PRODID:Nextcloud DAV app
 BEGIN:VTIMEZONE
 TZID:Europe/Vienna
 END:VTIMEZONE
 END:VCALENDAR');
-		$this->propertyMapper->expects(self::once())
-			->method('findPropertyByPathAndName')
-			->willReturn([
-				$property,
-			]);
-
-		$timezone = $this->service->getUserTimezone('test123');
-
-		self::assertNotNull($timezone);
-		self::assertEquals('Europe/Vienna', $timezone);
-	}
-
-	public function testGetUserTimezoneFromPersonalCalendar(): void {
-		$this->userConfig->expects(self::exactly(2))
-			->method('getValueString')
-			->willReturnMap([
-				['test123', 'core', 'timezone', '', false, ''],
-				['test123', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI, false, 'personal-1'],
-			]);
-		$other = $this->createMock(ICalendar::class);
-		$other->method('getUri')->willReturn('other');
-		$personal = $this->createMock(CalendarImpl::class);
-		$personal->method('getUri')->willReturn('personal-1');
-		$tz = new DateTimeZone('Europe/Berlin');
-		$vtz = $this->createMock(VTimeZone::class);
-		$vtz->method('getTimeZone')->willReturn($tz);
-		$personal->method('getSchedulingTimezone')->willReturn($vtz);
-		$this->calendarManager->expects(self::once())
-			->method('getCalendarsForPrincipal')
-			->with('principals/users/test123')
-			->willReturn([
-				$other,
-				$personal,
-			]);
-
-		$timezone = $this->service->getUserTimezone('test123');
-
-		self::assertNotNull($timezone);
-		self::assertEquals('Europe/Berlin', $timezone);
-	}
-
-	public function testGetUserTimezoneFromAny(): void {
-		$this->userConfig->expects(self::exactly(2))
-			->method('getValueString')
-			->willReturnMap([
-				['test123', 'core', 'timezone', '', false, ''],
-				['test123', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI, false, 'personal-1'],
-			]);
-		$other = $this->createMock(ICalendar::class);
-		$other->method('getUri')->willReturn('other');
-		$personal = $this->createMock(CalendarImpl::class);
-		$personal->method('getUri')->willReturn('personal-2');
-		$tz = new DateTimeZone('Europe/Prague');
-		$vtz = $this->createMock(VTimeZone::class);
-		$vtz->method('getTimeZone')->willReturn($tz);
-		$personal->method('getSchedulingTimezone')->willReturn($vtz);
-		$this->calendarManager->expects(self::once())
-			->method('getCalendarsForPrincipal')
-			->with('principals/users/test123')
-			->willReturn([
-				$other,
-				$personal,
-			]);
-
-		$timezone = $this->service->getUserTimezone('test123');
-
-		self::assertNotNull($timezone);
-		self::assertEquals('Europe/Prague', $timezone);
-	}
-
-	public function testGetUserTimezoneNoneFound(): void {
-		$timezone = $this->service->getUserTimezone('test123');
-
-		self::assertNull($timezone);
-	}
+        $this->propertyMapper->expects(self::once())
+            ->method('findPropertyByPathAndName')
+            ->willReturn([
+                $property,
+            ]);
+
+        $timezone = $this->service->getUserTimezone('test123');
+
+        self::assertNotNull($timezone);
+        self::assertEquals('Europe/Vienna', $timezone);
+    }
+
+    public function testGetUserTimezoneFromPersonalCalendar(): void {
+        $this->userConfig->expects(self::exactly(2))
+            ->method('getValueString')
+            ->willReturnMap([
+                ['test123', 'core', 'timezone', '', false, ''],
+                ['test123', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI, false, 'personal-1'],
+            ]);
+        $other = $this->createMock(ICalendar::class);
+        $other->method('getUri')->willReturn('other');
+        $personal = $this->createMock(CalendarImpl::class);
+        $personal->method('getUri')->willReturn('personal-1');
+        $tz = new DateTimeZone('Europe/Berlin');
+        $vtz = $this->createMock(VTimeZone::class);
+        $vtz->method('getTimeZone')->willReturn($tz);
+        $personal->method('getSchedulingTimezone')->willReturn($vtz);
+        $this->calendarManager->expects(self::once())
+            ->method('getCalendarsForPrincipal')
+            ->with('principals/users/test123')
+            ->willReturn([
+                $other,
+                $personal,
+            ]);
+
+        $timezone = $this->service->getUserTimezone('test123');
+
+        self::assertNotNull($timezone);
+        self::assertEquals('Europe/Berlin', $timezone);
+    }
+
+    public function testGetUserTimezoneFromAny(): void {
+        $this->userConfig->expects(self::exactly(2))
+            ->method('getValueString')
+            ->willReturnMap([
+                ['test123', 'core', 'timezone', '', false, ''],
+                ['test123', 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI, false, 'personal-1'],
+            ]);
+        $other = $this->createMock(ICalendar::class);
+        $other->method('getUri')->willReturn('other');
+        $personal = $this->createMock(CalendarImpl::class);
+        $personal->method('getUri')->willReturn('personal-2');
+        $tz = new DateTimeZone('Europe/Prague');
+        $vtz = $this->createMock(VTimeZone::class);
+        $vtz->method('getTimeZone')->willReturn($tz);
+        $personal->method('getSchedulingTimezone')->willReturn($vtz);
+        $this->calendarManager->expects(self::once())
+            ->method('getCalendarsForPrincipal')
+            ->with('principals/users/test123')
+            ->willReturn([
+                $other,
+                $personal,
+            ]);
+
+        $timezone = $this->service->getUserTimezone('test123');
+
+        self::assertNotNull($timezone);
+        self::assertEquals('Europe/Prague', $timezone);
+    }
+
+    public function testGetUserTimezoneNoneFound(): void {
+        $timezone = $this->service->getUserTimezone('test123');
+
+        self::assertNull($timezone);
+    }
 
 }