upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #55463 from nextcloud/fix/user-group-manager-return-type

Browse source
This commit is contained in:
Kate 2025-10-01 16:30:23 +02:00 committed by GitHub
commit 7e8926011d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/provisioning_api/lib/Controller/GroupsController.php
View file

@ -78,10 +78,10 @@ class GroupsController extends AUserDataOCSController {
#[NoAdminRequired]
public function getGroups(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
$groups = $this->groupManager->search($search, $limit, $offset);
$groups = array_values(array_map(function ($group) {
$groups = array_map(function ($group) {
/** @var IGroup $group */
return $group->getGID();
}, $groups));
}, $groups);
return new DataResponse(['groups' => $groups]);
}
@ -101,7 +101,7 @@ class GroupsController extends AUserDataOCSController {
#[AuthorizedAdminSetting(settings: Users::class)]
public function getGroupsDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
$groups = $this->groupManager->search($search, $limit, $offset);
$groups = array_values(array_map(function ($group) {
$groups = array_map(function ($group) {
/** @var IGroup $group */
return [
'id' => $group->getGID(),
@ -111,7 +111,7 @@ class GroupsController extends AUserDataOCSController {
'canAdd' => $group->canAddUser(),
'canRemove' => $group->canRemoveUser(),
];
}, $groups));
}, $groups);
return new DataResponse(['groups' => $groups]);
}

2
build/psalm-baseline.xml
View file

@ -3752,8 +3752,6 @@
<file src="lib/private/Group/Manager.php">
<LessSpecificReturnStatement>
<code><![CDATA[$groups]]></code>
<code><![CDATA[array_values($groups)]]></code>
<code><![CDATA[array_values($groups)]]></code>
</LessSpecificReturnStatement>
<MoreSpecificReturnType>
<code><![CDATA[\OC\Group\Group[]]]></code>

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

@ -264,12 +264,6 @@ class Manager extends PublicEmitter implements IGroupManager {
}
}
/**
* @param string $search
* @param ?int $limit
* @param ?int $offset
* @return \OC\Group\Group[]
*/
public function search(string $search, ?int $limit = null, ?int $offset = 0) {
$groups = [];
foreach ($this->backends as $backend) {

8
lib/private/User/Manager.php
View file

@ -269,14 +269,6 @@ class Manager extends PublicEmitter implements IUserManager {
return $users;
}
/**
* Search by displayName
*
* @param string $pattern
* @param int $limit
* @param int $offset
* @return IUser[]
*/
public function searchDisplayName($pattern, $limit = null, $offset = null) {
$users = [];
foreach ($this->backends as $backend) {

2
lib/public/IGroupManager.php
View file

@ -75,7 +75,7 @@ interface IGroupManager {
* @param string $search
* @param ?int $limit
* @param ?int $offset
* @return \OCP\IGroup[]
* @return list<IGroup>
* @since 8.0.0
*/
public function search(string $search, ?int $limit = null, ?int $offset = 0);

2
lib/public/IUserManager.php
View file

@ -114,7 +114,7 @@ interface IUserManager {
* @param string $pattern
* @param int $limit
* @param int $offset
* @return \OCP\IUser[]
* @return list<IUser>
* @since 8.0.0
*/
public function searchDisplayName($pattern, $limit = null, $offset = null);