diff options
author | jld3103 <jld3103yt@gmail.com> | 2023-10-23 16:47:38 +0200 |
---|---|---|
committer | Kate <26026535+provokateurin@users.noreply.github.com> | 2023-11-02 11:37:15 +0100 |
commit | 755de1e0b57aa9c7275257142b6f852fbcd1961e (patch) | |
tree | f9e993499eb4b7ff32682a9ef437c3e03b374669 /apps/provisioning_api/lib | |
parent | 99fa7f77eff6b615c9e40d4afefd1b1d62cb4917 (diff) | |
download | nextcloud-server-755de1e0b57aa9c7275257142b6f852fbcd1961e.tar.gz nextcloud-server-755de1e0b57aa9c7275257142b6f852fbcd1961e.zip |
refactor: Rename OpenAPI type aliases to their namespaces
Signed-off-by: jld3103 <jld3103yt@gmail.com>
Diffstat (limited to 'apps/provisioning_api/lib')
5 files changed, 21 insertions, 21 deletions
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 7ce1484cf71..584ff9a8cc7 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -54,8 +54,8 @@ use OCP\User\Backend\ISetDisplayNameBackend; use OCP\User\Backend\ISetPasswordBackend; /** - * @psalm-import-type ProvisioningApiUserDetails from ResponseDefinitions - * @psalm-import-type ProvisioningApiUserDetailsQuota from ResponseDefinitions + * @psalm-import-type Provisioning_APIUserDetails from ResponseDefinitions + * @psalm-import-type Provisioning_APIUserDetailsQuota from ResponseDefinitions */ abstract class AUserData extends OCSController { public const SCOPE_SUFFIX = 'Scope'; @@ -104,7 +104,7 @@ abstract class AUserData extends OCSController { * * @param string $userId * @param bool $includeScopes - * @return ProvisioningApiUserDetails|null + * @return Provisioning_APIUserDetails|null * @throws NotFoundException * @throws OCSException * @throws OCSNotFoundException @@ -252,7 +252,7 @@ abstract class AUserData extends OCSController { /** * @param string $userId - * @return ProvisioningApiUserDetailsQuota + * @return Provisioning_APIUserDetailsQuota * @throws OCSException */ protected function fillStorageInfo(string $userId): array { diff --git a/apps/provisioning_api/lib/Controller/AppsController.php b/apps/provisioning_api/lib/Controller/AppsController.php index 893a17d684e..534b1644262 100644 --- a/apps/provisioning_api/lib/Controller/AppsController.php +++ b/apps/provisioning_api/lib/Controller/AppsController.php @@ -40,7 +40,7 @@ use OCP\AppFramework\OCSController; use OCP\IRequest; /** - * @psalm-import-type ProvisioningApiAppInfo from ResponseDefinitions + * @psalm-import-type Provisioning_APIAppInfo from ResponseDefinitions */ class AppsController extends OCSController { /** @var IAppManager */ @@ -94,7 +94,7 @@ class AppsController extends OCSController { * Get the app info for an app * * @param string $app ID of the app - * @return DataResponse<Http::STATUS_OK, ProvisioningApiAppInfo, array{}> + * @return DataResponse<Http::STATUS_OK, Provisioning_APIAppInfo, array{}> * @throws OCSException * * 200: App info returned diff --git a/apps/provisioning_api/lib/Controller/GroupsController.php b/apps/provisioning_api/lib/Controller/GroupsController.php index 7b0e36ecec5..4fde3927916 100644 --- a/apps/provisioning_api/lib/Controller/GroupsController.php +++ b/apps/provisioning_api/lib/Controller/GroupsController.php @@ -52,8 +52,8 @@ use OCP\L10N\IFactory; use Psr\Log\LoggerInterface; /** - * @psalm-import-type ProvisioningApiGroupDetails from ResponseDefinitions - * @psalm-import-type ProvisioningApiUserDetails from ResponseDefinitions + * @psalm-import-type Provisioning_APIGroupDetails from ResponseDefinitions + * @psalm-import-type Provisioning_APIUserDetails from ResponseDefinitions */ class GroupsController extends AUserData { @@ -113,7 +113,7 @@ class GroupsController extends AUserData { * @param string $search Text to search for * @param ?int $limit Limit the amount of groups returned * @param int $offset Offset for searching for groups - * @return DataResponse<Http::STATUS_OK, array{groups: ProvisioningApiGroupDetails[]}, array{}> + * @return DataResponse<Http::STATUS_OK, array{groups: Provisioning_APIGroupDetails[]}, array{}> * * 200: Groups details returned */ @@ -204,7 +204,7 @@ class GroupsController extends AUserData { * @param int|null $limit Limit the amount of groups returned * @param int $offset Offset for searching for groups * - * @return DataResponse<Http::STATUS_OK, array{users: array<string, ProvisioningApiUserDetails|array{id: string}>}, array{}> + * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}> * @throws OCSException * * 200: Group users details returned diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 97d94ecb407..352970faa37 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -76,7 +76,7 @@ use OCP\User\Backend\ISetDisplayNameBackend; use Psr\Log\LoggerInterface; /** - * @psalm-import-type ProvisioningApiUserDetails from ResponseDefinitions + * @psalm-import-type Provisioning_APIUserDetails from ResponseDefinitions */ class UsersController extends AUserData { /** @var IURLGenerator */ @@ -184,7 +184,7 @@ class UsersController extends AUserData { * @param string $search Text to search for * @param int|null $limit Limit the amount of groups returned * @param int $offset Offset for searching for groups - * @return DataResponse<Http::STATUS_OK, array{users: array<string, ProvisioningApiUserDetails|array{id: string}>}, array{}> + * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}> * * 200: Users details returned */ @@ -237,7 +237,7 @@ class UsersController extends AUserData { * * @param ?int $limit Limit the amount of users returned * @param int $offset Offset - * @return DataResponse<Http::STATUS_OK, array{users: array<string, ProvisioningApiUserDetails|array{id: string}>}, array{}> + * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}> * * 200: Disabled users details returned */ @@ -611,7 +611,7 @@ class UsersController extends AUserData { * Get the details of a user * * @param string $userId ID of the user - * @return DataResponse<Http::STATUS_OK, ProvisioningApiUserDetails, array{}> + * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}> * @throws OCSException * * 200: User returned @@ -637,7 +637,7 @@ class UsersController extends AUserData { * * Get the details of the current user * - * @return DataResponse<Http::STATUS_OK, ProvisioningApiUserDetails, array{}> + * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}> * @throws OCSException * * 200: Current user returned @@ -645,7 +645,7 @@ class UsersController extends AUserData { public function getCurrentUser(): DataResponse { $user = $this->userSession->getUser(); if ($user) { - /** @var ProvisioningApiUserDetails $data */ + /** @var Provisioning_APIUserDetails $data */ $data = $this->getUserData($user->getUID(), true); return new DataResponse($data); } diff --git a/apps/provisioning_api/lib/ResponseDefinitions.php b/apps/provisioning_api/lib/ResponseDefinitions.php index 071faee5976..43e95c52e06 100644 --- a/apps/provisioning_api/lib/ResponseDefinitions.php +++ b/apps/provisioning_api/lib/ResponseDefinitions.php @@ -26,7 +26,7 @@ declare(strict_types=1); namespace OCA\Provisioning_API; /** - * @psalm-type ProvisioningApiUserDetailsQuota = array{ + * @psalm-type Provisioning_APIUserDetailsQuota = array{ * free?: float|int, * quota?: float|int|string, * relative?: float|int, @@ -34,7 +34,7 @@ namespace OCA\Provisioning_API; * used?: float|int, * } * - * @psalm-type ProvisioningApiUserDetails = array{ + * @psalm-type Provisioning_APIUserDetails = array{ * additional_mail: string[], * additional_mailScope?: string[], * address: string, @@ -70,7 +70,7 @@ namespace OCA\Provisioning_API; * phoneScope?: string, * profile_enabled: string, * profile_enabledScope?: string, - * quota: ProvisioningApiUserDetailsQuota, + * quota: Provisioning_APIUserDetailsQuota, * role: string, * roleScope?: string, * storageLocation?: string, @@ -81,7 +81,7 @@ namespace OCA\Provisioning_API; * websiteScope?: string, * } * - * @psalm-type ProvisioningApiAppInfo = array{ + * @psalm-type Provisioning_APIAppInfo = array{ * active: bool|null, * activity: ?mixed, * author: ?mixed, @@ -123,7 +123,7 @@ namespace OCA\Provisioning_API; * website: ?mixed, * } * - * @psalm-type ProvisioningApiGroupDetails = array{ + * @psalm-type Provisioning_APIGroupDetails = array{ * id: string, * displayname: string, * usercount: bool|int, |