nextcloud / server

lib/public/App/Events/AppUpdateEvent.php

Indentation +14 added lines, -14 removed lines

@@ -16,19 +16,19 @@
  * @since 27.0.0
  */
 class AppUpdateEvent extends Event {
-	/**
-	 * @since 27.0.0
-	 */
-	public function __construct(
-		private readonly string $appId,
-	) {
-		parent::__construct();
-	}
+    /**
+     * @since 27.0.0
+     */
+    public function __construct(
+        private readonly string $appId,
+    ) {
+        parent::__construct();
+    }
 
-	/**
-	 * @since 27.0.0
-	 */
-	public function getAppId(): string {
-		return $this->appId;
-	}
+    /**
+     * @since 27.0.0
+     */
+    public function getAppId(): string {
+        return $this->appId;
+    }
 }

lib/unstable/Config/Lexicon/ConfigLexiconEntry.php

Indentation +215 added lines, -215 removed lines

@@ -17,219 +17,219 @@
  * @experimental 31.0.0
  */
 class ConfigLexiconEntry {
-	/** @experimental 32.0.0 */
-	public const RENAME_INVERT_BOOLEAN = 1;
-
-	private string $definition = '';
-	private ?string $default = null;
-
-	/**
-	 * @param string $key config key
-	 * @param ValueType $type type of config value
-	 * @param string $definition optional description of config key available when using occ command
-	 * @param bool $lazy set config value as lazy
-	 * @param int $flags set flags
-	 * @param string|null $rename previous config key to migrate config value from
-	 * @param bool $deprecated set config key as deprecated
-	 *
-	 * @experimental 31.0.0
-	 * @psalm-suppress PossiblyInvalidCast
-	 * @psalm-suppress RiskyCast
-	 */
-	public function __construct(
-		private readonly string $key,
-		private readonly ValueType $type,
-		private null|string|int|float|bool|array $defaultRaw = null,
-		string $definition = '',
-		private readonly bool $lazy = false,
-		private readonly int $flags = 0,
-		private readonly bool $deprecated = false,
-		private readonly ?string $rename = null,
-		private readonly int $options = 0,
-	) {
-		/** @psalm-suppress UndefinedClass */
-		if (\OC::$CLI) { // only store definition if ran from CLI
-			$this->definition = $definition;
-		}
-	}
-
-	/**
-	 * returns the config key
-	 *
-	 * @return string config key
-	 * @experimental 31.0.0
-	 */
-	public function getKey(): string {
-		return $this->key;
-	}
-
-	/**
-	 * get expected type for config value
-	 *
-	 * @return ValueType
-	 * @experimental 31.0.0
-	 */
-	public function getValueType(): ValueType {
-		return $this->type;
-	}
-
-	/**
-	 * @param string $default
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	private function convertFromString(string $default): string {
-		return $default;
-	}
-
-	/**
-	 * @param int $default
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	private function convertFromInt(int $default): string {
-		return (string)$default;
-	}
-
-	/**
-	 * @param float $default
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	private function convertFromFloat(float $default): string {
-		return (string)$default;
-	}
-
-	/**
-	 * @param bool $default
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	private function convertFromBool(bool $default): string {
-		return ($default) ? '1' : '0';
-	}
-
-	/**
-	 * @param array $default
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	private function convertFromArray(array $default): string {
-		return json_encode($default);
-	}
-
-	/**
-	 * returns default value
-	 *
-	 * @return string|null NULL if no default is set
-	 * @experimental 31.0.0
-	 */
-	public function getDefault(): ?string {
-		if ($this->defaultRaw === null) {
-			return null;
-		}
-
-		if ($this->default === null) {
-			$this->default = $this->convertToString($this->defaultRaw);
-		}
-
-		return $this->default;
-	}
-
-	/**
-	 * convert $entry into string, based on the expected type for config value
-	 *
-	 * @param string|int|float|bool|array $entry
-	 *
-	 * @return string
-	 * @experimental 31.0.0
-	 * @psalm-suppress PossiblyInvalidCast arrays are managed pre-cast
-	 * @psalm-suppress RiskyCast
-	 */
-	public function convertToString(string|int|float|bool|array $entry): string {
-		// in case $default is array but is not expected to be an array...
-		if ($this->getValueType() !== ValueType::ARRAY && is_array($entry)) {
-			$entry = json_encode($entry, JSON_THROW_ON_ERROR);
-		}
-
-		return match ($this->getValueType()) {
-			ValueType::MIXED => (string)$entry,
-			ValueType::STRING => $this->convertFromString((string)$entry),
-			ValueType::INT => $this->convertFromInt((int)$entry),
-			ValueType::FLOAT => $this->convertFromFloat((float)$entry),
-			ValueType::BOOL => $this->convertFromBool((bool)$entry),
-			ValueType::ARRAY => $this->convertFromArray((array)$entry)
-		};
-	}
-
-	/**
-	 * returns definition
-	 *
-	 * @return string
-	 * @experimental 31.0.0
-	 */
-	public function getDefinition(): string {
-		return $this->definition;
-	}
-
-	/**
-	 * returns if config key is set as lazy
-	 *
-	 * @see IAppConfig for details on lazy config values
-	 * @return bool TRUE if config value is lazy
-	 * @experimental 31.0.0
-	 */
-	public function isLazy(): bool {
-		return $this->lazy;
-	}
-
-	/**
-	 * returns flags
-	 *
-	 * @see IAppConfig for details on sensitive config values
-	 * @return int bitflag about the config value
-	 * @experimental 31.0.0
-	 */
-	public function getFlags(): int {
-		return $this->flags;
-	}
-
-	/**
-	 * @param int $flag
-	 *
-	 * @return bool TRUE is config value bitflag contains $flag
-	 * @experimental 31.0.0
-	 */
-	public function isFlagged(int $flag): bool {
-		return (($flag & $this->getFlags()) === $flag);
-	}
-
-	/**
-	 * should be called/used only during migration/upgrade.
-	 * link to an old config key.
-	 *
-	 * @return string|null not NULL if value can be imported from a previous key
-	 * @experimental 32.0.0
-	 */
-	public function getRename(): ?string {
-		return $this->rename;
-	}
-
-	/**
-	 * @experimental 32.0.0
-	 * @return bool TRUE if $option was set during the creation of the entry.
-	 */
-	public function hasOption(int $option): bool {
-		return (($option & $this->options) !== 0);
-	}
-
-	/**
-	 * returns if config key is set as deprecated
-	 *
-	 * @return bool TRUE if config si deprecated
-	 * @experimental 31.0.0
-	 */
-	public function isDeprecated(): bool {
-		return $this->deprecated;
-	}
+    /** @experimental 32.0.0 */
+    public const RENAME_INVERT_BOOLEAN = 1;
+
+    private string $definition = '';
+    private ?string $default = null;
+
+    /**
+     * @param string $key config key
+     * @param ValueType $type type of config value
+     * @param string $definition optional description of config key available when using occ command
+     * @param bool $lazy set config value as lazy
+     * @param int $flags set flags
+     * @param string|null $rename previous config key to migrate config value from
+     * @param bool $deprecated set config key as deprecated
+     *
+     * @experimental 31.0.0
+     * @psalm-suppress PossiblyInvalidCast
+     * @psalm-suppress RiskyCast
+     */
+    public function __construct(
+        private readonly string $key,
+        private readonly ValueType $type,
+        private null|string|int|float|bool|array $defaultRaw = null,
+        string $definition = '',
+        private readonly bool $lazy = false,
+        private readonly int $flags = 0,
+        private readonly bool $deprecated = false,
+        private readonly ?string $rename = null,
+        private readonly int $options = 0,
+    ) {
+        /** @psalm-suppress UndefinedClass */
+        if (\OC::$CLI) { // only store definition if ran from CLI
+            $this->definition = $definition;
+        }
+    }
+
+    /**
+     * returns the config key
+     *
+     * @return string config key
+     * @experimental 31.0.0
+     */
+    public function getKey(): string {
+        return $this->key;
+    }
+
+    /**
+     * get expected type for config value
+     *
+     * @return ValueType
+     * @experimental 31.0.0
+     */
+    public function getValueType(): ValueType {
+        return $this->type;
+    }
+
+    /**
+     * @param string $default
+     * @return string
+     * @experimental 31.0.0
+     */
+    private function convertFromString(string $default): string {
+        return $default;
+    }
+
+    /**
+     * @param int $default
+     * @return string
+     * @experimental 31.0.0
+     */
+    private function convertFromInt(int $default): string {
+        return (string)$default;
+    }
+
+    /**
+     * @param float $default
+     * @return string
+     * @experimental 31.0.0
+     */
+    private function convertFromFloat(float $default): string {
+        return (string)$default;
+    }
+
+    /**
+     * @param bool $default
+     * @return string
+     * @experimental 31.0.0
+     */
+    private function convertFromBool(bool $default): string {
+        return ($default) ? '1' : '0';
+    }
+
+    /**
+     * @param array $default
+     * @return string
+     * @experimental 31.0.0
+     */
+    private function convertFromArray(array $default): string {
+        return json_encode($default);
+    }
+
+    /**
+     * returns default value
+     *
+     * @return string|null NULL if no default is set
+     * @experimental 31.0.0
+     */
+    public function getDefault(): ?string {
+        if ($this->defaultRaw === null) {
+            return null;
+        }
+
+        if ($this->default === null) {
+            $this->default = $this->convertToString($this->defaultRaw);
+        }
+
+        return $this->default;
+    }
+
+    /**
+     * convert $entry into string, based on the expected type for config value
+     *
+     * @param string|int|float|bool|array $entry
+     *
+     * @return string
+     * @experimental 31.0.0
+     * @psalm-suppress PossiblyInvalidCast arrays are managed pre-cast
+     * @psalm-suppress RiskyCast
+     */
+    public function convertToString(string|int|float|bool|array $entry): string {
+        // in case $default is array but is not expected to be an array...
+        if ($this->getValueType() !== ValueType::ARRAY && is_array($entry)) {
+            $entry = json_encode($entry, JSON_THROW_ON_ERROR);
+        }
+
+        return match ($this->getValueType()) {
+            ValueType::MIXED => (string)$entry,
+            ValueType::STRING => $this->convertFromString((string)$entry),
+            ValueType::INT => $this->convertFromInt((int)$entry),
+            ValueType::FLOAT => $this->convertFromFloat((float)$entry),
+            ValueType::BOOL => $this->convertFromBool((bool)$entry),
+            ValueType::ARRAY => $this->convertFromArray((array)$entry)
+        };
+    }
+
+    /**
+     * returns definition
+     *
+     * @return string
+     * @experimental 31.0.0
+     */
+    public function getDefinition(): string {
+        return $this->definition;
+    }
+
+    /**
+     * returns if config key is set as lazy
+     *
+     * @see IAppConfig for details on lazy config values
+     * @return bool TRUE if config value is lazy
+     * @experimental 31.0.0
+     */
+    public function isLazy(): bool {
+        return $this->lazy;
+    }
+
+    /**
+     * returns flags
+     *
+     * @see IAppConfig for details on sensitive config values
+     * @return int bitflag about the config value
+     * @experimental 31.0.0
+     */
+    public function getFlags(): int {
+        return $this->flags;
+    }
+
+    /**
+     * @param int $flag
+     *
+     * @return bool TRUE is config value bitflag contains $flag
+     * @experimental 31.0.0
+     */
+    public function isFlagged(int $flag): bool {
+        return (($flag & $this->getFlags()) === $flag);
+    }
+
+    /**
+     * should be called/used only during migration/upgrade.
+     * link to an old config key.
+     *
+     * @return string|null not NULL if value can be imported from a previous key
+     * @experimental 32.0.0
+     */
+    public function getRename(): ?string {
+        return $this->rename;
+    }
+
+    /**
+     * @experimental 32.0.0
+     * @return bool TRUE if $option was set during the creation of the entry.
+     */
+    public function hasOption(int $option): bool {
+        return (($option & $this->options) !== 0);
+    }
+
+    /**
+     * returns if config key is set as deprecated
+     *
+     * @return bool TRUE if config si deprecated
+     * @experimental 31.0.0
+     */
+    public function isDeprecated(): bool {
+        return $this->deprecated;
+    }
 }

lib/private/legacy/OC_App.php

Indentation +837 added lines, -837 removed lines

