From 4d0a1348cbf2dbdd2e9f02824db0984763635d1b Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Tue, 10 Mar 2026 12:52:59 +0100 Subject: [PATCH 1/2] fix: #58828 occ group:list -i displays user's name too Signed-off-by: Sebastien Marinier --- core/Command/Group/ListCommand.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php index 01522a23f7f27..17a1b76f2e830 100644 --- a/core/Command/Group/ListCommand.php +++ b/core/Command/Group/ListCommand.php @@ -9,6 +9,7 @@ use OC\Core\Command\Base; use OCP\IGroup; use OCP\IGroupManager; +use OCP\IUserManager; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -17,6 +18,7 @@ class ListCommand extends Base { public function __construct( protected IGroupManager $groupManager, + protected IUserManager $userManager, ) { parent::__construct(); } @@ -67,10 +69,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int * @param IGroup $group * @return string[] */ - public function usersForGroup(IGroup $group) { + public function usersForGroup(IGroup $group, bool $addInfo = false): array { $users = array_keys($group->getUsers()); - return array_map(function ($userId) { - return (string)$userId; + return array_map(function ($userId) use ($addInfo) { + $user = $addInfo ? $this->userManager->get($userId) : null; + return (string)$userId . ($user ? ': ' . $user->getDisplayName() : ''); }, $users); } @@ -83,10 +86,10 @@ private function formatGroups(array $groups, bool $addInfo = false): \Generator $value = [ 'displayName' => $group->getDisplayName(), 'backends' => $group->getBackendNames(), - 'users' => $this->usersForGroup($group), + 'users' => $this->usersForGroup($group, true), ]; } else { - $value = $this->usersForGroup($group); + $value = $this->usersForGroup($group, false); } yield $group->getGID() => $value; } From 10b315c000245d9ae1653e2abc8d5be5e5057179 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Thu, 12 Mar 2026 10:37:53 +0100 Subject: [PATCH 2/2] fix: pr requests Signed-off-by: Sebastien Marinier --- core/Command/Group/ListCommand.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php index 17a1b76f2e830..e597e8c083167 100644 --- a/core/Command/Group/ListCommand.php +++ b/core/Command/Group/ListCommand.php @@ -9,7 +9,6 @@ use OC\Core\Command\Base; use OCP\IGroup; use OCP\IGroupManager; -use OCP\IUserManager; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -18,7 +17,6 @@ class ListCommand extends Base { public function __construct( protected IGroupManager $groupManager, - protected IUserManager $userManager, ) { parent::__construct(); } @@ -70,10 +68,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int * @return string[] */ public function usersForGroup(IGroup $group, bool $addInfo = false): array { - $users = array_keys($group->getUsers()); - return array_map(function ($userId) use ($addInfo) { - $user = $addInfo ? $this->userManager->get($userId) : null; - return (string)$userId . ($user ? ': ' . $user->getDisplayName() : ''); + $users = array_values($group->getUsers()); + return array_map(function ($user) use ($addInfo) { + return $user->getUID() . ($addInfo ? ': ' . $user->getDisplayName() : ''); }, $users); }