diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-11-06 08:56:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 08:56:30 +0100 |
| commit | d53fde8eef13d408fcf035ea8a95e6345df9b99b (patch) | |
| tree | 60f6b612d967a9a264589cdd6cc0c6d008e1bf05 /apps/user_ldap | |
| parent | 8fab143aa486904f7a17c4f1c2f6364cd43bf9d9 (diff) | |
| parent | 77114fb3277742fc69ddcf2432311ecb263af97e (diff) | |
| download | nextcloud-server-d53fde8eef13d408fcf035ea8a95e6345df9b99b.tar.gz nextcloud-server-d53fde8eef13d408fcf035ea8a95e6345df9b99b.zip | |
Merge pull request #49015 from nextcloud/fix/openapi/array-syntax
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/Controller/ConfigAPIController.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 6 | ||||
| -rw-r--r-- | apps/user_ldap/lib/Group_Proxy.php | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php index 8ce2486c153..0a019312e35 100644 --- a/apps/user_ldap/lib/Controller/ConfigAPIController.php +++ b/apps/user_ldap/lib/Controller/ConfigAPIController.php @@ -74,7 +74,7 @@ class ConfigAPIController extends OCSController { * Delete a LDAP configuration * * @param string $configID ID of the config - * @return DataResponse<Http::STATUS_OK, array<empty>, array{}> + * @return DataResponse<Http::STATUS_OK, list<empty>, array{}> * @throws OCSException * @throws OCSNotFoundException Config not found * @@ -102,7 +102,7 @@ class ConfigAPIController extends OCSController { * * @param string $configID ID of the config * @param array<string, mixed> $configData New config - * @return DataResponse<Http::STATUS_OK, array<empty>, array{}> + * @return DataResponse<Http::STATUS_OK, list<empty>, array{}> * @throws OCSException * @throws OCSBadRequestException Modifying config is not possible * @throws OCSNotFoundException Config not found diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index 2c99fadfcc9..0cd263edec8 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -638,6 +638,10 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis return false; } + /** + * @param string $uid + * @return list<string> + */ protected function getCachedGroupsForUserId(string $uid): array { $groupStr = $this->config->getUserValue($uid, 'user_ldap', 'cached-group-memberships-' . $this->access->connection->getConfigPrefix(), '[]'); return json_decode($groupStr, true) ?? []; @@ -650,7 +654,7 @@ class Group_LDAP extends ABackend implements GroupInterface, IGroupLDAP, IGetDis * This function includes groups based on dynamic group membership. * * @param string $uid Name of the user - * @return string[] Group names + * @return list<string> Group names * @throws Exception * @throws ServerNotAvailableException */ diff --git a/apps/user_ldap/lib/Group_Proxy.php b/apps/user_ldap/lib/Group_Proxy.php index 11b7498fbed..8ed3a5dd87d 100644 --- a/apps/user_ldap/lib/Group_Proxy.php +++ b/apps/user_ldap/lib/Group_Proxy.php @@ -133,7 +133,7 @@ class Group_Proxy extends Proxy implements GroupInterface, IGroupLDAP, IGetDispl * Get all groups a user belongs to * * @param string $uid Name of the user - * @return string[] with group names + * @return list<string> with group names * * This function fetches all groups a user belongs to. It does not check * if the user exists at all. |