@@ -31,841 +31,841 @@
  * upgrading and removing apps.
  */
 class OC_App {
-	private static $altLogin = [];
-	private static $alreadyRegistered = [];
-	public const supportedApp = 300;
-	public const officialApp = 200;
-
-	/**
-	 * clean the appId
-	 *
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape include
-	 * @psalm-taint-escape html
-	 * @psalm-taint-escape has_quotes
-	 *
-	 * @deprecated 31.0.0 use IAppManager::cleanAppId
-	 */
-	public static function cleanAppId(string $app): string {
-		return str_replace(['<', '>', '"', "'", '\0', '/', '\\', '..'], '', $app);
-	}
-
-	/**
-	 * Check if an app is loaded
-	 *
-	 * @param string $app
-	 * @return bool
-	 * @deprecated 27.0.0 use IAppManager::isAppLoaded
-	 */
-	public static function isAppLoaded(string $app): bool {
-		return \OC::$server->get(IAppManager::class)->isAppLoaded($app);
-	}
-
-	/**
-	 * loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the Nextcloud directory and loads all apps
-	 * it can find. A directory contains an app if the file /appinfo/info.xml
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 *
-	 * @deprecated 29.0.0 use IAppManager::loadApps instead
-	 */
-	public static function loadApps(array $types = []): bool {
-		if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			// This should be done before calling this method so that appmanager can be used
-			return false;
-		}
-		return \OC::$server->get(IAppManager::class)->loadApps($types);
-	}
-
-	/**
-	 * load a single app
-	 *
-	 * @param string $app
-	 * @throws Exception
-	 * @deprecated 27.0.0 use IAppManager::loadApp
-	 */
-	public static function loadApp(string $app): void {
-		\OC::$server->get(IAppManager::class)->loadApp($app);
-	}
-
-	/**
-	 * @internal
-	 * @param string $app
-	 * @param string $path
-	 * @param bool $force
-	 */
-	public static function registerAutoloading(string $app, string $path, bool $force = false) {
-		$key = $app . '-' . $path;
-		if (!$force && isset(self::$alreadyRegistered[$key])) {
-			return;
-		}
-
-		self::$alreadyRegistered[$key] = true;
-
-		// Register on PSR-4 composer autoloader
-		$appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
-		\OC::$server->registerNamespace($app, $appNamespace);
-
-		if (file_exists($path . '/composer/autoload.php')) {
-			require_once $path . '/composer/autoload.php';
-		} else {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
-		}
-
-		// Register Test namespace only when testing
-		if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
-			\OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
-		}
-	}
-
-	/**
-	 * check if an app is of a specific type
-	 *
-	 * @param string $app
-	 * @param array $types
-	 * @return bool
-	 * @deprecated 27.0.0 use IAppManager::isType
-	 */
-	public static function isType(string $app, array $types): bool {
-		return \OC::$server->get(IAppManager::class)->isType($app, $types);
-	}
-
-	/**
-	 * read app types from info.xml and cache them in the database
-	 */
-	public static function setAppTypes(string $app) {
-		$appManager = \OC::$server->getAppManager();
-		$appData = $appManager->getAppInfo($app);
-		if (!is_array($appData)) {
-			return;
-		}
-
-		if (isset($appData['types'])) {
-			$appTypes = implode(',', $appData['types']);
-		} else {
-			$appTypes = '';
-			$appData['types'] = [];
-		}
-
-		$config = \OC::$server->getConfig();
-		$config->setAppValue($app, 'types', $appTypes);
-
-		if ($appManager->hasProtectedAppType($appData['types'])) {
-			$enabled = $config->getAppValue($app, 'enabled', 'yes');
-			if ($enabled !== 'yes' && $enabled !== 'no') {
-				$config->setAppValue($app, 'enabled', 'yes');
-			}
-		}
-	}
-
-	/**
-	 * Returns apps enabled for the current user.
-	 *
-	 * @param bool $forceRefresh whether to refresh the cache
-	 * @param bool $all whether to return apps for all users, not only the
-	 *                  currently logged in one
-	 * @return list<string>
-	 */
-	public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
-		if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
-			return [];
-		}
-		// in incognito mode or when logged out, $user will be false,
-		// which is also the case during an upgrade
-		$appManager = \OC::$server->getAppManager();
-		if ($all) {
-			$user = null;
-		} else {
-			$user = \OC::$server->getUserSession()->getUser();
-		}
-
-		if (is_null($user)) {
-			$apps = $appManager->getEnabledApps();
-		} else {
-			$apps = $appManager->getEnabledAppsForUser($user);
-		}
-		$apps = array_filter($apps, function ($app) {
-			return $app !== 'files';//we add this manually
-		});
-		sort($apps);
-		array_unshift($apps, 'files');
-		return $apps;
-	}
-
-	/**
-	 * enables an app
-	 *
-	 * @param string $appId
-	 * @param array $groups (optional) when set, only these groups will have access to the app
-	 * @throws \Exception
-	 * @return void
-	 *
-	 * This function set an app as enabled in appconfig.
-	 */
-	public function enable(string $appId,
-		array $groups = []) {
-		// Check if app is already downloaded
-		/** @var Installer $installer */
-		$installer = Server::get(Installer::class);
-		$isDownloaded = $installer->isDownloaded($appId);
-
-		if (!$isDownloaded) {
-			$installer->downloadApp($appId);
-		}
-
-		$installer->installApp($appId);
-
-		$appManager = \OC::$server->getAppManager();
-		if ($groups !== []) {
-			$groupManager = \OC::$server->getGroupManager();
-			$groupsList = [];
-			foreach ($groups as $group) {
-				$groupItem = $groupManager->get($group);
-				if ($groupItem instanceof \OCP\IGroup) {
-					$groupsList[] = $groupManager->get($group);
-				}
-			}
-			$appManager->enableAppForGroups($appId, $groupsList);
-		} else {
-			$appManager->enableApp($appId);
-		}
-	}
-
-	/**
-	 * Get the path where to install apps
-	 */
-	public static function getInstallPath(): ?string {
-		foreach (OC::$APPSROOTS as $dir) {
-			if (isset($dir['writable']) && $dir['writable'] === true) {
-				return $dir['path'];
-			}
-		}
-
-		Server::get(LoggerInterface::class)->error('No application directories are marked as writable.', ['app' => 'core']);
-		return null;
-	}
-
-
-	/**
-	 * Find the apps root for an app id.
-	 *
-	 * If multiple copies are found, the apps root the latest version is returned.
-	 *
-	 * @param string $appId
-	 * @param bool $ignoreCache ignore cache and rebuild it
-	 * @return false|array{path: string, url: string} the apps root shape
-	 */
-	public static function findAppInDirectories(string $appId, bool $ignoreCache = false) {
-		$sanitizedAppId = self::cleanAppId($appId);
-		if ($sanitizedAppId !== $appId) {
-			return false;
-		}
-		static $app_dir = [];
-
-		if (isset($app_dir[$appId]) && !$ignoreCache) {
-			return $app_dir[$appId];
-		}
-
-		$possibleApps = [];
-		foreach (OC::$APPSROOTS as $dir) {
-			if (file_exists($dir['path'] . '/' . $appId)) {
-				$possibleApps[] = $dir;
-			}
-		}
-
-		if (empty($possibleApps)) {
-			return false;
-		} elseif (count($possibleApps) === 1) {
-			$dir = array_shift($possibleApps);
-			$app_dir[$appId] = $dir;
-			return $dir;
-		} else {
-			$versionToLoad = [];
-			foreach ($possibleApps as $possibleApp) {
-				$version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
-				if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
-					$versionToLoad = [
-						'dir' => $possibleApp,
-						'version' => $version,
-					];
-				}
-			}
-			$app_dir[$appId] = $versionToLoad['dir'];
-			return $versionToLoad['dir'];
-			//TODO - write test
-		}
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 * If the app is defined in multiple directories, the first one is taken. (false if not found)
-	 *
-	 * @psalm-taint-specialize
-	 *
-	 * @param string $appId
-	 * @param bool $refreshAppPath should be set to true only during install/upgrade
-	 * @return string|false
-	 * @deprecated 11.0.0 use Server::get(IAppManager)->getAppPath()
-	 */
-	public static function getAppPath(string $appId, bool $refreshAppPath = false) {
-		$appId = self::cleanAppId($appId);
-		if ($appId === '') {
-			return false;
-		} elseif ($appId === 'core') {
-			return __DIR__ . '/../../../core';
-		}
-
-		if (($dir = self::findAppInDirectories($appId, $refreshAppPath)) != false) {
-			return $dir['path'] . '/' . $appId;
-		}
-		return false;
-	}
-
-	/**
-	 * Get the path for the given app on the access
-	 * If the app is defined in multiple directories, the first one is taken. (false if not found)
-	 *
-	 * @param string $appId
-	 * @return string|false
-	 * @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
-	 */
-	public static function getAppWebPath(string $appId) {
-		if (($dir = self::findAppInDirectories($appId)) != false) {
-			return OC::$WEBROOT . $dir['url'] . '/' . $appId;
-		}
-		return false;
-	}
-
-	/**
-	 * get app's version based on it's path
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public static function getAppVersionByPath(string $path): string {
-		$infoFile = $path . '/appinfo/info.xml';
-		$appData = Server::get(IAppManager::class)->getAppInfoByPath($infoFile);
-		return $appData['version'] ?? '';
-	}
-
-	/**
-	 * get the id of loaded app
-	 *
-	 * @return string
-	 */
-	public static function getCurrentApp(): string {
-		if (\OC::$CLI) {
-			return '';
-		}
-
-		$request = \OC::$server->getRequest();
-		$script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
-		$topFolder = substr($script, 0, strpos($script, '/') ?: 0);
-		if (empty($topFolder)) {
-			try {
-				$path_info = $request->getPathInfo();
-			} catch (Exception $e) {
-				// Can happen from unit tests because the script name is `./vendor/bin/phpunit` or something a like then.
-				\OC::$server->get(LoggerInterface::class)->error('Failed to detect current app from script path', ['exception' => $e]);
-				return '';
-			}
-			if ($path_info) {
-				$topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
-			}
-		}
-		if ($topFolder == 'apps') {
-			$length = strlen($topFolder);
-			return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1) ?: '';
-		} else {
-			return $topFolder;
-		}
-	}
-
-	/**
-	 * @param array $entry
-	 * @deprecated 20.0.0 Please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface
-	 */
-	public static function registerLogIn(array $entry) {
-		Server::get(LoggerInterface::class)->debug('OC_App::registerLogIn() is deprecated, please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface');
-		self::$altLogin[] = $entry;
-	}
-
-	/**
-	 * @return array
-	 */
-	public static function getAlternativeLogIns(): array {
-		/** @var Coordinator $bootstrapCoordinator */
-		$bootstrapCoordinator = Server::get(Coordinator::class);
-
-		foreach ($bootstrapCoordinator->getRegistrationContext()->getAlternativeLogins() as $registration) {
-			if (!in_array(IAlternativeLogin::class, class_implements($registration->getService()), true)) {
-				Server::get(LoggerInterface::class)->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
-					'option' => $registration->getService(),
-					'interface' => IAlternativeLogin::class,
-					'app' => $registration->getAppId(),
-				]);
-				continue;
-			}
-
-			try {
-				/** @var IAlternativeLogin $provider */
-				$provider = Server::get($registration->getService());
-			} catch (ContainerExceptionInterface $e) {
-				Server::get(LoggerInterface::class)->error('Alternative login option {option} can not be initialized.',
-					[
-						'exception' => $e,
-						'option' => $registration->getService(),
-						'app' => $registration->getAppId(),
-					]);
-			}
-
-			try {
-				$provider->load();
-
-				self::$altLogin[] = [
-					'name' => $provider->getLabel(),
-					'href' => $provider->getLink(),
-					'class' => $provider->getClass(),
-				];
-			} catch (Throwable $e) {
-				Server::get(LoggerInterface::class)->error('Alternative login option {option} had an error while loading.',
-					[
-						'exception' => $e,
-						'option' => $registration->getService(),
-						'app' => $registration->getAppId(),
-					]);
-			}
-		}
-
-		return self::$altLogin;
-	}
-
-	/**
-	 * get a list of all apps in the apps folder
-	 *
-	 * @return string[] an array of app names (string IDs)
-	 * @deprecated 31.0.0 Use IAppManager::getAllAppsInAppsFolders instead
-	 */
-	public static function getAllApps(): array {
-		return Server::get(IAppManager::class)->getAllAppsInAppsFolders();
-	}
-
-	/**
-	 * List all supported apps
-	 *
-	 * @deprecated 32.0.0 Use \OCP\Support\Subscription\IRegistry::delegateGetSupportedApps instead
-	 */
-	public function getSupportedApps(): array {
-		$subscriptionRegistry = Server::get(\OCP\Support\Subscription\IRegistry::class);
-		$supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
-		return $supportedApps;
-	}
-
-	/**
-	 * List all apps, this is used in apps.php
-	 *
-	 * @return array
-	 */
-	public function listAllApps(): array {
-		$appManager = \OC::$server->getAppManager();
-
-		$installedApps = $appManager->getAllAppsInAppsFolders();
-		//we don't want to show configuration for these
-		$blacklist = $appManager->getAlwaysEnabledApps();
-		$appList = [];
-		$langCode = \OC::$server->getL10N('core')->getLanguageCode();
-		$urlGenerator = \OC::$server->getURLGenerator();
-		$supportedApps = $this->getSupportedApps();
-
-		foreach ($installedApps as $app) {
-			if (!in_array($app, $blacklist)) {
-				$info = $appManager->getAppInfo($app, false, $langCode);
-				if (!is_array($info)) {
-					Server::get(LoggerInterface::class)->error('Could not read app info file for app "' . $app . '"', ['app' => 'core']);
-					continue;
-				}
-
-				if (!isset($info['name'])) {
-					Server::get(LoggerInterface::class)->error('App id "' . $app . '" has no name in appinfo', ['app' => 'core']);
-					continue;
-				}
-
-				$enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'no');
-				$info['groups'] = null;
-				if ($enabled === 'yes') {
-					$active = true;
-				} elseif ($enabled === 'no') {
-					$active = false;
-				} else {
-					$active = true;
-					$info['groups'] = $enabled;
-				}
-
-				$info['active'] = $active;
-
-				if ($appManager->isShipped($app)) {
-					$info['internal'] = true;
-					$info['level'] = self::officialApp;
-					$info['removable'] = false;
-				} else {
-					$info['internal'] = false;
-					$info['removable'] = true;
-				}
-
-				if (in_array($app, $supportedApps)) {
-					$info['level'] = self::supportedApp;
-				}
-
-				$appPath = self::getAppPath($app);
-				if ($appPath !== false) {
-					$appIcon = $appPath . '/img/' . $app . '.svg';
-					if (file_exists($appIcon)) {
-						$info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
-						$info['previewAsIcon'] = true;
-					} else {
-						$appIcon = $appPath . '/img/app.svg';
-						if (file_exists($appIcon)) {
-							$info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
-							$info['previewAsIcon'] = true;
-						}
-					}
-				}
-				// fix documentation
-				if (isset($info['documentation']) && is_array($info['documentation'])) {
-					foreach ($info['documentation'] as $key => $url) {
-						// If it is not an absolute URL we assume it is a key
-						// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-						if (stripos($url, 'https://') !== 0 && stripos($url, 'http://') !== 0) {
-							$url = $urlGenerator->linkToDocs($url);
-						}
-
-						$info['documentation'][$key] = $url;
-					}
-				}
-
-				$info['version'] = $appManager->getAppVersion($app);
-				$appList[] = $info;
-			}
-		}
-
-		return $appList;
-	}
-
-	public static function shouldUpgrade(string $app): bool {
-		$versions = self::getAppVersions();
-		$currentVersion = Server::get(\OCP\App\IAppManager::class)->getAppVersion($app);
-		if ($currentVersion && isset($versions[$app])) {
-			$installedVersion = $versions[$app];
-			if (!version_compare($currentVersion, $installedVersion, '=')) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Adjust the number of version parts of $version1 to match
-	 * the number of version parts of $version2.
-	 *
-	 * @param string $version1 version to adjust
-	 * @param string $version2 version to take the number of parts from
-	 * @return string shortened $version1
-	 */
-	private static function adjustVersionParts(string $version1, string $version2): string {
-		$version1 = explode('.', $version1);
-		$version2 = explode('.', $version2);
-		// reduce $version1 to match the number of parts in $version2
-		while (count($version1) > count($version2)) {
-			array_pop($version1);
-		}
-		// if $version1 does not have enough parts, add some
-		while (count($version1) < count($version2)) {
-			$version1[] = '0';
-		}
-		return implode('.', $version1);
-	}
-
-	/**
-	 * Check whether the current Nextcloud version matches the given
-	 * application's version requirements.
-	 *
-	 * The comparison is made based on the number of parts that the
-	 * app info version has. For example for ownCloud 6.0.3 if the
-	 * app info version is expecting version 6.0, the comparison is
-	 * made on the first two parts of the ownCloud version.
-	 * This means that it's possible to specify "requiremin" => 6
-	 * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
-	 *
-	 * @param string $ocVersion Nextcloud version to check against
-	 * @param array $appInfo app info (from xml)
-	 *
-	 * @return boolean true if compatible, otherwise false
-	 */
-	public static function isAppCompatible(string $ocVersion, array $appInfo, bool $ignoreMax = false): bool {
-		$requireMin = '';
-		$requireMax = '';
-		if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
-			$requireMin = $appInfo['dependencies']['nextcloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
-			$requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
-		} elseif (isset($appInfo['requiremin'])) {
-			$requireMin = $appInfo['requiremin'];
-		} elseif (isset($appInfo['require'])) {
-			$requireMin = $appInfo['require'];
-		}
-
-		if (isset($appInfo['dependencies']['nextcloud']['@attributes']['max-version'])) {
-			$requireMax = $appInfo['dependencies']['nextcloud']['@attributes']['max-version'];
-		} elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
-			$requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
-		} elseif (isset($appInfo['requiremax'])) {
-			$requireMax = $appInfo['requiremax'];
-		}
-
-		if (!empty($requireMin)
-			&& version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
-		) {
-			return false;
-		}
-
-		if (!$ignoreMax && !empty($requireMax)
-			&& version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
-		) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * get the installed version of all apps
-	 * @deprecated 32.0.0 Use IAppManager::getAppInstalledVersions or IAppConfig::getAppInstalledVersions instead
-	 */
-	public static function getAppVersions(): array {
-		return Server::get(IAppConfig::class)->getAppInstalledVersions();
-	}
-
-	/**
-	 * update the database for the app and call the update script
-	 *
-	 * @param string $appId
-	 * @return bool
-	 */
-	public static function updateApp(string $appId): bool {
-		// for apps distributed with core, we refresh app path in case the downloaded version
-		// have been installed in custom apps and not in the default path
-		$appPath = self::getAppPath($appId, true);
-		if ($appPath === false) {
-			return false;
-		}
-
-		if (is_file($appPath . '/appinfo/database.xml')) {
-			Server::get(LoggerInterface::class)->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
-			return false;
-		}
-
-		\OC::$server->getAppManager()->clearAppsCache();
-		$l = \OC::$server->getL10N('core');
-		$appData = Server::get(\OCP\App\IAppManager::class)->getAppInfo($appId, false, $l->getLanguageCode());
-
-		$ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []);
-		$ignoreMax = in_array($appId, $ignoreMaxApps, true);
-		\OC_App::checkAppDependencies(
-			\OC::$server->getConfig(),
-			$l,
-			$appData,
-			$ignoreMax
-		);
-
-		self::registerAutoloading($appId, $appPath, true);
-		self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
-
-		$ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class));
-		$ms->migrate();
-
-		self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
-		self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
-		// update appversion in app manager
-		\OC::$server->getAppManager()->clearAppsCache();
-		\OC::$server->getAppManager()->getAppVersion($appId, false);
-
-		self::setupBackgroundJobs($appData['background-jobs']);
-
-		//set remote/public handlers
-		if (array_key_exists('ocsid', $appData)) {
-			\OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
-		} elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
-			\OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
-		}
-		foreach ($appData['remote'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
-		}
-		foreach ($appData['public'] as $name => $path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
-		}
-
-		self::setAppTypes($appId);
-
-		$version = Server::get(\OCP\App\IAppManager::class)->getAppVersion($appId);
-		\OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
-
-		// migrate eventual new config keys in the process
-		/** @psalm-suppress InternalMethod */
-		Server::get(ConfigManager::class)->migrateConfigLexiconKeys($appId);
-
-		\OC::$server->get(IEventDispatcher::class)->dispatchTyped(new AppUpdateEvent($appId));
-		\OC::$server->get(IEventDispatcher::class)->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_UPDATE, $appId
-		));
-
-		return true;
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string[] $steps
-	 * @throws \OC\NeedsUpdateException
-	 */
-	public static function executeRepairSteps(string $appId, array $steps) {
-		if (empty($steps)) {
-			return;
-		}
-		// load the app
-		self::loadApp($appId);
-
-		$dispatcher = Server::get(IEventDispatcher::class);
-
-		// load the steps
-		$r = Server::get(Repair::class);
-		foreach ($steps as $step) {
-			try {
-				$r->addStep($step);
-			} catch (Exception $ex) {
-				$dispatcher->dispatchTyped(new RepairErrorEvent($ex->getMessage()));
-				logger('core')->error('Failed to add app migration step ' . $step, ['exception' => $ex]);
-			}
-		}
-		// run the steps
-		$r->run();
-	}
-
-	public static function setupBackgroundJobs(array $jobs) {
-		$queue = \OC::$server->getJobList();
-		foreach ($jobs as $job) {
-			$queue->add($job);
-		}
-	}
-
-	/**
-	 * @param string $appId
-	 * @param string[] $steps
-	 */
-	private static function setupLiveMigrations(string $appId, array $steps) {
-		$queue = \OC::$server->getJobList();
-		foreach ($steps as $step) {
-			$queue->add('OC\Migration\BackgroundRepair', [
-				'app' => $appId,
-				'step' => $step]);
-		}
-	}
-
-	protected static function findBestL10NOption(array $options, string $lang): string {
-		// only a single option
-		if (isset($options['@value'])) {
-			return $options['@value'];
-		}
-
-		$fallback = $similarLangFallback = $englishFallback = false;
-
-		$lang = strtolower($lang);
-		$similarLang = $lang;
-		if (strpos($similarLang, '_')) {
-			// For "de_DE" we want to find "de" and the other way around
-			$similarLang = substr($lang, 0, strpos($lang, '_'));
-		}
-
-		foreach ($options as $option) {
-			if (is_array($option)) {
-				if ($fallback === false) {
-					$fallback = $option['@value'];
-				}
-
-				if (!isset($option['@attributes']['lang'])) {
-					continue;
-				}
-
-				$attributeLang = strtolower($option['@attributes']['lang']);
-				if ($attributeLang === $lang) {
-					return $option['@value'];
-				}
-
-				if ($attributeLang === $similarLang) {
-					$similarLangFallback = $option['@value'];
-				} elseif (str_starts_with($attributeLang, $similarLang . '_')) {
-					if ($similarLangFallback === false) {
-						$similarLangFallback = $option['@value'];
-					}
-				}
-			} else {
-				$englishFallback = $option;
-			}
-		}
-
-		if ($similarLangFallback !== false) {
-			return $similarLangFallback;
-		} elseif ($englishFallback !== false) {
-			return $englishFallback;
-		}
-		return (string)$fallback;
-	}
-
-	/**
-	 * parses the app data array and enhanced the 'description' value
-	 *
-	 * @param array $data the app data
-	 * @param string $lang
-	 * @return array improved app data
-	 */
-	public static function parseAppInfo(array $data, $lang = null): array {
-		if ($lang && isset($data['name']) && is_array($data['name'])) {
-			$data['name'] = self::findBestL10NOption($data['name'], $lang);
-		}
-		if ($lang && isset($data['summary']) && is_array($data['summary'])) {
-			$data['summary'] = self::findBestL10NOption($data['summary'], $lang);
-		}
-		if ($lang && isset($data['description']) && is_array($data['description'])) {
-			$data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
-		} elseif (isset($data['description']) && is_string($data['description'])) {
-			$data['description'] = trim($data['description']);
-		} else {
-			$data['description'] = '';
-		}
-
-		return $data;
-	}
-
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \OCP\IL10N $l
-	 * @param array $info
-	 * @throws \Exception
-	 */
-	public static function checkAppDependencies(\OCP\IConfig $config, \OCP\IL10N $l, array $info, bool $ignoreMax) {
-		$dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
-		$missing = $dependencyAnalyzer->analyze($info, $ignoreMax);
-		if (!empty($missing)) {
-			$missingMsg = implode(PHP_EOL, $missing);
-			throw new \Exception(
-				$l->t('App "%1$s" cannot be installed because the following dependencies are not fulfilled: %2$s',
-					[$info['name'], $missingMsg]
-				)
-			);
-		}
-	}
+    private static $altLogin = [];
+    private static $alreadyRegistered = [];
+    public const supportedApp = 300;
+    public const officialApp = 200;
+
+    /**
+     * clean the appId
+     *
+     * @psalm-taint-escape file
+     * @psalm-taint-escape include
+     * @psalm-taint-escape html
+     * @psalm-taint-escape has_quotes
+     *
+     * @deprecated 31.0.0 use IAppManager::cleanAppId
+     */
+    public static function cleanAppId(string $app): string {
+        return str_replace(['<', '>', '"', "'", '\0', '/', '\\', '..'], '', $app);
+    }
+
+    /**
+     * Check if an app is loaded
+     *
+     * @param string $app
+     * @return bool
+     * @deprecated 27.0.0 use IAppManager::isAppLoaded
+     */
+    public static function isAppLoaded(string $app): bool {
+        return \OC::$server->get(IAppManager::class)->isAppLoaded($app);
+    }
+
+    /**
+     * loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the Nextcloud directory and loads all apps
+     * it can find. A directory contains an app if the file /appinfo/info.xml
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     *
+     * @deprecated 29.0.0 use IAppManager::loadApps instead
+     */
+    public static function loadApps(array $types = []): bool {
+        if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            // This should be done before calling this method so that appmanager can be used
+            return false;
+        }
+        return \OC::$server->get(IAppManager::class)->loadApps($types);
+    }
+
+    /**
+     * load a single app
+     *
+     * @param string $app
+     * @throws Exception
+     * @deprecated 27.0.0 use IAppManager::loadApp
+     */
+    public static function loadApp(string $app): void {
+        \OC::$server->get(IAppManager::class)->loadApp($app);
+    }
+
+    /**
+     * @internal
+     * @param string $app
+     * @param string $path
+     * @param bool $force
+     */
+    public static function registerAutoloading(string $app, string $path, bool $force = false) {
+        $key = $app . '-' . $path;
+        if (!$force && isset(self::$alreadyRegistered[$key])) {
+            return;
+        }
+
+        self::$alreadyRegistered[$key] = true;
+
+        // Register on PSR-4 composer autoloader
+        $appNamespace = \OC\AppFramework\App::buildAppNamespace($app);
+        \OC::$server->registerNamespace($app, $appNamespace);
+
+        if (file_exists($path . '/composer/autoload.php')) {
+            require_once $path . '/composer/autoload.php';
+        } else {
+            \OC::$composerAutoloader->addPsr4($appNamespace . '\\', $path . '/lib/', true);
+        }
+
+        // Register Test namespace only when testing
+        if (defined('PHPUNIT_RUN') || defined('CLI_TEST_RUN')) {
+            \OC::$composerAutoloader->addPsr4($appNamespace . '\\Tests\\', $path . '/tests/', true);
+        }
+    }
+
+    /**
+     * check if an app is of a specific type
+     *
+     * @param string $app
+     * @param array $types
+     * @return bool
+     * @deprecated 27.0.0 use IAppManager::isType
+     */
+    public static function isType(string $app, array $types): bool {
+        return \OC::$server->get(IAppManager::class)->isType($app, $types);
+    }
+
+    /**
+     * read app types from info.xml and cache them in the database
+     */
+    public static function setAppTypes(string $app) {
+        $appManager = \OC::$server->getAppManager();
+        $appData = $appManager->getAppInfo($app);
+        if (!is_array($appData)) {
+            return;
+        }
+
+        if (isset($appData['types'])) {
+            $appTypes = implode(',', $appData['types']);
+        } else {
+            $appTypes = '';
+            $appData['types'] = [];
+        }
+
+        $config = \OC::$server->getConfig();
+        $config->setAppValue($app, 'types', $appTypes);
+
+        if ($appManager->hasProtectedAppType($appData['types'])) {
+            $enabled = $config->getAppValue($app, 'enabled', 'yes');
+            if ($enabled !== 'yes' && $enabled !== 'no') {
+                $config->setAppValue($app, 'enabled', 'yes');
+            }
+        }
+    }
+
+    /**
+     * Returns apps enabled for the current user.
+     *
+     * @param bool $forceRefresh whether to refresh the cache
+     * @param bool $all whether to return apps for all users, not only the
+     *                  currently logged in one
+     * @return list<string>
+     */
+    public static function getEnabledApps(bool $forceRefresh = false, bool $all = false): array {
+        if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
+            return [];
+        }
+        // in incognito mode or when logged out, $user will be false,
+        // which is also the case during an upgrade
+        $appManager = \OC::$server->getAppManager();
+        if ($all) {
+            $user = null;
+        } else {
+            $user = \OC::$server->getUserSession()->getUser();
+        }
+
+        if (is_null($user)) {
+            $apps = $appManager->getEnabledApps();
+        } else {
+            $apps = $appManager->getEnabledAppsForUser($user);
+        }
+        $apps = array_filter($apps, function ($app) {
+            return $app !== 'files';//we add this manually
+        });
+        sort($apps);
+        array_unshift($apps, 'files');
+        return $apps;
+    }
+
+    /**
+     * enables an app
+     *
+     * @param string $appId
+     * @param array $groups (optional) when set, only these groups will have access to the app
+     * @throws \Exception
+     * @return void
+     *
+     * This function set an app as enabled in appconfig.
+     */
+    public function enable(string $appId,
+        array $groups = []) {
+        // Check if app is already downloaded
+        /** @var Installer $installer */
+        $installer = Server::get(Installer::class);
+        $isDownloaded = $installer->isDownloaded($appId);
+
+        if (!$isDownloaded) {
+            $installer->downloadApp($appId);
+        }
+
+        $installer->installApp($appId);
+
+        $appManager = \OC::$server->getAppManager();
+        if ($groups !== []) {
+            $groupManager = \OC::$server->getGroupManager();
+            $groupsList = [];
+            foreach ($groups as $group) {
+                $groupItem = $groupManager->get($group);
+                if ($groupItem instanceof \OCP\IGroup) {
+                    $groupsList[] = $groupManager->get($group);
+                }
+            }
+            $appManager->enableAppForGroups($appId, $groupsList);
+        } else {
+            $appManager->enableApp($appId);
+        }
+    }
+
+    /**
+     * Get the path where to install apps
+     */
+    public static function getInstallPath(): ?string {
+        foreach (OC::$APPSROOTS as $dir) {
+            if (isset($dir['writable']) && $dir['writable'] === true) {
+                return $dir['path'];
+            }
+        }
+
+        Server::get(LoggerInterface::class)->error('No application directories are marked as writable.', ['app' => 'core']);
+        return null;
+    }
+
+
+    /**
+     * Find the apps root for an app id.
+     *
+     * If multiple copies are found, the apps root the latest version is returned.
+     *
+     * @param string $appId
+     * @param bool $ignoreCache ignore cache and rebuild it
+     * @return false|array{path: string, url: string} the apps root shape
+     */
+    public static function findAppInDirectories(string $appId, bool $ignoreCache = false) {
+        $sanitizedAppId = self::cleanAppId($appId);
+        if ($sanitizedAppId !== $appId) {
+            return false;
+        }
+        static $app_dir = [];
+
+        if (isset($app_dir[$appId]) && !$ignoreCache) {
+            return $app_dir[$appId];
+        }
+
+        $possibleApps = [];
+        foreach (OC::$APPSROOTS as $dir) {
+            if (file_exists($dir['path'] . '/' . $appId)) {
+                $possibleApps[] = $dir;
+            }
+        }
+
+        if (empty($possibleApps)) {
+            return false;
+        } elseif (count($possibleApps) === 1) {
+            $dir = array_shift($possibleApps);
+            $app_dir[$appId] = $dir;
+            return $dir;
+        } else {
+            $versionToLoad = [];
+            foreach ($possibleApps as $possibleApp) {
+                $version = self::getAppVersionByPath($possibleApp['path'] . '/' . $appId);
+                if (empty($versionToLoad) || version_compare($version, $versionToLoad['version'], '>')) {
+                    $versionToLoad = [
+                        'dir' => $possibleApp,
+                        'version' => $version,
+                    ];
+                }
+            }
+            $app_dir[$appId] = $versionToLoad['dir'];
+            return $versionToLoad['dir'];
+            //TODO - write test
+        }
+    }
+
+    /**
+     * Get the directory for the given app.
+     * If the app is defined in multiple directories, the first one is taken. (false if not found)
+     *
+     * @psalm-taint-specialize
+     *
+     * @param string $appId
+     * @param bool $refreshAppPath should be set to true only during install/upgrade
+     * @return string|false
+     * @deprecated 11.0.0 use Server::get(IAppManager)->getAppPath()
+     */
+    public static function getAppPath(string $appId, bool $refreshAppPath = false) {
+        $appId = self::cleanAppId($appId);
+        if ($appId === '') {
+            return false;
+        } elseif ($appId === 'core') {
+            return __DIR__ . '/../../../core';
+        }
+
+        if (($dir = self::findAppInDirectories($appId, $refreshAppPath)) != false) {
+            return $dir['path'] . '/' . $appId;
+        }
+        return false;
+    }
+
+    /**
+     * Get the path for the given app on the access
+     * If the app is defined in multiple directories, the first one is taken. (false if not found)
+     *
+     * @param string $appId
+     * @return string|false
+     * @deprecated 18.0.0 use \OC::$server->getAppManager()->getAppWebPath()
+     */
+    public static function getAppWebPath(string $appId) {
+        if (($dir = self::findAppInDirectories($appId)) != false) {
+            return OC::$WEBROOT . $dir['url'] . '/' . $appId;
+        }
+        return false;
+    }
+
+    /**
+     * get app's version based on it's path
+     *
+     * @param string $path
+     * @return string
+     */
+    public static function getAppVersionByPath(string $path): string {
+        $infoFile = $path . '/appinfo/info.xml';
+        $appData = Server::get(IAppManager::class)->getAppInfoByPath($infoFile);
+        return $appData['version'] ?? '';
+    }
+
+    /**
+     * get the id of loaded app
+     *
+     * @return string
+     */
+    public static function getCurrentApp(): string {
+        if (\OC::$CLI) {
+            return '';
+        }
+
+        $request = \OC::$server->getRequest();
+        $script = substr($request->getScriptName(), strlen(OC::$WEBROOT) + 1);
+        $topFolder = substr($script, 0, strpos($script, '/') ?: 0);
+        if (empty($topFolder)) {
+            try {
+                $path_info = $request->getPathInfo();
+            } catch (Exception $e) {
+                // Can happen from unit tests because the script name is `./vendor/bin/phpunit` or something a like then.
+                \OC::$server->get(LoggerInterface::class)->error('Failed to detect current app from script path', ['exception' => $e]);
+                return '';
+            }
+            if ($path_info) {
+                $topFolder = substr($path_info, 1, strpos($path_info, '/', 1) - 1);
+            }
+        }
+        if ($topFolder == 'apps') {
+            $length = strlen($topFolder);
+            return substr($script, $length + 1, strpos($script, '/', $length + 1) - $length - 1) ?: '';
+        } else {
+            return $topFolder;
+        }
+    }
+
+    /**
+     * @param array $entry
+     * @deprecated 20.0.0 Please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface
+     */
+    public static function registerLogIn(array $entry) {
+        Server::get(LoggerInterface::class)->debug('OC_App::registerLogIn() is deprecated, please register your alternative login option using the registerAlternativeLogin() on the RegistrationContext in your Application class implementing the OCP\Authentication\IAlternativeLogin interface');
+        self::$altLogin[] = $entry;
+    }
+
+    /**
+     * @return array
+     */
+    public static function getAlternativeLogIns(): array {
+        /** @var Coordinator $bootstrapCoordinator */
+        $bootstrapCoordinator = Server::get(Coordinator::class);
+
+        foreach ($bootstrapCoordinator->getRegistrationContext()->getAlternativeLogins() as $registration) {
+            if (!in_array(IAlternativeLogin::class, class_implements($registration->getService()), true)) {
+                Server::get(LoggerInterface::class)->error('Alternative login option {option} does not implement {interface} and is therefore ignored.', [
+                    'option' => $registration->getService(),
+                    'interface' => IAlternativeLogin::class,
+                    'app' => $registration->getAppId(),
+                ]);
+                continue;
+            }
+
+            try {
+                /** @var IAlternativeLogin $provider */
+                $provider = Server::get($registration->getService());
+            } catch (ContainerExceptionInterface $e) {
+                Server::get(LoggerInterface::class)->error('Alternative login option {option} can not be initialized.',
+                    [
+                        'exception' => $e,
+                        'option' => $registration->getService(),
+                        'app' => $registration->getAppId(),
+                    ]);
+            }
+
+            try {
+                $provider->load();
+
+                self::$altLogin[] = [
+                    'name' => $provider->getLabel(),
+                    'href' => $provider->getLink(),
+                    'class' => $provider->getClass(),
+                ];
+            } catch (Throwable $e) {
+                Server::get(LoggerInterface::class)->error('Alternative login option {option} had an error while loading.',
+                    [
+                        'exception' => $e,
+                        'option' => $registration->getService(),
+                        'app' => $registration->getAppId(),
+                    ]);
+            }
+        }
+
+        return self::$altLogin;
+    }
+
+    /**
+     * get a list of all apps in the apps folder
+     *
+     * @return string[] an array of app names (string IDs)
+     * @deprecated 31.0.0 Use IAppManager::getAllAppsInAppsFolders instead
+     */
+    public static function getAllApps(): array {
+        return Server::get(IAppManager::class)->getAllAppsInAppsFolders();
+    }
+
+    /**
+     * List all supported apps
+     *
+     * @deprecated 32.0.0 Use \OCP\Support\Subscription\IRegistry::delegateGetSupportedApps instead
+     */
+    public function getSupportedApps(): array {
+        $subscriptionRegistry = Server::get(\OCP\Support\Subscription\IRegistry::class);
+        $supportedApps = $subscriptionRegistry->delegateGetSupportedApps();
+        return $supportedApps;
+    }
+
+    /**
+     * List all apps, this is used in apps.php
+     *
+     * @return array
+     */
+    public function listAllApps(): array {
+        $appManager = \OC::$server->getAppManager();
+
+        $installedApps = $appManager->getAllAppsInAppsFolders();
+        //we don't want to show configuration for these
+        $blacklist = $appManager->getAlwaysEnabledApps();
+        $appList = [];
+        $langCode = \OC::$server->getL10N('core')->getLanguageCode();
+        $urlGenerator = \OC::$server->getURLGenerator();
+        $supportedApps = $this->getSupportedApps();
+
+        foreach ($installedApps as $app) {
+            if (!in_array($app, $blacklist)) {
+                $info = $appManager->getAppInfo($app, false, $langCode);
+                if (!is_array($info)) {
+                    Server::get(LoggerInterface::class)->error('Could not read app info file for app "' . $app . '"', ['app' => 'core']);
+                    continue;
+                }
+
+                if (!isset($info['name'])) {
+                    Server::get(LoggerInterface::class)->error('App id "' . $app . '" has no name in appinfo', ['app' => 'core']);
+                    continue;
+                }
+
+                $enabled = \OC::$server->getConfig()->getAppValue($app, 'enabled', 'no');
+                $info['groups'] = null;
+                if ($enabled === 'yes') {
+                    $active = true;
+                } elseif ($enabled === 'no') {
+                    $active = false;
+                } else {
+                    $active = true;
+                    $info['groups'] = $enabled;
+                }
+
+                $info['active'] = $active;
+
+                if ($appManager->isShipped($app)) {
+                    $info['internal'] = true;
+                    $info['level'] = self::officialApp;
+                    $info['removable'] = false;
+                } else {
+                    $info['internal'] = false;
+                    $info['removable'] = true;
+                }
+
+                if (in_array($app, $supportedApps)) {
+                    $info['level'] = self::supportedApp;
+                }
+
+                $appPath = self::getAppPath($app);
+                if ($appPath !== false) {
+                    $appIcon = $appPath . '/img/' . $app . '.svg';
+                    if (file_exists($appIcon)) {
+                        $info['preview'] = $urlGenerator->imagePath($app, $app . '.svg');
+                        $info['previewAsIcon'] = true;
+                    } else {
+                        $appIcon = $appPath . '/img/app.svg';
+                        if (file_exists($appIcon)) {
+                            $info['preview'] = $urlGenerator->imagePath($app, 'app.svg');
+                            $info['previewAsIcon'] = true;
+                        }
+                    }
+                }
+                // fix documentation
+                if (isset($info['documentation']) && is_array($info['documentation'])) {
+                    foreach ($info['documentation'] as $key => $url) {
+                        // If it is not an absolute URL we assume it is a key
+                        // i.e. admin-ldap will get converted to go.php?to=admin-ldap
+                        if (stripos($url, 'https://') !== 0 && stripos($url, 'http://') !== 0) {
+                            $url = $urlGenerator->linkToDocs($url);
+                        }
+
+                        $info['documentation'][$key] = $url;
+                    }
+                }
+
+                $info['version'] = $appManager->getAppVersion($app);
+                $appList[] = $info;
+            }
+        }
+
+        return $appList;
+    }
+
+    public static function shouldUpgrade(string $app): bool {
+        $versions = self::getAppVersions();
+        $currentVersion = Server::get(\OCP\App\IAppManager::class)->getAppVersion($app);
+        if ($currentVersion && isset($versions[$app])) {
+            $installedVersion = $versions[$app];
+            if (!version_compare($currentVersion, $installedVersion, '=')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Adjust the number of version parts of $version1 to match
+     * the number of version parts of $version2.
+     *
+     * @param string $version1 version to adjust
+     * @param string $version2 version to take the number of parts from
+     * @return string shortened $version1
+     */
+    private static function adjustVersionParts(string $version1, string $version2): string {
+        $version1 = explode('.', $version1);
+        $version2 = explode('.', $version2);
+        // reduce $version1 to match the number of parts in $version2
+        while (count($version1) > count($version2)) {
+            array_pop($version1);
+        }
+        // if $version1 does not have enough parts, add some
+        while (count($version1) < count($version2)) {
+            $version1[] = '0';
+        }
+        return implode('.', $version1);
+    }
+
+    /**
+     * Check whether the current Nextcloud version matches the given
+     * application's version requirements.
+     *
+     * The comparison is made based on the number of parts that the
+     * app info version has. For example for ownCloud 6.0.3 if the
+     * app info version is expecting version 6.0, the comparison is
+     * made on the first two parts of the ownCloud version.
+     * This means that it's possible to specify "requiremin" => 6
+     * and "requiremax" => 6 and it will still match ownCloud 6.0.3.
+     *
+     * @param string $ocVersion Nextcloud version to check against
+     * @param array $appInfo app info (from xml)
+     *
+     * @return boolean true if compatible, otherwise false
+     */
+    public static function isAppCompatible(string $ocVersion, array $appInfo, bool $ignoreMax = false): bool {
+        $requireMin = '';
+        $requireMax = '';
+        if (isset($appInfo['dependencies']['nextcloud']['@attributes']['min-version'])) {
+            $requireMin = $appInfo['dependencies']['nextcloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['min-version'])) {
+            $requireMin = $appInfo['dependencies']['owncloud']['@attributes']['min-version'];
+        } elseif (isset($appInfo['requiremin'])) {
+            $requireMin = $appInfo['requiremin'];
+        } elseif (isset($appInfo['require'])) {
+            $requireMin = $appInfo['require'];
+        }
+
+        if (isset($appInfo['dependencies']['nextcloud']['@attributes']['max-version'])) {
+            $requireMax = $appInfo['dependencies']['nextcloud']['@attributes']['max-version'];
+        } elseif (isset($appInfo['dependencies']['owncloud']['@attributes']['max-version'])) {
+            $requireMax = $appInfo['dependencies']['owncloud']['@attributes']['max-version'];
+        } elseif (isset($appInfo['requiremax'])) {
+            $requireMax = $appInfo['requiremax'];
+        }
+
+        if (!empty($requireMin)
+            && version_compare(self::adjustVersionParts($ocVersion, $requireMin), $requireMin, '<')
+        ) {
+            return false;
+        }
+
+        if (!$ignoreMax && !empty($requireMax)
+            && version_compare(self::adjustVersionParts($ocVersion, $requireMax), $requireMax, '>')
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * get the installed version of all apps
+     * @deprecated 32.0.0 Use IAppManager::getAppInstalledVersions or IAppConfig::getAppInstalledVersions instead
+     */
+    public static function getAppVersions(): array {
+        return Server::get(IAppConfig::class)->getAppInstalledVersions();
+    }
+
+    /**
+     * update the database for the app and call the update script
+     *
+     * @param string $appId
+     * @return bool
+     */
+    public static function updateApp(string $appId): bool {
+        // for apps distributed with core, we refresh app path in case the downloaded version
+        // have been installed in custom apps and not in the default path
+        $appPath = self::getAppPath($appId, true);
+        if ($appPath === false) {
+            return false;
+        }
+
+        if (is_file($appPath . '/appinfo/database.xml')) {
+            Server::get(LoggerInterface::class)->error('The appinfo/database.xml file is not longer supported. Used in ' . $appId);
+            return false;
+        }
+
+        \OC::$server->getAppManager()->clearAppsCache();
+        $l = \OC::$server->getL10N('core');
+        $appData = Server::get(\OCP\App\IAppManager::class)->getAppInfo($appId, false, $l->getLanguageCode());
+
+        $ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []);
+        $ignoreMax = in_array($appId, $ignoreMaxApps, true);
+        \OC_App::checkAppDependencies(
+            \OC::$server->getConfig(),
+            $l,
+            $appData,
+            $ignoreMax
+        );
+
+        self::registerAutoloading($appId, $appPath, true);
+        self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);
+
+        $ms = new MigrationService($appId, \OC::$server->get(\OC\DB\Connection::class));
+        $ms->migrate();
+
+        self::executeRepairSteps($appId, $appData['repair-steps']['post-migration']);
+        self::setupLiveMigrations($appId, $appData['repair-steps']['live-migration']);
+        // update appversion in app manager
+        \OC::$server->getAppManager()->clearAppsCache();
+        \OC::$server->getAppManager()->getAppVersion($appId, false);
+
+        self::setupBackgroundJobs($appData['background-jobs']);
+
+        //set remote/public handlers
+        if (array_key_exists('ocsid', $appData)) {
+            \OC::$server->getConfig()->setAppValue($appId, 'ocsid', $appData['ocsid']);
+        } elseif (\OC::$server->getConfig()->getAppValue($appId, 'ocsid', null) !== null) {
+            \OC::$server->getConfig()->deleteAppValue($appId, 'ocsid');
+        }
+        foreach ($appData['remote'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_' . $name, $appId . '/' . $path);
+        }
+        foreach ($appData['public'] as $name => $path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_' . $name, $appId . '/' . $path);
+        }
+
+        self::setAppTypes($appId);
+
+        $version = Server::get(\OCP\App\IAppManager::class)->getAppVersion($appId);
+        \OC::$server->getConfig()->setAppValue($appId, 'installed_version', $version);
+
+        // migrate eventual new config keys in the process
+        /** @psalm-suppress InternalMethod */
+        Server::get(ConfigManager::class)->migrateConfigLexiconKeys($appId);
+
+        \OC::$server->get(IEventDispatcher::class)->dispatchTyped(new AppUpdateEvent($appId));
+        \OC::$server->get(IEventDispatcher::class)->dispatch(ManagerEvent::EVENT_APP_UPDATE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_UPDATE, $appId
+        ));
+
+        return true;
+    }
+
+    /**
+     * @param string $appId
+     * @param string[] $steps
+     * @throws \OC\NeedsUpdateException
+     */
+    public static function executeRepairSteps(string $appId, array $steps) {
+        if (empty($steps)) {
+            return;
+        }
+        // load the app
+        self::loadApp($appId);
+
+        $dispatcher = Server::get(IEventDispatcher::class);
+
+        // load the steps
+        $r = Server::get(Repair::class);
+        foreach ($steps as $step) {
+            try {
+                $r->addStep($step);
+            } catch (Exception $ex) {
+                $dispatcher->dispatchTyped(new RepairErrorEvent($ex->getMessage()));
+                logger('core')->error('Failed to add app migration step ' . $step, ['exception' => $ex]);
+            }
+        }
+        // run the steps
+        $r->run();
+    }
+
+    public static function setupBackgroundJobs(array $jobs) {
+        $queue = \OC::$server->getJobList();
+        foreach ($jobs as $job) {
+            $queue->add($job);
+        }
+    }
+
+    /**
+     * @param string $appId
+     * @param string[] $steps
+     */
+    private static function setupLiveMigrations(string $appId, array $steps) {
+        $queue = \OC::$server->getJobList();
+        foreach ($steps as $step) {
+            $queue->add('OC\Migration\BackgroundRepair', [
+                'app' => $appId,
+                'step' => $step]);
+        }
+    }
+
+    protected static function findBestL10NOption(array $options, string $lang): string {
+        // only a single option
+        if (isset($options['@value'])) {
+            return $options['@value'];
+        }
+
+        $fallback = $similarLangFallback = $englishFallback = false;
+
+        $lang = strtolower($lang);
+        $similarLang = $lang;
+        if (strpos($similarLang, '_')) {
+            // For "de_DE" we want to find "de" and the other way around
+            $similarLang = substr($lang, 0, strpos($lang, '_'));
+        }
+
+        foreach ($options as $option) {
+            if (is_array($option)) {
+                if ($fallback === false) {
+                    $fallback = $option['@value'];
+                }
+
+                if (!isset($option['@attributes']['lang'])) {
+                    continue;
+                }
+
+                $attributeLang = strtolower($option['@attributes']['lang']);
+                if ($attributeLang === $lang) {
+                    return $option['@value'];
+                }
+
+                if ($attributeLang === $similarLang) {
+                    $similarLangFallback = $option['@value'];
+                } elseif (str_starts_with($attributeLang, $similarLang . '_')) {
+                    if ($similarLangFallback === false) {
+                        $similarLangFallback = $option['@value'];
+                    }
+                }
+            } else {
+                $englishFallback = $option;
+            }
+        }
+
+        if ($similarLangFallback !== false) {
+            return $similarLangFallback;
+        } elseif ($englishFallback !== false) {
+            return $englishFallback;
+        }
+        return (string)$fallback;
+    }
+
+    /**
+     * parses the app data array and enhanced the 'description' value
+     *
+     * @param array $data the app data
+     * @param string $lang
+     * @return array improved app data
+     */
+    public static function parseAppInfo(array $data, $lang = null): array {
+        if ($lang && isset($data['name']) && is_array($data['name'])) {
+            $data['name'] = self::findBestL10NOption($data['name'], $lang);
+        }
+        if ($lang && isset($data['summary']) && is_array($data['summary'])) {
+            $data['summary'] = self::findBestL10NOption($data['summary'], $lang);
+        }
+        if ($lang && isset($data['description']) && is_array($data['description'])) {
+            $data['description'] = trim(self::findBestL10NOption($data['description'], $lang));
+        } elseif (isset($data['description']) && is_string($data['description'])) {
+            $data['description'] = trim($data['description']);
+        } else {
+            $data['description'] = '';
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param \OCP\IConfig $config
+     * @param \OCP\IL10N $l
+     * @param array $info
+     * @throws \Exception
+     */
+    public static function checkAppDependencies(\OCP\IConfig $config, \OCP\IL10N $l, array $info, bool $ignoreMax) {
+        $dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l);
+        $missing = $dependencyAnalyzer->analyze($info, $ignoreMax);
+        if (!empty($missing)) {
+            $missingMsg = implode(PHP_EOL, $missing);
+            throw new \Exception(
+                $l->t('App "%1$s" cannot be installed because the following dependencies are not fulfilled: %2$s',
+                    [$info['name'], $missingMsg]
+                )
+            );
+        }
+    }
 }

lib/private/Server.php

Indentation +1421 added lines, -1421 removed lines

@@ -250,1462 +250,1462 @@
  * 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->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
-			return $c;
-		});
-
-		$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\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),
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::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(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
-			return new \OC\Preview\Watcher(
-				new \OC\Preview\Storage\Root(
-					$c->get(IRootFolder::class),
-					$c->get(SystemConfig::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),
-			);
-
-			$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->registerService(ICache::class, function ($c) {
-			return new Cache\File();
-		});
-
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
-				$profiler,
-				ArrayCache::class,
-				ArrayCache::class,
-				ArrayCache::class
-			);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			/** @var ServerVersion $serverVersion */
-			$serverVersion = $c->get(ServerVersion::class);
-
-			if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				$logQuery = $config->getValue('log_query');
-				$prefixClosure = function () use ($logQuery, $serverVersion): ?string {
-					if (!$logQuery) {
-						try {
-							$v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true);
-						} catch (\Doctrine\DBAL\Exception $e) {
-							// Database service probably unavailable
-							// Probably related to https://github.com/nextcloud/server/issues/37424
-							return null;
-						}
-					} else {
-						// If the log_query is enabled, we can not get the app versions
-						// as that does a query, which will be logged and the logging
-						// depends on redis and here we are back again in the same function.
-						$v = [
-							'log_query' => 'enabled',
-						];
-					}
-					$v['core'] = implode(',', $serverVersion->getVersion());
-					$version = implode(',', array_keys($v)) . implode(',', $v);
-					$instanceId = \OC_Util::getInstanceId();
-					$path = \OC::$SERVERROOT;
-					return md5($instanceId . '-' . $version . '-' . $path);
-				};
-				return new \OC\Memcache\Factory($prefixClosure,
-					$c->get(LoggerInterface::class),
-					$profiler,
-					/** @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')
-				);
-			}
-			return $arrayCacheFactory;
-		});
-		$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
-			);
-		});
-
-		$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));
-			$manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $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(),
-				new AppLocator(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(\OCP\IRequest::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->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::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)
-			);
-		});
-
-		/** @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) or (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->getAppDataDir('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->getAppDataDir('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					$c->get(\OCP\IAppConfig::class),
-					$c->getL10N('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->getAppDataDir('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(SystemConfig::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_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::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(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::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();
-		});
+    /** @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->registerService(\OCP\IServerContainer::class, function (ContainerInterface $c) {
+            return $c;
+        });
+
+        $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\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),
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::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(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
+            return new \OC\Preview\Watcher(
+                new \OC\Preview\Storage\Root(
+                    $c->get(IRootFolder::class),
+                    $c->get(SystemConfig::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),
+            );
+
+            $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->registerService(ICache::class, function ($c) {
+            return new Cache\File();
+        });
+
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $arrayCacheFactory = new \OC\Memcache\Factory(fn () => '', $c->get(LoggerInterface::class),
+                $profiler,
+                ArrayCache::class,
+                ArrayCache::class,
+                ArrayCache::class
+            );
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            /** @var ServerVersion $serverVersion */
+            $serverVersion = $c->get(ServerVersion::class);
+
+            if ($config->getValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                $logQuery = $config->getValue('log_query');
+                $prefixClosure = function () use ($logQuery, $serverVersion): ?string {
+                    if (!$logQuery) {
+                        try {
+                            $v = \OCP\Server::get(IAppConfig::class)->getAppInstalledVersions(true);
+                        } catch (\Doctrine\DBAL\Exception $e) {
+                            // Database service probably unavailable
+                            // Probably related to https://github.com/nextcloud/server/issues/37424
+                            return null;
+                        }
+                    } else {
+                        // If the log_query is enabled, we can not get the app versions
+                        // as that does a query, which will be logged and the logging
+                        // depends on redis and here we are back again in the same function.
+                        $v = [
+                            'log_query' => 'enabled',
+                        ];
+                    }
+                    $v['core'] = implode(',', $serverVersion->getVersion());
+                    $version = implode(',', array_keys($v)) . implode(',', $v);
+                    $instanceId = \OC_Util::getInstanceId();
+                    $path = \OC::$SERVERROOT;
+                    return md5($instanceId . '-' . $version . '-' . $path);
+                };
+                return new \OC\Memcache\Factory($prefixClosure,
+                    $c->get(LoggerInterface::class),
+                    $profiler,
+                    /** @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')
+                );
+            }
+            return $arrayCacheFactory;
+        });
+        $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
+            );
+        });
+
+        $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));
+            $manager->registerRootProvider(new ObjectStorePreviewCacheMountProvider($logger, $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(),
+                new AppLocator(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(\OCP\IRequest::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->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::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)
+            );
+        });
+
+        /** @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) or (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->getAppDataDir('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->getAppDataDir('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(\OCP\IAppConfig::class),
+                    $c->getL10N('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->getAppDataDir('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(SystemConfig::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_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailPlugin::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(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::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\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(Installer::class, function (ContainerInterface $c) {
-			return new Installer(
-				$c->get(AppFetcher::class),
-				$c->get(IClientService::class),
-				$c->get(ITempManager::class),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				\OC::$CLI
-			);
-		});
+        $this->registerService(Installer::class, function (ContainerInterface $c) {
+            return new Installer(
+                $c->get(AppFetcher::class),
+                $c->get(IClientService::class),
+                $c->get(ITempManager::class),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                \OC::$CLI
+            );
+        });
 
-		$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);
 
-		$this->registerAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        $this->registerAlias(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(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
-
-		$this->registerAlias(ISignatureManager::class, SignatureManager::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) {
-		/** @var \OC\Files\AppData\Factory $factory */
-		$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);
-	}
-
-	private function registerDeprecatedAlias(string $alias, string $target) {
-		$this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
-			try {
-				/** @var LoggerInterface $logger */
-				$logger = $container->get(LoggerInterface::class);
-				$logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
-			} catch (ContainerExceptionInterface $e) {
-				// Could not get logger. Continue
-			}
-
-			return $container->get($target);
-		}, false);
-	}
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+
+        $this->registerAlias(ISignatureManager::class, SignatureManager::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) {
+        /** @var \OC\Files\AppData\Factory $factory */
+        $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);
+    }
+
+    private function registerDeprecatedAlias(string $alias, string $target) {
+        $this->registerService($alias, function (ContainerInterface $container) use ($target, $alias) {
+            try {
+                /** @var LoggerInterface $logger */
+                $logger = $container->get(LoggerInterface::class);
+                $logger->debug('The requested alias "' . $alias . '" is deprecated. Please request "' . $target . '" directly. This alias will be removed in a future Nextcloud version.', ['app' => 'serverDI']);
+            } catch (ContainerExceptionInterface $e) {
+                // Could not get logger. Continue
+            }
+
+            return $container->get($target);
+        }, false);
+    }
 }

lib/private/Config/ConfigManager.php

Indentation +222 added lines, -222 removed lines

