upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-19 21:49:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 50

revert public interface back to the original types, just cast them before passing the nulls to the backends

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2023-02-09 11:46:46 +01:00
parent 7ad3574d71
commit 13b06ba4e2
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/private/Group/Manager.php
View file

@ -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);
}
}

6
lib/public/IGroupManager.php
View file

@ -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