diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-01-02 17:10:31 +0100 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2023-04-27 12:00:45 +0200 |
| commit | b6c17c6ce76080df0e291f60a85c0e42afab8f39 (patch) | |
| tree | 3b26ccfc21ffe384a0c972d37a1ae2f12c7e7da5 /lib/private/Group | |
| parent | 6385a5af36957cac4e1beed531d941129eb3a5a0 (diff) | |
| download | nextcloud-server-b6c17c6ce76080df0e291f60a85c0e42afab8f39.tar.gz nextcloud-server-b6c17c6ce76080df0e291f60a85c0e42afab8f39.zip | |
Clear up return types
usersInGroup index by int for BC, searchInGroup index by uid (string).
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'lib/private/Group')
| -rw-r--r-- | lib/private/Group/Backend.php | 2 | ||||
| -rw-r--r-- | lib/private/Group/Database.php | 4 | ||||
| -rw-r--r-- | lib/private/Group/Group.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Group/Backend.php b/lib/private/Group/Backend.php index 037cdacf445..1e3e5ef1164 100644 --- a/lib/private/Group/Backend.php +++ b/lib/private/Group/Backend.php @@ -126,7 +126,7 @@ abstract class Backend implements \OCP\GroupInterface { * @param string $search * @param int $limit * @param int $offset - * @return array an array of user ids + * @return array<int,string> an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { return []; diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 13e4906c298..569cfa5007f 100644 --- a/lib/private/Group/Database.php +++ b/lib/private/Group/Database.php @@ -333,10 +333,10 @@ class Database extends ABackend implements * @param string $search * @param int $limit * @param int $offset - * @return array<string> an array of user ids + * @return array<int,string> an array of user ids */ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0): array { - return array_map(fn ($user) => $user->getUid(), $this->searchInGroup($gid, $search, $limit, $offset)); + return array_values(array_map(fn ($user) => $user->getUid(), $this->searchInGroup($gid, $search, $limit, $offset))); } public function searchInGroup(string $gid, string $search = '', int $limit = -1, int $offset = 0): array { diff --git a/lib/private/Group/Group.php b/lib/private/Group/Group.php index f70221de8bd..c72a7826fd0 100644 --- a/lib/private/Group/Group.php +++ b/lib/private/Group/Group.php @@ -251,7 +251,7 @@ class Group implements IGroup { $users = []; foreach ($this->backends as $backend) { if ($backend instanceof ISearchableGroupBackend) { - $users = array_merge($users, $backend->searchInGroup($this->gid, $search, $limit ?? -1, $offset ?? 0)); + $users = array_merge($users, array_values($backend->searchInGroup($this->gid, $search, $limit ?? -1, $offset ?? 0))); } else { $userIds = $backend->usersInGroup($this->gid, $search, $limit ?? -1, $offset ?? 0); $userManager = \OCP\Server::get(IUserManager::class); |