@@ -25,226 +25,226 @@
  * @since 32.0.0
  */
 class ConfigManager {
-	/** @var AppConfig|null $appConfig */
-	private ?IAppConfig $appConfig = null;
-	/** @var UserConfig|null $userConfig */
-	private ?IUserConfig $userConfig = null;
-
-	public function __construct(
-		private readonly LoggerInterface $logger,
-	) {
-	}
-
-	/**
-	 * Use the rename values from the list of ConfigLexiconEntry defined in each app ConfigLexicon
-	 * to migrate config value to a new config key.
-	 * Migration will only occur if new config key has no value in database.
-	 * The previous value from the key set in rename will be deleted from the database when migration
-	 * is over.
-	 *
-	 * This method should be mainly called during a new upgrade or when a new app is enabled.
-	 *
-	 * @see ConfigLexiconEntry
-	 * @internal
-	 * @since 32.0.0
-	 * @param string|null $appId when set to NULL the method will be executed for all enabled apps of the instance
-	 */
-	public function migrateConfigLexiconKeys(?string $appId = null): void {
-		if ($appId === null) {
-			$this->migrateConfigLexiconKeys('core');
-			$appManager = Server::get(IAppManager::class);
-			foreach ($appManager->getEnabledApps() as $app) {
-				$this->migrateConfigLexiconKeys($app);
-			}
-
-			return;
-		}
-
-		$this->loadConfigServices();
-
-		// it is required to ignore aliases when moving config values
-		$this->appConfig->ignoreLexiconAliases(true);
-		$this->userConfig->ignoreLexiconAliases(true);
-
-		$this->migrateAppConfigKeys($appId);
-		$this->migrateUserConfigKeys($appId);
-
-		// switch back to normal behavior
-		$this->appConfig->ignoreLexiconAliases(false);
-		$this->userConfig->ignoreLexiconAliases(false);
-	}
-
-	/**
-	 * config services cannot be load at __construct() or install will fail
-	 */
-	private function loadConfigServices(): void {
-		if ($this->appConfig === null) {
-			$this->appConfig = Server::get(IAppConfig::class);
-		}
-		if ($this->userConfig === null) {
-			$this->userConfig = Server::get(IUserConfig::class);
-		}
-	}
-
-	/**
-	 * Get details from lexicon related to AppConfig and search for entries with rename to initiate
-	 * a migration to new config key
-	 */
-	private function migrateAppConfigKeys(string $appId): void {
-		$lexicon = $this->appConfig->getConfigDetailsFromLexicon($appId);
-		foreach ($lexicon['entries'] as $entry) {
-			// only interested in entries with rename set
-			if ($entry->getRename() === null) {
-				continue;
-			}
-
-			// only migrate if rename config key has a value and the new config key hasn't
-			if ($this->appConfig->hasKey($appId, $entry->getRename())
-				&& !$this->appConfig->hasKey($appId, $entry->getKey())) {
-				try {
-					$this->migrateAppConfigValue($appId, $entry);
-				} catch (TypeConflictException $e) {
-					$this->logger->error('could not migrate AppConfig value', ['appId' => $appId, 'entry' => $entry, 'exception' => $e]);
-					continue;
-				}
-			}
-
-			// we only delete previous config value if migration went fine.
-			$this->appConfig->deleteKey($appId, $entry->getRename());
-		}
-	}
-
-	/**
-	 * Get details from lexicon related to UserConfig and search for entries with rename to initiate
-	 * a migration to new config key
-	 */
-	private function migrateUserConfigKeys(string $appId): void {
-		$lexicon = $this->userConfig->getConfigDetailsFromLexicon($appId);
-		foreach ($lexicon['entries'] as $entry) {
-			// only interested in keys with rename set
-			if ($entry->getRename() === null) {
-				continue;
-			}
-
-			foreach ($this->userConfig->getValuesByUsers($appId, $entry->getRename()) as $userId => $value) {
-				if ($this->userConfig->hasKey($userId, $appId, $entry->getKey())) {
-					continue;
-				}
-
-				try {
-					$this->migrateUserConfigValue($userId, $appId, $entry);
-				} catch (TypeConflictException $e) {
-					$this->logger->error('could not migrate UserConfig value', ['userId' => $userId, 'appId' => $appId, 'entry' => $entry, 'exception' => $e]);
-					continue;
-				}
-
-				$this->userConfig->deleteUserConfig($userId, $appId, $entry->getRename());
-			}
-		}
-	}
-
-
-	/**
-	 * converting value from rename to the new key
-	 *
-	 * @throws TypeConflictException if previous value does not fit the expected type
-	 */
-	private function migrateAppConfigValue(string $appId, ConfigLexiconEntry $entry): void {
-		$value = $this->appConfig->getValueMixed($appId, $entry->getRename(), lazy: null);
-		switch ($entry->getValueType()) {
-			case ValueType::STRING:
-				$this->appConfig->setValueString($appId, $entry->getKey(), $value);
-				return;
-
-			case ValueType::INT:
-				$this->appConfig->setValueInt($appId, $entry->getKey(), $this->convertToInt($value));
-				return;
-
-			case ValueType::FLOAT:
-				$this->appConfig->setValueFloat($appId, $entry->getKey(), $this->convertToFloat($value));
-				return;
-
-			case ValueType::BOOL:
-				$this->appConfig->setValueBool($appId, $entry->getKey(), $this->convertToBool($value, $entry));
-				return;
-
-			case ValueType::ARRAY:
-				$this->appConfig->setValueArray($appId, $entry->getKey(), $this->convertToArray($value));
-				return;
-		}
-	}
-
-	/**
-	 * converting value from rename to the new key
-	 *
-	 * @throws TypeConflictException if previous value does not fit the expected type
-	 */
-	private function migrateUserConfigValue(string $userId, string $appId, ConfigLexiconEntry $entry): void {
-		$value = $this->userConfig->getValueMixed($userId, $appId, $entry->getRename(), lazy: null);
-		switch ($entry->getValueType()) {
-			case ValueType::STRING:
-				$this->userConfig->setValueString($userId, $appId, $entry->getKey(), $value);
-				return;
-
-			case ValueType::INT:
-				$this->userConfig->setValueInt($userId, $appId, $entry->getKey(), $this->convertToInt($value));
-				return;
-
-			case ValueType::FLOAT:
-				$this->userConfig->setValueFloat($userId, $appId, $entry->getKey(), $this->convertToFloat($value));
-				return;
-
-			case ValueType::BOOL:
-				$this->userConfig->setValueBool($userId, $appId, $entry->getKey(), $this->convertToBool($value, $entry));
-				return;
-
-			case ValueType::ARRAY:
-				$this->userConfig->setValueArray($userId, $appId, $entry->getKey(), $this->convertToArray($value));
-				return;
-		}
-	}
-
-	public function convertToInt(string $value): int {
-		if (!is_numeric($value) || (float)$value <> (int)$value) {
-			throw new TypeConflictException('Value is not an integer');
-		}
-
-		return (int)$value;
-	}
-
-	public function convertToFloat(string $value): float {
-		if (!is_numeric($value)) {
-			throw new TypeConflictException('Value is not a float');
-		}
-
-		return (float)$value;
-	}
-
-	public function convertToBool(string $value, ?ConfigLexiconEntry $entry = null): bool {
-		if (in_array(strtolower($value), ['true', '1', 'on', 'yes'])) {
-			$valueBool = true;
-		} elseif (in_array(strtolower($value), ['false', '0', 'off', 'no'])) {
-			$valueBool = false;
-		} else {
-			throw new TypeConflictException('Value cannot be converted to boolean');
-		}
-		if ($entry?->hasOption(ConfigLexiconEntry::RENAME_INVERT_BOOLEAN) === true) {
-			$valueBool = !$valueBool;
-		}
-
-		return $valueBool;
-	}
-
-	public function convertToArray(string $value): array {
-		try {
-			$valueArray = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-		} catch (JsonException) {
-			throw new TypeConflictException('Value is not a valid json');
-		}
-		if (!is_array($valueArray)) {
-			throw new TypeConflictException('Value is not an array');
-		}
-
-		return $valueArray;
-	}
+    /** @var AppConfig|null $appConfig */
+    private ?IAppConfig $appConfig = null;
+    /** @var UserConfig|null $userConfig */
+    private ?IUserConfig $userConfig = null;
+
+    public function __construct(
+        private readonly LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * Use the rename values from the list of ConfigLexiconEntry defined in each app ConfigLexicon
+     * to migrate config value to a new config key.
+     * Migration will only occur if new config key has no value in database.
+     * The previous value from the key set in rename will be deleted from the database when migration
+     * is over.
+     *
+     * This method should be mainly called during a new upgrade or when a new app is enabled.
+     *
+     * @see ConfigLexiconEntry
+     * @internal
+     * @since 32.0.0
+     * @param string|null $appId when set to NULL the method will be executed for all enabled apps of the instance
+     */
+    public function migrateConfigLexiconKeys(?string $appId = null): void {
+        if ($appId === null) {
+            $this->migrateConfigLexiconKeys('core');
+            $appManager = Server::get(IAppManager::class);
+            foreach ($appManager->getEnabledApps() as $app) {
+                $this->migrateConfigLexiconKeys($app);
+            }
+
+            return;
+        }
+
+        $this->loadConfigServices();
+
+        // it is required to ignore aliases when moving config values
+        $this->appConfig->ignoreLexiconAliases(true);
+        $this->userConfig->ignoreLexiconAliases(true);
+
+        $this->migrateAppConfigKeys($appId);
+        $this->migrateUserConfigKeys($appId);
+
+        // switch back to normal behavior
+        $this->appConfig->ignoreLexiconAliases(false);
+        $this->userConfig->ignoreLexiconAliases(false);
+    }
+
+    /**
+     * config services cannot be load at __construct() or install will fail
+     */
+    private function loadConfigServices(): void {
+        if ($this->appConfig === null) {
+            $this->appConfig = Server::get(IAppConfig::class);
+        }
+        if ($this->userConfig === null) {
+            $this->userConfig = Server::get(IUserConfig::class);
+        }
+    }
+
+    /**
+     * Get details from lexicon related to AppConfig and search for entries with rename to initiate
+     * a migration to new config key
+     */
+    private function migrateAppConfigKeys(string $appId): void {
+        $lexicon = $this->appConfig->getConfigDetailsFromLexicon($appId);
+        foreach ($lexicon['entries'] as $entry) {
+            // only interested in entries with rename set
+            if ($entry->getRename() === null) {
+                continue;
+            }
+
+            // only migrate if rename config key has a value and the new config key hasn't
+            if ($this->appConfig->hasKey($appId, $entry->getRename())
+                && !$this->appConfig->hasKey($appId, $entry->getKey())) {
+                try {
+                    $this->migrateAppConfigValue($appId, $entry);
+                } catch (TypeConflictException $e) {
+                    $this->logger->error('could not migrate AppConfig value', ['appId' => $appId, 'entry' => $entry, 'exception' => $e]);
+                    continue;
+                }
+            }
+
+            // we only delete previous config value if migration went fine.
+            $this->appConfig->deleteKey($appId, $entry->getRename());
+        }
+    }
+
+    /**
+     * Get details from lexicon related to UserConfig and search for entries with rename to initiate
+     * a migration to new config key
+     */
+    private function migrateUserConfigKeys(string $appId): void {
+        $lexicon = $this->userConfig->getConfigDetailsFromLexicon($appId);
+        foreach ($lexicon['entries'] as $entry) {
+            // only interested in keys with rename set
+            if ($entry->getRename() === null) {
+                continue;
+            }
+
+            foreach ($this->userConfig->getValuesByUsers($appId, $entry->getRename()) as $userId => $value) {
+                if ($this->userConfig->hasKey($userId, $appId, $entry->getKey())) {
+                    continue;
+                }
+
+                try {
+                    $this->migrateUserConfigValue($userId, $appId, $entry);
+                } catch (TypeConflictException $e) {
+                    $this->logger->error('could not migrate UserConfig value', ['userId' => $userId, 'appId' => $appId, 'entry' => $entry, 'exception' => $e]);
+                    continue;
+                }
+
+                $this->userConfig->deleteUserConfig($userId, $appId, $entry->getRename());
+            }
+        }
+    }
+
+
+    /**
+     * converting value from rename to the new key
+     *
+     * @throws TypeConflictException if previous value does not fit the expected type
+     */
+    private function migrateAppConfigValue(string $appId, ConfigLexiconEntry $entry): void {
+        $value = $this->appConfig->getValueMixed($appId, $entry->getRename(), lazy: null);
+        switch ($entry->getValueType()) {
+            case ValueType::STRING:
+                $this->appConfig->setValueString($appId, $entry->getKey(), $value);
+                return;
+
+            case ValueType::INT:
+                $this->appConfig->setValueInt($appId, $entry->getKey(), $this->convertToInt($value));
+                return;
+
+            case ValueType::FLOAT:
+                $this->appConfig->setValueFloat($appId, $entry->getKey(), $this->convertToFloat($value));
+                return;
+
+            case ValueType::BOOL:
+                $this->appConfig->setValueBool($appId, $entry->getKey(), $this->convertToBool($value, $entry));
+                return;
+
+            case ValueType::ARRAY:
+                $this->appConfig->setValueArray($appId, $entry->getKey(), $this->convertToArray($value));
+                return;
+        }
+    }
+
+    /**
+     * converting value from rename to the new key
+     *
+     * @throws TypeConflictException if previous value does not fit the expected type
+     */
+    private function migrateUserConfigValue(string $userId, string $appId, ConfigLexiconEntry $entry): void {
+        $value = $this->userConfig->getValueMixed($userId, $appId, $entry->getRename(), lazy: null);
+        switch ($entry->getValueType()) {
+            case ValueType::STRING:
+                $this->userConfig->setValueString($userId, $appId, $entry->getKey(), $value);
+                return;
+
+            case ValueType::INT:
+                $this->userConfig->setValueInt($userId, $appId, $entry->getKey(), $this->convertToInt($value));
+                return;
+
+            case ValueType::FLOAT:
+                $this->userConfig->setValueFloat($userId, $appId, $entry->getKey(), $this->convertToFloat($value));
+                return;
+
+            case ValueType::BOOL:
+                $this->userConfig->setValueBool($userId, $appId, $entry->getKey(), $this->convertToBool($value, $entry));
+                return;
+
+            case ValueType::ARRAY:
+                $this->userConfig->setValueArray($userId, $appId, $entry->getKey(), $this->convertToArray($value));
+                return;
+        }
+    }
+
+    public function convertToInt(string $value): int {
+        if (!is_numeric($value) || (float)$value <> (int)$value) {
+            throw new TypeConflictException('Value is not an integer');
+        }
+
+        return (int)$value;
+    }
+
+    public function convertToFloat(string $value): float {
+        if (!is_numeric($value)) {
+            throw new TypeConflictException('Value is not a float');
+        }
+
+        return (float)$value;
+    }
+
+    public function convertToBool(string $value, ?ConfigLexiconEntry $entry = null): bool {
+        if (in_array(strtolower($value), ['true', '1', 'on', 'yes'])) {
+            $valueBool = true;
+        } elseif (in_array(strtolower($value), ['false', '0', 'off', 'no'])) {
+            $valueBool = false;
+        } else {
+            throw new TypeConflictException('Value cannot be converted to boolean');
+        }
+        if ($entry?->hasOption(ConfigLexiconEntry::RENAME_INVERT_BOOLEAN) === true) {
+            $valueBool = !$valueBool;
+        }
+
+        return $valueBool;
+    }
+
+    public function convertToArray(string $value): array {
+        try {
+            $valueArray = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+        } catch (JsonException) {
+            throw new TypeConflictException('Value is not a valid json');
+        }
+        if (!is_array($valueArray)) {
+            throw new TypeConflictException('Value is not an array');
+        }
+
+        return $valueArray;
+    }
 }

lib/private/Config/UserConfig.php

Indentation +1979 added lines, -1979 removed lines

@@ -46,1983 +46,1983 @@
  * @since 31.0.0
  */
 class UserConfig implements IUserConfig {
-	private const USER_MAX_LENGTH = 64;
-	private const APP_MAX_LENGTH = 32;
-	private const KEY_MAX_LENGTH = 64;
-	private const INDEX_MAX_LENGTH = 64;
-	private const ENCRYPTION_PREFIX = '$UserConfigEncryption$';
-	private const ENCRYPTION_PREFIX_LENGTH = 22; // strlen(self::ENCRYPTION_PREFIX)
-
-	/** @var array<string, array<string, array<string, mixed>>> [ass'user_id' => ['app_id' => ['key' => 'value']]] */
-	private array $fastCache = [];   // cache for normal config keys
-	/** @var array<string, array<string, array<string, mixed>>> ['user_id' => ['app_id' => ['key' => 'value']]] */
-	private array $lazyCache = [];   // cache for lazy config keys
-	/** @var array<string, array<string, array<string, array<string, mixed>>>> ['user_id' => ['app_id' => ['key' => ['type' => ValueType, 'flags' => bitflag]]]] */
-	private array $valueDetails = [];  // type for all config values
-	/** @var array<string, boolean> ['user_id' => bool] */
-	private array $fastLoaded = [];
-	/** @var array<string, boolean> ['user_id' => bool] */
-	private array $lazyLoaded = [];
-	/** @var array<string, array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
-	private array $configLexiconDetails = [];
-	private bool $ignoreLexiconAliases = false;
-
-	public function __construct(
-		protected IDBConnection $connection,
-		protected IConfig $config,
-		protected LoggerInterface $logger,
-		protected ICrypto $crypto,
-	) {
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $appId optional id of app
-	 *
-	 * @return list<string> list of userIds
-	 * @since 31.0.0
-	 */
-	public function getUserIds(string $appId = ''): array {
-		$this->assertParams(app: $appId, allowEmptyUser: true, allowEmptyApp: true);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->from('preferences');
-		$qb->select('userid');
-		$qb->groupBy('userid');
-		if ($appId !== '') {
-			$qb->where($qb->expr()->eq('appid', $qb->createNamedParameter($appId)));
-		}
-
-		$result = $qb->executeQuery();
-		$rows = $result->fetchAll();
-		$userIds = [];
-		foreach ($rows as $row) {
-			$userIds[] = $row['userid'];
-		}
-
-		return $userIds;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @return list<string> list of app ids
-	 * @since 31.0.0
-	 */
-	public function getApps(string $userId): array {
-		$this->assertParams($userId, allowEmptyApp: true);
-		$this->loadConfigAll($userId);
-		$apps = array_merge(array_keys($this->fastCache[$userId] ?? []), array_keys($this->lazyCache[$userId] ?? []));
-		sort($apps);
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 *
-	 * @return list<string> list of stored config keys
-	 * @since 31.0.0
-	 */
-	public function getKeys(string $userId, string $app): array {
-		$this->assertParams($userId, $app);
-		$this->loadConfigAll($userId);
-		// array_merge() will remove numeric keys (here config keys), so addition arrays instead
-		$keys = array_map('strval', array_keys(($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? [])));
-		sort($keys);
-
-		return array_values(array_unique($keys));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool TRUE if key exists
-	 * @since 31.0.0
-	 */
-	public function hasKey(string $userId, string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfig($userId, $lazy);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		if ($lazy === null) {
-			$appCache = $this->getValues($userId, $app);
-			return isset($appCache[$key]);
-		}
-
-		if ($lazy) {
-			return isset($this->lazyCache[$userId][$app][$key]);
-		}
-
-		return isset($this->fastCache[$userId][$app][$key]);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool
-	 * @throws UnknownKeyException if config key is not known
-	 * @since 31.0.0
-	 */
-	public function isSensitive(string $userId, string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfig($userId, $lazy);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		if (!isset($this->valueDetails[$userId][$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		return $this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags']);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool
-	 * @throws UnknownKeyException if config key is not known
-	 * @since 31.0.0
-	 */
-	public function isIndexed(string $userId, string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfig($userId, $lazy);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		if (!isset($this->valueDetails[$userId][$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		return $this->isFlagged(self::FLAG_INDEXED, $this->valueDetails[$userId][$app][$key]['flags']);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app if of the app
-	 * @param string $key config key
-	 *
-	 * @return bool TRUE if config is lazy loaded
-	 * @throws UnknownKeyException if config key is not known
-	 * @see IUserConfig for details about lazy loading
-	 * @since 31.0.0
-	 */
-	public function isLazy(string $userId, string $app, string $key): bool {
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		// there is a huge probability the non-lazy config are already loaded
-		// meaning that we can start by only checking if a current non-lazy key exists
-		if ($this->hasKey($userId, $app, $key, false)) {
-			// meaning key is not lazy.
-			return false;
-		}
-
-		// as key is not found as non-lazy, we load and search in the lazy config
-		if ($this->hasKey($userId, $app, $key, true)) {
-			return true;
-		}
-
-		throw new UnknownKeyException('unknown config key');
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $prefix config keys prefix to search
-	 * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
-	 *
-	 * @return array<string, string|int|float|bool|array> [key => value]
-	 * @since 31.0.0
-	 */
-	public function getValues(
-		string $userId,
-		string $app,
-		string $prefix = '',
-		bool $filtered = false,
-	): array {
-		$this->assertParams($userId, $app, $prefix);
-		// if we want to filter values, we need to get sensitivity
-		$this->loadConfigAll($userId);
-		// array_merge() will remove numeric keys (here config keys), so addition arrays instead
-		$values = array_filter(
-			$this->formatAppValues($userId, $app, ($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? []), $filtered),
-			function (string $key) use ($prefix): bool {
-				// filter values based on $prefix
-				return str_starts_with($key, $prefix);
-			}, ARRAY_FILTER_USE_KEY
-		);
-
-		return $values;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
-	 *
-	 * @return array<string, array<string, string|int|float|bool|array>> [appId => [key => value]]
-	 * @since 31.0.0
-	 */
-	public function getAllValues(string $userId, bool $filtered = false): array {
-		$this->assertParams($userId, allowEmptyApp: true);
-		$this->loadConfigAll($userId);
-
-		$result = [];
-		foreach ($this->getApps($userId) as $app) {
-			// array_merge() will remove numeric keys (here config keys), so addition arrays instead
-			$cached = ($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? []);
-			$result[$app] = $this->formatAppValues($userId, $app, $cached, $filtered);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $key config key
-	 * @param bool $lazy search within lazy loaded config
-	 * @param ValueType|null $typedAs enforce type for the returned values
-	 *
-	 * @return array<string, string|int|float|bool|array> [appId => value]
-	 * @since 31.0.0
-	 */
-	public function getValuesByApps(string $userId, string $key, bool $lazy = false, ?ValueType $typedAs = null): array {
-		$this->assertParams($userId, '', $key, allowEmptyApp: true);
-		$this->loadConfig($userId, $lazy);
-
-		/** @var array<array-key, array<array-key, mixed>> $cache */
-		if ($lazy) {
-			$cache = $this->lazyCache[$userId];
-		} else {
-			$cache = $this->fastCache[$userId];
-		}
-
-		$values = [];
-		foreach (array_keys($cache) as $app) {
-			if (isset($cache[$app][$key])) {
-				$value = $cache[$app][$key];
-				try {
-					$this->decryptSensitiveValue($userId, $app, $key, $value);
-					$value = $this->convertTypedValue($value, $typedAs ?? $this->getValueType($userId, $app, $key, $lazy));
-				} catch (IncorrectTypeException|UnknownKeyException) {
-				}
-				$values[$app] = $value;
-			}
-		}
-
-		return $values;
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param ValueType|null $typedAs enforce type for the returned values
-	 * @param array|null $userIds limit to a list of user ids
-	 *
-	 * @return array<string, string|int|float|bool|array> [userId => value]
-	 * @since 31.0.0
-	 */
-	public function getValuesByUsers(
-		string $app,
-		string $key,
-		?ValueType $typedAs = null,
-		?array $userIds = null,
-	): array {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('userid', 'configvalue', 'type')
-			->from('preferences')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-
-		$values = [];
-		// this nested function will execute current Query and store result within $values.
-		$executeAndStoreValue = function (IQueryBuilder $qb) use (&$values, $typedAs): IResult {
-			$result = $qb->executeQuery();
-			while ($row = $result->fetch()) {
-				$value = $row['configvalue'];
-				try {
-					$value = $this->convertTypedValue($value, $typedAs ?? ValueType::from((int)$row['type']));
-				} catch (IncorrectTypeException) {
-				}
-				$values[$row['userid']] = $value;
-			}
-			return $result;
-		};
-
-		// if no userIds to filter, we execute query as it is and returns all values ...
-		if ($userIds === null) {
-			$result = $executeAndStoreValue($qb);
-			$result->closeCursor();
-			return $values;
-		}
-
-		// if userIds to filter, we chunk the list and execute the same query multiple times until we get all values
-		$result = null;
-		$qb->andWhere($qb->expr()->in('userid', $qb->createParameter('userIds')));
-		foreach (array_chunk($userIds, 50, true) as $chunk) {
-			$qb->setParameter('userIds', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $executeAndStoreValue($qb);
-		}
-		$result?->closeCursor();
-
-		return $values;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $caseInsensitive non-case-sensitive search, only works if $value is a string
-	 *
-	 * @return Generator<string>
-	 * @since 31.0.0
-	 */
-	public function searchUsersByValueString(string $app, string $key, string $value, bool $caseInsensitive = false): Generator {
-		return $this->searchUsersByTypedValue($app, $key, $value, $caseInsensitive);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $value config value
-	 *
-	 * @return Generator<string>
-	 * @since 31.0.0
-	 */
-	public function searchUsersByValueInt(string $app, string $key, int $value): Generator {
-		return $this->searchUsersByValueString($app, $key, (string)$value);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $values list of config values
-	 *
-	 * @return Generator<string>
-	 * @since 31.0.0
-	 */
-	public function searchUsersByValues(string $app, string $key, array $values): Generator {
-		return $this->searchUsersByTypedValue($app, $key, $values);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $value config value
-	 *
-	 * @return Generator<string>
-	 * @since 31.0.0
-	 */
-	public function searchUsersByValueBool(string $app, string $key, bool $value): Generator {
-		$values = ['0', 'off', 'false', 'no'];
-		if ($value) {
-			$values = ['1', 'on', 'true', 'yes'];
-		}
-		return $this->searchUsersByValues($app, $key, $values);
-	}
-
-	/**
-	 * returns a list of users with config key set to a specific value, or within the list of
-	 * possible values
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @param string|array $value
-	 * @param bool $caseInsensitive
-	 *
-	 * @return Generator<string>
-	 */
-	private function searchUsersByTypedValue(string $app, string $key, string|array $value, bool $caseInsensitive = false): Generator {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->from('preferences');
-		$qb->select('userid');
-		$qb->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
-		$qb->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-
-		// search within 'indexed' OR 'configvalue' only if 'flags' is set as not indexed
-		// TODO: when implementing config lexicon remove the searches on 'configvalue' if value is set as indexed
-		$configValueColumn = ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) ? $qb->expr()->castColumn('configvalue', IQueryBuilder::PARAM_STR) : 'configvalue';
-		if (is_array($value)) {
-			$where = $qb->expr()->orX(
-				$qb->expr()->in('indexed', $qb->createNamedParameter($value, IQueryBuilder::PARAM_STR_ARRAY)),
-				$qb->expr()->andX(
-					$qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
-					$qb->expr()->in($configValueColumn, $qb->createNamedParameter($value, IQueryBuilder::PARAM_STR_ARRAY))
-				)
-			);
-		} else {
-			if ($caseInsensitive) {
-				$where = $qb->expr()->orX(
-					$qb->expr()->eq($qb->func()->lower('indexed'), $qb->createNamedParameter(strtolower($value))),
-					$qb->expr()->andX(
-						$qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
-						$qb->expr()->eq($qb->func()->lower($configValueColumn), $qb->createNamedParameter(strtolower($value)))
-					)
-				);
-			} else {
-				$where = $qb->expr()->orX(
-					$qb->expr()->eq('indexed', $qb->createNamedParameter($value)),
-					$qb->expr()->andX(
-						$qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
-						$qb->expr()->eq($configValueColumn, $qb->createNamedParameter($value))
-					)
-				);
-			}
-		}
-
-		$qb->andWhere($where);
-		$result = $qb->executeQuery();
-		while ($row = $result->fetch()) {
-			yield $row['userid'];
-		}
-	}
-
-	/**
-	 * Get the config value as string.
-	 * If the value does not exist the given default will be returned.
-	 *
-	 * Set lazy to `null` to ignore it and get the value from either source.
-	 *
-	 * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default config value
-	 * @param null|bool $lazy get config as lazy loaded or not. can be NULL
-	 *
-	 * @return string the value or $default
-	 * @throws TypeConflictException
-	 * @internal
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 * @see getValueString()
-	 * @see getValueInt()
-	 * @see getValueFloat()
-	 * @see getValueBool()
-	 * @see getValueArray()
-	 */
-	public function getValueMixed(
-		string $userId,
-		string $app,
-		string $key,
-		string $default = '',
-		?bool $lazy = false,
-	): string {
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-		try {
-			$lazy ??= $this->isLazy($userId, $app, $key);
-		} catch (UnknownKeyException) {
-			return $default;
-		}
-
-		return $this->getTypedValue(
-			$userId,
-			$app,
-			$key,
-			$default,
-			$lazy,
-			ValueType::MIXED
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return string stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws TypeConflictException in case of conflict with the value type set in database
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function getValueString(
-		string $userId,
-		string $app,
-		string $key,
-		string $default = '',
-		bool $lazy = false,
-	): string {
-		return $this->getTypedValue($userId, $app, $key, $default, $lazy, ValueType::STRING);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return int stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws TypeConflictException in case of conflict with the value type set in database
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function getValueInt(
-		string $userId,
-		string $app,
-		string $key,
-		int $default = 0,
-		bool $lazy = false,
-	): int {
-		return (int)$this->getTypedValue($userId, $app, $key, (string)$default, $lazy, ValueType::INT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return float stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws TypeConflictException in case of conflict with the value type set in database
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function getValueFloat(
-		string $userId,
-		string $app,
-		string $key,
-		float $default = 0,
-		bool $lazy = false,
-	): float {
-		return (float)$this->getTypedValue($userId, $app, $key, (string)$default, $lazy, ValueType::FLOAT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return bool stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws TypeConflictException in case of conflict with the value type set in database
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function getValueBool(
-		string $userId,
-		string $app,
-		string $key,
-		bool $default = false,
-		bool $lazy = false,
-	): bool {
-		$b = strtolower($this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::BOOL));
-		return in_array($b, ['1', 'true', 'yes', 'on']);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return array stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws TypeConflictException in case of conflict with the value type set in database
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function getValueArray(
-		string $userId,
-		string $app,
-		string $key,
-		array $default = [],
-		bool $lazy = false,
-	): array {
-		try {
-			$defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
-			$value = json_decode($this->getTypedValue($userId, $app, $key, $defaultJson, $lazy, ValueType::ARRAY), true, flags: JSON_THROW_ON_ERROR);
-
-			return is_array($value) ? $value : [];
-		} catch (JsonException) {
-			return [];
-		}
-	}
-
-	/**
-	 * @param string $userId
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 * @param ValueType $type value type
-	 *
-	 * @return string
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 */
-	private function getTypedValue(
-		string $userId,
-		string $app,
-		string $key,
-		string $default,
-		bool $lazy,
-		ValueType $type,
-	): string {
-		$this->assertParams($userId, $app, $key);
-		$origKey = $key;
-		if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, default: $default)) {
-			// returns default if strictness of lexicon is set to WARNING (block and report)
-			return $default;
-		}
-		$this->loadConfig($userId, $lazy);
-
-		/**
-		 * We ignore check if mixed type is requested.
-		 * If type of stored value is set as mixed, we don't filter.
-		 * If type of stored value is defined, we compare with the one requested.
-		 */
-		$knownType = $this->valueDetails[$userId][$app][$key]['type'] ?? null;
-		if ($type !== ValueType::MIXED
-			&& $knownType !== null
-			&& $knownType !== ValueType::MIXED
-			&& $type !== $knownType) {
-			$this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
-			throw new TypeConflictException('conflict with value type from database');
-		}
-
-		/**
-		 * - the pair $app/$key cannot exist in both array,
-		 * - we should still return an existing non-lazy value even if current method
-		 *   is called with $lazy is true
-		 *
-		 * This way, lazyCache will be empty until the load for lazy config value is requested.
-		 */
-		if (isset($this->lazyCache[$userId][$app][$key])) {
-			$value = $this->lazyCache[$userId][$app][$key];
-		} elseif (isset($this->fastCache[$userId][$app][$key])) {
-			$value = $this->fastCache[$userId][$app][$key];
-		} else {
-			return $default;
-		}
-
-		$this->decryptSensitiveValue($userId, $app, $key, $value);
-
-		// in case the key was modified while running matchAndApplyLexiconDefinition() we are
-		// interested to check options in case a modification of the value is needed
-		// ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
-		if ($origKey !== $key && $type === ValueType::BOOL) {
-			$configManager = Server::get(ConfigManager::class);
-			$value = ($configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return ValueType type of the value
-	 * @throws UnknownKeyException if config key is not known
-	 * @throws IncorrectTypeException if config value type is not known
-	 * @since 31.0.0
-	 */
-	public function getValueType(string $userId, string $app, string $key, ?bool $lazy = null): ValueType {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfig($userId, $lazy);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		if (!isset($this->valueDetails[$userId][$app][$key]['type'])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		return $this->valueDetails[$userId][$app][$key]['type'];
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $lazy lazy loading
-	 *
-	 * @return int flags applied to value
-	 * @throws UnknownKeyException if config key is not known
-	 * @throws IncorrectTypeException if config value type is not known
-	 * @since 31.0.0
-	 */
-	public function getValueFlags(string $userId, string $app, string $key, bool $lazy = false): int {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfig($userId, $lazy);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		if (!isset($this->valueDetails[$userId][$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		return $this->valueDetails[$userId][$app][$key]['flags'];
-	}
-
-	/**
-	 * Store a config key and its value in database as VALUE_MIXED
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED
-	 * @internal
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 * @see setValueString()
-	 * @see setValueInt()
-	 * @see setValueFloat()
-	 * @see setValueBool()
-	 * @see setValueArray()
-	 */
-	public function setValueMixed(
-		string $userId,
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		return $this->setTypedValue(
-			$userId,
-			$app,
-			$key,
-			$value,
-			$lazy,
-			$flags,
-			ValueType::MIXED
-		);
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function setValueString(
-		string $userId,
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		return $this->setTypedValue(
-			$userId,
-			$app,
-			$key,
-			$value,
-			$lazy,
-			$flags,
-			ValueType::STRING
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function setValueInt(
-		string $userId,
-		string $app,
-		string $key,
-		int $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		if ($value > 2000000000) {
-			$this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
-		}
-
-		return $this->setTypedValue(
-			$userId,
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			$flags,
-			ValueType::INT
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function setValueFloat(
-		string $userId,
-		string $app,
-		string $key,
-		float $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		return $this->setTypedValue(
-			$userId,
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			$flags,
-			ValueType::FLOAT
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function setValueBool(
-		string $userId,
-		string $app,
-		string $key,
-		bool $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		return $this->setTypedValue(
-			$userId,
-			$app,
-			$key,
-			($value) ? '1' : '0',
-			$lazy,
-			$flags,
-			ValueType::BOOL
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @throws JsonException
-	 * @since 31.0.0
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	public function setValueArray(
-		string $userId,
-		string $app,
-		string $key,
-		array $value,
-		bool $lazy = false,
-		int $flags = 0,
-	): bool {
-		try {
-			return $this->setTypedValue(
-				$userId,
-				$app,
-				$key,
-				json_encode($value, JSON_THROW_ON_ERROR),
-				$lazy,
-				$flags,
-				ValueType::ARRAY
-			);
-		} catch (JsonException $e) {
-			$this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
-			throw $e;
-		}
-	}
-
-	/**
-	 * Store a config key and its value in database
-	 *
-	 * If config key is already known with the exact same config value and same sensitive/lazy status, the
-	 * database is not updated. If config value was previously stored as sensitive, status will not be
-	 * altered.
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy config set as lazy loaded
-	 * @param ValueType $type value type
-	 *
-	 * @return bool TRUE if value was updated in database
-	 * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @see IUserConfig for explanation about lazy loading
-	 */
-	private function setTypedValue(
-		string $userId,
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy,
-		int $flags,
-		ValueType $type,
-	): bool {
-		// Primary email addresses are always(!) expected to be lowercase
-		if ($app === 'settings' && $key === 'email') {
-			$value = strtolower($value);
-		}
-
-		$this->assertParams($userId, $app, $key);
-		if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, $flags)) {
-			// returns false as database is not updated
-			return false;
-		}
-		$this->loadConfig($userId, $lazy);
-
-		$inserted = $refreshCache = false;
-		$origValue = $value;
-		$sensitive = $this->isFlagged(self::FLAG_SENSITIVE, $flags);
-		if ($sensitive || ($this->hasKey($userId, $app, $key, $lazy) && $this->isSensitive($userId, $app, $key, $lazy))) {
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-			$flags |= self::FLAG_SENSITIVE;
-		}
-
-		// if requested, we fill the 'indexed' field with current value
-		$indexed = '';
-		if ($type !== ValueType::ARRAY && $this->isFlagged(self::FLAG_INDEXED, $flags)) {
-			if ($this->isFlagged(self::FLAG_SENSITIVE, $flags)) {
-				$this->logger->warning('sensitive value are not to be indexed');
-			} elseif (strlen($value) > self::USER_MAX_LENGTH) {
-				$this->logger->warning('value is too lengthy to be indexed');
-			} else {
-				$indexed = $value;
-			}
-		}
-
-		if ($this->hasKey($userId, $app, $key, $lazy)) {
-			/**
-			 * no update if key is already known with set lazy status and value is
-			 * not different, unless sensitivity is switched from false to true.
-			 */
-			if ($origValue === $this->getTypedValue($userId, $app, $key, $value, $lazy, $type)
-				&& (!$sensitive || $this->isSensitive($userId, $app, $key, $lazy))) {
-				return false;
-			}
-		} else {
-			/**
-			 * if key is not known yet, we try to insert.
-			 * It might fail if the key exists with a different lazy flag.
-			 */
-			try {
-				$insert = $this->connection->getQueryBuilder();
-				$insert->insert('preferences')
-					->setValue('userid', $insert->createNamedParameter($userId))
-					->setValue('appid', $insert->createNamedParameter($app))
-					->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-					->setValue('type', $insert->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
-					->setValue('flags', $insert->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
-					->setValue('indexed', $insert->createNamedParameter($indexed))
-					->setValue('configkey', $insert->createNamedParameter($key))
-					->setValue('configvalue', $insert->createNamedParameter($value));
-				$insert->executeStatement();
-				$inserted = true;
-			} catch (DBException $e) {
-				if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					// TODO: throw exception or just log and returns false !?
-					throw $e;
-				}
-			}
-		}
-
-		/**
-		 * We cannot insert a new row, meaning we need to update an already existing one
-		 */
-		if (!$inserted) {
-			$currType = $this->valueDetails[$userId][$app][$key]['type'] ?? null;
-			if ($currType === null) { // this might happen when switching lazy loading status
-				$this->loadConfigAll($userId);
-				$currType = $this->valueDetails[$userId][$app][$key]['type'];
-			}
-
-			/**
-			 * We only log a warning and set it to VALUE_MIXED.
-			 */
-			if ($currType === null) {
-				$this->logger->warning('Value type is set to zero (0) in database. This is not supposed to happens', ['app' => $app, 'key' => $key]);
-				$currType = ValueType::MIXED;
-			}
-
-			/**
-			 * we only accept a different type from the one stored in database
-			 * if the one stored in database is not-defined (VALUE_MIXED)
-			 */
-			if ($currType !== ValueType::MIXED &&
-				$currType !== $type) {
-				try {
-					$currTypeDef = $currType->getDefinition();
-					$typeDef = $type->getDefinition();
-				} catch (IncorrectTypeException) {
-					$currTypeDef = $currType->value;
-					$typeDef = $type->value;
-				}
-				throw new TypeConflictException('conflict between new type (' . $typeDef . ') and old type (' . $currTypeDef . ')');
-			}
-
-			if ($lazy !== $this->isLazy($userId, $app, $key)) {
-				$refreshCache = true;
-			}
-
-			$update = $this->connection->getQueryBuilder();
-			$update->update('preferences')
-				->set('configvalue', $update->createNamedParameter($value))
-				->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-				->set('type', $update->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
-				->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
-				->set('indexed', $update->createNamedParameter($indexed))
-				->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
-				->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
-				->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-
-			$update->executeStatement();
-		}
-
-		if ($refreshCache) {
-			$this->clearCache($userId);
-			return true;
-		}
-
-		// update local cache
-		if ($lazy) {
-			$this->lazyCache[$userId][$app][$key] = $value;
-		} else {
-			$this->fastCache[$userId][$app][$key] = $value;
-		}
-		$this->valueDetails[$userId][$app][$key] = [
-			'type' => $type,
-			'flags' => $flags
-		];
-
-		return true;
-	}
-
-	/**
-	 * Change the type of config value.
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it may break things.
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param ValueType $type value type
-	 *
-	 * @return bool TRUE if database update were necessary
-	 * @throws UnknownKeyException if $key is now known in database
-	 * @throws IncorrectTypeException if $type is not valid
-	 * @internal
-	 * @since 31.0.0
-	 */
-	public function updateType(string $userId, string $app, string $key, ValueType $type = ValueType::MIXED): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfigAll($userId);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-		$this->isLazy($userId, $app, $key); // confirm key exists
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('preferences')
-			->set('type', $update->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
-			->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->valueDetails[$userId][$app][$key]['type'] = $type;
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 31.0.0
-	 */
-	public function updateSensitive(string $userId, string $app, string $key, bool $sensitive): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfigAll($userId);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		try {
-			if ($sensitive === $this->isSensitive($userId, $app, $key, null)) {
-				return false;
-			}
-		} catch (UnknownKeyException) {
-			return false;
-		}
-
-		$lazy = $this->isLazy($userId, $app, $key);
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		if (!isset($cache[$userId][$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		$value = $cache[$userId][$app][$key];
-		$flags = $this->getValueFlags($userId, $app, $key);
-		if ($sensitive) {
-			$flags |= self::FLAG_SENSITIVE;
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-		} else {
-			$flags &= ~self::FLAG_SENSITIVE;
-			$this->decryptSensitiveValue($userId, $app, $key, $value);
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('preferences')
-			->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
-			->set('configvalue', $update->createNamedParameter($value))
-			->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
-			->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->valueDetails[$userId][$app][$key]['flags'] = $flags;
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @param bool $sensitive
-	 *
-	 * @since 31.0.0
-	 */
-	public function updateGlobalSensitive(string $app, string $key, bool $sensitive): void {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		foreach (array_keys($this->getValuesByUsers($app, $key)) as $userId) {
-			try {
-				$this->updateSensitive($userId, $app, $key, $sensitive);
-			} catch (UnknownKeyException) {
-				// should not happen and can be ignored
-			}
-		}
-
-		// we clear all cache
-		$this->clearCacheAll();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId
-	 * @param string $app
-	 * @param string $key
-	 * @param bool $indexed
-	 *
-	 * @return bool
-	 * @throws DBException
-	 * @throws IncorrectTypeException
-	 * @throws UnknownKeyException
-	 * @since 31.0.0
-	 */
-	public function updateIndexed(string $userId, string $app, string $key, bool $indexed): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfigAll($userId);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		try {
-			if ($indexed === $this->isIndexed($userId, $app, $key, null)) {
-				return false;
-			}
-		} catch (UnknownKeyException) {
-			return false;
-		}
-
-		$lazy = $this->isLazy($userId, $app, $key);
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		if (!isset($cache[$userId][$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		$value = $cache[$userId][$app][$key];
-		$flags = $this->getValueFlags($userId, $app, $key);
-		if ($indexed) {
-			$indexed = $value;
-		} else {
-			$flags &= ~self::FLAG_INDEXED;
-			$indexed = '';
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('preferences')
-			->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
-			->set('indexed', $update->createNamedParameter($indexed))
-			->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
-			->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->valueDetails[$userId][$app][$key]['flags'] = $flags;
-
-		return true;
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app
-	 * @param string $key
-	 * @param bool $indexed
-	 *
-	 * @since 31.0.0
-	 */
-	public function updateGlobalIndexed(string $app, string $key, bool $indexed): void {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		foreach (array_keys($this->getValuesByUsers($app, $key)) as $userId) {
-			try {
-				$this->updateIndexed($userId, $app, $key, $indexed);
-			} catch (UnknownKeyException) {
-				// should not happen and can be ignored
-			}
-		}
-
-		// we clear all cache
-		$this->clearCacheAll();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 31.0.0
-	 */
-	public function updateLazy(string $userId, string $app, string $key, bool $lazy): bool {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfigAll($userId);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		try {
-			if ($lazy === $this->isLazy($userId, $app, $key)) {
-				return false;
-			}
-		} catch (UnknownKeyException) {
-			return false;
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('preferences')
-			->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
-			->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		// At this point, it is a lot safer to clean cache
-		$this->clearCache($userId);
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
-	 *
-	 * @since 31.0.0
-	 */
-	public function updateGlobalLazy(string $app, string $key, bool $lazy): void {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('preferences')
-			->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->clearCacheAll();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return array
-	 * @throws UnknownKeyException if config key is not known in database
-	 * @since 31.0.0
-	 */
-	public function getDetails(string $userId, string $app, string $key): array {
-		$this->assertParams($userId, $app, $key);
-		$this->loadConfigAll($userId);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		$lazy = $this->isLazy($userId, $app, $key);
-
-		if ($lazy) {
-			$cache = $this->lazyCache[$userId];
-		} else {
-			$cache = $this->fastCache[$userId];
-		}
-
-		$type = $this->getValueType($userId, $app, $key);
-		try {
-			$typeString = $type->getDefinition();
-		} catch (IncorrectTypeException $e) {
-			$this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
-			$typeString = (string)$type->value;
-		}
-
-		if (!isset($cache[$app][$key])) {
-			throw new UnknownKeyException('unknown config key');
-		}
-
-		$value = $cache[$app][$key];
-		$sensitive = $this->isSensitive($userId, $app, $key, null);
-		$this->decryptSensitiveValue($userId, $app, $key, $value);
-
-		return [
-			'userId' => $userId,
-			'app' => $app,
-			'key' => $key,
-			'value' => $value,
-			'type' => $type->value,
-			'lazy' => $lazy,
-			'typeString' => $typeString,
-			'sensitive' => $sensitive
-		];
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @since 31.0.0
-	 */
-	public function deleteUserConfig(string $userId, string $app, string $key): void {
-		$this->assertParams($userId, $app, $key);
-		$this->matchAndApplyLexiconDefinition($userId, $app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preferences')
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)))
-			->andWhere($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-		$qb->executeStatement();
-
-		unset($this->lazyCache[$userId][$app][$key]);
-		unset($this->fastCache[$userId][$app][$key]);
-		unset($this->valueDetails[$userId][$app][$key]);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @since 31.0.0
-	 */
-	public function deleteKey(string $app, string $key): void {
-		$this->assertParams('', $app, $key, allowEmptyUser: true);
-		$this->matchAndApplyLexiconDefinition('', $app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preferences')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-		$qb->executeStatement();
-
-		$this->clearCacheAll();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 *
-	 * @since 31.0.0
-	 */
-	public function deleteApp(string $app): void {
-		$this->assertParams('', $app, allowEmptyUser: true);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preferences')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
-		$qb->executeStatement();
-
-		$this->clearCacheAll();
-	}
-
-	public function deleteAllUserConfig(string $userId): void {
-		$this->assertParams($userId, '', allowEmptyApp: true);
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('preferences')
-			->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)));
-		$qb->executeStatement();
-
-		$this->clearCache($userId);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $userId id of the user
-	 * @param bool $reload set to TRUE to refill cache instantly after clearing it.
-	 *
-	 * @since 31.0.0
-	 */
-	public function clearCache(string $userId, bool $reload = false): void {
-		$this->assertParams($userId, allowEmptyApp: true);
-		$this->lazyLoaded[$userId] = $this->fastLoaded[$userId] = false;
-		$this->lazyCache[$userId] = $this->fastCache[$userId] = $this->valueDetails[$userId] = [];
-
-		if (!$reload) {
-			return;
-		}
-
-		$this->loadConfigAll($userId);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @since 31.0.0
-	 */
-	public function clearCacheAll(): void {
-		$this->lazyLoaded = $this->fastLoaded = [];
-		$this->lazyCache = $this->fastCache = $this->valueDetails = [];
-	}
-
-	/**
-	 * For debug purpose.
-	 * Returns the cached data.
-	 *
-	 * @return array
-	 * @since 31.0.0
-	 * @internal
-	 */
-	public function statusCache(): array {
-		return [
-			'fastLoaded' => $this->fastLoaded,
-			'fastCache' => $this->fastCache,
-			'lazyLoaded' => $this->lazyLoaded,
-			'lazyCache' => $this->lazyCache,
-			'valueDetails' => $this->valueDetails,
-		];
-	}
-
-	/**
-	 * @param int $needle bitflag to search
-	 * @param int $flags all flags
-	 *
-	 * @return bool TRUE if bitflag $needle is set in $flags
-	 */
-	private function isFlagged(int $needle, int $flags): bool {
-		return (($needle & $flags) !== 0);
-	}
-
-	/**
-	 * Confirm the string set for app and key fit the database description
-	 *
-	 * @param string $userId
-	 * @param string $app assert $app fit in database
-	 * @param string $prefKey assert config key fit in database
-	 * @param bool $allowEmptyUser
-	 * @param bool $allowEmptyApp $app can be empty string
-	 * @param ValueType|null $valueType assert value type is only one type
-	 */
-	private function assertParams(
-		string $userId = '',
-		string $app = '',
-		string $prefKey = '',
-		bool $allowEmptyUser = false,
-		bool $allowEmptyApp = false,
-	): void {
-		if (!$allowEmptyUser && $userId === '') {
-			throw new InvalidArgumentException('userId cannot be an empty string');
-		}
-		if (!$allowEmptyApp && $app === '') {
-			throw new InvalidArgumentException('app cannot be an empty string');
-		}
-		if (strlen($userId) > self::USER_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $userId . ') for userId is too long (' . self::USER_MAX_LENGTH . ')');
-		}
-		if (strlen($app) > self::APP_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')');
-		}
-		if (strlen($prefKey) > self::KEY_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $prefKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
-		}
-	}
-
-	private function loadConfigAll(string $userId): void {
-		$this->loadConfig($userId, null);
-	}
-
-	/**
-	 * Load normal config or config set as lazy loaded
-	 *
-	 * @param bool|null $lazy set to TRUE to load config set as lazy loaded, set to NULL to load all config
-	 */
-	private function loadConfig(string $userId, ?bool $lazy = false): void {
-		if ($this->isLoaded($userId, $lazy)) {
-			return;
-		}
-
-		if (($lazy ?? true) !== false) { // if lazy is null or true, we debug log
-			$this->logger->debug('The loading of lazy UserConfig values have been requested', ['exception' => new \RuntimeException('ignorable exception')]);
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->from('preferences');
-		$qb->select('appid', 'configkey', 'configvalue', 'type', 'flags');
-		$qb->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)));
-
-		// we only need value from lazy when loadConfig does not specify it
-		if ($lazy !== null) {
-			$qb->andWhere($qb->expr()->eq('lazy', $qb->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)));
-		} else {
-			$qb->addSelect('lazy');
-		}
-
-		$result = $qb->executeQuery();
-		$rows = $result->fetchAll();
-		foreach ($rows as $row) {
-			if (($row['lazy'] ?? ($lazy ?? 0) ? 1 : 0) === 1) {
-				$this->lazyCache[$userId][$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			} else {
-				$this->fastCache[$userId][$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			}
-			$this->valueDetails[$userId][$row['appid']][$row['configkey']] = ['type' => ValueType::from((int)($row['type'] ?? 0)), 'flags' => (int)$row['flags']];
-		}
-		$result->closeCursor();
-		$this->setAsLoaded($userId, $lazy);
-	}
-
-	/**
-	 * if $lazy is:
-	 *  - false: will returns true if fast config are loaded
-	 *  - true : will returns true if lazy config are loaded
-	 *  - null : will returns true if both config are loaded
-	 *
-	 * @param string $userId
-	 * @param bool $lazy
-	 *
-	 * @return bool
-	 */
-	private function isLoaded(string $userId, ?bool $lazy): bool {
-		if ($lazy === null) {
-			return ($this->lazyLoaded[$userId] ?? false) && ($this->fastLoaded[$userId] ?? false);
-		}
-
-		return $lazy ? $this->lazyLoaded[$userId] ?? false : $this->fastLoaded[$userId] ?? false;
-	}
-
-	/**
-	 * if $lazy is:
-	 * - false: set fast config as loaded
-	 * - true : set lazy config as loaded
-	 * - null : set both config as loaded
-	 *
-	 * @param string $userId
-	 * @param bool $lazy
-	 */
-	private function setAsLoaded(string $userId, ?bool $lazy): void {
-		if ($lazy === null) {
-			$this->fastLoaded[$userId] = $this->lazyLoaded[$userId] = true;
-			return;
-		}
-
-		// We also create empty entry to keep both fastLoaded/lazyLoaded synced
-		if ($lazy) {
-			$this->lazyLoaded[$userId] = true;
-			$this->fastLoaded[$userId] = $this->fastLoaded[$userId] ?? false;
-			$this->fastCache[$userId] = $this->fastCache[$userId] ?? [];
-		} else {
-			$this->fastLoaded[$userId] = true;
-			$this->lazyLoaded[$userId] = $this->lazyLoaded[$userId] ?? false;
-			$this->lazyCache[$userId] = $this->lazyCache[$userId] ?? [];
-		}
-	}
-
-	/**
-	 * **Warning:** this will load all lazy values from the database
-	 *
-	 * @param string $userId id of the user
-	 * @param string $app id of the app
-	 * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
-	 *
-	 * @return array<string, string|int|float|bool|array>
-	 */
-	private function formatAppValues(string $userId, string $app, array $values, bool $filtered = false): array {
-		foreach ($values as $key => $value) {
-			//$key = (string)$key;
-			try {
-				$type = $this->getValueType($userId, $app, (string)$key);
-			} catch (UnknownKeyException) {
-				continue;
-			}
-
-			if ($this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags'] ?? 0)) {
-				if ($filtered) {
-					$value = IConfig::SENSITIVE_VALUE;
-					$type = ValueType::STRING;
-				} else {
-					$this->decryptSensitiveValue($userId, $app, (string)$key, $value);
-				}
-			}
-
-			$values[$key] = $this->convertTypedValue($value, $type);
-		}
-
-		return $values;
-	}
-
-	/**
-	 * convert string value to the expected type
-	 *
-	 * @param string $value
-	 * @param ValueType $type
-	 *
-	 * @return string|int|float|bool|array
-	 */
-	private function convertTypedValue(string $value, ValueType $type): string|int|float|bool|array {
-		switch ($type) {
-			case ValueType::INT:
-				return (int)$value;
-			case ValueType::FLOAT:
-				return (float)$value;
-			case ValueType::BOOL:
-				return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
-			case ValueType::ARRAY:
-				try {
-					return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-				} catch (JsonException) {
-					// ignoreable
-				}
-				break;
-		}
-		return $value;
-	}
-
-
-	/**
-	 * will change referenced $value with the decrypted value in case of encrypted (sensitive value)
-	 *
-	 * @param string $userId
-	 * @param string $app
-	 * @param string $key
-	 * @param string $value
-	 */
-	private function decryptSensitiveValue(string $userId, string $app, string $key, string &$value): void {
-		if (!$this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags'] ?? 0)) {
-			return;
-		}
-
-		if (!str_starts_with($value, self::ENCRYPTION_PREFIX)) {
-			return;
-		}
-
-		try {
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		} catch (\Exception $e) {
-			$this->logger->warning('could not decrypt sensitive value', [
-				'userId' => $userId,
-				'app' => $app,
-				'key' => $key,
-				'value' => $value,
-				'exception' => $e
-			]);
-		}
-	}
-
-	/**
-	 * Match and apply current use of config values with defined lexicon.
-	 * Set $lazy to NULL only if only interested into checking that $key is alias.
-	 *
-	 * @throws UnknownKeyException
-	 * @throws TypeConflictException
-	 * @return bool FALSE if conflict with defined lexicon were observed in the process
-	 */
-	private function matchAndApplyLexiconDefinition(
-		string $userId,
-		string $app,
-		string &$key,
-		?bool &$lazy = null,
-		ValueType &$type = ValueType::MIXED,
-		int &$flags = 0,
-		string &$default = '',
-	): bool {
-		$configDetails = $this->getConfigDetailsFromLexicon($app);
-		if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
-			// in case '$rename' is set in ConfigLexiconEntry, we use the new config key
-			$key = $configDetails['aliases'][$key];
-		}
-
-		if (!array_key_exists($key, $configDetails['entries'])) {
-			return $this->applyLexiconStrictness($configDetails['strictness'], 'The user config key ' . $app . '/' . $key . ' is not defined in the config lexicon');
-		}
-
-		// if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
-		if ($lazy === null) {
-			return true;
-		}
-
-		/** @var ConfigLexiconEntry $configValue */
-		$configValue = $configDetails['entries'][$key];
-		if ($type === ValueType::MIXED) {
-			// we overwrite if value was requested as mixed
-			$type = $configValue->getValueType();
-		} elseif ($configValue->getValueType() !== $type) {
-			throw new TypeConflictException('The user config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
-		}
-
-		$lazy = $configValue->isLazy();
-		$flags = $configValue->getFlags();
-		if ($configValue->isDeprecated()) {
-			$this->logger->notice('User config key ' . $app . '/' . $key . ' is set as deprecated.');
-		}
-
-		$enforcedValue = $this->config->getSystemValue('lexicon.default.userconfig.enforced', [])[$app][$key] ?? false;
-		if (!$enforcedValue && $this->hasKey($userId, $app, $key, $lazy)) {
-			// if key exists there should be no need to extract default
-			return true;
-		}
-
-		// default from Lexicon got priority but it can still be overwritten by admin
-		$default = $this->getSystemDefault($app, $configValue) ?? $configValue->getDefault() ?? $default;
-
-		// returning false will make get() returning $default and set() not changing value in database
-		return !$enforcedValue;
-	}
-
-	/**
-	 * get default value set in config/config.php if stored in key:
-	 *
-	 * 'lexicon.default.userconfig' => [
-	 *        <appId> => [
-	 *           <configKey> => 'my value',
-	 *        ]
-	 *     ],
-	 *
-	 * The entry is converted to string to fit the expected type when managing default value
-	 */
-	private function getSystemDefault(string $appId, ConfigLexiconEntry $configValue): ?string {
-		$default = $this->config->getSystemValue('lexicon.default.userconfig', [])[$appId][$configValue->getKey()] ?? null;
-		if ($default === null) {
-			// no system default, using default default.
-			return null;
-		}
-
-		return $configValue->convertToString($default);
-	}
-
-	/**
-	 * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
-	 *
-	 * @see IConfigLexicon::getStrictness()
-	 * @param ConfigLexiconStrictness|null $strictness
-	 * @param string $line
-	 *
-	 * @return bool TRUE if conflict can be fully ignored
-	 * @throws UnknownKeyException
-	 */
-	private function applyLexiconStrictness(?ConfigLexiconStrictness $strictness, string $line = ''): bool {
-		if ($strictness === null) {
-			return true;
-		}
-
-		switch ($strictness) {
-			case ConfigLexiconStrictness::IGNORE:
-				return true;
-			case ConfigLexiconStrictness::NOTICE:
-				$this->logger->notice($line);
-				return true;
-			case ConfigLexiconStrictness::WARNING:
-				$this->logger->warning($line);
-				return false;
-			case ConfigLexiconStrictness::EXCEPTION:
-				throw new UnknownKeyException($line);
-		}
-
-		throw new UnknownKeyException($line);
-	}
-
-	/**
-	 * extract details from registered $appId's config lexicon
-	 *
-	 * @param string $appId
-	 * @internal
-	 *
-	 * @return array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}
-	 */
-	public function getConfigDetailsFromLexicon(string $appId): array {
-		if (!array_key_exists($appId, $this->configLexiconDetails)) {
-			$entries = $aliases = [];
-			$bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
-			$configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
-			foreach ($configLexicon?->getUserConfigs() ?? [] as $configEntry) {
-				$entries[$configEntry->getKey()] = $configEntry;
-				if ($configEntry->getRename() !== null) {
-					$aliases[$configEntry->getRename()] = $configEntry->getKey();
-				}
-			}
-
-			$this->configLexiconDetails[$appId] = [
-				'entries' => $entries,
-				'aliases' => $aliases,
-				'strictness' => $configLexicon?->getStrictness() ?? ConfigLexiconStrictness::IGNORE
-			];
-		}
-
-		return $this->configLexiconDetails[$appId];
-	}
-
-	private function getLexiconEntry(string $appId, string $key): ?ConfigLexiconEntry {
-		return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
-	}
-
-	/**
-	 * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
-	 *
-	 * @internal
-	 */
-	public function ignoreLexiconAliases(bool $ignore): void {
-		$this->ignoreLexiconAliases = $ignore;
-	}
+    private const USER_MAX_LENGTH = 64;
+    private const APP_MAX_LENGTH = 32;
+    private const KEY_MAX_LENGTH = 64;
+    private const INDEX_MAX_LENGTH = 64;
+    private const ENCRYPTION_PREFIX = '$UserConfigEncryption$';
+    private const ENCRYPTION_PREFIX_LENGTH = 22; // strlen(self::ENCRYPTION_PREFIX)
+
+    /** @var array<string, array<string, array<string, mixed>>> [ass'user_id' => ['app_id' => ['key' => 'value']]] */
+    private array $fastCache = [];   // cache for normal config keys
+    /** @var array<string, array<string, array<string, mixed>>> ['user_id' => ['app_id' => ['key' => 'value']]] */
+    private array $lazyCache = [];   // cache for lazy config keys
+    /** @var array<string, array<string, array<string, array<string, mixed>>>> ['user_id' => ['app_id' => ['key' => ['type' => ValueType, 'flags' => bitflag]]]] */
+    private array $valueDetails = [];  // type for all config values
+    /** @var array<string, boolean> ['user_id' => bool] */
+    private array $fastLoaded = [];
+    /** @var array<string, boolean> ['user_id' => bool] */
+    private array $lazyLoaded = [];
+    /** @var array<string, array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
+    private array $configLexiconDetails = [];
+    private bool $ignoreLexiconAliases = false;
+
+    public function __construct(
+        protected IDBConnection $connection,
+        protected IConfig $config,
+        protected LoggerInterface $logger,
+        protected ICrypto $crypto,
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $appId optional id of app
+     *
+     * @return list<string> list of userIds
+     * @since 31.0.0
+     */
+    public function getUserIds(string $appId = ''): array {
+        $this->assertParams(app: $appId, allowEmptyUser: true, allowEmptyApp: true);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->from('preferences');
+        $qb->select('userid');
+        $qb->groupBy('userid');
+        if ($appId !== '') {
+            $qb->where($qb->expr()->eq('appid', $qb->createNamedParameter($appId)));
+        }
+
+        $result = $qb->executeQuery();
+        $rows = $result->fetchAll();
+        $userIds = [];
+        foreach ($rows as $row) {
+            $userIds[] = $row['userid'];
+        }
+
+        return $userIds;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @return list<string> list of app ids
+     * @since 31.0.0
+     */
+    public function getApps(string $userId): array {
+        $this->assertParams($userId, allowEmptyApp: true);
+        $this->loadConfigAll($userId);
+        $apps = array_merge(array_keys($this->fastCache[$userId] ?? []), array_keys($this->lazyCache[$userId] ?? []));
+        sort($apps);
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     *
+     * @return list<string> list of stored config keys
+     * @since 31.0.0
+     */
+    public function getKeys(string $userId, string $app): array {
+        $this->assertParams($userId, $app);
+        $this->loadConfigAll($userId);
+        // array_merge() will remove numeric keys (here config keys), so addition arrays instead
+        $keys = array_map('strval', array_keys(($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? [])));
+        sort($keys);
+
+        return array_values(array_unique($keys));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool TRUE if key exists
+     * @since 31.0.0
+     */
+    public function hasKey(string $userId, string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfig($userId, $lazy);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        if ($lazy === null) {
+            $appCache = $this->getValues($userId, $app);
+            return isset($appCache[$key]);
+        }
+
+        if ($lazy) {
+            return isset($this->lazyCache[$userId][$app][$key]);
+        }
+
+        return isset($this->fastCache[$userId][$app][$key]);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool
+     * @throws UnknownKeyException if config key is not known
+     * @since 31.0.0
+     */
+    public function isSensitive(string $userId, string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfig($userId, $lazy);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        if (!isset($this->valueDetails[$userId][$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        return $this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags']);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool
+     * @throws UnknownKeyException if config key is not known
+     * @since 31.0.0
+     */
+    public function isIndexed(string $userId, string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfig($userId, $lazy);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        if (!isset($this->valueDetails[$userId][$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        return $this->isFlagged(self::FLAG_INDEXED, $this->valueDetails[$userId][$app][$key]['flags']);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app if of the app
+     * @param string $key config key
+     *
+     * @return bool TRUE if config is lazy loaded
+     * @throws UnknownKeyException if config key is not known
+     * @see IUserConfig for details about lazy loading
+     * @since 31.0.0
+     */
+    public function isLazy(string $userId, string $app, string $key): bool {
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        // there is a huge probability the non-lazy config are already loaded
+        // meaning that we can start by only checking if a current non-lazy key exists
+        if ($this->hasKey($userId, $app, $key, false)) {
+            // meaning key is not lazy.
+            return false;
+        }
+
+        // as key is not found as non-lazy, we load and search in the lazy config
+        if ($this->hasKey($userId, $app, $key, true)) {
+            return true;
+        }
+
+        throw new UnknownKeyException('unknown config key');
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $prefix config keys prefix to search
+     * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
+     *
+     * @return array<string, string|int|float|bool|array> [key => value]
+     * @since 31.0.0
+     */
+    public function getValues(
+        string $userId,
+        string $app,
+        string $prefix = '',
+        bool $filtered = false,
+    ): array {
+        $this->assertParams($userId, $app, $prefix);
+        // if we want to filter values, we need to get sensitivity
+        $this->loadConfigAll($userId);
+        // array_merge() will remove numeric keys (here config keys), so addition arrays instead
+        $values = array_filter(
+            $this->formatAppValues($userId, $app, ($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? []), $filtered),
+            function (string $key) use ($prefix): bool {
+                // filter values based on $prefix
+                return str_starts_with($key, $prefix);
+            }, ARRAY_FILTER_USE_KEY
+        );
+
+        return $values;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
+     *
+     * @return array<string, array<string, string|int|float|bool|array>> [appId => [key => value]]
+     * @since 31.0.0
+     */
+    public function getAllValues(string $userId, bool $filtered = false): array {
+        $this->assertParams($userId, allowEmptyApp: true);
+        $this->loadConfigAll($userId);
+
+        $result = [];
+        foreach ($this->getApps($userId) as $app) {
+            // array_merge() will remove numeric keys (here config keys), so addition arrays instead
+            $cached = ($this->fastCache[$userId][$app] ?? []) + ($this->lazyCache[$userId][$app] ?? []);
+            $result[$app] = $this->formatAppValues($userId, $app, $cached, $filtered);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $key config key
+     * @param bool $lazy search within lazy loaded config
+     * @param ValueType|null $typedAs enforce type for the returned values
+     *
+     * @return array<string, string|int|float|bool|array> [appId => value]
+     * @since 31.0.0
+     */
+    public function getValuesByApps(string $userId, string $key, bool $lazy = false, ?ValueType $typedAs = null): array {
+        $this->assertParams($userId, '', $key, allowEmptyApp: true);
+        $this->loadConfig($userId, $lazy);
+
+        /** @var array<array-key, array<array-key, mixed>> $cache */
+        if ($lazy) {
+            $cache = $this->lazyCache[$userId];
+        } else {
+            $cache = $this->fastCache[$userId];
+        }
+
+        $values = [];
+        foreach (array_keys($cache) as $app) {
+            if (isset($cache[$app][$key])) {
+                $value = $cache[$app][$key];
+                try {
+                    $this->decryptSensitiveValue($userId, $app, $key, $value);
+                    $value = $this->convertTypedValue($value, $typedAs ?? $this->getValueType($userId, $app, $key, $lazy));
+                } catch (IncorrectTypeException|UnknownKeyException) {
+                }
+                $values[$app] = $value;
+            }
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param ValueType|null $typedAs enforce type for the returned values
+     * @param array|null $userIds limit to a list of user ids
+     *
+     * @return array<string, string|int|float|bool|array> [userId => value]
+     * @since 31.0.0
+     */
+    public function getValuesByUsers(
+        string $app,
+        string $key,
+        ?ValueType $typedAs = null,
+        ?array $userIds = null,
+    ): array {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('userid', 'configvalue', 'type')
+            ->from('preferences')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+
+        $values = [];
+        // this nested function will execute current Query and store result within $values.
+        $executeAndStoreValue = function (IQueryBuilder $qb) use (&$values, $typedAs): IResult {
+            $result = $qb->executeQuery();
+            while ($row = $result->fetch()) {
+                $value = $row['configvalue'];
+                try {
+                    $value = $this->convertTypedValue($value, $typedAs ?? ValueType::from((int)$row['type']));
+                } catch (IncorrectTypeException) {
+                }
+                $values[$row['userid']] = $value;
+            }
+            return $result;
+        };
+
+        // if no userIds to filter, we execute query as it is and returns all values ...
+        if ($userIds === null) {
+            $result = $executeAndStoreValue($qb);
+            $result->closeCursor();
+            return $values;
+        }
+
+        // if userIds to filter, we chunk the list and execute the same query multiple times until we get all values
+        $result = null;
+        $qb->andWhere($qb->expr()->in('userid', $qb->createParameter('userIds')));
+        foreach (array_chunk($userIds, 50, true) as $chunk) {
+            $qb->setParameter('userIds', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $executeAndStoreValue($qb);
+        }
+        $result?->closeCursor();
+
+        return $values;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $caseInsensitive non-case-sensitive search, only works if $value is a string
+     *
+     * @return Generator<string>
+     * @since 31.0.0
+     */
+    public function searchUsersByValueString(string $app, string $key, string $value, bool $caseInsensitive = false): Generator {
+        return $this->searchUsersByTypedValue($app, $key, $value, $caseInsensitive);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $value config value
+     *
+     * @return Generator<string>
+     * @since 31.0.0
+     */
+    public function searchUsersByValueInt(string $app, string $key, int $value): Generator {
+        return $this->searchUsersByValueString($app, $key, (string)$value);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $values list of config values
+     *
+     * @return Generator<string>
+     * @since 31.0.0
+     */
+    public function searchUsersByValues(string $app, string $key, array $values): Generator {
+        return $this->searchUsersByTypedValue($app, $key, $values);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $value config value
+     *
+     * @return Generator<string>
+     * @since 31.0.0
+     */
+    public function searchUsersByValueBool(string $app, string $key, bool $value): Generator {
+        $values = ['0', 'off', 'false', 'no'];
+        if ($value) {
+            $values = ['1', 'on', 'true', 'yes'];
+        }
+        return $this->searchUsersByValues($app, $key, $values);
+    }
+
+    /**
+     * returns a list of users with config key set to a specific value, or within the list of
+     * possible values
+     *
+     * @param string $app
+     * @param string $key
+     * @param string|array $value
+     * @param bool $caseInsensitive
+     *
+     * @return Generator<string>
+     */
+    private function searchUsersByTypedValue(string $app, string $key, string|array $value, bool $caseInsensitive = false): Generator {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->from('preferences');
+        $qb->select('userid');
+        $qb->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
+        $qb->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+
+        // search within 'indexed' OR 'configvalue' only if 'flags' is set as not indexed
+        // TODO: when implementing config lexicon remove the searches on 'configvalue' if value is set as indexed
+        $configValueColumn = ($this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_ORACLE) ? $qb->expr()->castColumn('configvalue', IQueryBuilder::PARAM_STR) : 'configvalue';
+        if (is_array($value)) {
+            $where = $qb->expr()->orX(
+                $qb->expr()->in('indexed', $qb->createNamedParameter($value, IQueryBuilder::PARAM_STR_ARRAY)),
+                $qb->expr()->andX(
+                    $qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
+                    $qb->expr()->in($configValueColumn, $qb->createNamedParameter($value, IQueryBuilder::PARAM_STR_ARRAY))
+                )
+            );
+        } else {
+            if ($caseInsensitive) {
+                $where = $qb->expr()->orX(
+                    $qb->expr()->eq($qb->func()->lower('indexed'), $qb->createNamedParameter(strtolower($value))),
+                    $qb->expr()->andX(
+                        $qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
+                        $qb->expr()->eq($qb->func()->lower($configValueColumn), $qb->createNamedParameter(strtolower($value)))
+                    )
+                );
+            } else {
+                $where = $qb->expr()->orX(
+                    $qb->expr()->eq('indexed', $qb->createNamedParameter($value)),
+                    $qb->expr()->andX(
+                        $qb->expr()->neq($qb->expr()->bitwiseAnd('flags', self::FLAG_INDEXED), $qb->createNamedParameter(self::FLAG_INDEXED, IQueryBuilder::PARAM_INT)),
+                        $qb->expr()->eq($configValueColumn, $qb->createNamedParameter($value))
+                    )
+                );
+            }
+        }
+
+        $qb->andWhere($where);
+        $result = $qb->executeQuery();
+        while ($row = $result->fetch()) {
+            yield $row['userid'];
+        }
+    }
+
+    /**
+     * Get the config value as string.
+     * If the value does not exist the given default will be returned.
+     *
+     * Set lazy to `null` to ignore it and get the value from either source.
+     *
+     * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default config value
+     * @param null|bool $lazy get config as lazy loaded or not. can be NULL
+     *
+     * @return string the value or $default
+     * @throws TypeConflictException
+     * @internal
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     * @see getValueString()
+     * @see getValueInt()
+     * @see getValueFloat()
+     * @see getValueBool()
+     * @see getValueArray()
+     */
+    public function getValueMixed(
+        string $userId,
+        string $app,
+        string $key,
+        string $default = '',
+        ?bool $lazy = false,
+    ): string {
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+        try {
+            $lazy ??= $this->isLazy($userId, $app, $key);
+        } catch (UnknownKeyException) {
+            return $default;
+        }
+
+        return $this->getTypedValue(
+            $userId,
+            $app,
+            $key,
+            $default,
+            $lazy,
+            ValueType::MIXED
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return string stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws TypeConflictException in case of conflict with the value type set in database
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function getValueString(
+        string $userId,
+        string $app,
+        string $key,
+        string $default = '',
+        bool $lazy = false,
+    ): string {
+        return $this->getTypedValue($userId, $app, $key, $default, $lazy, ValueType::STRING);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return int stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws TypeConflictException in case of conflict with the value type set in database
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function getValueInt(
+        string $userId,
+        string $app,
+        string $key,
+        int $default = 0,
+        bool $lazy = false,
+    ): int {
+        return (int)$this->getTypedValue($userId, $app, $key, (string)$default, $lazy, ValueType::INT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return float stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws TypeConflictException in case of conflict with the value type set in database
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function getValueFloat(
+        string $userId,
+        string $app,
+        string $key,
+        float $default = 0,
+        bool $lazy = false,
+    ): float {
+        return (float)$this->getTypedValue($userId, $app, $key, (string)$default, $lazy, ValueType::FLOAT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return bool stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws TypeConflictException in case of conflict with the value type set in database
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function getValueBool(
+        string $userId,
+        string $app,
+        string $key,
+        bool $default = false,
+        bool $lazy = false,
+    ): bool {
+        $b = strtolower($this->getTypedValue($userId, $app, $key, $default ? 'true' : 'false', $lazy, ValueType::BOOL));
+        return in_array($b, ['1', 'true', 'yes', 'on']);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return array stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws TypeConflictException in case of conflict with the value type set in database
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function getValueArray(
+        string $userId,
+        string $app,
+        string $key,
+        array $default = [],
+        bool $lazy = false,
+    ): array {
+        try {
+            $defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
+            $value = json_decode($this->getTypedValue($userId, $app, $key, $defaultJson, $lazy, ValueType::ARRAY), true, flags: JSON_THROW_ON_ERROR);
+
+            return is_array($value) ? $value : [];
+        } catch (JsonException) {
+            return [];
+        }
+    }
+
+    /**
+     * @param string $userId
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     * @param ValueType $type value type
+     *
+     * @return string
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     */
+    private function getTypedValue(
+        string $userId,
+        string $app,
+        string $key,
+        string $default,
+        bool $lazy,
+        ValueType $type,
+    ): string {
+        $this->assertParams($userId, $app, $key);
+        $origKey = $key;
+        if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, default: $default)) {
+            // returns default if strictness of lexicon is set to WARNING (block and report)
+            return $default;
+        }
+        $this->loadConfig($userId, $lazy);
+
+        /**
+         * We ignore check if mixed type is requested.
+         * If type of stored value is set as mixed, we don't filter.
+         * If type of stored value is defined, we compare with the one requested.
+         */
+        $knownType = $this->valueDetails[$userId][$app][$key]['type'] ?? null;
+        if ($type !== ValueType::MIXED
+            && $knownType !== null
+            && $knownType !== ValueType::MIXED
+            && $type !== $knownType) {
+            $this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
+            throw new TypeConflictException('conflict with value type from database');
+        }
+
+        /**
+         * - the pair $app/$key cannot exist in both array,
+         * - we should still return an existing non-lazy value even if current method
+         *   is called with $lazy is true
+         *
+         * This way, lazyCache will be empty until the load for lazy config value is requested.
+         */
+        if (isset($this->lazyCache[$userId][$app][$key])) {
+            $value = $this->lazyCache[$userId][$app][$key];
+        } elseif (isset($this->fastCache[$userId][$app][$key])) {
+            $value = $this->fastCache[$userId][$app][$key];
+        } else {
+            return $default;
+        }
+
+        $this->decryptSensitiveValue($userId, $app, $key, $value);
+
+        // in case the key was modified while running matchAndApplyLexiconDefinition() we are
+        // interested to check options in case a modification of the value is needed
+        // ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
+        if ($origKey !== $key && $type === ValueType::BOOL) {
+            $configManager = Server::get(ConfigManager::class);
+            $value = ($configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return ValueType type of the value
+     * @throws UnknownKeyException if config key is not known
+     * @throws IncorrectTypeException if config value type is not known
+     * @since 31.0.0
+     */
+    public function getValueType(string $userId, string $app, string $key, ?bool $lazy = null): ValueType {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfig($userId, $lazy);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        if (!isset($this->valueDetails[$userId][$app][$key]['type'])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        return $this->valueDetails[$userId][$app][$key]['type'];
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $lazy lazy loading
+     *
+     * @return int flags applied to value
+     * @throws UnknownKeyException if config key is not known
+     * @throws IncorrectTypeException if config value type is not known
+     * @since 31.0.0
+     */
+    public function getValueFlags(string $userId, string $app, string $key, bool $lazy = false): int {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfig($userId, $lazy);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        if (!isset($this->valueDetails[$userId][$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        return $this->valueDetails[$userId][$app][$key]['flags'];
+    }
+
+    /**
+     * Store a config key and its value in database as VALUE_MIXED
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED
+     * @internal
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     * @see setValueString()
+     * @see setValueInt()
+     * @see setValueFloat()
+     * @see setValueBool()
+     * @see setValueArray()
+     */
+    public function setValueMixed(
+        string $userId,
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        return $this->setTypedValue(
+            $userId,
+            $app,
+            $key,
+            $value,
+            $lazy,
+            $flags,
+            ValueType::MIXED
+        );
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function setValueString(
+        string $userId,
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        return $this->setTypedValue(
+            $userId,
+            $app,
+            $key,
+            $value,
+            $lazy,
+            $flags,
+            ValueType::STRING
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function setValueInt(
+        string $userId,
+        string $app,
+        string $key,
+        int $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        if ($value > 2000000000) {
+            $this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
+        }
+
+        return $this->setTypedValue(
+            $userId,
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            $flags,
+            ValueType::INT
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function setValueFloat(
+        string $userId,
+        string $app,
+        string $key,
+        float $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        return $this->setTypedValue(
+            $userId,
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            $flags,
+            ValueType::FLOAT
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $value config value
+     * @param bool $lazy set config as lazy loaded
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function setValueBool(
+        string $userId,
+        string $app,
+        string $key,
+        bool $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        return $this->setTypedValue(
+            $userId,
+            $app,
+            $key,
+            ($value) ? '1' : '0',
+            $lazy,
+            $flags,
+            ValueType::BOOL
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @throws JsonException
+     * @since 31.0.0
+     * @see IUserConfig for explanation about lazy loading
+     */
+    public function setValueArray(
+        string $userId,
+        string $app,
+        string $key,
+        array $value,
+        bool $lazy = false,
+        int $flags = 0,
+    ): bool {
+        try {
+            return $this->setTypedValue(
+                $userId,
+                $app,
+                $key,
+                json_encode($value, JSON_THROW_ON_ERROR),
+                $lazy,
+                $flags,
+                ValueType::ARRAY
+            );
+        } catch (JsonException $e) {
+            $this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
+            throw $e;
+        }
+    }
+
+    /**
+     * Store a config key and its value in database
+     *
+     * If config key is already known with the exact same config value and same sensitive/lazy status, the
+     * database is not updated. If config value was previously stored as sensitive, status will not be
+     * altered.
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy config set as lazy loaded
+     * @param ValueType $type value type
+     *
+     * @return bool TRUE if value was updated in database
+     * @throws TypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @see IUserConfig for explanation about lazy loading
+     */
+    private function setTypedValue(
+        string $userId,
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy,
+        int $flags,
+        ValueType $type,
+    ): bool {
+        // Primary email addresses are always(!) expected to be lowercase
+        if ($app === 'settings' && $key === 'email') {
+            $value = strtolower($value);
+        }
+
+        $this->assertParams($userId, $app, $key);
+        if (!$this->matchAndApplyLexiconDefinition($userId, $app, $key, $lazy, $type, $flags)) {
+            // returns false as database is not updated
+            return false;
+        }
+        $this->loadConfig($userId, $lazy);
+
+        $inserted = $refreshCache = false;
+        $origValue = $value;
+        $sensitive = $this->isFlagged(self::FLAG_SENSITIVE, $flags);
+        if ($sensitive || ($this->hasKey($userId, $app, $key, $lazy) && $this->isSensitive($userId, $app, $key, $lazy))) {
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+            $flags |= self::FLAG_SENSITIVE;
+        }
+
+        // if requested, we fill the 'indexed' field with current value
+        $indexed = '';
+        if ($type !== ValueType::ARRAY && $this->isFlagged(self::FLAG_INDEXED, $flags)) {
+            if ($this->isFlagged(self::FLAG_SENSITIVE, $flags)) {
+                $this->logger->warning('sensitive value are not to be indexed');
+            } elseif (strlen($value) > self::USER_MAX_LENGTH) {
+                $this->logger->warning('value is too lengthy to be indexed');
+            } else {
+                $indexed = $value;
+            }
+        }
+
+        if ($this->hasKey($userId, $app, $key, $lazy)) {
+            /**
+             * no update if key is already known with set lazy status and value is
+             * not different, unless sensitivity is switched from false to true.
+             */
+            if ($origValue === $this->getTypedValue($userId, $app, $key, $value, $lazy, $type)
+                && (!$sensitive || $this->isSensitive($userId, $app, $key, $lazy))) {
+                return false;
+            }
+        } else {
+            /**
+             * if key is not known yet, we try to insert.
+             * It might fail if the key exists with a different lazy flag.
+             */
+            try {
+                $insert = $this->connection->getQueryBuilder();
+                $insert->insert('preferences')
+                    ->setValue('userid', $insert->createNamedParameter($userId))
+                    ->setValue('appid', $insert->createNamedParameter($app))
+                    ->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                    ->setValue('type', $insert->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
+                    ->setValue('flags', $insert->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
+                    ->setValue('indexed', $insert->createNamedParameter($indexed))
+                    ->setValue('configkey', $insert->createNamedParameter($key))
+                    ->setValue('configvalue', $insert->createNamedParameter($value));
+                $insert->executeStatement();
+                $inserted = true;
+            } catch (DBException $e) {
+                if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    // TODO: throw exception or just log and returns false !?
+                    throw $e;
+                }
+            }
+        }
+
+        /**
+         * We cannot insert a new row, meaning we need to update an already existing one
+         */
+        if (!$inserted) {
+            $currType = $this->valueDetails[$userId][$app][$key]['type'] ?? null;
+            if ($currType === null) { // this might happen when switching lazy loading status
+                $this->loadConfigAll($userId);
+                $currType = $this->valueDetails[$userId][$app][$key]['type'];
+            }
+
+            /**
+             * We only log a warning and set it to VALUE_MIXED.
+             */
+            if ($currType === null) {
+                $this->logger->warning('Value type is set to zero (0) in database. This is not supposed to happens', ['app' => $app, 'key' => $key]);
+                $currType = ValueType::MIXED;
+            }
+
+            /**
+             * we only accept a different type from the one stored in database
+             * if the one stored in database is not-defined (VALUE_MIXED)
+             */
+            if ($currType !== ValueType::MIXED &&
+                $currType !== $type) {
+                try {
+                    $currTypeDef = $currType->getDefinition();
+                    $typeDef = $type->getDefinition();
+                } catch (IncorrectTypeException) {
+                    $currTypeDef = $currType->value;
+                    $typeDef = $type->value;
+                }
+                throw new TypeConflictException('conflict between new type (' . $typeDef . ') and old type (' . $currTypeDef . ')');
+            }
+
+            if ($lazy !== $this->isLazy($userId, $app, $key)) {
+                $refreshCache = true;
+            }
+
+            $update = $this->connection->getQueryBuilder();
+            $update->update('preferences')
+                ->set('configvalue', $update->createNamedParameter($value))
+                ->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                ->set('type', $update->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
+                ->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
+                ->set('indexed', $update->createNamedParameter($indexed))
+                ->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
+                ->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
+                ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+
+            $update->executeStatement();
+        }
+
+        if ($refreshCache) {
+            $this->clearCache($userId);
+            return true;
+        }
+
+        // update local cache
+        if ($lazy) {
+            $this->lazyCache[$userId][$app][$key] = $value;
+        } else {
+            $this->fastCache[$userId][$app][$key] = $value;
+        }
+        $this->valueDetails[$userId][$app][$key] = [
+            'type' => $type,
+            'flags' => $flags
+        ];
+
+        return true;
+    }
+
+    /**
+     * Change the type of config value.
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it may break things.
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param ValueType $type value type
+     *
+     * @return bool TRUE if database update were necessary
+     * @throws UnknownKeyException if $key is now known in database
+     * @throws IncorrectTypeException if $type is not valid
+     * @internal
+     * @since 31.0.0
+     */
+    public function updateType(string $userId, string $app, string $key, ValueType $type = ValueType::MIXED): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfigAll($userId);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+        $this->isLazy($userId, $app, $key); // confirm key exists
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('preferences')
+            ->set('type', $update->createNamedParameter($type->value, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
+            ->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->valueDetails[$userId][$app][$key]['type'] = $type;
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 31.0.0
+     */
+    public function updateSensitive(string $userId, string $app, string $key, bool $sensitive): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfigAll($userId);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        try {
+            if ($sensitive === $this->isSensitive($userId, $app, $key, null)) {
+                return false;
+            }
+        } catch (UnknownKeyException) {
+            return false;
+        }
+
+        $lazy = $this->isLazy($userId, $app, $key);
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        if (!isset($cache[$userId][$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        $value = $cache[$userId][$app][$key];
+        $flags = $this->getValueFlags($userId, $app, $key);
+        if ($sensitive) {
+            $flags |= self::FLAG_SENSITIVE;
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+        } else {
+            $flags &= ~self::FLAG_SENSITIVE;
+            $this->decryptSensitiveValue($userId, $app, $key, $value);
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('preferences')
+            ->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
+            ->set('configvalue', $update->createNamedParameter($value))
+            ->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
+            ->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->valueDetails[$userId][$app][$key]['flags'] = $flags;
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app
+     * @param string $key
+     * @param bool $sensitive
+     *
+     * @since 31.0.0
+     */
+    public function updateGlobalSensitive(string $app, string $key, bool $sensitive): void {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        foreach (array_keys($this->getValuesByUsers($app, $key)) as $userId) {
+            try {
+                $this->updateSensitive($userId, $app, $key, $sensitive);
+            } catch (UnknownKeyException) {
+                // should not happen and can be ignored
+            }
+        }
+
+        // we clear all cache
+        $this->clearCacheAll();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId
+     * @param string $app
+     * @param string $key
+     * @param bool $indexed
+     *
+     * @return bool
+     * @throws DBException
+     * @throws IncorrectTypeException
+     * @throws UnknownKeyException
+     * @since 31.0.0
+     */
+    public function updateIndexed(string $userId, string $app, string $key, bool $indexed): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfigAll($userId);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        try {
+            if ($indexed === $this->isIndexed($userId, $app, $key, null)) {
+                return false;
+            }
+        } catch (UnknownKeyException) {
+            return false;
+        }
+
+        $lazy = $this->isLazy($userId, $app, $key);
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        if (!isset($cache[$userId][$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        $value = $cache[$userId][$app][$key];
+        $flags = $this->getValueFlags($userId, $app, $key);
+        if ($indexed) {
+            $indexed = $value;
+        } else {
+            $flags &= ~self::FLAG_INDEXED;
+            $indexed = '';
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('preferences')
+            ->set('flags', $update->createNamedParameter($flags, IQueryBuilder::PARAM_INT))
+            ->set('indexed', $update->createNamedParameter($indexed))
+            ->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
+            ->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->valueDetails[$userId][$app][$key]['flags'] = $flags;
+
+        return true;
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app
+     * @param string $key
+     * @param bool $indexed
+     *
+     * @since 31.0.0
+     */
+    public function updateGlobalIndexed(string $app, string $key, bool $indexed): void {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        foreach (array_keys($this->getValuesByUsers($app, $key)) as $userId) {
+            try {
+                $this->updateIndexed($userId, $app, $key, $indexed);
+            } catch (UnknownKeyException) {
+                // should not happen and can be ignored
+            }
+        }
+
+        // we clear all cache
+        $this->clearCacheAll();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 31.0.0
+     */
+    public function updateLazy(string $userId, string $app, string $key, bool $lazy): bool {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfigAll($userId);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        try {
+            if ($lazy === $this->isLazy($userId, $app, $key)) {
+                return false;
+            }
+        } catch (UnknownKeyException) {
+            return false;
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('preferences')
+            ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('userid', $update->createNamedParameter($userId)))
+            ->andWhere($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        // At this point, it is a lot safer to clean cache
+        $this->clearCache($userId);
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
+     *
+     * @since 31.0.0
+     */
+    public function updateGlobalLazy(string $app, string $key, bool $lazy): void {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('preferences')
+            ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->clearCacheAll();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return array
+     * @throws UnknownKeyException if config key is not known in database
+     * @since 31.0.0
+     */
+    public function getDetails(string $userId, string $app, string $key): array {
+        $this->assertParams($userId, $app, $key);
+        $this->loadConfigAll($userId);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        $lazy = $this->isLazy($userId, $app, $key);
+
+        if ($lazy) {
+            $cache = $this->lazyCache[$userId];
+        } else {
+            $cache = $this->fastCache[$userId];
+        }
+
+        $type = $this->getValueType($userId, $app, $key);
+        try {
+            $typeString = $type->getDefinition();
+        } catch (IncorrectTypeException $e) {
+            $this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
+            $typeString = (string)$type->value;
+        }
+
+        if (!isset($cache[$app][$key])) {
+            throw new UnknownKeyException('unknown config key');
+        }
+
+        $value = $cache[$app][$key];
+        $sensitive = $this->isSensitive($userId, $app, $key, null);
+        $this->decryptSensitiveValue($userId, $app, $key, $value);
+
+        return [
+            'userId' => $userId,
+            'app' => $app,
+            'key' => $key,
+            'value' => $value,
+            'type' => $type->value,
+            'lazy' => $lazy,
+            'typeString' => $typeString,
+            'sensitive' => $sensitive
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @since 31.0.0
+     */
+    public function deleteUserConfig(string $userId, string $app, string $key): void {
+        $this->assertParams($userId, $app, $key);
+        $this->matchAndApplyLexiconDefinition($userId, $app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preferences')
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)))
+            ->andWhere($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+        $qb->executeStatement();
+
+        unset($this->lazyCache[$userId][$app][$key]);
+        unset($this->fastCache[$userId][$app][$key]);
+        unset($this->valueDetails[$userId][$app][$key]);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @since 31.0.0
+     */
+    public function deleteKey(string $app, string $key): void {
+        $this->assertParams('', $app, $key, allowEmptyUser: true);
+        $this->matchAndApplyLexiconDefinition('', $app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preferences')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+        $qb->executeStatement();
+
+        $this->clearCacheAll();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     *
+     * @since 31.0.0
+     */
+    public function deleteApp(string $app): void {
+        $this->assertParams('', $app, allowEmptyUser: true);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preferences')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
+        $qb->executeStatement();
+
+        $this->clearCacheAll();
+    }
+
+    public function deleteAllUserConfig(string $userId): void {
+        $this->assertParams($userId, '', allowEmptyApp: true);
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('preferences')
+            ->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)));
+        $qb->executeStatement();
+
+        $this->clearCache($userId);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $userId id of the user
+     * @param bool $reload set to TRUE to refill cache instantly after clearing it.
+     *
+     * @since 31.0.0
+     */
+    public function clearCache(string $userId, bool $reload = false): void {
+        $this->assertParams($userId, allowEmptyApp: true);
+        $this->lazyLoaded[$userId] = $this->fastLoaded[$userId] = false;
+        $this->lazyCache[$userId] = $this->fastCache[$userId] = $this->valueDetails[$userId] = [];
+
+        if (!$reload) {
+            return;
+        }
+
+        $this->loadConfigAll($userId);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @since 31.0.0
+     */
+    public function clearCacheAll(): void {
+        $this->lazyLoaded = $this->fastLoaded = [];
+        $this->lazyCache = $this->fastCache = $this->valueDetails = [];
+    }
+
+    /**
+     * For debug purpose.
+     * Returns the cached data.
+     *
+     * @return array
+     * @since 31.0.0
+     * @internal
+     */
+    public function statusCache(): array {
+        return [
+            'fastLoaded' => $this->fastLoaded,
+            'fastCache' => $this->fastCache,
+            'lazyLoaded' => $this->lazyLoaded,
+            'lazyCache' => $this->lazyCache,
+            'valueDetails' => $this->valueDetails,
+        ];
+    }
+
+    /**
+     * @param int $needle bitflag to search
+     * @param int $flags all flags
+     *
+     * @return bool TRUE if bitflag $needle is set in $flags
+     */
+    private function isFlagged(int $needle, int $flags): bool {
+        return (($needle & $flags) !== 0);
+    }
+
+    /**
+     * Confirm the string set for app and key fit the database description
+     *
+     * @param string $userId
+     * @param string $app assert $app fit in database
+     * @param string $prefKey assert config key fit in database
+     * @param bool $allowEmptyUser
+     * @param bool $allowEmptyApp $app can be empty string
+     * @param ValueType|null $valueType assert value type is only one type
+     */
+    private function assertParams(
+        string $userId = '',
+        string $app = '',
+        string $prefKey = '',
+        bool $allowEmptyUser = false,
+        bool $allowEmptyApp = false,
+    ): void {
+        if (!$allowEmptyUser && $userId === '') {
+            throw new InvalidArgumentException('userId cannot be an empty string');
+        }
+        if (!$allowEmptyApp && $app === '') {
+            throw new InvalidArgumentException('app cannot be an empty string');
+        }
+        if (strlen($userId) > self::USER_MAX_LENGTH) {
+            throw new InvalidArgumentException('Value (' . $userId . ') for userId is too long (' . self::USER_MAX_LENGTH . ')');
+        }
+        if (strlen($app) > self::APP_MAX_LENGTH) {
+            throw new InvalidArgumentException('Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')');
+        }
+        if (strlen($prefKey) > self::KEY_MAX_LENGTH) {
+            throw new InvalidArgumentException('Value (' . $prefKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
+        }
+    }
+
+    private function loadConfigAll(string $userId): void {
+        $this->loadConfig($userId, null);
+    }
+
+    /**
+     * Load normal config or config set as lazy loaded
+     *
+     * @param bool|null $lazy set to TRUE to load config set as lazy loaded, set to NULL to load all config
+     */
+    private function loadConfig(string $userId, ?bool $lazy = false): void {
+        if ($this->isLoaded($userId, $lazy)) {
+            return;
+        }
+
+        if (($lazy ?? true) !== false) { // if lazy is null or true, we debug log
+            $this->logger->debug('The loading of lazy UserConfig values have been requested', ['exception' => new \RuntimeException('ignorable exception')]);
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->from('preferences');
+        $qb->select('appid', 'configkey', 'configvalue', 'type', 'flags');
+        $qb->where($qb->expr()->eq('userid', $qb->createNamedParameter($userId)));
+
+        // we only need value from lazy when loadConfig does not specify it
+        if ($lazy !== null) {
+            $qb->andWhere($qb->expr()->eq('lazy', $qb->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)));
+        } else {
+            $qb->addSelect('lazy');
+        }
+
+        $result = $qb->executeQuery();
+        $rows = $result->fetchAll();
+        foreach ($rows as $row) {
+            if (($row['lazy'] ?? ($lazy ?? 0) ? 1 : 0) === 1) {
+                $this->lazyCache[$userId][$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            } else {
+                $this->fastCache[$userId][$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            }
+            $this->valueDetails[$userId][$row['appid']][$row['configkey']] = ['type' => ValueType::from((int)($row['type'] ?? 0)), 'flags' => (int)$row['flags']];
+        }
+        $result->closeCursor();
+        $this->setAsLoaded($userId, $lazy);
+    }
+
+    /**
+     * if $lazy is:
+     *  - false: will returns true if fast config are loaded
+     *  - true : will returns true if lazy config are loaded
+     *  - null : will returns true if both config are loaded
+     *
+     * @param string $userId
+     * @param bool $lazy
+     *
+     * @return bool
+     */
+    private function isLoaded(string $userId, ?bool $lazy): bool {
+        if ($lazy === null) {
+            return ($this->lazyLoaded[$userId] ?? false) && ($this->fastLoaded[$userId] ?? false);
+        }
+
+        return $lazy ? $this->lazyLoaded[$userId] ?? false : $this->fastLoaded[$userId] ?? false;
+    }
+
+    /**
+     * if $lazy is:
+     * - false: set fast config as loaded
+     * - true : set lazy config as loaded
+     * - null : set both config as loaded
+     *
+     * @param string $userId
+     * @param bool $lazy
+     */
+    private function setAsLoaded(string $userId, ?bool $lazy): void {
+        if ($lazy === null) {
+            $this->fastLoaded[$userId] = $this->lazyLoaded[$userId] = true;
+            return;
+        }
+
+        // We also create empty entry to keep both fastLoaded/lazyLoaded synced
+        if ($lazy) {
+            $this->lazyLoaded[$userId] = true;
+            $this->fastLoaded[$userId] = $this->fastLoaded[$userId] ?? false;
+            $this->fastCache[$userId] = $this->fastCache[$userId] ?? [];
+        } else {
+            $this->fastLoaded[$userId] = true;
+            $this->lazyLoaded[$userId] = $this->lazyLoaded[$userId] ?? false;
+            $this->lazyCache[$userId] = $this->lazyCache[$userId] ?? [];
+        }
+    }
+
+    /**
+     * **Warning:** this will load all lazy values from the database
+     *
+     * @param string $userId id of the user
+     * @param string $app id of the app
+     * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
+     *
+     * @return array<string, string|int|float|bool|array>
+     */
+    private function formatAppValues(string $userId, string $app, array $values, bool $filtered = false): array {
+        foreach ($values as $key => $value) {
+            //$key = (string)$key;
+            try {
+                $type = $this->getValueType($userId, $app, (string)$key);
+            } catch (UnknownKeyException) {
+                continue;
+            }
+
+            if ($this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags'] ?? 0)) {
+                if ($filtered) {
+                    $value = IConfig::SENSITIVE_VALUE;
+                    $type = ValueType::STRING;
+                } else {
+                    $this->decryptSensitiveValue($userId, $app, (string)$key, $value);
+                }
+            }
+
+            $values[$key] = $this->convertTypedValue($value, $type);
+        }
+
+        return $values;
+    }
+
+    /**
+     * convert string value to the expected type
+     *
+     * @param string $value
+     * @param ValueType $type
+     *
+     * @return string|int|float|bool|array
+     */
+    private function convertTypedValue(string $value, ValueType $type): string|int|float|bool|array {
+        switch ($type) {
+            case ValueType::INT:
+                return (int)$value;
+            case ValueType::FLOAT:
+                return (float)$value;
+            case ValueType::BOOL:
+                return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
+            case ValueType::ARRAY:
+                try {
+                    return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+                } catch (JsonException) {
+                    // ignoreable
+                }
+                break;
+        }
+        return $value;
+    }
+
+
+    /**
+     * will change referenced $value with the decrypted value in case of encrypted (sensitive value)
+     *
+     * @param string $userId
+     * @param string $app
+     * @param string $key
+     * @param string $value
+     */
+    private function decryptSensitiveValue(string $userId, string $app, string $key, string &$value): void {
+        if (!$this->isFlagged(self::FLAG_SENSITIVE, $this->valueDetails[$userId][$app][$key]['flags'] ?? 0)) {
+            return;
+        }
+
+        if (!str_starts_with($value, self::ENCRYPTION_PREFIX)) {
+            return;
+        }
+
+        try {
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        } catch (\Exception $e) {
+            $this->logger->warning('could not decrypt sensitive value', [
+                'userId' => $userId,
+                'app' => $app,
+                'key' => $key,
+                'value' => $value,
+                'exception' => $e
+            ]);
+        }
+    }
+
+    /**
+     * Match and apply current use of config values with defined lexicon.
+     * Set $lazy to NULL only if only interested into checking that $key is alias.
+     *
+     * @throws UnknownKeyException
+     * @throws TypeConflictException
+     * @return bool FALSE if conflict with defined lexicon were observed in the process
+     */
+    private function matchAndApplyLexiconDefinition(
+        string $userId,
+        string $app,
+        string &$key,
+        ?bool &$lazy = null,
+        ValueType &$type = ValueType::MIXED,
+        int &$flags = 0,
+        string &$default = '',
+    ): bool {
+        $configDetails = $this->getConfigDetailsFromLexicon($app);
+        if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
+            // in case '$rename' is set in ConfigLexiconEntry, we use the new config key
+            $key = $configDetails['aliases'][$key];
+        }
+
+        if (!array_key_exists($key, $configDetails['entries'])) {
+            return $this->applyLexiconStrictness($configDetails['strictness'], 'The user config key ' . $app . '/' . $key . ' is not defined in the config lexicon');
+        }
+
+        // if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
+        if ($lazy === null) {
+            return true;
+        }
+
+        /** @var ConfigLexiconEntry $configValue */
+        $configValue = $configDetails['entries'][$key];
+        if ($type === ValueType::MIXED) {
+            // we overwrite if value was requested as mixed
+            $type = $configValue->getValueType();
+        } elseif ($configValue->getValueType() !== $type) {
+            throw new TypeConflictException('The user config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
+        }
+
+        $lazy = $configValue->isLazy();
+        $flags = $configValue->getFlags();
+        if ($configValue->isDeprecated()) {
+            $this->logger->notice('User config key ' . $app . '/' . $key . ' is set as deprecated.');
+        }
+
+        $enforcedValue = $this->config->getSystemValue('lexicon.default.userconfig.enforced', [])[$app][$key] ?? false;
+        if (!$enforcedValue && $this->hasKey($userId, $app, $key, $lazy)) {
+            // if key exists there should be no need to extract default
+            return true;
+        }
+
+        // default from Lexicon got priority but it can still be overwritten by admin
+        $default = $this->getSystemDefault($app, $configValue) ?? $configValue->getDefault() ?? $default;
+
+        // returning false will make get() returning $default and set() not changing value in database
+        return !$enforcedValue;
+    }
+
+    /**
+     * get default value set in config/config.php if stored in key:
+     *
+     * 'lexicon.default.userconfig' => [
+     *        <appId> => [
+     *           <configKey> => 'my value',
+     *        ]
+     *     ],
+     *
+     * The entry is converted to string to fit the expected type when managing default value
+     */
+    private function getSystemDefault(string $appId, ConfigLexiconEntry $configValue): ?string {
+        $default = $this->config->getSystemValue('lexicon.default.userconfig', [])[$appId][$configValue->getKey()] ?? null;
+        if ($default === null) {
+            // no system default, using default default.
+            return null;
+        }
+
+        return $configValue->convertToString($default);
+    }
+
+    /**
+     * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
+     *
+     * @see IConfigLexicon::getStrictness()
+     * @param ConfigLexiconStrictness|null $strictness
+     * @param string $line
+     *
+     * @return bool TRUE if conflict can be fully ignored
+     * @throws UnknownKeyException
+     */
+    private function applyLexiconStrictness(?ConfigLexiconStrictness $strictness, string $line = ''): bool {
+        if ($strictness === null) {
+            return true;
+        }
+
+        switch ($strictness) {
+            case ConfigLexiconStrictness::IGNORE:
+                return true;
+            case ConfigLexiconStrictness::NOTICE:
+                $this->logger->notice($line);
+                return true;
+            case ConfigLexiconStrictness::WARNING:
+                $this->logger->warning($line);
+                return false;
+            case ConfigLexiconStrictness::EXCEPTION:
+                throw new UnknownKeyException($line);
+        }
+
+        throw new UnknownKeyException($line);
+    }
+
+    /**
+     * extract details from registered $appId's config lexicon
+     *
+     * @param string $appId
+     * @internal
+     *
+     * @return array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}
+     */
+    public function getConfigDetailsFromLexicon(string $appId): array {
+        if (!array_key_exists($appId, $this->configLexiconDetails)) {
+            $entries = $aliases = [];
+            $bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
+            $configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
+            foreach ($configLexicon?->getUserConfigs() ?? [] as $configEntry) {
+                $entries[$configEntry->getKey()] = $configEntry;
+                if ($configEntry->getRename() !== null) {
+                    $aliases[$configEntry->getRename()] = $configEntry->getKey();
+                }
+            }
+
+            $this->configLexiconDetails[$appId] = [
+                'entries' => $entries,
+                'aliases' => $aliases,
+                'strictness' => $configLexicon?->getStrictness() ?? ConfigLexiconStrictness::IGNORE
+            ];
+        }
+
+        return $this->configLexiconDetails[$appId];
+    }
+
+    private function getLexiconEntry(string $appId, string $key): ?ConfigLexiconEntry {
+        return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
+    }
+
+    /**
+     * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
+     *
+     * @internal
+     */
+    public function ignoreLexiconAliases(bool $ignore): void {
+        $this->ignoreLexiconAliases = $ignore;
+    }
 }

lib/private/App/AppManager.php

Indentation +914 added lines, -914 removed lines

@@ -34,918 +34,918 @@
 use Psr\Log\LoggerInterface;
 
 class AppManager implements IAppManager {
-	/**
-	 * Apps with these types can not be enabled for certain groups only
-	 * @var string[]
-	 */
-	protected $protectedAppTypes = [
-		'filesystem',
-		'prelogin',
-		'authentication',
-		'logging',
-		'prevent_group_restriction',
-	];
-
-	/** @var string[] $appId => $enabled */
-	private array $enabledAppsCache = [];
-
-	/** @var string[]|null */
-	private ?array $shippedApps = null;
-
-	private array $alwaysEnabled = [];
-	private array $defaultEnabled = [];
-
-	/** @var array */
-	private array $appInfos = [];
-
-	/** @var array */
-	private array $appVersions = [];
-
-	/** @var array */
-	private array $autoDisabledApps = [];
-	private array $appTypes = [];
-
-	/** @var array<string, true> */
-	private array $loadedApps = [];
-
-	private ?AppConfig $appConfig = null;
-	private ?IURLGenerator $urlGenerator = null;
-	private ?INavigationManager $navigationManager = null;
-
-	/**
-	 * Be extremely careful when injecting classes here. The AppManager is used by the installer,
-	 * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
-	 */
-	public function __construct(
-		private IUserSession $userSession,
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private ICacheFactory $memCacheFactory,
-		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
-		private ServerVersion $serverVersion,
-		private ConfigManager $configManager,
-	) {
-	}
-
-	private function getNavigationManager(): INavigationManager {
-		if ($this->navigationManager === null) {
-			$this->navigationManager = Server::get(INavigationManager::class);
-		}
-		return $this->navigationManager;
-	}
-
-	public function getAppIcon(string $appId, bool $dark = false): ?string {
-		$possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
-		$icon = null;
-		foreach ($possibleIcons as $iconName) {
-			try {
-				$icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
-				break;
-			} catch (\RuntimeException $e) {
-				// ignore
-			}
-		}
-		return $icon;
-	}
-
-	private function getAppConfig(): AppConfig {
-		if ($this->appConfig !== null) {
-			return $this->appConfig;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->appConfig = Server::get(AppConfig::class);
-		return $this->appConfig;
-	}
-
-	private function getUrlGenerator(): IURLGenerator {
-		if ($this->urlGenerator !== null) {
-			return $this->urlGenerator;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->urlGenerator = Server::get(IURLGenerator::class);
-		return $this->urlGenerator;
-	}
-
-	/**
-	 * For all enabled apps, return the value of their 'enabled' config key.
-	 *
-	 * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
-	 */
-	private function getEnabledAppsValues(): array {
-		if (!$this->enabledAppsCache) {
-			/** @var array<string,string> */
-			$values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
-
-			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach ($alwaysEnabledApps as $appId) {
-				$values[$appId] = 'yes';
-			}
-
-			$this->enabledAppsCache = array_filter($values, function ($value) {
-				return $value !== 'no';
-			});
-			ksort($this->enabledAppsCache);
-		}
-		return $this->enabledAppsCache;
-	}
-
-	/**
-	 * Deprecated alias
-	 *
-	 * @return string[]
-	 */
-	public function getInstalledApps() {
-		return $this->getEnabledApps();
-	}
-
-	/**
-	 * List all enabled apps, either for everyone or for some groups
-	 *
-	 * @return list<string>
-	 */
-	public function getEnabledApps(): array {
-		return array_keys($this->getEnabledAppsValues());
-	}
-
-	/**
-	 * Get a list of all apps in the apps folder
-	 *
-	 * @return list<string> an array of app names (string IDs)
-	 */
-	public function getAllAppsInAppsFolders(): array {
-		$apps = [];
-
-		foreach (\OC::$APPSROOTS as $apps_dir) {
-			if (!is_readable($apps_dir['path'])) {
-				$this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
-				continue;
-			}
-			$dh = opendir($apps_dir['path']);
-
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (
-						$file[0] != '.' &&
-						is_dir($apps_dir['path'] . '/' . $file) &&
-						is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
-					) {
-						$apps[] = $file;
-					}
-				}
-			}
-		}
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * List all apps enabled for a user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return list<string>
-	 */
-	public function getEnabledAppsForUser(IUser $user) {
-		$apps = $this->getEnabledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
-			return $this->checkAppForUser($enabled, $user);
-		});
-		return array_keys($appsForUser);
-	}
-
-	public function getEnabledAppsForGroup(IGroup $group): array {
-		$apps = $this->getEnabledAppsValues();
-		$appsForGroups = array_filter($apps, function ($enabled) use ($group) {
-			return $this->checkAppForGroups($enabled, $group);
-		});
-		return array_keys($appsForGroups);
-	}
-
-	/**
-	 * Loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the Nextcloud directory and loads all apps
-	 * it can find. A directory contains an app if the file /appinfo/info.xml
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 */
-	public function loadApps(array $types = []): bool {
-		if ($this->config->getSystemValueBool('maintenance', false)) {
-			return false;
-		}
-		// Load the enabled apps here
-		$apps = \OC_App::getEnabledApps();
-
-		// Add each apps' folder as allowed class path
-		foreach ($apps as $app) {
-			// If the app is already loaded then autoloading it makes no sense
-			if (!$this->isAppLoaded($app)) {
-				$path = \OC_App::getAppPath($app);
-				if ($path !== false) {
-					\OC_App::registerAutoloading($app, $path);
-				}
-			}
-		}
-
-		// prevent app loading from printing output
-		ob_start();
-		foreach ($apps as $app) {
-			if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
-				try {
-					$this->loadApp($app);
-				} catch (\Throwable $e) {
-					$this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
-						'exception' => $e,
-						'app' => $app,
-					]);
-				}
-			}
-		}
-		ob_end_clean();
-
-		return true;
-	}
-
-	/**
-	 * check if an app is of a specific type
-	 *
-	 * @param string $app
-	 * @param array $types
-	 * @return bool
-	 */
-	public function isType(string $app, array $types): bool {
-		$appTypes = $this->getAppTypes($app);
-		foreach ($types as $type) {
-			if (in_array($type, $appTypes, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * get the types of an app
-	 *
-	 * @param string $app
-	 * @return string[]
-	 */
-	private function getAppTypes(string $app): array {
-		//load the cache
-		if (count($this->appTypes) === 0) {
-			$this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
-		}
-
-		if (isset($this->appTypes[$app])) {
-			return explode(',', $this->appTypes[$app]);
-		}
-
-		return [];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAutoDisabledApps(): array {
-		return $this->autoDisabledApps;
-	}
-
-	public function getAppRestriction(string $appId): array {
-		$values = $this->getEnabledAppsValues();
-
-		if (!isset($values[$appId])) {
-			return [];
-		}
-
-		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
-			return [];
-		}
-		return json_decode($values[$appId], true);
-	}
-
-	/**
-	 * Check if an app is enabled for user
-	 *
-	 * @param string $appId
-	 * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
-	 * @return bool
-	 */
-	public function isEnabledForUser($appId, $user = null) {
-		if ($this->isAlwaysEnabled($appId)) {
-			return true;
-		}
-		if ($user === null) {
-			$user = $this->userSession->getUser();
-		}
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		if (isset($enabledAppsValues[$appId])) {
-			return $this->checkAppForUser($enabledAppsValues[$appId], $user);
-		} else {
-			return false;
-		}
-	}
-
-	private function checkAppForUser(string $enabled, ?IUser $user): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} elseif ($user === null) {
-			return false;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			$userGroups = $this->groupManager->getUserGroupIds($user);
-			foreach ($userGroups as $groupId) {
-				if (in_array($groupId, $groupIds, true)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private function checkAppForGroups(string $enabled, IGroup $group): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			return in_array($group->getGID(), $groupIds);
-		}
-	}
-
-	/**
-	 * Check if an app is enabled in the instance
-	 *
-	 * Notice: This actually checks if the app is enabled and not only if it is installed.
-	 *
-	 * @param string $appId
-	 */
-	public function isInstalled($appId): bool {
-		return $this->isEnabledForAnyone($appId);
-	}
-
-	public function isEnabledForAnyone(string $appId): bool {
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		return isset($enabledAppsValues[$appId]);
-	}
-
-	/**
-	 * Overwrite the `max-version` requirement for this app.
-	 */
-	public function overwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		if (!in_array($appId, $ignoreMaxApps, true)) {
-			$ignoreMaxApps[] = $appId;
-		}
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	/**
-	 * Remove the `max-version` overwrite for this app.
-	 * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
-	 */
-	public function removeOverwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	public function loadApp(string $app): void {
-		if (isset($this->loadedApps[$app])) {
-			return;
-		}
-		$this->loadedApps[$app] = true;
-		$appPath = \OC_App::getAppPath($app);
-		if ($appPath === false) {
-			return;
-		}
-		$eventLogger = \OC::$server->get(IEventLogger::class);
-		$eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
-
-		// in case someone calls loadApp() directly
-		\OC_App::registerAutoloading($app, $appPath);
-
-		if (is_file($appPath . '/appinfo/app.php')) {
-			$this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
-				'app' => $app,
-			]);
-		}
-
-		$coordinator = Server::get(Coordinator::class);
-		$coordinator->bootApp($app);
-
-		$eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
-		$info = $this->getAppInfo($app);
-		if (!empty($info['activity'])) {
-			$activityManager = \OC::$server->get(IActivityManager::class);
-			if (!empty($info['activity']['filters'])) {
-				foreach ($info['activity']['filters'] as $filter) {
-					$activityManager->registerFilter($filter);
-				}
-			}
-			if (!empty($info['activity']['settings'])) {
-				foreach ($info['activity']['settings'] as $setting) {
-					$activityManager->registerSetting($setting);
-				}
-			}
-			if (!empty($info['activity']['providers'])) {
-				foreach ($info['activity']['providers'] as $provider) {
-					$activityManager->registerProvider($provider);
-				}
-			}
-		}
-
-		if (!empty($info['settings'])) {
-			$settingsManager = \OC::$server->get(ISettingsManager::class);
-			if (!empty($info['settings']['admin'])) {
-				foreach ($info['settings']['admin'] as $setting) {
-					$settingsManager->registerSetting('admin', $setting);
-				}
-			}
-			if (!empty($info['settings']['admin-section'])) {
-				foreach ($info['settings']['admin-section'] as $section) {
-					$settingsManager->registerSection('admin', $section);
-				}
-			}
-			if (!empty($info['settings']['personal'])) {
-				foreach ($info['settings']['personal'] as $setting) {
-					$settingsManager->registerSetting('personal', $setting);
-				}
-			}
-			if (!empty($info['settings']['personal-section'])) {
-				foreach ($info['settings']['personal-section'] as $section) {
-					$settingsManager->registerSection('personal', $section);
-				}
-			}
-		}
-
-		if (!empty($info['collaboration']['plugins'])) {
-			// deal with one or many plugin entries
-			$plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
-				[$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
-			$collaboratorSearch = null;
-			$autoCompleteManager = null;
-			foreach ($plugins as $plugin) {
-				if ($plugin['@attributes']['type'] === 'collaborator-search') {
-					$pluginInfo = [
-						'shareType' => $plugin['@attributes']['share-type'],
-						'class' => $plugin['@value'],
-					];
-					$collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
-					$collaboratorSearch->registerPlugin($pluginInfo);
-				} elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
-					$autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
-					$autoCompleteManager->registerSorter($plugin['@value']);
-				}
-			}
-		}
-		$eventLogger->end("bootstrap:load_app:$app:info");
-
-		$eventLogger->end("bootstrap:load_app:$app");
-	}
-
-	/**
-	 * Check if an app is loaded
-	 * @param string $app app id
-	 * @since 26.0.0
-	 */
-	public function isAppLoaded(string $app): bool {
-		return isset($this->loadedApps[$app]);
-	}
-
-	/**
-	 * Enable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $forceEnable
-	 * @throws AppPathNotFoundException
-	 * @throws \InvalidArgumentException if the application is not installed yet
-	 */
-	public function enableApp(string $appId, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		$this->enabledAppsCache[$appId] = 'yes';
-		$this->getAppConfig()->setValue($appId, 'enabled', 'yes');
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE, $appId
-		));
-		$this->clearAppsCache();
-
-		$this->configManager->migrateConfigLexiconKeys($appId);
-	}
-
-	/**
-	 * Whether a list of types contains a protected app type
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 */
-	public function hasProtectedAppType($types) {
-		if (empty($types)) {
-			return false;
-		}
-
-		$protectedTypes = array_intersect($this->protectedAppTypes, $types);
-		return !empty($protectedTypes);
-	}
-
-	/**
-	 * Enable an app only for specific groups
-	 *
-	 * @param string $appId
-	 * @param IGroup[] $groups
-	 * @param bool $forceEnable
-	 * @throws \InvalidArgumentException if app can't be enabled for groups
-	 * @throws AppPathNotFoundException
-	 */
-	public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		$info = $this->getAppInfo($appId);
-		if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
-			throw new \InvalidArgumentException("$appId can't be enabled for groups.");
-		}
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		/** @var string[] $groupIds */
-		$groupIds = array_map(function ($group) {
-			/** @var IGroup $group */
-			return ($group instanceof IGroup)
-				? $group->getGID()
-				: $group;
-		}, $groups);
-
-		$this->enabledAppsCache[$appId] = json_encode($groupIds);
-		$this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
-		));
-		$this->clearAppsCache();
-
-		$this->configManager->migrateConfigLexiconKeys($appId);
-	}
-
-	/**
-	 * Disable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $automaticDisabled
-	 * @throws \Exception if app can't be disabled
-	 */
-	public function disableApp($appId, $automaticDisabled = false): void {
-		if ($this->isAlwaysEnabled($appId)) {
-			throw new \Exception("$appId can't be disabled.");
-		}
-
-		if ($automaticDisabled) {
-			$previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
-			if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
-				$previousSetting = json_decode($previousSetting, true);
-			}
-			$this->autoDisabledApps[$appId] = $previousSetting;
-		}
-
-		unset($this->enabledAppsCache[$appId]);
-		$this->getAppConfig()->setValue($appId, 'enabled', 'no');
-
-		// run uninstall steps
-		$appData = $this->getAppInfo($appId);
-		if (!is_null($appData)) {
-			\OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
-		}
-
-		$this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_DISABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 *
-	 * @throws AppPathNotFoundException if app folder can't be found
-	 */
-	public function getAppPath(string $appId): string {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new AppPathNotFoundException('Could not find path for ' . $appId);
-		}
-		return $appPath;
-	}
-
-	/**
-	 * Get the web path for the given app.
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws AppPathNotFoundException if app path can't be found
-	 */
-	public function getAppWebPath(string $appId): string {
-		$appWebPath = \OC_App::getAppWebPath($appId);
-		if ($appWebPath === false) {
-			throw new AppPathNotFoundException('Could not find web path for ' . $appId);
-		}
-		return $appWebPath;
-	}
-
-	/**
-	 * Clear the cached list of apps when enabling/disabling an app
-	 */
-	public function clearAppsCache(): void {
-		$this->appInfos = [];
-	}
-
-	/**
-	 * Returns a list of apps that need upgrade
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 * @return array list of app info from apps that need an upgrade
-	 *
-	 * @internal
-	 */
-	public function getAppsNeedingUpgrade($version) {
-		$appsToUpgrade = [];
-		$apps = $this->getEnabledApps();
-		foreach ($apps as $appId) {
-			$appInfo = $this->getAppInfo($appId);
-			$appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
-			if ($appDbVersion
-				&& isset($appInfo['version'])
-				&& version_compare($appInfo['version'], $appDbVersion, '>')
-				&& \OC_App::isAppCompatible($version, $appInfo)
-			) {
-				$appsToUpgrade[] = $appInfo;
-			}
-		}
-
-		return $appsToUpgrade;
-	}
-
-	/**
-	 * Returns the app information from "appinfo/info.xml".
-	 *
-	 * @param string|null $lang
-	 * @return array|null app info
-	 */
-	public function getAppInfo(string $appId, bool $path = false, $lang = null) {
-		if ($path) {
-			throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
-		}
-		if ($lang === null && isset($this->appInfos[$appId])) {
-			return $this->appInfos[$appId];
-		}
-		try {
-			$appPath = $this->getAppPath($appId);
-		} catch (AppPathNotFoundException) {
-			return null;
-		}
-		$file = $appPath . '/appinfo/info.xml';
-
-		$data = $this->getAppInfoByPath($file, $lang);
-
-		if ($lang === null) {
-			$this->appInfos[$appId] = $data;
-		}
-
-		return $data;
-	}
-
-	public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
-		if (!str_ends_with($path, '/appinfo/info.xml')) {
-			return null;
-		}
-
-		$parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
-		$data = $parser->parse($path);
-
-		if (is_array($data)) {
-			$data = \OC_App::parseAppInfo($data, $lang);
-		}
-
-		return $data;
-	}
-
-	public function getAppVersion(string $appId, bool $useCache = true): string {
-		if (!$useCache || !isset($this->appVersions[$appId])) {
-			if ($appId === 'core') {
-				$this->appVersions[$appId] = $this->serverVersion->getVersionString();
-			} else {
-				$appInfo = $this->getAppInfo($appId);
-				$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
-			}
-		}
-		return $this->appVersions[$appId];
-	}
-
-	/**
-	 * Returns the installed versions of all apps
-	 *
-	 * @return array<string, string>
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array {
-		return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
-	}
-
-	/**
-	 * Returns a list of apps incompatible with the given version
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 *
-	 * @return array list of app info from incompatible apps
-	 *
-	 * @internal
-	 */
-	public function getIncompatibleApps(string $version): array {
-		$apps = $this->getEnabledApps();
-		$incompatibleApps = [];
-		foreach ($apps as $appId) {
-			$info = $this->getAppInfo($appId);
-			if ($info === null) {
-				$incompatibleApps[] = ['id' => $appId, 'name' => $appId];
-			} elseif (!\OC_App::isAppCompatible($version, $info)) {
-				$incompatibleApps[] = $info;
-			}
-		}
-		return $incompatibleApps;
-	}
-
-	/**
-	 * @inheritdoc
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
-	 */
-	public function isShipped($appId) {
-		$this->loadShippedJson();
-		return in_array($appId, $this->shippedApps, true);
-	}
-
-	private function isAlwaysEnabled(string $appId): bool {
-		if ($appId === 'core') {
-			return true;
-		}
-
-		$alwaysEnabled = $this->getAlwaysEnabledApps();
-		return in_array($appId, $alwaysEnabled, true);
-	}
-
-	/**
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
-	 * @throws \Exception
-	 */
-	private function loadShippedJson(): void {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-			$this->defaultEnabled = $content['defaultEnabled'];
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAlwaysEnabledApps() {
-		$this->loadShippedJson();
-		return $this->alwaysEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isDefaultEnabled(string $appId): bool {
-		return (in_array($appId, $this->getDefaultEnabledApps()));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultEnabledApps(): array {
-		$this->loadShippedJson();
-
-		return $this->defaultEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
-		$id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
-		$entry = $this->getNavigationManager()->get($id);
-		return (string)$entry['app'];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultApps(): array {
-		$ids = $this->getNavigationManager()->getDefaultEntryIds();
-
-		return array_values(array_unique(array_map(function (string $id) {
-			$entry = $this->getNavigationManager()->get($id);
-			return (string)$entry['app'];
-		}, $ids)));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setDefaultApps(array $defaultApps): void {
-		$entries = $this->getNavigationManager()->getAll();
-		$ids = [];
-		foreach ($defaultApps as $defaultApp) {
-			foreach ($entries as $entry) {
-				if ((string)$entry['app'] === $defaultApp) {
-					$ids[] = (string)$entry['id'];
-					break;
-				}
-			}
-		}
-		$this->getNavigationManager()->setDefaultEntryIds($ids);
-	}
-
-	public function isBackendRequired(string $backend): bool {
-		foreach ($this->appInfos as $appInfo) {
-			foreach ($appInfo['dependencies']['backend'] as $appBackend) {
-				if ($backend === $appBackend) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Clean the appId from forbidden characters
-	 *
-	 * @psalm-taint-escape callable
-	 * @psalm-taint-escape cookie
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape has_quotes
-	 * @psalm-taint-escape header
-	 * @psalm-taint-escape html
-	 * @psalm-taint-escape include
-	 * @psalm-taint-escape ldap
-	 * @psalm-taint-escape shell
-	 * @psalm-taint-escape sql
-	 * @psalm-taint-escape unserialize
-	 */
-	public function cleanAppId(string $app): string {
-		/* Only lowercase alphanumeric is allowed */
-		return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
-	}
+    /**
+     * Apps with these types can not be enabled for certain groups only
+     * @var string[]
+     */
+    protected $protectedAppTypes = [
+        'filesystem',
+        'prelogin',
+        'authentication',
+        'logging',
+        'prevent_group_restriction',
+    ];
+
+    /** @var string[] $appId => $enabled */
+    private array $enabledAppsCache = [];
+
+    /** @var string[]|null */
+    private ?array $shippedApps = null;
+
+    private array $alwaysEnabled = [];
+    private array $defaultEnabled = [];
+
+    /** @var array */
+    private array $appInfos = [];
+
+    /** @var array */
+    private array $appVersions = [];
+
+    /** @var array */
+    private array $autoDisabledApps = [];
+    private array $appTypes = [];
+
+    /** @var array<string, true> */
+    private array $loadedApps = [];
+
+    private ?AppConfig $appConfig = null;
+    private ?IURLGenerator $urlGenerator = null;
+    private ?INavigationManager $navigationManager = null;
+
+    /**
+     * Be extremely careful when injecting classes here. The AppManager is used by the installer,
+     * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
+     */
+    public function __construct(
+        private IUserSession $userSession,
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private ICacheFactory $memCacheFactory,
+        private IEventDispatcher $dispatcher,
+        private LoggerInterface $logger,
+        private ServerVersion $serverVersion,
+        private ConfigManager $configManager,
+    ) {
+    }
+
+    private function getNavigationManager(): INavigationManager {
+        if ($this->navigationManager === null) {
+            $this->navigationManager = Server::get(INavigationManager::class);
+        }
+        return $this->navigationManager;
+    }
+
+    public function getAppIcon(string $appId, bool $dark = false): ?string {
+        $possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
+        $icon = null;
+        foreach ($possibleIcons as $iconName) {
+            try {
+                $icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
+                break;
+            } catch (\RuntimeException $e) {
+                // ignore
+            }
+        }
+        return $icon;
+    }
+
+    private function getAppConfig(): AppConfig {
+        if ($this->appConfig !== null) {
+            return $this->appConfig;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->appConfig = Server::get(AppConfig::class);
+        return $this->appConfig;
+    }
+
+    private function getUrlGenerator(): IURLGenerator {
+        if ($this->urlGenerator !== null) {
+            return $this->urlGenerator;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->urlGenerator = Server::get(IURLGenerator::class);
+        return $this->urlGenerator;
+    }
+
+    /**
+     * For all enabled apps, return the value of their 'enabled' config key.
+     *
+     * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
+     */
+    private function getEnabledAppsValues(): array {
+        if (!$this->enabledAppsCache) {
+            /** @var array<string,string> */
+            $values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
+
+            $alwaysEnabledApps = $this->getAlwaysEnabledApps();
+            foreach ($alwaysEnabledApps as $appId) {
+                $values[$appId] = 'yes';
+            }
+
+            $this->enabledAppsCache = array_filter($values, function ($value) {
+                return $value !== 'no';
+            });
+            ksort($this->enabledAppsCache);
+        }
+        return $this->enabledAppsCache;
+    }
+
+    /**
+     * Deprecated alias
+     *
+     * @return string[]
+     */
+    public function getInstalledApps() {
+        return $this->getEnabledApps();
+    }
+
+    /**
+     * List all enabled apps, either for everyone or for some groups
+     *
+     * @return list<string>
+     */
+    public function getEnabledApps(): array {
+        return array_keys($this->getEnabledAppsValues());
+    }
+
+    /**
+     * Get a list of all apps in the apps folder
+     *
+     * @return list<string> an array of app names (string IDs)
+     */
+    public function getAllAppsInAppsFolders(): array {
+        $apps = [];
+
+        foreach (\OC::$APPSROOTS as $apps_dir) {
+            if (!is_readable($apps_dir['path'])) {
+                $this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
+                continue;
+            }
+            $dh = opendir($apps_dir['path']);
+
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (
+                        $file[0] != '.' &&
+                        is_dir($apps_dir['path'] . '/' . $file) &&
+                        is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
+                    ) {
+                        $apps[] = $file;
+                    }
+                }
+            }
+        }
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * List all apps enabled for a user
+     *
+     * @param \OCP\IUser $user
+     * @return list<string>
+     */
+    public function getEnabledAppsForUser(IUser $user) {
+        $apps = $this->getEnabledAppsValues();
+        $appsForUser = array_filter($apps, function ($enabled) use ($user) {
+            return $this->checkAppForUser($enabled, $user);
+        });
+        return array_keys($appsForUser);
+    }
+
+    public function getEnabledAppsForGroup(IGroup $group): array {
+        $apps = $this->getEnabledAppsValues();
+        $appsForGroups = array_filter($apps, function ($enabled) use ($group) {
+            return $this->checkAppForGroups($enabled, $group);
+        });
+        return array_keys($appsForGroups);
+    }
+
+    /**
+     * Loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the Nextcloud directory and loads all apps
+     * it can find. A directory contains an app if the file /appinfo/info.xml
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     */
+    public function loadApps(array $types = []): bool {
+        if ($this->config->getSystemValueBool('maintenance', false)) {
+            return false;
+        }
+        // Load the enabled apps here
+        $apps = \OC_App::getEnabledApps();
+
+        // Add each apps' folder as allowed class path
+        foreach ($apps as $app) {
+            // If the app is already loaded then autoloading it makes no sense
+            if (!$this->isAppLoaded($app)) {
+                $path = \OC_App::getAppPath($app);
+                if ($path !== false) {
+                    \OC_App::registerAutoloading($app, $path);
+                }
+            }
+        }
+
+        // prevent app loading from printing output
+        ob_start();
+        foreach ($apps as $app) {
+            if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
+                try {
+                    $this->loadApp($app);
+                } catch (\Throwable $e) {
+                    $this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
+                        'exception' => $e,
+                        'app' => $app,
+                    ]);
+                }
+            }
+        }
+        ob_end_clean();
+
+        return true;
+    }
+
+    /**
+     * check if an app is of a specific type
+     *
+     * @param string $app
+     * @param array $types
+     * @return bool
+     */
+    public function isType(string $app, array $types): bool {
+        $appTypes = $this->getAppTypes($app);
+        foreach ($types as $type) {
+            if (in_array($type, $appTypes, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the types of an app
+     *
+     * @param string $app
+     * @return string[]
+     */
+    private function getAppTypes(string $app): array {
+        //load the cache
+        if (count($this->appTypes) === 0) {
+            $this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
+        }
+
+        if (isset($this->appTypes[$app])) {
+            return explode(',', $this->appTypes[$app]);
+        }
+
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAutoDisabledApps(): array {
+        return $this->autoDisabledApps;
+    }
+
+    public function getAppRestriction(string $appId): array {
+        $values = $this->getEnabledAppsValues();
+
+        if (!isset($values[$appId])) {
+            return [];
+        }
+
+        if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
+            return [];
+        }
+        return json_decode($values[$appId], true);
+    }
+
+    /**
+     * Check if an app is enabled for user
+     *
+     * @param string $appId
+     * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
+     * @return bool
+     */
+    public function isEnabledForUser($appId, $user = null) {
+        if ($this->isAlwaysEnabled($appId)) {
+            return true;
+        }
+        if ($user === null) {
+            $user = $this->userSession->getUser();
+        }
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        if (isset($enabledAppsValues[$appId])) {
+            return $this->checkAppForUser($enabledAppsValues[$appId], $user);
+        } else {
+            return false;
+        }
+    }
+
+    private function checkAppForUser(string $enabled, ?IUser $user): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } elseif ($user === null) {
+            return false;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            $userGroups = $this->groupManager->getUserGroupIds($user);
+            foreach ($userGroups as $groupId) {
+                if (in_array($groupId, $groupIds, true)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private function checkAppForGroups(string $enabled, IGroup $group): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            return in_array($group->getGID(), $groupIds);
+        }
+    }
+
+    /**
+     * Check if an app is enabled in the instance
+     *
+     * Notice: This actually checks if the app is enabled and not only if it is installed.
+     *
+     * @param string $appId
+     */
+    public function isInstalled($appId): bool {
+        return $this->isEnabledForAnyone($appId);
+    }
+
+    public function isEnabledForAnyone(string $appId): bool {
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        return isset($enabledAppsValues[$appId]);
+    }
+
+    /**
+     * Overwrite the `max-version` requirement for this app.
+     */
+    public function overwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        if (!in_array($appId, $ignoreMaxApps, true)) {
+            $ignoreMaxApps[] = $appId;
+        }
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    /**
+     * Remove the `max-version` overwrite for this app.
+     * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
+     */
+    public function removeOverwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    public function loadApp(string $app): void {
+        if (isset($this->loadedApps[$app])) {
+            return;
+        }
+        $this->loadedApps[$app] = true;
+        $appPath = \OC_App::getAppPath($app);
+        if ($appPath === false) {
+            return;
+        }
+        $eventLogger = \OC::$server->get(IEventLogger::class);
+        $eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
+
+        // in case someone calls loadApp() directly
+        \OC_App::registerAutoloading($app, $appPath);
+
+        if (is_file($appPath . '/appinfo/app.php')) {
+            $this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
+                'app' => $app,
+            ]);
+        }
+
+        $coordinator = Server::get(Coordinator::class);
+        $coordinator->bootApp($app);
+
+        $eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
+        $info = $this->getAppInfo($app);
+        if (!empty($info['activity'])) {
+            $activityManager = \OC::$server->get(IActivityManager::class);
+            if (!empty($info['activity']['filters'])) {
+                foreach ($info['activity']['filters'] as $filter) {
+                    $activityManager->registerFilter($filter);
+                }
+            }
+            if (!empty($info['activity']['settings'])) {
+                foreach ($info['activity']['settings'] as $setting) {
+                    $activityManager->registerSetting($setting);
+                }
+            }
+            if (!empty($info['activity']['providers'])) {
+                foreach ($info['activity']['providers'] as $provider) {
+                    $activityManager->registerProvider($provider);
+                }
+            }
+        }
+
+        if (!empty($info['settings'])) {
+            $settingsManager = \OC::$server->get(ISettingsManager::class);
+            if (!empty($info['settings']['admin'])) {
+                foreach ($info['settings']['admin'] as $setting) {
+                    $settingsManager->registerSetting('admin', $setting);
+                }
+            }
+            if (!empty($info['settings']['admin-section'])) {
+                foreach ($info['settings']['admin-section'] as $section) {
+                    $settingsManager->registerSection('admin', $section);
+                }
+            }
+            if (!empty($info['settings']['personal'])) {
+                foreach ($info['settings']['personal'] as $setting) {
+                    $settingsManager->registerSetting('personal', $setting);
+                }
+            }
+            if (!empty($info['settings']['personal-section'])) {
+                foreach ($info['settings']['personal-section'] as $section) {
+                    $settingsManager->registerSection('personal', $section);
+                }
+            }
+        }
+
+        if (!empty($info['collaboration']['plugins'])) {
+            // deal with one or many plugin entries
+            $plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
+                [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
+            $collaboratorSearch = null;
+            $autoCompleteManager = null;
+            foreach ($plugins as $plugin) {
+                if ($plugin['@attributes']['type'] === 'collaborator-search') {
+                    $pluginInfo = [
+                        'shareType' => $plugin['@attributes']['share-type'],
+                        'class' => $plugin['@value'],
+                    ];
+                    $collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
+                    $collaboratorSearch->registerPlugin($pluginInfo);
+                } elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
+                    $autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
+                    $autoCompleteManager->registerSorter($plugin['@value']);
+                }
+            }
+        }
+        $eventLogger->end("bootstrap:load_app:$app:info");
+
+        $eventLogger->end("bootstrap:load_app:$app");
+    }
+
+    /**
+     * Check if an app is loaded
+     * @param string $app app id
+     * @since 26.0.0
+     */
+    public function isAppLoaded(string $app): bool {
+        return isset($this->loadedApps[$app]);
+    }
+
+    /**
+     * Enable an app for every user
+     *
+     * @param string $appId
+     * @param bool $forceEnable
+     * @throws AppPathNotFoundException
+     * @throws \InvalidArgumentException if the application is not installed yet
+     */
+    public function enableApp(string $appId, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        $this->enabledAppsCache[$appId] = 'yes';
+        $this->getAppConfig()->setValue($appId, 'enabled', 'yes');
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE, $appId
+        ));
+        $this->clearAppsCache();
+
+        $this->configManager->migrateConfigLexiconKeys($appId);
+    }
+
+    /**
+     * Whether a list of types contains a protected app type
+     *
+     * @param string[] $types
+     * @return bool
+     */
+    public function hasProtectedAppType($types) {
+        if (empty($types)) {
+            return false;
+        }
+
+        $protectedTypes = array_intersect($this->protectedAppTypes, $types);
+        return !empty($protectedTypes);
+    }
+
+    /**
+     * Enable an app only for specific groups
+     *
+     * @param string $appId
+     * @param IGroup[] $groups
+     * @param bool $forceEnable
+     * @throws \InvalidArgumentException if app can't be enabled for groups
+     * @throws AppPathNotFoundException
+     */
+    public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        $info = $this->getAppInfo($appId);
+        if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
+            throw new \InvalidArgumentException("$appId can't be enabled for groups.");
+        }
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        /** @var string[] $groupIds */
+        $groupIds = array_map(function ($group) {
+            /** @var IGroup $group */
+            return ($group instanceof IGroup)
+                ? $group->getGID()
+                : $group;
+        }, $groups);
+
+        $this->enabledAppsCache[$appId] = json_encode($groupIds);
+        $this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
+        ));
+        $this->clearAppsCache();
+
+        $this->configManager->migrateConfigLexiconKeys($appId);
+    }
+
+    /**
+     * Disable an app for every user
+     *
+     * @param string $appId
+     * @param bool $automaticDisabled
+     * @throws \Exception if app can't be disabled
+     */
+    public function disableApp($appId, $automaticDisabled = false): void {
+        if ($this->isAlwaysEnabled($appId)) {
+            throw new \Exception("$appId can't be disabled.");
+        }
+
+        if ($automaticDisabled) {
+            $previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
+            if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
+                $previousSetting = json_decode($previousSetting, true);
+            }
+            $this->autoDisabledApps[$appId] = $previousSetting;
+        }
+
+        unset($this->enabledAppsCache[$appId]);
+        $this->getAppConfig()->setValue($appId, 'enabled', 'no');
+
+        // run uninstall steps
+        $appData = $this->getAppInfo($appId);
+        if (!is_null($appData)) {
+            \OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
+        }
+
+        $this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_DISABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Get the directory for the given app.
+     *
+     * @throws AppPathNotFoundException if app folder can't be found
+     */
+    public function getAppPath(string $appId): string {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new AppPathNotFoundException('Could not find path for ' . $appId);
+        }
+        return $appPath;
+    }
+
+    /**
+     * Get the web path for the given app.
+     *
+     * @param string $appId
+     * @return string
+     * @throws AppPathNotFoundException if app path can't be found
+     */
+    public function getAppWebPath(string $appId): string {
+        $appWebPath = \OC_App::getAppWebPath($appId);
+        if ($appWebPath === false) {
+            throw new AppPathNotFoundException('Could not find web path for ' . $appId);
+        }
+        return $appWebPath;
+    }
+
+    /**
+     * Clear the cached list of apps when enabling/disabling an app
+     */
+    public function clearAppsCache(): void {
+        $this->appInfos = [];
+    }
+
+    /**
+     * Returns a list of apps that need upgrade
+     *
+     * @param string $version Nextcloud version as array of version components
+     * @return array list of app info from apps that need an upgrade
+     *
+     * @internal
+     */
+    public function getAppsNeedingUpgrade($version) {
+        $appsToUpgrade = [];
+        $apps = $this->getEnabledApps();
+        foreach ($apps as $appId) {
+            $appInfo = $this->getAppInfo($appId);
+            $appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
+            if ($appDbVersion
+                && isset($appInfo['version'])
+                && version_compare($appInfo['version'], $appDbVersion, '>')
+                && \OC_App::isAppCompatible($version, $appInfo)
+            ) {
+                $appsToUpgrade[] = $appInfo;
+            }
+        }
+
+        return $appsToUpgrade;
+    }
+
+    /**
+     * Returns the app information from "appinfo/info.xml".
+     *
+     * @param string|null $lang
+     * @return array|null app info
+     */
+    public function getAppInfo(string $appId, bool $path = false, $lang = null) {
+        if ($path) {
+            throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
+        }
+        if ($lang === null && isset($this->appInfos[$appId])) {
+            return $this->appInfos[$appId];
+        }
+        try {
+            $appPath = $this->getAppPath($appId);
+        } catch (AppPathNotFoundException) {
+            return null;
+        }
+        $file = $appPath . '/appinfo/info.xml';
+
+        $data = $this->getAppInfoByPath($file, $lang);
+
+        if ($lang === null) {
+            $this->appInfos[$appId] = $data;
+        }
+
+        return $data;
+    }
+
+    public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
+        if (!str_ends_with($path, '/appinfo/info.xml')) {
+            return null;
+        }
+
+        $parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
+        $data = $parser->parse($path);
+
+        if (is_array($data)) {
+            $data = \OC_App::parseAppInfo($data, $lang);
+        }
+
+        return $data;
+    }
+
+    public function getAppVersion(string $appId, bool $useCache = true): string {
+        if (!$useCache || !isset($this->appVersions[$appId])) {
+            if ($appId === 'core') {
+                $this->appVersions[$appId] = $this->serverVersion->getVersionString();
+            } else {
+                $appInfo = $this->getAppInfo($appId);
+                $this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+            }
+        }
+        return $this->appVersions[$appId];
+    }
+
+    /**
+     * Returns the installed versions of all apps
+     *
+     * @return array<string, string>
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array {
+        return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
+    }
+
+    /**
+     * Returns a list of apps incompatible with the given version
+     *
+     * @param string $version Nextcloud version as array of version components
+     *
+     * @return array list of app info from incompatible apps
+     *
+     * @internal
+     */
+    public function getIncompatibleApps(string $version): array {
+        $apps = $this->getEnabledApps();
+        $incompatibleApps = [];
+        foreach ($apps as $appId) {
+            $info = $this->getAppInfo($appId);
+            if ($info === null) {
+                $incompatibleApps[] = ['id' => $appId, 'name' => $appId];
+            } elseif (!\OC_App::isAppCompatible($version, $info)) {
+                $incompatibleApps[] = $info;
+            }
+        }
+        return $incompatibleApps;
+    }
+
+    /**
+     * @inheritdoc
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
+     */
+    public function isShipped($appId) {
+        $this->loadShippedJson();
+        return in_array($appId, $this->shippedApps, true);
+    }
+
+    private function isAlwaysEnabled(string $appId): bool {
+        if ($appId === 'core') {
+            return true;
+        }
+
+        $alwaysEnabled = $this->getAlwaysEnabledApps();
+        return in_array($appId, $alwaysEnabled, true);
+    }
+
+    /**
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
+     * @throws \Exception
+     */
+    private function loadShippedJson(): void {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+            $this->defaultEnabled = $content['defaultEnabled'];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAlwaysEnabledApps() {
+        $this->loadShippedJson();
+        return $this->alwaysEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDefaultEnabled(string $appId): bool {
+        return (in_array($appId, $this->getDefaultEnabledApps()));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultEnabledApps(): array {
+        $this->loadShippedJson();
+
+        return $this->defaultEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
+        $id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
+        $entry = $this->getNavigationManager()->get($id);
+        return (string)$entry['app'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultApps(): array {
+        $ids = $this->getNavigationManager()->getDefaultEntryIds();
+
+        return array_values(array_unique(array_map(function (string $id) {
+            $entry = $this->getNavigationManager()->get($id);
+            return (string)$entry['app'];
+        }, $ids)));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setDefaultApps(array $defaultApps): void {
+        $entries = $this->getNavigationManager()->getAll();
+        $ids = [];
+        foreach ($defaultApps as $defaultApp) {
+            foreach ($entries as $entry) {
+                if ((string)$entry['app'] === $defaultApp) {
+                    $ids[] = (string)$entry['id'];
+                    break;
+                }
+            }
+        }
+        $this->getNavigationManager()->setDefaultEntryIds($ids);
+    }
+
+    public function isBackendRequired(string $backend): bool {
+        foreach ($this->appInfos as $appInfo) {
+            foreach ($appInfo['dependencies']['backend'] as $appBackend) {
+                if ($backend === $appBackend) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clean the appId from forbidden characters
+     *
+     * @psalm-taint-escape callable
+     * @psalm-taint-escape cookie
+     * @psalm-taint-escape file
+     * @psalm-taint-escape has_quotes
+     * @psalm-taint-escape header
+     * @psalm-taint-escape html
+     * @psalm-taint-escape include
+     * @psalm-taint-escape ldap
+     * @psalm-taint-escape shell
+     * @psalm-taint-escape sql
+     * @psalm-taint-escape unserialize
+     */
+    public function cleanAppId(string $app): string {
+        /* Only lowercase alphanumeric is allowed */
+        return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
+    }
 }

lib/private/AppConfig.php

Indentation +1686 added lines, -1686 removed lines

@@ -48,1690 +48,1690 @@
  * @since 29.0.0 - Supporting types and lazy loading
  */
 class AppConfig implements IAppConfig {
-	private const APP_MAX_LENGTH = 32;
-	private const KEY_MAX_LENGTH = 64;
-	private const ENCRYPTION_PREFIX = '$AppConfigEncryption$';
-	private const ENCRYPTION_PREFIX_LENGTH = 21; // strlen(self::ENCRYPTION_PREFIX)
-
-	/** @var array<string, array<string, mixed>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $fastCache = [];   // cache for normal config keys
-	/** @var array<string, array<string, mixed>> ['app_id' => ['config_key' => 'config_value']] */
-	private array $lazyCache = [];   // cache for lazy config keys
-	/** @var array<string, array<string, int>> ['app_id' => ['config_key' => bitflag]] */
-	private array $valueTypes = [];  // type for all config values
-	private bool $fastLoaded = false;
-	private bool $lazyLoaded = false;
-	/** @var array<string, array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
-	private array $configLexiconDetails = [];
-	private bool $ignoreLexiconAliases = false;
-
-	/** @var ?array<string, string> */
-	private ?array $appVersionsCache = null;
-
-	public function __construct(
-		protected IDBConnection $connection,
-		protected LoggerInterface $logger,
-		protected ICrypto $crypto,
-	) {
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @return list<string> list of app ids
-	 * @since 7.0.0
-	 */
-	public function getApps(): array {
-		$this->loadConfigAll();
-		$apps = array_merge(array_keys($this->fastCache), array_keys($this->lazyCache));
-		sort($apps);
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 *
-	 * @return list<string> list of stored config keys
-	 * @since 29.0.0
-	 */
-	public function getKeys(string $app): array {
-		$this->assertParams($app);
-		$this->loadConfigAll($app);
-		$keys = array_merge(array_keys($this->fastCache[$app] ?? []), array_keys($this->lazyCache[$app] ?? []));
-		sort($keys);
-
-		return array_values(array_unique($keys));
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool TRUE if key exists
-	 * @since 7.0.0
-	 * @since 29.0.0 Added the $lazy argument
-	 */
-	public function hasKey(string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig($app, $lazy);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		if ($lazy === null) {
-			$appCache = $this->getAllValues($app);
-			return isset($appCache[$key]);
-		}
-
-		if ($lazy) {
-			return isset($this->lazyCache[$app][$key]);
-		}
-
-		return isset($this->fastCache[$app][$key]);
-	}
-
-	/**
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
-	 *
-	 * @return bool
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @since 29.0.0
-	 */
-	public function isSensitive(string $app, string $key, ?bool $lazy = false): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfig(null, $lazy);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		if (!isset($this->valueTypes[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		return $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key]);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app if of the app
-	 * @param string $key config key
-	 *
-	 * @return bool TRUE if config is lazy loaded
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @see IAppConfig for details about lazy loading
-	 * @since 29.0.0
-	 */
-	public function isLazy(string $app, string $key): bool {
-		$this->assertParams($app, $key);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		// there is a huge probability the non-lazy config are already loaded
-		if ($this->hasKey($app, $key, false)) {
-			return false;
-		}
-
-		// key not found, we search in the lazy config
-		if ($this->hasKey($app, $key, true)) {
-			return true;
-		}
-
-		throw new AppConfigUnknownKeyException('unknown config key');
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $prefix config keys prefix to search
-	 * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
-	 *
-	 * @return array<string, string|int|float|bool|array> [configKey => configValue]
-	 * @since 29.0.0
-	 */
-	public function getAllValues(string $app, string $prefix = '', bool $filtered = false): array {
-		$this->assertParams($app, $prefix);
-		// if we want to filter values, we need to get sensitivity
-		$this->loadConfigAll($app);
-		// array_merge() will remove numeric keys (here config keys), so addition arrays instead
-		$values = $this->formatAppValues($app, ($this->fastCache[$app] ?? []) + ($this->lazyCache[$app] ?? []));
-		$values = array_filter(
-			$values,
-			function (string $key) use ($prefix): bool {
-				return str_starts_with($key, $prefix); // filter values based on $prefix
-			}, ARRAY_FILTER_USE_KEY
-		);
-
-		if (!$filtered) {
-			return $values;
-		}
-
-		/**
-		 * Using the old (deprecated) list of sensitive values.
-		 */
-		foreach ($this->getSensitiveKeys($app) as $sensitiveKeyExp) {
-			$sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
-			foreach ($sensitiveKeys as $sensitiveKey) {
-				$this->valueTypes[$app][$sensitiveKey] = ($this->valueTypes[$app][$sensitiveKey] ?? 0) | self::VALUE_SENSITIVE;
-			}
-		}
-
-		$result = [];
-		foreach ($values as $key => $value) {
-			$result[$key] = $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key] ?? 0) ? IConfig::SENSITIVE_VALUE : $value;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $key config key
-	 * @param bool $lazy search within lazy loaded config
-	 * @param int|null $typedAs enforce type for the returned values ({@see self::VALUE_STRING} and others)
-	 *
-	 * @return array<string, string|int|float|bool|array> [appId => configValue]
-	 * @since 29.0.0
-	 */
-	public function searchValues(string $key, bool $lazy = false, ?int $typedAs = null): array {
-		$this->assertParams('', $key, true);
-		$this->loadConfig(null, $lazy);
-
-		/** @var array<array-key, array<array-key, mixed>> $cache */
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		$values = [];
-		foreach (array_keys($cache) as $app) {
-			if (isset($cache[$app][$key])) {
-				$values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string)$app, $key, $lazy));
-			}
-		}
-
-		return $values;
-	}
-
-
-	/**
-	 * Get the config value as string.
-	 * If the value does not exist the given default will be returned.
-	 *
-	 * Set lazy to `null` to ignore it and get the value from either source.
-	 *
-	 * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default config value
-	 * @param null|bool $lazy get config as lazy loaded or not. can be NULL
-	 *
-	 * @return string the value or $default
-	 * @internal
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 * @see getValueString()
-	 * @see getValueInt()
-	 * @see getValueFloat()
-	 * @see getValueBool()
-	 * @see getValueArray()
-	 */
-	public function getValueMixed(
-		string $app,
-		string $key,
-		string $default = '',
-		?bool $lazy = false,
-	): string {
-		try {
-			$lazy = ($lazy === null) ? $this->isLazy($app, $key) : $lazy;
-		} catch (AppConfigUnknownKeyException) {
-			return $default;
-		}
-
-		return $this->getTypedValue(
-			$app,
-			$key,
-			$default,
-			$lazy,
-			self::VALUE_MIXED
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return string stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueString(
-		string $app,
-		string $key,
-		string $default = '',
-		bool $lazy = false,
-	): string {
-		return $this->getTypedValue($app, $key, $default, $lazy, self::VALUE_STRING);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return int stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueInt(
-		string $app,
-		string $key,
-		int $default = 0,
-		bool $lazy = false,
-	): int {
-		return (int)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_INT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return float stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueFloat(string $app, string $key, float $default = 0, bool $lazy = false): float {
-		return (float)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_FLOAT);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return bool stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueBool(string $app, string $key, bool $default = false, bool $lazy = false): bool {
-		$b = strtolower($this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL));
-		return in_array($b, ['1', 'true', 'yes', 'on']);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 *
-	 * @return array stored config value or $default if not set in database
-	 * @throws InvalidArgumentException if one of the argument format is invalid
-	 * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function getValueArray(
-		string $app,
-		string $key,
-		array $default = [],
-		bool $lazy = false,
-	): array {
-		try {
-			$defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
-			$value = json_decode($this->getTypedValue($app, $key, $defaultJson, $lazy, self::VALUE_ARRAY), true, flags: JSON_THROW_ON_ERROR);
-
-			return is_array($value) ? $value : [];
-		} catch (JsonException) {
-			return [];
-		}
-	}
-
-	/**
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $default default value
-	 * @param bool $lazy search within lazy loaded config
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT}{@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return string
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @throws InvalidArgumentException
-	 */
-	private function getTypedValue(
-		string $app,
-		string $key,
-		string $default,
-		bool $lazy,
-		int $type,
-	): string {
-		$this->assertParams($app, $key, valueType: $type);
-		$origKey = $key;
-		if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, $default)) {
-			return $default; // returns default if strictness of lexicon is set to WARNING (block and report)
-		}
-		$this->loadConfig($app, $lazy);
-
-		/**
-		 * We ignore check if mixed type is requested.
-		 * If type of stored value is set as mixed, we don't filter.
-		 * If type of stored value is defined, we compare with the one requested.
-		 */
-		$knownType = $this->valueTypes[$app][$key] ?? 0;
-		if (!$this->isTyped(self::VALUE_MIXED, $type)
-			&& $knownType > 0
-			&& !$this->isTyped(self::VALUE_MIXED, $knownType)
-			&& !$this->isTyped($type, $knownType)) {
-			$this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
-			throw new AppConfigTypeConflictException('conflict with value type from database');
-		}
-
-		/**
-		 * - the pair $app/$key cannot exist in both array,
-		 * - we should still return an existing non-lazy value even if current method
-		 *   is called with $lazy is true
-		 *
-		 * This way, lazyCache will be empty until the load for lazy config value is requested.
-		 */
-		if (isset($this->lazyCache[$app][$key])) {
-			$value = $this->lazyCache[$app][$key];
-		} elseif (isset($this->fastCache[$app][$key])) {
-			$value = $this->fastCache[$app][$key];
-		} else {
-			return $default;
-		}
-
-		$sensitive = $this->isTyped(self::VALUE_SENSITIVE, $knownType);
-		if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
-			// Only decrypt values that are stored encrypted
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		// in case the key was modified while running matchAndApplyLexiconDefinition() we are
-		// interested to check options in case a modification of the value is needed
-		// ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
-		if ($origKey !== $key && $type === self::VALUE_BOOL) {
-			$configManager = Server::get(ConfigManager::class);
-			$value = ($configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
-		}
-
-		return $value;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return int type of the value
-	 * @throws AppConfigUnknownKeyException if config key is not known
-	 * @since 29.0.0
-	 * @see VALUE_STRING
-	 * @see VALUE_INT
-	 * @see VALUE_FLOAT
-	 * @see VALUE_BOOL
-	 * @see VALUE_ARRAY
-	 */
-	public function getValueType(string $app, string $key, ?bool $lazy = null): int {
-		$type = self::VALUE_MIXED;
-		$ignorable = $lazy ?? false;
-		$this->matchAndApplyLexiconDefinition($app, $key, $ignorable, $type);
-		if ($type !== self::VALUE_MIXED) {
-			// a modified $type means config key is set in Lexicon
-			return $type;
-		}
-
-		$this->assertParams($app, $key);
-		$this->loadConfig($app, $lazy);
-
-		if (!isset($this->valueTypes[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		$type = $this->valueTypes[$app][$key];
-		$type &= ~self::VALUE_SENSITIVE;
-		return $type;
-	}
-
-
-	/**
-	 * Store a config key and its value in database as VALUE_MIXED
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED
-	 * @internal
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 * @see setValueString()
-	 * @see setValueInt()
-	 * @see setValueFloat()
-	 * @see setValueBool()
-	 * @see setValueArray()
-	 */
-	public function setValueMixed(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			$value,
-			$lazy,
-			self::VALUE_MIXED | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueString(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			$value,
-			$lazy,
-			self::VALUE_STRING | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueInt(
-		string $app,
-		string $key,
-		int $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		if ($value > 2000000000) {
-			$this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
-		}
-
-		return $this->setTypedValue(
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			self::VALUE_INT | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param float $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueFloat(
-		string $app,
-		string $key,
-		float $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			(string)$value,
-			$lazy,
-			self::VALUE_FLOAT | ($sensitive ? self::VALUE_SENSITIVE : 0)
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueBool(
-		string $app,
-		string $key,
-		bool $value,
-		bool $lazy = false,
-	): bool {
-		return $this->setTypedValue(
-			$app,
-			$key,
-			($value) ? '1' : '0',
-			$lazy,
-			self::VALUE_BOOL
-		);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param array $value config value
-	 * @param bool $lazy set config as lazy loaded
-	 * @param bool $sensitive if TRUE value will be hidden when listing config values.
-	 *
-	 * @return bool TRUE if value was different, therefor updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @throws JsonException
-	 * @since 29.0.0
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	public function setValueArray(
-		string $app,
-		string $key,
-		array $value,
-		bool $lazy = false,
-		bool $sensitive = false,
-	): bool {
-		try {
-			return $this->setTypedValue(
-				$app,
-				$key,
-				json_encode($value, JSON_THROW_ON_ERROR),
-				$lazy,
-				self::VALUE_ARRAY | ($sensitive ? self::VALUE_SENSITIVE : 0)
-			);
-		} catch (JsonException $e) {
-			$this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
-			throw $e;
-		}
-	}
-
-	/**
-	 * Store a config key and its value in database
-	 *
-	 * If config key is already known with the exact same config value and same sensitive/lazy status, the
-	 * database is not updated. If config value was previously stored as sensitive, status will not be
-	 * altered.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param string $value config value
-	 * @param bool $lazy config set as lazy loaded
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return bool TRUE if value was updated in database
-	 * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
-	 * @see IAppConfig for explanation about lazy loading
-	 */
-	private function setTypedValue(
-		string $app,
-		string $key,
-		string $value,
-		bool $lazy,
-		int $type,
-	): bool {
-		$this->assertParams($app, $key);
-		if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type)) {
-			return false; // returns false as database is not updated
-		}
-		$this->loadConfig(null, $lazy);
-
-		$sensitive = $this->isTyped(self::VALUE_SENSITIVE, $type);
-		$inserted = $refreshCache = false;
-
-		$origValue = $value;
-		if ($sensitive || ($this->hasKey($app, $key, $lazy) && $this->isSensitive($app, $key, $lazy))) {
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-		}
-
-		if ($this->hasKey($app, $key, $lazy)) {
-			/**
-			 * no update if key is already known with set lazy status and value is
-			 * not different, unless sensitivity is switched from false to true.
-			 */
-			if ($origValue === $this->getTypedValue($app, $key, $value, $lazy, $type)
-				&& (!$sensitive || $this->isSensitive($app, $key, $lazy))) {
-				return false;
-			}
-		} else {
-			/**
-			 * if key is not known yet, we try to insert.
-			 * It might fail if the key exists with a different lazy flag.
-			 */
-			try {
-				$insert = $this->connection->getQueryBuilder();
-				$insert->insert('appconfig')
-					->setValue('appid', $insert->createNamedParameter($app))
-					->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-					->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-					->setValue('configkey', $insert->createNamedParameter($key))
-					->setValue('configvalue', $insert->createNamedParameter($value));
-				$insert->executeStatement();
-				$inserted = true;
-			} catch (DBException $e) {
-				if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
-					throw $e; // TODO: throw exception or just log and returns false !?
-				}
-			}
-		}
-
-		/**
-		 * We cannot insert a new row, meaning we need to update an already existing one
-		 */
-		if (!$inserted) {
-			$currType = $this->valueTypes[$app][$key] ?? 0;
-			if ($currType === 0) { // this might happen when switching lazy loading status
-				$this->loadConfigAll();
-				$currType = $this->valueTypes[$app][$key] ?? 0;
-			}
-
-			/**
-			 * This should only happen during the upgrade process from 28 to 29.
-			 * We only log a warning and set it to VALUE_MIXED.
-			 */
-			if ($currType === 0) {
-				$this->logger->warning('Value type is set to zero (0) in database. This is fine only during the upgrade process from 28 to 29.', ['app' => $app, 'key' => $key]);
-				$currType = self::VALUE_MIXED;
-			}
-
-			/**
-			 * we only accept a different type from the one stored in database
-			 * if the one stored in database is not-defined (VALUE_MIXED)
-			 */
-			if (!$this->isTyped(self::VALUE_MIXED, $currType) &&
-				($type | self::VALUE_SENSITIVE) !== ($currType | self::VALUE_SENSITIVE)) {
-				try {
-					$currType = $this->convertTypeToString($currType);
-					$type = $this->convertTypeToString($type);
-				} catch (AppConfigIncorrectTypeException) {
-					// can be ignored, this was just needed for a better exception message.
-				}
-				throw new AppConfigTypeConflictException('conflict between new type (' . $type . ') and old type (' . $currType . ')');
-			}
-
-			// we fix $type if the stored value, or the new value as it might be changed, is set as sensitive
-			if ($sensitive || $this->isTyped(self::VALUE_SENSITIVE, $currType)) {
-				$type |= self::VALUE_SENSITIVE;
-			}
-
-			if ($lazy !== $this->isLazy($app, $key)) {
-				$refreshCache = true;
-			}
-
-			$update = $this->connection->getQueryBuilder();
-			$update->update('appconfig')
-				->set('configvalue', $update->createNamedParameter($value))
-				->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
-				->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-				->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-				->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-
-			$update->executeStatement();
-		}
-
-		if ($refreshCache) {
-			$this->clearCache();
-			return true;
-		}
-
-		// update local cache
-		if ($lazy) {
-			$this->lazyCache[$app][$key] = $value;
-		} else {
-			$this->fastCache[$app][$key] = $value;
-		}
-		$this->valueTypes[$app][$key] = $type;
-
-		return true;
-	}
-
-	/**
-	 * Change the type of config value.
-	 *
-	 * **WARNING:** Method is internal and **MUST** not be used as it may break things.
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
-	 *
-	 * @return bool TRUE if database update were necessary
-	 * @throws AppConfigUnknownKeyException if $key is now known in database
-	 * @throws AppConfigIncorrectTypeException if $type is not valid
-	 * @internal
-	 * @since 29.0.0
-	 */
-	public function updateType(string $app, string $key, int $type = self::VALUE_MIXED): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfigAll();
-		$this->matchAndApplyLexiconDefinition($app, $key);
-		$this->isLazy($app, $key); // confirm key exists
-
-		// type can only be one type
-		if (!in_array($type, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
-			throw new AppConfigIncorrectTypeException('Unknown value type');
-		}
-
-		$currType = $this->valueTypes[$app][$key];
-		if (($type | self::VALUE_SENSITIVE) === ($currType | self::VALUE_SENSITIVE)) {
-			return false;
-		}
-
-		// we complete with sensitive flag if the stored value is set as sensitive
-		if ($this->isTyped(self::VALUE_SENSITIVE, $currType)) {
-			$type = $type | self::VALUE_SENSITIVE;
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-		$this->valueTypes[$app][$key] = $type;
-
-		return true;
-	}
-
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 29.0.0
-	 */
-	public function updateSensitive(string $app, string $key, bool $sensitive): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfigAll();
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		try {
-			if ($sensitive === $this->isSensitive($app, $key, null)) {
-				return false;
-			}
-		} catch (AppConfigUnknownKeyException $e) {
-			return false;
-		}
-
-		$lazy = $this->isLazy($app, $key);
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		if (!isset($cache[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		/**
-		 * type returned by getValueType() is already cleaned from sensitive flag
-		 * we just need to update it based on $sensitive and store it in database
-		 */
-		$type = $this->getValueType($app, $key);
-		$value = $cache[$app][$key];
-		if ($sensitive) {
-			$type |= self::VALUE_SENSITIVE;
-			$value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
-		} else {
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
-			->set('configvalue', $update->createNamedParameter($value))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		$this->valueTypes[$app][$key] = $type;
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
-	 *
-	 * @return bool TRUE if entry was found in database and an update was necessary
-	 * @since 29.0.0
-	 */
-	public function updateLazy(string $app, string $key, bool $lazy): bool {
-		$this->assertParams($app, $key);
-		$this->loadConfigAll();
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		try {
-			if ($lazy === $this->isLazy($app, $key)) {
-				return false;
-			}
-		} catch (AppConfigUnknownKeyException $e) {
-			return false;
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('appconfig')
-			->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
-			->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
-			->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
-		$update->executeStatement();
-
-		// At this point, it is a lot safer to clean cache
-		$this->clearCache();
-
-		return true;
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @return array
-	 * @throws AppConfigUnknownKeyException if config key is not known in database
-	 * @since 29.0.0
-	 */
-	public function getDetails(string $app, string $key): array {
-		$this->assertParams($app, $key);
-		$this->loadConfigAll();
-		$this->matchAndApplyLexiconDefinition($app, $key);
-		$lazy = $this->isLazy($app, $key);
-
-		if ($lazy) {
-			$cache = $this->lazyCache;
-		} else {
-			$cache = $this->fastCache;
-		}
-
-		$type = $this->getValueType($app, $key);
-		try {
-			$typeString = $this->convertTypeToString($type);
-		} catch (AppConfigIncorrectTypeException $e) {
-			$this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
-			$typeString = (string)$type;
-		}
-
-		if (!isset($cache[$app][$key])) {
-			throw new AppConfigUnknownKeyException('unknown config key');
-		}
-
-		$value = $cache[$app][$key];
-		$sensitive = $this->isSensitive($app, $key, null);
-		if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
-			$value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
-		}
-
-		return [
-			'app' => $app,
-			'key' => $key,
-			'value' => $value,
-			'type' => $type,
-			'lazy' => $lazy,
-			'typeString' => $typeString,
-			'sensitive' => $sensitive
-		];
-	}
-
-	/**
-	 * @param string $type
-	 *
-	 * @return int
-	 * @throws AppConfigIncorrectTypeException
-	 * @since 29.0.0
-	 */
-	public function convertTypeToInt(string $type): int {
-		return match (strtolower($type)) {
-			'mixed' => IAppConfig::VALUE_MIXED,
-			'string' => IAppConfig::VALUE_STRING,
-			'integer' => IAppConfig::VALUE_INT,
-			'float' => IAppConfig::VALUE_FLOAT,
-			'boolean' => IAppConfig::VALUE_BOOL,
-			'array' => IAppConfig::VALUE_ARRAY,
-			default => throw new AppConfigIncorrectTypeException('Unknown type ' . $type)
-		};
-	}
-
-	/**
-	 * @param int $type
-	 *
-	 * @return string
-	 * @throws AppConfigIncorrectTypeException
-	 * @since 29.0.0
-	 */
-	public function convertTypeToString(int $type): string {
-		$type &= ~self::VALUE_SENSITIVE;
-
-		return match ($type) {
-			IAppConfig::VALUE_MIXED => 'mixed',
-			IAppConfig::VALUE_STRING => 'string',
-			IAppConfig::VALUE_INT => 'integer',
-			IAppConfig::VALUE_FLOAT => 'float',
-			IAppConfig::VALUE_BOOL => 'boolean',
-			IAppConfig::VALUE_ARRAY => 'array',
-			default => throw new AppConfigIncorrectTypeException('Unknown numeric type ' . $type)
-		};
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 * @param string $key config key
-	 *
-	 * @since 29.0.0
-	 */
-	public function deleteKey(string $app, string $key): void {
-		$this->assertParams($app, $key);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
-			->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
-		$qb->executeStatement();
-
-		unset($this->lazyCache[$app][$key]);
-		unset($this->fastCache[$app][$key]);
-		unset($this->valueTypes[$app][$key]);
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param string $app id of the app
-	 *
-	 * @since 29.0.0
-	 */
-	public function deleteApp(string $app): void {
-		$this->assertParams($app);
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('appconfig')
-			->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
-		$qb->executeStatement();
-
-		$this->clearCache();
-	}
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param bool $reload set to TRUE to refill cache instantly after clearing it
-	 *
-	 * @since 29.0.0
-	 */
-	public function clearCache(bool $reload = false): void {
-		$this->lazyLoaded = $this->fastLoaded = false;
-		$this->lazyCache = $this->fastCache = $this->valueTypes = [];
-
-		if (!$reload) {
-			return;
-		}
-
-		$this->loadConfigAll();
-	}
-
-
-	/**
-	 * For debug purpose.
-	 * Returns the cached data.
-	 *
-	 * @return array
-	 * @since 29.0.0
-	 * @internal
-	 */
-	public function statusCache(): array {
-		return [
-			'fastLoaded' => $this->fastLoaded,
-			'fastCache' => $this->fastCache,
-			'lazyLoaded' => $this->lazyLoaded,
-			'lazyCache' => $this->lazyCache,
-		];
-	}
-
-	/**
-	 * @param int $needle bitflag to search
-	 * @param int $type known value
-	 *
-	 * @return bool TRUE if bitflag $needle is set in $type
-	 */
-	private function isTyped(int $needle, int $type): bool {
-		return (($needle & $type) !== 0);
-	}
-
-	/**
-	 * Confirm the string set for app and key fit the database description
-	 *
-	 * @param string $app assert $app fit in database
-	 * @param string $configKey assert config key fit in database
-	 * @param bool $allowEmptyApp $app can be empty string
-	 * @param int $valueType assert value type is only one type
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	private function assertParams(string $app = '', string $configKey = '', bool $allowEmptyApp = false, int $valueType = -1): void {
-		if (!$allowEmptyApp && $app === '') {
-			throw new InvalidArgumentException('app cannot be an empty string');
-		}
-		if (strlen($app) > self::APP_MAX_LENGTH) {
-			throw new InvalidArgumentException(
-				'Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')'
-			);
-		}
-		if (strlen($configKey) > self::KEY_MAX_LENGTH) {
-			throw new InvalidArgumentException('Value (' . $configKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
-		}
-		if ($valueType > -1) {
-			$valueType &= ~self::VALUE_SENSITIVE;
-			if (!in_array($valueType, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
-				throw new InvalidArgumentException('Unknown value type');
-			}
-		}
-	}
-
-	private function loadConfigAll(?string $app = null): void {
-		$this->loadConfig($app, null);
-	}
-
-	/**
-	 * Load normal config or config set as lazy loaded
-	 *
-	 * @param bool|null $lazy set to TRUE to load config set as lazy loaded, set to NULL to load all config
-	 */
-	private function loadConfig(?string $app = null, ?bool $lazy = false): void {
-		if ($this->isLoaded($lazy)) {
-			return;
-		}
-
-		// if lazy is null or true, we debug log
-		if (($lazy ?? true) !== false && $app !== null) {
-			$exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "' . $app . '"');
-			$this->logger->debug($exception->getMessage(), ['exception' => $exception, 'app' => $app]);
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->from('appconfig');
-
-		// we only need value from lazy when loadConfig does not specify it
-		$qb->select('appid', 'configkey', 'configvalue', 'type');
-
-		if ($lazy !== null) {
-			$qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)));
-		} else {
-			$qb->addSelect('lazy');
-		}
-
-		$result = $qb->executeQuery();
-		$rows = $result->fetchAll();
-		foreach ($rows as $row) {
-			// most of the time, 'lazy' is not in the select because its value is already known
-			if (($row['lazy'] ?? ($lazy ?? 0) ? 1 : 0) === 1) {
-				$this->lazyCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			} else {
-				$this->fastCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
-			}
-			$this->valueTypes[$row['appid']][$row['configkey']] = (int)($row['type'] ?? 0);
-		}
-		$result->closeCursor();
-		$this->setAsLoaded($lazy);
-	}
-
-	/**
-	 * if $lazy is:
-	 *  - false: will returns true if fast config is loaded
-	 *  - true : will returns true if lazy config is loaded
-	 *  - null : will returns true if both config are loaded
-	 *
-	 * @param bool $lazy
-	 *
-	 * @return bool
-	 */
-	private function isLoaded(?bool $lazy): bool {
-		if ($lazy === null) {
-			return $this->lazyLoaded && $this->fastLoaded;
-		}
-
-		return $lazy ? $this->lazyLoaded : $this->fastLoaded;
-	}
-
-	/**
-	 * if $lazy is:
-	 * - false: set fast config as loaded
-	 * - true : set lazy config as loaded
-	 * - null : set both config as loaded
-	 *
-	 * @param bool $lazy
-	 */
-	private function setAsLoaded(?bool $lazy): void {
-		if ($lazy === null) {
-			$this->fastLoaded = true;
-			$this->lazyLoaded = true;
-
-			return;
-		}
-
-		if ($lazy) {
-			$this->lazyLoaded = true;
-		} else {
-			$this->fastLoaded = true;
-		}
-	}
-
-	/**
-	 * Gets the config value
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default = null, default value if the key does not exist
-	 *
-	 * @return string the value or $default
-	 * @deprecated 29.0.0 use getValue*()
-	 *
-	 * This function gets a value from the appconfig table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public function getValue($app, $key, $default = null) {
-		$this->loadConfig($app);
-		$this->matchAndApplyLexiconDefinition($app, $key);
-
-		return $this->fastCache[$app][$key] ?? $default;
-	}
-
-	/**
-	 * Sets a value. If the key did not exist before it will be created.
-	 *
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string|float|int $value value
-	 *
-	 * @return bool True if the value was inserted or updated, false if the value was the same
-	 * @throws AppConfigTypeConflictException
-	 * @throws AppConfigUnknownKeyException
-	 * @deprecated 29.0.0
-	 */
-	public function setValue($app, $key, $value) {
-		/**
-		 * TODO: would it be overkill, or decently improve performance, to catch
-		 * call to this method with $key='enabled' and 'hide' config value related
-		 * to $app when the app is disabled (by modifying entry in database: lazy=lazy+2)
-		 * or enabled (lazy=lazy-2)
-		 *
-		 * this solution would remove the loading of config values from disabled app
-		 * unless calling the method {@see loadConfigAll()}
-		 */
-		return $this->setTypedValue($app, $key, (string)$value, false, self::VALUE_MIXED);
-	}
-
-
-	/**
-	 * get multiple values, either the app or key can be used as wildcard by setting it to false
-	 *
-	 * @param string|false $app
-	 * @param string|false $key
-	 *
-	 * @return array|false
-	 * @deprecated 29.0.0 use {@see getAllValues()}
-	 */
-	public function getValues($app, $key) {
-		if (($app !== false) === ($key !== false)) {
-			return false;
-		}
-
-		$key = ($key === false) ? '' : $key;
-		if (!$app) {
-			return $this->searchValues($key, false, self::VALUE_MIXED);
-		} else {
-			return $this->getAllValues($app, $key);
-		}
-	}
-
-	/**
-	 * get all values of the app or and filters out sensitive data
-	 *
-	 * @param string $app
-	 *
-	 * @return array
-	 * @deprecated 29.0.0 use {@see getAllValues()}
-	 */
-	public function getFilteredValues($app) {
-		return $this->getAllValues($app, filtered: true);
-	}
-
-
-	/**
-	 * **Warning:** avoid default NULL value for $lazy as this will
-	 * load all lazy values from the database
-	 *
-	 * @param string $app
-	 * @param array<string, string> $values ['key' => 'value']
-	 * @param bool|null $lazy
-	 *
-	 * @return array<string, string|int|float|bool|array>
-	 */
-	private function formatAppValues(string $app, array $values, ?bool $lazy = null): array {
-		foreach ($values as $key => $value) {
-			try {
-				$type = $this->getValueType($app, $key, $lazy);
-			} catch (AppConfigUnknownKeyException) {
-				continue;
-			}
-
-			$values[$key] = $this->convertTypedValue($value, $type);
-		}
-
-		return $values;
-	}
-
-	/**
-	 * convert string value to the expected type
-	 *
-	 * @param string $value
-	 * @param int $type
-	 *
-	 * @return string|int|float|bool|array
-	 */
-	private function convertTypedValue(string $value, int $type): string|int|float|bool|array {
-		switch ($type) {
-			case self::VALUE_INT:
-				return (int)$value;
-			case self::VALUE_FLOAT:
-				return (float)$value;
-			case self::VALUE_BOOL:
-				return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
-			case self::VALUE_ARRAY:
-				try {
-					return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-				} catch (JsonException $e) {
-					// ignoreable
-				}
-				break;
-		}
-		return $value;
-	}
-
-	/**
-	 * @param string $app
-	 *
-	 * @return string[]
-	 * @deprecated 29.0.0 data sensitivity should be set when calling setValue*()
-	 */
-	private function getSensitiveKeys(string $app): array {
-		$sensitiveValues = [
-			'circles' => [
-				'/^key_pairs$/',
-				'/^local_gskey$/',
-			],
-			'call_summary_bot' => [
-				'/^secret_(.*)$/',
-			],
-			'external' => [
-				'/^sites$/',
-				'/^jwt_token_privkey_(.*)$/',
-			],
-			'globalsiteselector' => [
-				'/^gss\.jwt\.key$/',
-			],
-			'gpgmailer' => [
-				'/^GpgServerKey$/',
-			],
-			'integration_discourse' => [
-				'/^private_key$/',
-				'/^public_key$/',
-			],
-			'integration_dropbox' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_github' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_gitlab' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_google' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_jira' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^forced_instance_url$/',
-			],
-			'integration_onedrive' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_openproject' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_reddit' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-			],
-			'integration_suitecrm' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'integration_twitter' => [
-				'/^consumer_key$/',
-				'/^consumer_secret$/',
-				'/^followed_user$/',
-			],
-			'integration_zammad' => [
-				'/^client_id$/',
-				'/^client_secret$/',
-				'/^oauth_instance_url$/',
-			],
-			'maps' => [
-				'/^mapboxAPIKEY$/',
-			],
-			'notify_push' => [
-				'/^cookie$/',
-			],
-			'onlyoffice' => [
-				'/^jwt_secret$/',
-			],
-			'passwords' => [
-				'/^SSEv1ServerKey$/',
-			],
-			'serverinfo' => [
-				'/^token$/',
-			],
-			'spreed' => [
-				'/^bridge_bot_password$/',
-				'/^hosted-signaling-server-(.*)$/',
-				'/^recording_servers$/',
-				'/^signaling_servers$/',
-				'/^signaling_ticket_secret$/',
-				'/^signaling_token_privkey_(.*)$/',
-				'/^signaling_token_pubkey_(.*)$/',
-				'/^sip_bridge_dialin_info$/',
-				'/^sip_bridge_shared_secret$/',
-				'/^stun_servers$/',
-				'/^turn_servers$/',
-				'/^turn_server_secret$/',
-			],
-			'support' => [
-				'/^last_response$/',
-				'/^potential_subscription_key$/',
-				'/^subscription_key$/',
-			],
-			'theming' => [
-				'/^imprintUrl$/',
-				'/^privacyUrl$/',
-				'/^slogan$/',
-				'/^url$/',
-			],
-			'twofactor_gateway' => [
-				'/^.*token$/',
-			],
-			'user_ldap' => [
-				'/^(s..)?ldap_agent_password$/',
-			],
-			'user_saml' => [
-				'/^idp-x509cert$/',
-			],
-			'whiteboard' => [
-				'/^jwt_secret_key$/',
-			],
-		];
-
-		return $sensitiveValues[$app] ?? [];
-	}
-
-	/**
-	 * Clear all the cached app config values
-	 * New cache will be generated next time a config value is retrieved
-	 *
-	 * @deprecated 29.0.0 use {@see clearCache()}
-	 */
-	public function clearCachedConfig(): void {
-		$this->clearCache();
-	}
-
-	/**
-	 * Match and apply current use of config values with defined lexicon.
-	 * Set $lazy to NULL only if only interested into checking that $key is alias.
-	 *
-	 * @throws AppConfigUnknownKeyException
-	 * @throws AppConfigTypeConflictException
-	 * @return bool TRUE if everything is fine compared to lexicon or lexicon does not exist
-	 */
-	private function matchAndApplyLexiconDefinition(
-		string $app,
-		string &$key,
-		?bool &$lazy = null,
-		int &$type = self::VALUE_MIXED,
-		string &$default = '',
-	): bool {
-		if (in_array($key,
-			[
-				'enabled',
-				'installed_version',
-				'types',
-			])) {
-			return true; // we don't break stuff for this list of config keys.
-		}
-		$configDetails = $this->getConfigDetailsFromLexicon($app);
-		if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
-			// in case '$rename' is set in ConfigLexiconEntry, we use the new config key
-			$key = $configDetails['aliases'][$key];
-		}
-
-		if (!array_key_exists($key, $configDetails['entries'])) {
-			return $this->applyLexiconStrictness($configDetails['strictness'], 'The app config key ' . $app . '/' . $key . ' is not defined in the config lexicon');
-		}
-
-		// if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
-		if ($lazy === null) {
-			return true;
-		}
-
-		/** @var ConfigLexiconEntry $configValue */
-		$configValue = $configDetails['entries'][$key];
-		$type &= ~self::VALUE_SENSITIVE;
-
-		$appConfigValueType = $configValue->getValueType()->toAppConfigFlag();
-		if ($type === self::VALUE_MIXED) {
-			$type = $appConfigValueType; // we overwrite if value was requested as mixed
-		} elseif ($appConfigValueType !== $type) {
-			throw new AppConfigTypeConflictException('The app config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
-		}
-
-		$lazy = $configValue->isLazy();
-		$default = $configValue->getDefault() ?? $default; // default from Lexicon got priority
-		if ($configValue->isFlagged(self::FLAG_SENSITIVE)) {
-			$type |= self::VALUE_SENSITIVE;
-		}
-		if ($configValue->isDeprecated()) {
-			$this->logger->notice('App config key ' . $app . '/' . $key . ' is set as deprecated.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
-	 *
-	 * @param ConfigLexiconStrictness|null $strictness
-	 * @param string $line
-	 *
-	 * @return bool TRUE if conflict can be fully ignored, FALSE if action should be not performed
-	 * @throws AppConfigUnknownKeyException if strictness implies exception
-	 * @see IConfigLexicon::getStrictness()
-	 */
-	private function applyLexiconStrictness(
-		?ConfigLexiconStrictness $strictness,
-		string $line = '',
-	): bool {
-		if ($strictness === null) {
-			return true;
-		}
-
-		switch ($strictness) {
-			case ConfigLexiconStrictness::IGNORE:
-				return true;
-			case ConfigLexiconStrictness::NOTICE:
-				$this->logger->notice($line);
-				return true;
-			case ConfigLexiconStrictness::WARNING:
-				$this->logger->warning($line);
-				return false;
-		}
-
-		throw new AppConfigUnknownKeyException($line);
-	}
-
-	/**
-	 * extract details from registered $appId's config lexicon
-	 *
-	 * @param string $appId
-	 * @internal
-	 *
-	 * @return array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}
-	 */
-	public function getConfigDetailsFromLexicon(string $appId): array {
-		if (!array_key_exists($appId, $this->configLexiconDetails)) {
-			$entries = $aliases = [];
-			$bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
-			$configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
-			foreach ($configLexicon?->getAppConfigs() ?? [] as $configEntry) {
-				$entries[$configEntry->getKey()] = $configEntry;
-				if ($configEntry->getRename() !== null) {
-					$aliases[$configEntry->getRename()] = $configEntry->getKey();
-				}
-			}
-
-			$this->configLexiconDetails[$appId] = [
-				'entries' => $entries,
-				'aliases' => $aliases,
-				'strictness' => $configLexicon?->getStrictness() ?? ConfigLexiconStrictness::IGNORE
-			];
-		}
-
-		return $this->configLexiconDetails[$appId];
-	}
-
-	private function getLexiconEntry(string $appId, string $key): ?ConfigLexiconEntry {
-		return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
-	}
-
-	/**
-	 * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
-	 *
-	 * @internal
-	 */
-	public function ignoreLexiconAliases(bool $ignore): void {
-		$this->ignoreLexiconAliases = $ignore;
-	}
-
-	/**
-	 * Returns the installed versions of all apps
-	 *
-	 * @return array<string, string>
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array {
-		if ($this->appVersionsCache === null) {
-			/** @var array<string, string> */
-			$this->appVersionsCache = $this->searchValues('installed_version', false, IAppConfig::VALUE_STRING);
-		}
-		if ($onlyEnabled) {
-			return array_filter(
-				$this->appVersionsCache,
-				fn (string $app): bool => $this->getValueString($app, 'enabled', 'no') !== 'no',
-				ARRAY_FILTER_USE_KEY
-			);
-		}
-		return $this->appVersionsCache;
-	}
+    private const APP_MAX_LENGTH = 32;
+    private const KEY_MAX_LENGTH = 64;
+    private const ENCRYPTION_PREFIX = '$AppConfigEncryption$';
+    private const ENCRYPTION_PREFIX_LENGTH = 21; // strlen(self::ENCRYPTION_PREFIX)
+
+    /** @var array<string, array<string, mixed>> ['app_id' => ['config_key' => 'config_value']] */
+    private array $fastCache = [];   // cache for normal config keys
+    /** @var array<string, array<string, mixed>> ['app_id' => ['config_key' => 'config_value']] */
+    private array $lazyCache = [];   // cache for lazy config keys
+    /** @var array<string, array<string, int>> ['app_id' => ['config_key' => bitflag]] */
+    private array $valueTypes = [];  // type for all config values
+    private bool $fastLoaded = false;
+    private bool $lazyLoaded = false;
+    /** @var array<string, array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}> ['app_id' => ['strictness' => ConfigLexiconStrictness, 'entries' => ['config_key' => ConfigLexiconEntry[]]] */
+    private array $configLexiconDetails = [];
+    private bool $ignoreLexiconAliases = false;
+
+    /** @var ?array<string, string> */
+    private ?array $appVersionsCache = null;
+
+    public function __construct(
+        protected IDBConnection $connection,
+        protected LoggerInterface $logger,
+        protected ICrypto $crypto,
+    ) {
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @return list<string> list of app ids
+     * @since 7.0.0
+     */
+    public function getApps(): array {
+        $this->loadConfigAll();
+        $apps = array_merge(array_keys($this->fastCache), array_keys($this->lazyCache));
+        sort($apps);
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     *
+     * @return list<string> list of stored config keys
+     * @since 29.0.0
+     */
+    public function getKeys(string $app): array {
+        $this->assertParams($app);
+        $this->loadConfigAll($app);
+        $keys = array_merge(array_keys($this->fastCache[$app] ?? []), array_keys($this->lazyCache[$app] ?? []));
+        sort($keys);
+
+        return array_values(array_unique($keys));
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool TRUE if key exists
+     * @since 7.0.0
+     * @since 29.0.0 Added the $lazy argument
+     */
+    public function hasKey(string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig($app, $lazy);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        if ($lazy === null) {
+            $appCache = $this->getAllValues($app);
+            return isset($appCache[$key]);
+        }
+
+        if ($lazy) {
+            return isset($this->lazyCache[$app][$key]);
+        }
+
+        return isset($this->fastCache[$app][$key]);
+    }
+
+    /**
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool|null $lazy TRUE to search within lazy loaded config, NULL to search within all config
+     *
+     * @return bool
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @since 29.0.0
+     */
+    public function isSensitive(string $app, string $key, ?bool $lazy = false): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfig(null, $lazy);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        if (!isset($this->valueTypes[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        return $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key]);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app if of the app
+     * @param string $key config key
+     *
+     * @return bool TRUE if config is lazy loaded
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @see IAppConfig for details about lazy loading
+     * @since 29.0.0
+     */
+    public function isLazy(string $app, string $key): bool {
+        $this->assertParams($app, $key);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        // there is a huge probability the non-lazy config are already loaded
+        if ($this->hasKey($app, $key, false)) {
+            return false;
+        }
+
+        // key not found, we search in the lazy config
+        if ($this->hasKey($app, $key, true)) {
+            return true;
+        }
+
+        throw new AppConfigUnknownKeyException('unknown config key');
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $prefix config keys prefix to search
+     * @param bool $filtered TRUE to hide sensitive config values. Value are replaced by {@see IConfig::SENSITIVE_VALUE}
+     *
+     * @return array<string, string|int|float|bool|array> [configKey => configValue]
+     * @since 29.0.0
+     */
+    public function getAllValues(string $app, string $prefix = '', bool $filtered = false): array {
+        $this->assertParams($app, $prefix);
+        // if we want to filter values, we need to get sensitivity
+        $this->loadConfigAll($app);
+        // array_merge() will remove numeric keys (here config keys), so addition arrays instead
+        $values = $this->formatAppValues($app, ($this->fastCache[$app] ?? []) + ($this->lazyCache[$app] ?? []));
+        $values = array_filter(
+            $values,
+            function (string $key) use ($prefix): bool {
+                return str_starts_with($key, $prefix); // filter values based on $prefix
+            }, ARRAY_FILTER_USE_KEY
+        );
+
+        if (!$filtered) {
+            return $values;
+        }
+
+        /**
+         * Using the old (deprecated) list of sensitive values.
+         */
+        foreach ($this->getSensitiveKeys($app) as $sensitiveKeyExp) {
+            $sensitiveKeys = preg_grep($sensitiveKeyExp, array_keys($values));
+            foreach ($sensitiveKeys as $sensitiveKey) {
+                $this->valueTypes[$app][$sensitiveKey] = ($this->valueTypes[$app][$sensitiveKey] ?? 0) | self::VALUE_SENSITIVE;
+            }
+        }
+
+        $result = [];
+        foreach ($values as $key => $value) {
+            $result[$key] = $this->isTyped(self::VALUE_SENSITIVE, $this->valueTypes[$app][$key] ?? 0) ? IConfig::SENSITIVE_VALUE : $value;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $key config key
+     * @param bool $lazy search within lazy loaded config
+     * @param int|null $typedAs enforce type for the returned values ({@see self::VALUE_STRING} and others)
+     *
+     * @return array<string, string|int|float|bool|array> [appId => configValue]
+     * @since 29.0.0
+     */
+    public function searchValues(string $key, bool $lazy = false, ?int $typedAs = null): array {
+        $this->assertParams('', $key, true);
+        $this->loadConfig(null, $lazy);
+
+        /** @var array<array-key, array<array-key, mixed>> $cache */
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        $values = [];
+        foreach (array_keys($cache) as $app) {
+            if (isset($cache[$app][$key])) {
+                $values[$app] = $this->convertTypedValue($cache[$app][$key], $typedAs ?? $this->getValueType((string)$app, $key, $lazy));
+            }
+        }
+
+        return $values;
+    }
+
+
+    /**
+     * Get the config value as string.
+     * If the value does not exist the given default will be returned.
+     *
+     * Set lazy to `null` to ignore it and get the value from either source.
+     *
+     * **WARNING:** Method is internal and **SHOULD** not be used, as it is better to get the value with a type.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default config value
+     * @param null|bool $lazy get config as lazy loaded or not. can be NULL
+     *
+     * @return string the value or $default
+     * @internal
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     * @see getValueString()
+     * @see getValueInt()
+     * @see getValueFloat()
+     * @see getValueBool()
+     * @see getValueArray()
+     */
+    public function getValueMixed(
+        string $app,
+        string $key,
+        string $default = '',
+        ?bool $lazy = false,
+    ): string {
+        try {
+            $lazy = ($lazy === null) ? $this->isLazy($app, $key) : $lazy;
+        } catch (AppConfigUnknownKeyException) {
+            return $default;
+        }
+
+        return $this->getTypedValue(
+            $app,
+            $key,
+            $default,
+            $lazy,
+            self::VALUE_MIXED
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return string stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueString(
+        string $app,
+        string $key,
+        string $default = '',
+        bool $lazy = false,
+    ): string {
+        return $this->getTypedValue($app, $key, $default, $lazy, self::VALUE_STRING);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return int stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueInt(
+        string $app,
+        string $key,
+        int $default = 0,
+        bool $lazy = false,
+    ): int {
+        return (int)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_INT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return float stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueFloat(string $app, string $key, float $default = 0, bool $lazy = false): float {
+        return (float)$this->getTypedValue($app, $key, (string)$default, $lazy, self::VALUE_FLOAT);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return bool stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueBool(string $app, string $key, bool $default = false, bool $lazy = false): bool {
+        $b = strtolower($this->getTypedValue($app, $key, $default ? 'true' : 'false', $lazy, self::VALUE_BOOL));
+        return in_array($b, ['1', 'true', 'yes', 'on']);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $default default value
+     * @param bool $lazy search within lazy loaded config
+     *
+     * @return array stored config value or $default if not set in database
+     * @throws InvalidArgumentException if one of the argument format is invalid
+     * @throws AppConfigTypeConflictException in case of conflict with the value type set in database
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function getValueArray(
+        string $app,
+        string $key,
+        array $default = [],
+        bool $lazy = false,
+    ): array {
+        try {
+            $defaultJson = json_encode($default, JSON_THROW_ON_ERROR);
+            $value = json_decode($this->getTypedValue($app, $key, $defaultJson, $lazy, self::VALUE_ARRAY), true, flags: JSON_THROW_ON_ERROR);
+
+            return is_array($value) ? $value : [];
+        } catch (JsonException) {
+            return [];
+        }
+    }
+
+    /**
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $default default value
+     * @param bool $lazy search within lazy loaded config
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT}{@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return string
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @throws InvalidArgumentException
+     */
+    private function getTypedValue(
+        string $app,
+        string $key,
+        string $default,
+        bool $lazy,
+        int $type,
+    ): string {
+        $this->assertParams($app, $key, valueType: $type);
+        $origKey = $key;
+        if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type, $default)) {
+            return $default; // returns default if strictness of lexicon is set to WARNING (block and report)
+        }
+        $this->loadConfig($app, $lazy);
+
+        /**
+         * We ignore check if mixed type is requested.
+         * If type of stored value is set as mixed, we don't filter.
+         * If type of stored value is defined, we compare with the one requested.
+         */
+        $knownType = $this->valueTypes[$app][$key] ?? 0;
+        if (!$this->isTyped(self::VALUE_MIXED, $type)
+            && $knownType > 0
+            && !$this->isTyped(self::VALUE_MIXED, $knownType)
+            && !$this->isTyped($type, $knownType)) {
+            $this->logger->warning('conflict with value type from database', ['app' => $app, 'key' => $key, 'type' => $type, 'knownType' => $knownType]);
+            throw new AppConfigTypeConflictException('conflict with value type from database');
+        }
+
+        /**
+         * - the pair $app/$key cannot exist in both array,
+         * - we should still return an existing non-lazy value even if current method
+         *   is called with $lazy is true
+         *
+         * This way, lazyCache will be empty until the load for lazy config value is requested.
+         */
+        if (isset($this->lazyCache[$app][$key])) {
+            $value = $this->lazyCache[$app][$key];
+        } elseif (isset($this->fastCache[$app][$key])) {
+            $value = $this->fastCache[$app][$key];
+        } else {
+            return $default;
+        }
+
+        $sensitive = $this->isTyped(self::VALUE_SENSITIVE, $knownType);
+        if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
+            // Only decrypt values that are stored encrypted
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        // in case the key was modified while running matchAndApplyLexiconDefinition() we are
+        // interested to check options in case a modification of the value is needed
+        // ie inverting value from previous key when using lexicon option RENAME_INVERT_BOOLEAN
+        if ($origKey !== $key && $type === self::VALUE_BOOL) {
+            $configManager = Server::get(ConfigManager::class);
+            $value = ($configManager->convertToBool($value, $this->getLexiconEntry($app, $key))) ? '1' : '0';
+        }
+
+        return $value;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return int type of the value
+     * @throws AppConfigUnknownKeyException if config key is not known
+     * @since 29.0.0
+     * @see VALUE_STRING
+     * @see VALUE_INT
+     * @see VALUE_FLOAT
+     * @see VALUE_BOOL
+     * @see VALUE_ARRAY
+     */
+    public function getValueType(string $app, string $key, ?bool $lazy = null): int {
+        $type = self::VALUE_MIXED;
+        $ignorable = $lazy ?? false;
+        $this->matchAndApplyLexiconDefinition($app, $key, $ignorable, $type);
+        if ($type !== self::VALUE_MIXED) {
+            // a modified $type means config key is set in Lexicon
+            return $type;
+        }
+
+        $this->assertParams($app, $key);
+        $this->loadConfig($app, $lazy);
+
+        if (!isset($this->valueTypes[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        $type = $this->valueTypes[$app][$key];
+        $type &= ~self::VALUE_SENSITIVE;
+        return $type;
+    }
+
+
+    /**
+     * Store a config key and its value in database as VALUE_MIXED
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it is best to set a real value type
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED
+     * @internal
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     * @see setValueString()
+     * @see setValueInt()
+     * @see setValueFloat()
+     * @see setValueBool()
+     * @see setValueArray()
+     */
+    public function setValueMixed(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            $value,
+            $lazy,
+            self::VALUE_MIXED | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueString(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            $value,
+            $lazy,
+            self::VALUE_STRING | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueInt(
+        string $app,
+        string $key,
+        int $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        if ($value > 2000000000) {
+            $this->logger->debug('You are trying to store an integer value around/above 2,147,483,647. This is a reminder that reaching this theoretical limit on 32 bits system will throw an exception.');
+        }
+
+        return $this->setTypedValue(
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            self::VALUE_INT | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param float $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueFloat(
+        string $app,
+        string $key,
+        float $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            (string)$value,
+            $lazy,
+            self::VALUE_FLOAT | ($sensitive ? self::VALUE_SENSITIVE : 0)
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $value config value
+     * @param bool $lazy set config as lazy loaded
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueBool(
+        string $app,
+        string $key,
+        bool $value,
+        bool $lazy = false,
+    ): bool {
+        return $this->setTypedValue(
+            $app,
+            $key,
+            ($value) ? '1' : '0',
+            $lazy,
+            self::VALUE_BOOL
+        );
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param array $value config value
+     * @param bool $lazy set config as lazy loaded
+     * @param bool $sensitive if TRUE value will be hidden when listing config values.
+     *
+     * @return bool TRUE if value was different, therefor updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @throws JsonException
+     * @since 29.0.0
+     * @see IAppConfig for explanation about lazy loading
+     */
+    public function setValueArray(
+        string $app,
+        string $key,
+        array $value,
+        bool $lazy = false,
+        bool $sensitive = false,
+    ): bool {
+        try {
+            return $this->setTypedValue(
+                $app,
+                $key,
+                json_encode($value, JSON_THROW_ON_ERROR),
+                $lazy,
+                self::VALUE_ARRAY | ($sensitive ? self::VALUE_SENSITIVE : 0)
+            );
+        } catch (JsonException $e) {
+            $this->logger->warning('could not setValueArray', ['app' => $app, 'key' => $key, 'exception' => $e]);
+            throw $e;
+        }
+    }
+
+    /**
+     * Store a config key and its value in database
+     *
+     * If config key is already known with the exact same config value and same sensitive/lazy status, the
+     * database is not updated. If config value was previously stored as sensitive, status will not be
+     * altered.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param string $value config value
+     * @param bool $lazy config set as lazy loaded
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return bool TRUE if value was updated in database
+     * @throws AppConfigTypeConflictException if type from database is not VALUE_MIXED and different from the requested one
+     * @see IAppConfig for explanation about lazy loading
+     */
+    private function setTypedValue(
+        string $app,
+        string $key,
+        string $value,
+        bool $lazy,
+        int $type,
+    ): bool {
+        $this->assertParams($app, $key);
+        if (!$this->matchAndApplyLexiconDefinition($app, $key, $lazy, $type)) {
+            return false; // returns false as database is not updated
+        }
+        $this->loadConfig(null, $lazy);
+
+        $sensitive = $this->isTyped(self::VALUE_SENSITIVE, $type);
+        $inserted = $refreshCache = false;
+
+        $origValue = $value;
+        if ($sensitive || ($this->hasKey($app, $key, $lazy) && $this->isSensitive($app, $key, $lazy))) {
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+        }
+
+        if ($this->hasKey($app, $key, $lazy)) {
+            /**
+             * no update if key is already known with set lazy status and value is
+             * not different, unless sensitivity is switched from false to true.
+             */
+            if ($origValue === $this->getTypedValue($app, $key, $value, $lazy, $type)
+                && (!$sensitive || $this->isSensitive($app, $key, $lazy))) {
+                return false;
+            }
+        } else {
+            /**
+             * if key is not known yet, we try to insert.
+             * It might fail if the key exists with a different lazy flag.
+             */
+            try {
+                $insert = $this->connection->getQueryBuilder();
+                $insert->insert('appconfig')
+                    ->setValue('appid', $insert->createNamedParameter($app))
+                    ->setValue('lazy', $insert->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                    ->setValue('type', $insert->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+                    ->setValue('configkey', $insert->createNamedParameter($key))
+                    ->setValue('configvalue', $insert->createNamedParameter($value));
+                $insert->executeStatement();
+                $inserted = true;
+            } catch (DBException $e) {
+                if ($e->getReason() !== DBException::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+                    throw $e; // TODO: throw exception or just log and returns false !?
+                }
+            }
+        }
+
+        /**
+         * We cannot insert a new row, meaning we need to update an already existing one
+         */
+        if (!$inserted) {
+            $currType = $this->valueTypes[$app][$key] ?? 0;
+            if ($currType === 0) { // this might happen when switching lazy loading status
+                $this->loadConfigAll();
+                $currType = $this->valueTypes[$app][$key] ?? 0;
+            }
+
+            /**
+             * This should only happen during the upgrade process from 28 to 29.
+             * We only log a warning and set it to VALUE_MIXED.
+             */
+            if ($currType === 0) {
+                $this->logger->warning('Value type is set to zero (0) in database. This is fine only during the upgrade process from 28 to 29.', ['app' => $app, 'key' => $key]);
+                $currType = self::VALUE_MIXED;
+            }
+
+            /**
+             * we only accept a different type from the one stored in database
+             * if the one stored in database is not-defined (VALUE_MIXED)
+             */
+            if (!$this->isTyped(self::VALUE_MIXED, $currType) &&
+                ($type | self::VALUE_SENSITIVE) !== ($currType | self::VALUE_SENSITIVE)) {
+                try {
+                    $currType = $this->convertTypeToString($currType);
+                    $type = $this->convertTypeToString($type);
+                } catch (AppConfigIncorrectTypeException) {
+                    // can be ignored, this was just needed for a better exception message.
+                }
+                throw new AppConfigTypeConflictException('conflict between new type (' . $type . ') and old type (' . $currType . ')');
+            }
+
+            // we fix $type if the stored value, or the new value as it might be changed, is set as sensitive
+            if ($sensitive || $this->isTyped(self::VALUE_SENSITIVE, $currType)) {
+                $type |= self::VALUE_SENSITIVE;
+            }
+
+            if ($lazy !== $this->isLazy($app, $key)) {
+                $refreshCache = true;
+            }
+
+            $update = $this->connection->getQueryBuilder();
+            $update->update('appconfig')
+                ->set('configvalue', $update->createNamedParameter($value))
+                ->set('lazy', $update->createNamedParameter(($lazy) ? 1 : 0, IQueryBuilder::PARAM_INT))
+                ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+                ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+                ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+
+            $update->executeStatement();
+        }
+
+        if ($refreshCache) {
+            $this->clearCache();
+            return true;
+        }
+
+        // update local cache
+        if ($lazy) {
+            $this->lazyCache[$app][$key] = $value;
+        } else {
+            $this->fastCache[$app][$key] = $value;
+        }
+        $this->valueTypes[$app][$key] = $type;
+
+        return true;
+    }
+
+    /**
+     * Change the type of config value.
+     *
+     * **WARNING:** Method is internal and **MUST** not be used as it may break things.
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param int $type value type {@see VALUE_STRING} {@see VALUE_INT} {@see VALUE_FLOAT} {@see VALUE_BOOL} {@see VALUE_ARRAY}
+     *
+     * @return bool TRUE if database update were necessary
+     * @throws AppConfigUnknownKeyException if $key is now known in database
+     * @throws AppConfigIncorrectTypeException if $type is not valid
+     * @internal
+     * @since 29.0.0
+     */
+    public function updateType(string $app, string $key, int $type = self::VALUE_MIXED): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfigAll();
+        $this->matchAndApplyLexiconDefinition($app, $key);
+        $this->isLazy($app, $key); // confirm key exists
+
+        // type can only be one type
+        if (!in_array($type, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
+            throw new AppConfigIncorrectTypeException('Unknown value type');
+        }
+
+        $currType = $this->valueTypes[$app][$key];
+        if (($type | self::VALUE_SENSITIVE) === ($currType | self::VALUE_SENSITIVE)) {
+            return false;
+        }
+
+        // we complete with sensitive flag if the stored value is set as sensitive
+        if ($this->isTyped(self::VALUE_SENSITIVE, $currType)) {
+            $type = $type | self::VALUE_SENSITIVE;
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+        $this->valueTypes[$app][$key] = $type;
+
+        return true;
+    }
+
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $sensitive TRUE to set as sensitive, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 29.0.0
+     */
+    public function updateSensitive(string $app, string $key, bool $sensitive): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfigAll();
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        try {
+            if ($sensitive === $this->isSensitive($app, $key, null)) {
+                return false;
+            }
+        } catch (AppConfigUnknownKeyException $e) {
+            return false;
+        }
+
+        $lazy = $this->isLazy($app, $key);
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        if (!isset($cache[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        /**
+         * type returned by getValueType() is already cleaned from sensitive flag
+         * we just need to update it based on $sensitive and store it in database
+         */
+        $type = $this->getValueType($app, $key);
+        $value = $cache[$app][$key];
+        if ($sensitive) {
+            $type |= self::VALUE_SENSITIVE;
+            $value = self::ENCRYPTION_PREFIX . $this->crypto->encrypt($value);
+        } else {
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('type', $update->createNamedParameter($type, IQueryBuilder::PARAM_INT))
+            ->set('configvalue', $update->createNamedParameter($value))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        $this->valueTypes[$app][$key] = $type;
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     * @param bool $lazy TRUE to set as lazy loaded, FALSE to unset
+     *
+     * @return bool TRUE if entry was found in database and an update was necessary
+     * @since 29.0.0
+     */
+    public function updateLazy(string $app, string $key, bool $lazy): bool {
+        $this->assertParams($app, $key);
+        $this->loadConfigAll();
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        try {
+            if ($lazy === $this->isLazy($app, $key)) {
+                return false;
+            }
+        } catch (AppConfigUnknownKeyException $e) {
+            return false;
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('appconfig')
+            ->set('lazy', $update->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT))
+            ->where($update->expr()->eq('appid', $update->createNamedParameter($app)))
+            ->andWhere($update->expr()->eq('configkey', $update->createNamedParameter($key)));
+        $update->executeStatement();
+
+        // At this point, it is a lot safer to clean cache
+        $this->clearCache();
+
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @return array
+     * @throws AppConfigUnknownKeyException if config key is not known in database
+     * @since 29.0.0
+     */
+    public function getDetails(string $app, string $key): array {
+        $this->assertParams($app, $key);
+        $this->loadConfigAll();
+        $this->matchAndApplyLexiconDefinition($app, $key);
+        $lazy = $this->isLazy($app, $key);
+
+        if ($lazy) {
+            $cache = $this->lazyCache;
+        } else {
+            $cache = $this->fastCache;
+        }
+
+        $type = $this->getValueType($app, $key);
+        try {
+            $typeString = $this->convertTypeToString($type);
+        } catch (AppConfigIncorrectTypeException $e) {
+            $this->logger->warning('type stored in database is not correct', ['exception' => $e, 'type' => $type]);
+            $typeString = (string)$type;
+        }
+
+        if (!isset($cache[$app][$key])) {
+            throw new AppConfigUnknownKeyException('unknown config key');
+        }
+
+        $value = $cache[$app][$key];
+        $sensitive = $this->isSensitive($app, $key, null);
+        if ($sensitive && str_starts_with($value, self::ENCRYPTION_PREFIX)) {
+            $value = $this->crypto->decrypt(substr($value, self::ENCRYPTION_PREFIX_LENGTH));
+        }
+
+        return [
+            'app' => $app,
+            'key' => $key,
+            'value' => $value,
+            'type' => $type,
+            'lazy' => $lazy,
+            'typeString' => $typeString,
+            'sensitive' => $sensitive
+        ];
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return int
+     * @throws AppConfigIncorrectTypeException
+     * @since 29.0.0
+     */
+    public function convertTypeToInt(string $type): int {
+        return match (strtolower($type)) {
+            'mixed' => IAppConfig::VALUE_MIXED,
+            'string' => IAppConfig::VALUE_STRING,
+            'integer' => IAppConfig::VALUE_INT,
+            'float' => IAppConfig::VALUE_FLOAT,
+            'boolean' => IAppConfig::VALUE_BOOL,
+            'array' => IAppConfig::VALUE_ARRAY,
+            default => throw new AppConfigIncorrectTypeException('Unknown type ' . $type)
+        };
+    }
+
+    /**
+     * @param int $type
+     *
+     * @return string
+     * @throws AppConfigIncorrectTypeException
+     * @since 29.0.0
+     */
+    public function convertTypeToString(int $type): string {
+        $type &= ~self::VALUE_SENSITIVE;
+
+        return match ($type) {
+            IAppConfig::VALUE_MIXED => 'mixed',
+            IAppConfig::VALUE_STRING => 'string',
+            IAppConfig::VALUE_INT => 'integer',
+            IAppConfig::VALUE_FLOAT => 'float',
+            IAppConfig::VALUE_BOOL => 'boolean',
+            IAppConfig::VALUE_ARRAY => 'array',
+            default => throw new AppConfigIncorrectTypeException('Unknown numeric type ' . $type)
+        };
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     * @param string $key config key
+     *
+     * @since 29.0.0
+     */
+    public function deleteKey(string $app, string $key): void {
+        $this->assertParams($app, $key);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)))
+            ->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($key)));
+        $qb->executeStatement();
+
+        unset($this->lazyCache[$app][$key]);
+        unset($this->fastCache[$app][$key]);
+        unset($this->valueTypes[$app][$key]);
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param string $app id of the app
+     *
+     * @since 29.0.0
+     */
+    public function deleteApp(string $app): void {
+        $this->assertParams($app);
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('appconfig')
+            ->where($qb->expr()->eq('appid', $qb->createNamedParameter($app)));
+        $qb->executeStatement();
+
+        $this->clearCache();
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @param bool $reload set to TRUE to refill cache instantly after clearing it
+     *
+     * @since 29.0.0
+     */
+    public function clearCache(bool $reload = false): void {
+        $this->lazyLoaded = $this->fastLoaded = false;
+        $this->lazyCache = $this->fastCache = $this->valueTypes = [];
+
+        if (!$reload) {
+            return;
+        }
+
+        $this->loadConfigAll();
+    }
+
+
+    /**
+     * For debug purpose.
+     * Returns the cached data.
+     *
+     * @return array
+     * @since 29.0.0
+     * @internal
+     */
+    public function statusCache(): array {
+        return [
+            'fastLoaded' => $this->fastLoaded,
+            'fastCache' => $this->fastCache,
+            'lazyLoaded' => $this->lazyLoaded,
+            'lazyCache' => $this->lazyCache,
+        ];
+    }
+
+    /**
+     * @param int $needle bitflag to search
+     * @param int $type known value
+     *
+     * @return bool TRUE if bitflag $needle is set in $type
+     */
+    private function isTyped(int $needle, int $type): bool {
+        return (($needle & $type) !== 0);
+    }
+
+    /**
+     * Confirm the string set for app and key fit the database description
+     *
+     * @param string $app assert $app fit in database
+     * @param string $configKey assert config key fit in database
+     * @param bool $allowEmptyApp $app can be empty string
+     * @param int $valueType assert value type is only one type
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertParams(string $app = '', string $configKey = '', bool $allowEmptyApp = false, int $valueType = -1): void {
+        if (!$allowEmptyApp && $app === '') {
+            throw new InvalidArgumentException('app cannot be an empty string');
+        }
+        if (strlen($app) > self::APP_MAX_LENGTH) {
+            throw new InvalidArgumentException(
+                'Value (' . $app . ') for app is too long (' . self::APP_MAX_LENGTH . ')'
+            );
+        }
+        if (strlen($configKey) > self::KEY_MAX_LENGTH) {
+            throw new InvalidArgumentException('Value (' . $configKey . ') for key is too long (' . self::KEY_MAX_LENGTH . ')');
+        }
+        if ($valueType > -1) {
+            $valueType &= ~self::VALUE_SENSITIVE;
+            if (!in_array($valueType, [self::VALUE_MIXED, self::VALUE_STRING, self::VALUE_INT, self::VALUE_FLOAT, self::VALUE_BOOL, self::VALUE_ARRAY])) {
+                throw new InvalidArgumentException('Unknown value type');
+            }
+        }
+    }
+
+    private function loadConfigAll(?string $app = null): void {
+        $this->loadConfig($app, null);
+    }
+
+    /**
+     * Load normal config or config set as lazy loaded
+     *
+     * @param bool|null $lazy set to TRUE to load config set as lazy loaded, set to NULL to load all config
+     */
+    private function loadConfig(?string $app = null, ?bool $lazy = false): void {
+        if ($this->isLoaded($lazy)) {
+            return;
+        }
+
+        // if lazy is null or true, we debug log
+        if (($lazy ?? true) !== false && $app !== null) {
+            $exception = new \RuntimeException('The loading of lazy AppConfig values have been triggered by app "' . $app . '"');
+            $this->logger->debug($exception->getMessage(), ['exception' => $exception, 'app' => $app]);
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->from('appconfig');
+
+        // we only need value from lazy when loadConfig does not specify it
+        $qb->select('appid', 'configkey', 'configvalue', 'type');
+
+        if ($lazy !== null) {
+            $qb->where($qb->expr()->eq('lazy', $qb->createNamedParameter($lazy ? 1 : 0, IQueryBuilder::PARAM_INT)));
+        } else {
+            $qb->addSelect('lazy');
+        }
+
+        $result = $qb->executeQuery();
+        $rows = $result->fetchAll();
+        foreach ($rows as $row) {
+            // most of the time, 'lazy' is not in the select because its value is already known
+            if (($row['lazy'] ?? ($lazy ?? 0) ? 1 : 0) === 1) {
+                $this->lazyCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            } else {
+                $this->fastCache[$row['appid']][$row['configkey']] = $row['configvalue'] ?? '';
+            }
+            $this->valueTypes[$row['appid']][$row['configkey']] = (int)($row['type'] ?? 0);
+        }
+        $result->closeCursor();
+        $this->setAsLoaded($lazy);
+    }
+
+    /**
+     * if $lazy is:
+     *  - false: will returns true if fast config is loaded
+     *  - true : will returns true if lazy config is loaded
+     *  - null : will returns true if both config are loaded
+     *
+     * @param bool $lazy
+     *
+     * @return bool
+     */
+    private function isLoaded(?bool $lazy): bool {
+        if ($lazy === null) {
+            return $this->lazyLoaded && $this->fastLoaded;
+        }
+
+        return $lazy ? $this->lazyLoaded : $this->fastLoaded;
+    }
+
+    /**
+     * if $lazy is:
+     * - false: set fast config as loaded
+     * - true : set lazy config as loaded
+     * - null : set both config as loaded
+     *
+     * @param bool $lazy
+     */
+    private function setAsLoaded(?bool $lazy): void {
+        if ($lazy === null) {
+            $this->fastLoaded = true;
+            $this->lazyLoaded = true;
+
+            return;
+        }
+
+        if ($lazy) {
+            $this->lazyLoaded = true;
+        } else {
+            $this->fastLoaded = true;
+        }
+    }
+
+    /**
+     * Gets the config value
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string $default = null, default value if the key does not exist
+     *
+     * @return string the value or $default
+     * @deprecated 29.0.0 use getValue*()
+     *
+     * This function gets a value from the appconfig table. If the key does
+     * not exist the default value will be returned
+     */
+    public function getValue($app, $key, $default = null) {
+        $this->loadConfig($app);
+        $this->matchAndApplyLexiconDefinition($app, $key);
+
+        return $this->fastCache[$app][$key] ?? $default;
+    }
+
+    /**
+     * Sets a value. If the key did not exist before it will be created.
+     *
+     * @param string $app app
+     * @param string $key key
+     * @param string|float|int $value value
+     *
+     * @return bool True if the value was inserted or updated, false if the value was the same
+     * @throws AppConfigTypeConflictException
+     * @throws AppConfigUnknownKeyException
+     * @deprecated 29.0.0
+     */
+    public function setValue($app, $key, $value) {
+        /**
+         * TODO: would it be overkill, or decently improve performance, to catch
+         * call to this method with $key='enabled' and 'hide' config value related
+         * to $app when the app is disabled (by modifying entry in database: lazy=lazy+2)
+         * or enabled (lazy=lazy-2)
+         *
+         * this solution would remove the loading of config values from disabled app
+         * unless calling the method {@see loadConfigAll()}
+         */
+        return $this->setTypedValue($app, $key, (string)$value, false, self::VALUE_MIXED);
+    }
+
+
+    /**
+     * get multiple values, either the app or key can be used as wildcard by setting it to false
+     *
+     * @param string|false $app
+     * @param string|false $key
+     *
+     * @return array|false
+     * @deprecated 29.0.0 use {@see getAllValues()}
+     */
+    public function getValues($app, $key) {
+        if (($app !== false) === ($key !== false)) {
+            return false;
+        }
+
+        $key = ($key === false) ? '' : $key;
+        if (!$app) {
+            return $this->searchValues($key, false, self::VALUE_MIXED);
+        } else {
+            return $this->getAllValues($app, $key);
+        }
+    }
+
+    /**
+     * get all values of the app or and filters out sensitive data
+     *
+     * @param string $app
+     *
+     * @return array
+     * @deprecated 29.0.0 use {@see getAllValues()}
+     */
+    public function getFilteredValues($app) {
+        return $this->getAllValues($app, filtered: true);
+    }
+
+
+    /**
+     * **Warning:** avoid default NULL value for $lazy as this will
+     * load all lazy values from the database
+     *
+     * @param string $app
+     * @param array<string, string> $values ['key' => 'value']
+     * @param bool|null $lazy
+     *
+     * @return array<string, string|int|float|bool|array>
+     */
+    private function formatAppValues(string $app, array $values, ?bool $lazy = null): array {
+        foreach ($values as $key => $value) {
+            try {
+                $type = $this->getValueType($app, $key, $lazy);
+            } catch (AppConfigUnknownKeyException) {
+                continue;
+            }
+
+            $values[$key] = $this->convertTypedValue($value, $type);
+        }
+
+        return $values;
+    }
+
+    /**
+     * convert string value to the expected type
+     *
+     * @param string $value
+     * @param int $type
+     *
+     * @return string|int|float|bool|array
+     */
+    private function convertTypedValue(string $value, int $type): string|int|float|bool|array {
+        switch ($type) {
+            case self::VALUE_INT:
+                return (int)$value;
+            case self::VALUE_FLOAT:
+                return (float)$value;
+            case self::VALUE_BOOL:
+                return in_array(strtolower($value), ['1', 'true', 'yes', 'on']);
+            case self::VALUE_ARRAY:
+                try {
+                    return json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+                } catch (JsonException $e) {
+                    // ignoreable
+                }
+                break;
+        }
+        return $value;
+    }
+
+    /**
+     * @param string $app
+     *
+     * @return string[]
+     * @deprecated 29.0.0 data sensitivity should be set when calling setValue*()
+     */
+    private function getSensitiveKeys(string $app): array {
+        $sensitiveValues = [
+            'circles' => [
+                '/^key_pairs$/',
+                '/^local_gskey$/',
+            ],
+            'call_summary_bot' => [
+                '/^secret_(.*)$/',
+            ],
+            'external' => [
+                '/^sites$/',
+                '/^jwt_token_privkey_(.*)$/',
+            ],
+            'globalsiteselector' => [
+                '/^gss\.jwt\.key$/',
+            ],
+            'gpgmailer' => [
+                '/^GpgServerKey$/',
+            ],
+            'integration_discourse' => [
+                '/^private_key$/',
+                '/^public_key$/',
+            ],
+            'integration_dropbox' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_github' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_gitlab' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_google' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_jira' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^forced_instance_url$/',
+            ],
+            'integration_onedrive' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_openproject' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_reddit' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+            ],
+            'integration_suitecrm' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'integration_twitter' => [
+                '/^consumer_key$/',
+                '/^consumer_secret$/',
+                '/^followed_user$/',
+            ],
+            'integration_zammad' => [
+                '/^client_id$/',
+                '/^client_secret$/',
+                '/^oauth_instance_url$/',
+            ],
+            'maps' => [
+                '/^mapboxAPIKEY$/',
+            ],
+            'notify_push' => [
+                '/^cookie$/',
+            ],
+            'onlyoffice' => [
+                '/^jwt_secret$/',
+            ],
+            'passwords' => [
+                '/^SSEv1ServerKey$/',
+            ],
+            'serverinfo' => [
+                '/^token$/',
+            ],
+            'spreed' => [
+                '/^bridge_bot_password$/',
+                '/^hosted-signaling-server-(.*)$/',
+                '/^recording_servers$/',
+                '/^signaling_servers$/',
+                '/^signaling_ticket_secret$/',
+                '/^signaling_token_privkey_(.*)$/',
+                '/^signaling_token_pubkey_(.*)$/',
+                '/^sip_bridge_dialin_info$/',
+                '/^sip_bridge_shared_secret$/',
+                '/^stun_servers$/',
+                '/^turn_servers$/',
+                '/^turn_server_secret$/',
+            ],
+            'support' => [
+                '/^last_response$/',
+                '/^potential_subscription_key$/',
+                '/^subscription_key$/',
+            ],
+            'theming' => [
+                '/^imprintUrl$/',
+                '/^privacyUrl$/',
+                '/^slogan$/',
+                '/^url$/',
+            ],
+            'twofactor_gateway' => [
+                '/^.*token$/',
+            ],
+            'user_ldap' => [
+                '/^(s..)?ldap_agent_password$/',
+            ],
+            'user_saml' => [
+                '/^idp-x509cert$/',
+            ],
+            'whiteboard' => [
+                '/^jwt_secret_key$/',
+            ],
+        ];
+
+        return $sensitiveValues[$app] ?? [];
+    }
+
+    /**
+     * Clear all the cached app config values
+     * New cache will be generated next time a config value is retrieved
+     *
+     * @deprecated 29.0.0 use {@see clearCache()}
+     */
+    public function clearCachedConfig(): void {
+        $this->clearCache();
+    }
+
+    /**
+     * Match and apply current use of config values with defined lexicon.
+     * Set $lazy to NULL only if only interested into checking that $key is alias.
+     *
+     * @throws AppConfigUnknownKeyException
+     * @throws AppConfigTypeConflictException
+     * @return bool TRUE if everything is fine compared to lexicon or lexicon does not exist
+     */
+    private function matchAndApplyLexiconDefinition(
+        string $app,
+        string &$key,
+        ?bool &$lazy = null,
+        int &$type = self::VALUE_MIXED,
+        string &$default = '',
+    ): bool {
+        if (in_array($key,
+            [
+                'enabled',
+                'installed_version',
+                'types',
+            ])) {
+            return true; // we don't break stuff for this list of config keys.
+        }
+        $configDetails = $this->getConfigDetailsFromLexicon($app);
+        if (array_key_exists($key, $configDetails['aliases']) && !$this->ignoreLexiconAliases) {
+            // in case '$rename' is set in ConfigLexiconEntry, we use the new config key
+            $key = $configDetails['aliases'][$key];
+        }
+
+        if (!array_key_exists($key, $configDetails['entries'])) {
+            return $this->applyLexiconStrictness($configDetails['strictness'], 'The app config key ' . $app . '/' . $key . ' is not defined in the config lexicon');
+        }
+
+        // if lazy is NULL, we ignore all check on the type/lazyness/default from Lexicon
+        if ($lazy === null) {
+            return true;
+        }
+
+        /** @var ConfigLexiconEntry $configValue */
+        $configValue = $configDetails['entries'][$key];
+        $type &= ~self::VALUE_SENSITIVE;
+
+        $appConfigValueType = $configValue->getValueType()->toAppConfigFlag();
+        if ($type === self::VALUE_MIXED) {
+            $type = $appConfigValueType; // we overwrite if value was requested as mixed
+        } elseif ($appConfigValueType !== $type) {
+            throw new AppConfigTypeConflictException('The app config key ' . $app . '/' . $key . ' is typed incorrectly in relation to the config lexicon');
+        }
+
+        $lazy = $configValue->isLazy();
+        $default = $configValue->getDefault() ?? $default; // default from Lexicon got priority
+        if ($configValue->isFlagged(self::FLAG_SENSITIVE)) {
+            $type |= self::VALUE_SENSITIVE;
+        }
+        if ($configValue->isDeprecated()) {
+            $this->logger->notice('App config key ' . $app . '/' . $key . ' is set as deprecated.');
+        }
+
+        return true;
+    }
+
+    /**
+     * manage ConfigLexicon behavior based on strictness set in IConfigLexicon
+     *
+     * @param ConfigLexiconStrictness|null $strictness
+     * @param string $line
+     *
+     * @return bool TRUE if conflict can be fully ignored, FALSE if action should be not performed
+     * @throws AppConfigUnknownKeyException if strictness implies exception
+     * @see IConfigLexicon::getStrictness()
+     */
+    private function applyLexiconStrictness(
+        ?ConfigLexiconStrictness $strictness,
+        string $line = '',
+    ): bool {
+        if ($strictness === null) {
+            return true;
+        }
+
+        switch ($strictness) {
+            case ConfigLexiconStrictness::IGNORE:
+                return true;
+            case ConfigLexiconStrictness::NOTICE:
+                $this->logger->notice($line);
+                return true;
+            case ConfigLexiconStrictness::WARNING:
+                $this->logger->warning($line);
+                return false;
+        }
+
+        throw new AppConfigUnknownKeyException($line);
+    }
+
+    /**
+     * extract details from registered $appId's config lexicon
+     *
+     * @param string $appId
+     * @internal
+     *
+     * @return array{entries: array<string, ConfigLexiconEntry>, aliases: array<string, string>, strictness: ConfigLexiconStrictness}
+     */
+    public function getConfigDetailsFromLexicon(string $appId): array {
+        if (!array_key_exists($appId, $this->configLexiconDetails)) {
+            $entries = $aliases = [];
+            $bootstrapCoordinator = \OCP\Server::get(Coordinator::class);
+            $configLexicon = $bootstrapCoordinator->getRegistrationContext()?->getConfigLexicon($appId);
+            foreach ($configLexicon?->getAppConfigs() ?? [] as $configEntry) {
+                $entries[$configEntry->getKey()] = $configEntry;
+                if ($configEntry->getRename() !== null) {
+                    $aliases[$configEntry->getRename()] = $configEntry->getKey();
+                }
+            }
+
+            $this->configLexiconDetails[$appId] = [
+                'entries' => $entries,
+                'aliases' => $aliases,
+                'strictness' => $configLexicon?->getStrictness() ?? ConfigLexiconStrictness::IGNORE
+            ];
+        }
+
+        return $this->configLexiconDetails[$appId];
+    }
+
+    private function getLexiconEntry(string $appId, string $key): ?ConfigLexiconEntry {
+        return $this->getConfigDetailsFromLexicon($appId)['entries'][$key] ?? null;
+    }
+
+    /**
+     * if set to TRUE, ignore aliases defined in Config Lexicon during the use of the methods of this class
+     *
+     * @internal
+     */
+    public function ignoreLexiconAliases(bool $ignore): void {
+        $this->ignoreLexiconAliases = $ignore;
+    }
+
+    /**
+     * Returns the installed versions of all apps
+     *
+     * @return array<string, string>
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array {
+        if ($this->appVersionsCache === null) {
+            /** @var array<string, string> */
+            $this->appVersionsCache = $this->searchValues('installed_version', false, IAppConfig::VALUE_STRING);
+        }
+        if ($onlyEnabled) {
+            return array_filter(
+                $this->appVersionsCache,
+                fn (string $app): bool => $this->getValueString($app, 'enabled', 'no') !== 'no',
+                ARRAY_FILTER_USE_KEY
+            );
+        }
+        return $this->appVersionsCache;
+    }
 }

lib/private/Repair/ConfigKeyMigration.php

Indentation +10 added lines, -10 removed lines

@@ -14,16 +14,16 @@
 use OCP\Migration\IRepairStep;
 
 class ConfigKeyMigration implements IRepairStep {
-	public function __construct(
-		private ConfigManager $configManager,
-	) {
-	}
+    public function __construct(
+        private ConfigManager $configManager,
+    ) {
+    }
 
-	public function getName(): string {
-		return 'Migrate config keys';
-	}
+    public function getName(): string {
+        return 'Migrate config keys';
+    }
 
-	public function run(IOutput $output) {
-		$this->configManager->migrateConfigLexiconKeys();
-	}
+    public function run(IOutput $output) {
+        $this->configManager->migrateConfigLexiconKeys();
+    }
 }