Invert parameter order in getDisabledUserList to be consistent

This matches what was done in the calls and so fixes getting disabled user list when there are several backends returning disabled users. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com> (cherry picked from commit 85e7887)
nextcloud · Dec 5, 2023 · 9c11e2d · 9c11e2d
1 parent 29f74be
commit 9c11e2d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
@@ -682,7 +682,7 @@ public function setUserEnabled(string $uid, bool $enabled, callable $queryDataba
 		return $enabled;
 	}
 
-	public function getDisabledUserList(int $offset = 0, ?int $limit = null): array {
+	public function getDisabledUserList(?int $limit = null, int $offset = 0): array {
 		throw new \Exception('This is implemented directly in User_Proxy');
 	}
 }
diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php
@@ -463,7 +463,7 @@ public function setUserEnabled(string $uid, bool $enabled, callable $queryDataba
 		return $this->handleRequest($uid, 'setUserEnabled', [$uid, $enabled, $queryDatabaseValue, $setDatabaseValue]);
 	}
 
-	public function getDisabledUserList(int $offset = 0, ?int $limit = null): array {
+	public function getDisabledUserList(?int $limit = null, int $offset = 0): array {
 		return array_map(
 			fn (OfflineUser $user) => $user->getOCName(),
 			array_slice(

diff --git a/lib/public/User/Backend/IProvideEnabledStateBackend.php b/lib/public/User/Backend/IProvideEnabledStateBackend.php
@@ -52,5 +52,5 @@ public function setUserEnabled(string $uid, bool $enabled, callable $queryDataba
 	 *
 	 * @return string[]
 	 */
-	public function getDisabledUserList(int $offset = 0, ?int $limit = null): array;
+	public function getDisabledUserList(?int $limit = null, int $offset = 0): array;
 }