From e4b9ecd8f2d5f98c2f67cf31c151909c81075653 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 7 Feb 2023 17:19:16 +0100 Subject: [PATCH] fix default values and type hints for GroupManager::search ints really are ints Signed-off-by: Robin Appelman --- lib/private/Group/Manager.php | 4 ++-- lib/public/IGroupManager.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php index b718afa5168..4dde6152275 100644 --- a/lib/private/Group/Manager.php +++ b/lib/private/Group/Manager.php @@ -240,7 +240,7 @@ class Manager extends PublicEmitter implements IGroupManager { * @param int $offset * @return \OC\Group\Group[] */ - public function search($search, $limit = null, $offset = null) { + public function search(string $search, int $limit = -1, int $offset = 0) { $groups = []; foreach ($this->backends as $backend) { $groupIds = $backend->getGroups($search, $limit, $offset); @@ -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 (!is_null($limit) and $limit <= 0) { + if ($limit === 0) { return array_values($groups); } } diff --git a/lib/public/IGroupManager.php b/lib/public/IGroupManager.php index 2e2685eeeb4..5c41d7e5842 100644 --- a/lib/public/IGroupManager.php +++ b/lib/public/IGroupManager.php @@ -101,7 +101,7 @@ interface IGroupManager { * @return \OCP\IGroup[] * @since 8.0.0 */ - public function search($search, $limit = null, $offset = null); + public function search(string $search, int $limit = -1, int $offset = 0); /** * @param \OCP\IUser|null $user -- 2.39.5