Browse Source
fix output for group:list command with numeric user ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/37622/head
Robin Appelman
3 years ago
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
1 changed files with
13 additions and
2 deletions
-
core/Command/Group/ListCommand.php
|
|
@ -75,6 +75,17 @@ class ListCommand extends Base { |
|
|
return 0; |
|
|
return 0; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* @param IGroup $group |
|
|
|
|
|
* @return string[] |
|
|
|
|
|
*/ |
|
|
|
|
|
public function usersForGroup(IGroup $group) { |
|
|
|
|
|
$users = array_keys($group->getUsers()); |
|
|
|
|
|
return array_map(function ($userId) { |
|
|
|
|
|
return (string)$userId; |
|
|
|
|
|
}, $users); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @param IGroup[] $groups |
|
|
* @param IGroup[] $groups |
|
|
* @return array |
|
|
* @return array |
|
|
@ -88,12 +99,12 @@ class ListCommand extends Base { |
|
|
$values = array_map(function (IGroup $group) { |
|
|
$values = array_map(function (IGroup $group) { |
|
|
return [ |
|
|
return [ |
|
|
'backends' => $group->getBackendNames(), |
|
|
'backends' => $group->getBackendNames(), |
|
|
'users' => array_keys($group->getUsers()), |
|
|
|
|
|
|
|
|
'users' => $this->usersForGroup($group), |
|
|
]; |
|
|
]; |
|
|
}, $groups); |
|
|
}, $groups); |
|
|
} else { |
|
|
} else { |
|
|
$values = array_map(function (IGroup $group) { |
|
|
$values = array_map(function (IGroup $group) { |
|
|
return array_keys($group->getUsers()); |
|
|
|
|
|
|
|
|
return $this->usersForGroup($group); |
|
|
}, $groups); |
|
|
}, $groups); |
|
|
} |
|
|
} |
|
|
return array_combine($keys, $values); |
|
|
return array_combine($keys, $values); |
|
|
|