fix default values and type hints for GroupManager::search

ints really are ints Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Feb 7, 2023 · 5871ca0 · 5871ca0
1 parent 82498bc
commit 5871ca0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/private/Group/Manager.php b/lib/private/Group/Manager.php
@@ -240,7 +240,7 @@ public function createGroup($gid) {
 	 * @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 @@ public function search($search, $limit = null, $offset = null) {
 					$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
@@ -101,7 +101,7 @@ public function createGroup($gid);
 	 * @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