fix test

Signed-off-by: Maxence Lange <[email protected]>
nextcloud · Sep 2, 2024 · f71bb7d · f71bb7d
1 parent e510535
commit f71bb7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -261,7 +261,12 @@ public function getUserValue($userId, $appName, $key, $default = '') {
 		if ($userId === null || $userId === '') {
 			return $default;
 		}
-		return \OC::$server->get(UserPreferences::class)->getValueMixed($userId, $appName, $key, $default);
+		$userPrefs = \OC::$server->get(UserPreferences::class);
+		// because $default can be null ...
+		if (!$userPrefs->hasKey($userId, $appName, $key)) {
+			return $default;
+		}
+		return \OC::$server->get(UserPreferences::class)->getValueMixed($userId, $appName, $key, $default ?? '');
 	}
 
 	/**

diff --git a/lib/private/UserPreferences.php b/lib/private/UserPreferences.php
@@ -454,7 +454,7 @@ public function getValueMixed(
 		string $key,
 		string $default = '',
 		?bool $lazy = false
-	): ?string {
+	): string {
 		try {
 			$lazy = ($lazy === null) ? $this->isLazy($userId, $app, $key) : $lazy;
 		} catch (UnknownKeyException) {
@@ -465,7 +465,7 @@ public function getValueMixed(
 			$userId,
 			$app,
 			$key,
-			$default ?? '',
+			$default,
 			$lazy,
 			ValueType::MIXED
 		);