fix test

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Sep 2, 2024 · c78f304 · c78f304
1 parent 745f75a
commit c78f304
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/lib/private/AllConfig.php b/lib/private/AllConfig.php
@@ -256,6 +256,9 @@ public function setUserValue($userId, $appName, $key, $value, $preCondition = nu
 	 * @return string
 	 */
 	public function getUserValue($userId, $appName, $key, $default = '') {
+		if ($userId === null || $userId === '') {
+			return $default;
+		}
 		return \OC::$server->get(UserPreferences::class)->getValueMixed($userId, $appName, $key, $default);
 	}
 

diff --git a/lib/public/UserPreferences/IUserPreferences.php b/lib/public/UserPreferences/IUserPreferences.php
@@ -215,7 +215,7 @@ public function getValueInt(string $userId, string $app, string $key, int $defau
 	 * @param bool $lazy search within lazy loaded preferences
 	 *
 	 * @return float stored preference value or $default if not set in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see getValueString()
 	 * @see getValueInt()
@@ -236,7 +236,7 @@ public function getValueFloat(string $userId, string $app, string $key, float $d
 	 * @param bool $lazy search within lazy loaded preferences
 	 *
 	 * @return bool stored preference value or $default if not set in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPrefences for explanation about lazy loading
 	 * @see getValueString()
 	 * @see getValueInt()
@@ -253,11 +253,11 @@ public function getValueBool(string $userId, string $app, string $key, bool $def
 	 * @param string $userId id of the user
 	 * @param string $app id of the app
 	 * @param string $key preference key
-	 * @param array $default default value
+	 * @param array $default default value`
 	 * @param bool $lazy search within lazy loaded preferences
 	 *
 	 * @return array stored preference value or $default if not set in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see getValueString()
 	 * @see getValueInt()
@@ -300,7 +300,7 @@ public function getValueType(string $userId, string $app, string $key, ?bool $la
 	 * @param bool $lazy set preference as lazy loaded
 	 *
 	 * @return bool TRUE if value was different, therefor updated in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see setValueInt()
 	 * @see setValueFloat()
@@ -330,7 +330,7 @@ public function setValueString(string $userId, string $app, string $key, string
 	 * @param bool $lazy set preference as lazy loaded
 	 *
 	 * @return bool TRUE if value was different, therefor updated in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see setValueString()
 	 * @see setValueFloat()
@@ -355,7 +355,7 @@ public function setValueInt(string $userId, string $app, string $key, int $value
 	 * @param bool $lazy set preference as lazy loaded
 	 *
 	 * @return bool TRUE if value was different, therefor updated in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see setValueString()
 	 * @see setValueInt()
@@ -379,7 +379,7 @@ public function setValueFloat(string $userId, string $app, string $key, float $v
 	 * @param bool $lazy set preference as lazy loaded
 	 *
 	 * @return bool TRUE if value was different, therefor updated in database
-	 * @since 30.0.0
+	 * @since 31.0.0
 	 * @see IUserPreferences for explanation about lazy loading
 	 * @see setValueString()
 	 * @see setValueInt()

diff --git a/tests/lib/AllConfigTest.php b/tests/lib/AllConfigTest.php
@@ -281,8 +281,8 @@ public function testGetUserKeysAllInts() {
 
 		// preparation - add something to the database
 		$data = [
-			['userFetch', 'appFetch1', '123', 'value'],
-			['userFetch', 'appFetch1', '456', 'value'],
+			['userFetch2', 'appFetch1', '123', 'value'],
+			['userFetch2', 'appFetch1', '456', 'value'],
 		];
 		foreach ($data as $entry) {
 			$this->connection->executeUpdate(
@@ -292,7 +292,7 @@ public function testGetUserKeysAllInts() {
 			);
 		}
 
-		$value = $config->getUserKeys('userFetch', 'appFetch1');
+		$value = $config->getUserKeys('userFetch2', 'appFetch1');
 		$this->assertEquals(['123', '456'], $value);
 		$this->assertIsString($value[0]);
 		$this->assertIsString($value[1]);