diff options
| author | Robin Appelman <robin@icewind.nl> | 2023-02-09 11:46:46 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2023-05-11 17:30:03 +0200 |
| commit | 13b06ba4e25c4673f782bdf0bb356a07bfac0f7d (patch) | |
| tree | a6389f2487f4481f254ae74c31c2af777fbd9a1e /lib | |
| parent | 7ad3574d71e0565438753cf94878723b540ae54f (diff) | |
| download | nextcloud-server-13b06ba4e25c4673f782bdf0bb356a07bfac0f7d.tar.gz nextcloud-server-13b06ba4e25c4673f782bdf0bb356a07bfac0f7d.zip | |
revert public interface back to the original types, just cast them before passing the nulls to the backends
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Group/Manager.php | 10 | ||||
| -rw-r--r-- | lib/public/IGroupManager.php | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index 4dde6152275..0672e519e36 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -236,14 +236,14 @@ class Manager extends PublicEmitter implements IGroupManager { /** * @param string $search - * @param int $limit - * @param int $offset + * @param ?int $limit + * @param ?int $offset * @return \OC\Group\Group[] */ - public function search(string $search, int $limit = -1, int $offset = 0) { + public function search(string $search, ?int $limit = null, ?int $offset = 0) { $groups = []; foreach ($this->backends as $backend) { - $groupIds = $backend->getGroups($search, $limit, $offset); + $groupIds = $backend->getGroups($search, $limit ?? -1, $offset ?? 0); foreach ($groupIds as $groupId) { $aGroup = $this->get($groupId); if ($aGroup instanceof IGroup) { @@ -252,7 +252,7 @@ class Manager extends PublicEmitter implements IGroupManager { $this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']); } } - if ($limit === 0) { + if (!is_null($limit) and $limit <= 0) { return array_values($groups); } } diff --git a/lib/public/IGroupManager.php b/lib/public/IGroupManager.php index 5c41d7e5842..a6655292398 100644 --- a/lib/public/IGroupManager.php +++ b/lib/public/IGroupManager.php @@ -96,12 +96,12 @@ interface IGroupManager { /** * @param string $search - * @param int $limit - * @param int $offset + * @param ?int $limit + * @param ?int $offset * @return \OCP\IGroup[] * @since 8.0.0 */ - public function search(string $search, int $limit = -1, int $offset = 0); + public function search(string $search, ?int $limit = null, ?int $offset = 0); /** * @param \OCP\IUser|null $user |