diff --git a/src/bundle/Resources/api_platform/schemas/base_schemas.yml b/src/bundle/Resources/api_platform/schemas/base_schemas.yml index 67b6733f6..e41421c5a 100644 --- a/src/bundle/Resources/api_platform/schemas/base_schemas.yml +++ b/src/bundle/Resources/api_platform/schemas/base_schemas.yml @@ -19,16 +19,16 @@ schemas: $ref: "#/components/schemas/BaseObject" UnixTimestamp: type: integer - Href: - type: object - required: - - _href - properties: - _href: - xml: - attribute: true - name: href - type: string + Href: + type: object + required: + - _href + properties: + _href: + xml: + attribute: true + name: href + type: string Target: description: Struct that stores extra target information for a SortClause object. type: object @@ -76,7 +76,8 @@ schemas: type: string "#text": description: Content type description. - type: [string, 'null'] + type: string + nullable: true ValueObject: type: object required: @@ -109,7 +110,8 @@ schemas: type: string "#text": description: Translation contents. - type: [string, 'null'] + type: string + nullable: true KeyValue: description: Key-value structure type: object @@ -120,7 +122,8 @@ schemas: _key: type: string "#text": - type: [string, 'null'] + type: string + nullable: true DateRange: allOf: - $ref: "#/components/schemas/BaseObject" diff --git a/src/bundle/Resources/api_platform/schemas/content_types_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_types_schemas.yml index b86770294..c67cebc10 100644 --- a/src/bundle/Resources/api_platform/schemas/content_types_schemas.yml +++ b/src/bundle/Resources/api_platform/schemas/content_types_schemas.yml @@ -72,7 +72,8 @@ schemas: type: string urlAliasSchema: description: URL alias schema. If nothing is provided, $nameSchema will be used instead. - type: [ string, 'null' ] + type: string + nullable: true nameSchema: description: Name schema. Can be composed of FieldDefinition identifier place holders. type: string @@ -233,7 +234,8 @@ schemas: remoteId: type: string urlAliasSchema: - type: [ string, 'null' ] + type: string + nullable: true nameSchema: type: string isContainer: @@ -354,7 +356,8 @@ schemas: type: string urlAliasSchema: description: URL alias schema. If nothing is provided, $nameSchema will be used instead. - type: [ string, 'null' ] + type: string + nullable: true nameSchema: description: Name schema. Can be composed of FieldDefinition identifier place holders. type: string diff --git a/src/bundle/Resources/api_platform/schemas/language_schemas.yml b/src/bundle/Resources/api_platform/schemas/language_schemas.yml index 5750c417e..b56134af6 100644 --- a/src/bundle/Resources/api_platform/schemas/language_schemas.yml +++ b/src/bundle/Resources/api_platform/schemas/language_schemas.yml @@ -11,7 +11,8 @@ schemas: properties: languageId: description: The language ID (auto generated). - type: [string, 'null'] + type: string + nullable: true languageCode: description: The languageCode code. type: string diff --git a/src/lib/Server/Controller/Bookmark/BookmarkListController.php b/src/lib/Server/Controller/Bookmark/BookmarkListController.php index 5f916ffc0..7dbe77f0c 100644 --- a/src/lib/Server/Controller/Bookmark/BookmarkListController.php +++ b/src/lib/Server/Controller/Bookmark/BookmarkListController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\Bookmark; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\BookmarkService; use Ibexa\Contracts\Core\Repository\LocationService; @@ -21,6 +22,7 @@ #[Get( uriTemplate: '/bookmark', name: 'List of bookmarks', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Lists bookmarked Locations for the current user.', tags: [ diff --git a/src/lib/Server/Controller/Content/ContentCurrentVersionRelationsRedirectController.php b/src/lib/Server/Controller/Content/ContentCurrentVersionRelationsRedirectController.php index ef04ecd5f..676f81ad7 100644 --- a/src/lib/Server/Controller/Content/ContentCurrentVersionRelationsRedirectController.php +++ b/src/lib/Server/Controller/Content/ContentCurrentVersionRelationsRedirectController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Content; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values; @@ -16,6 +17,7 @@ #[Get( uriTemplate: '/content/objects/{contentId}/relations', name: 'Load Relations of content item', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Redirects to the Relations of the current version.', tags: [ diff --git a/src/lib/Server/Controller/Content/ContentRedirectController.php b/src/lib/Server/Controller/Content/ContentRedirectController.php index 740552bc3..b9662f8cc 100644 --- a/src/lib/Server/Controller/Content/ContentRedirectController.php +++ b/src/lib/Server/Controller/Content/ContentRedirectController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Content; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Exceptions\BadRequestException; @@ -18,6 +19,7 @@ #[Get( uriTemplate: '/content/objects', name: 'Load content by remote ID', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Loads content item for a given remote ID.', tags: [ diff --git a/src/lib/Server/Controller/Content/ContentVersionsListController.php b/src/lib/Server/Controller/Content/ContentVersionsListController.php index ef8c0fca0..6b821850f 100644 --- a/src/lib/Server/Controller/Content/ContentVersionsListController.php +++ b/src/lib/Server/Controller/Content/ContentVersionsListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Content; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values\VersionList; @@ -17,6 +18,7 @@ #[Get( uriTemplate: '/content/objects/{contentId}/versions', name: 'List versions', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all versions of the content item. This method does not include fields and relations in the version elements of the response.', tags: [ diff --git a/src/lib/Server/Controller/ContentType/ContentTypeDraftFieldDefinitionDeleteController.php b/src/lib/Server/Controller/ContentType/ContentTypeDraftFieldDefinitionDeleteController.php index aeb02d958..5b6eb9334 100644 --- a/src/lib/Server/Controller/ContentType/ContentTypeDraftFieldDefinitionDeleteController.php +++ b/src/lib/Server/Controller/ContentType/ContentTypeDraftFieldDefinitionDeleteController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ContentType; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Rest\Exceptions; @@ -19,6 +20,7 @@ #[Delete( uriTemplate: '/content/types/{contentTypeId}/draft/fieldDefinitions/{fieldDefinitionId}', name: 'Delete content type Draft Field definition', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Deletes the provided Field definition.', tags: [ diff --git a/src/lib/Server/Controller/ContentType/ContentTypeListController.php b/src/lib/Server/Controller/ContentType/ContentTypeListController.php index 2dc06b8de..27753cbac 100644 --- a/src/lib/Server/Controller/ContentType/ContentTypeListController.php +++ b/src/lib/Server/Controller/ContentType/ContentTypeListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ContentType; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\Content\Language; @@ -22,6 +23,7 @@ #[Get( uriTemplate: '/content/types', name: 'List content types', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of content types.', tags: [ diff --git a/src/lib/Server/Controller/ContentType/ContentTypeListForGroupController.php b/src/lib/Server/Controller/ContentType/ContentTypeListForGroupController.php index f2ec266ba..34ae05a41 100644 --- a/src/lib/Server/Controller/ContentType/ContentTypeListForGroupController.php +++ b/src/lib/Server/Controller/ContentType/ContentTypeListForGroupController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ContentType; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Core\Repository\Values\Content\Language; @@ -19,6 +20,7 @@ #[Get( uriTemplate: '/content/typegroups/{contentTypeGroupId}/types', name: 'List content types for group', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of content types in the provided group.', tags: [ diff --git a/src/lib/Server/Controller/Language/LanguageListController.php b/src/lib/Server/Controller/Language/LanguageListController.php index 9373ec053..fe52b8bf7 100644 --- a/src/lib/Server/Controller/Language/LanguageListController.php +++ b/src/lib/Server/Controller/Language/LanguageListController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\Language; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LanguageService; use Ibexa\Rest\Server\Controller as RestController; @@ -19,6 +20,7 @@ #[Get( uriTemplate: '/languages', name: 'Language list', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Lists languages', tags: [ diff --git a/src/lib/Server/Controller/Language/LanguageLoadByIdController.php b/src/lib/Server/Controller/Language/LanguageLoadByIdController.php index 708de672f..592a44b8a 100644 --- a/src/lib/Server/Controller/Language/LanguageLoadByIdController.php +++ b/src/lib/Server/Controller/Language/LanguageLoadByIdController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\Language; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LanguageService; use Ibexa\Contracts\Core\Repository\Values\Content\Language as ApiLanguage; @@ -18,6 +19,7 @@ #[Get( uriTemplate: '/languages/{code}', name: 'Get language', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( tags: [ 'Language', diff --git a/src/lib/Server/Controller/ObjectState/ObjectStateGroupListController.php b/src/lib/Server/Controller/ObjectState/ObjectStateGroupListController.php index 230670e27..e3d92cd3b 100644 --- a/src/lib/Server/Controller/ObjectState/ObjectStateGroupListController.php +++ b/src/lib/Server/Controller/ObjectState/ObjectStateGroupListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ObjectState; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ObjectStateService; @@ -19,6 +20,7 @@ #[Get( uriTemplate: '/content/objectstategroups', name: 'List Object state groups', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Object state groups.', tags: [ diff --git a/src/lib/Server/Controller/ObjectState/ObjectStateListController.php b/src/lib/Server/Controller/ObjectState/ObjectStateListController.php index 3ab48bd89..f4c3949a9 100644 --- a/src/lib/Server/Controller/ObjectState/ObjectStateListController.php +++ b/src/lib/Server/Controller/ObjectState/ObjectStateListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ObjectState; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\ObjectStateService; @@ -19,6 +20,7 @@ #[Get( uriTemplate: '/content/objectstategroups/{objectStateGroupId}/objectstates', name: 'List Object states', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Object states of the given group.', tags: [ diff --git a/src/lib/Server/Controller/ObjectState/ObjectStatesForContentListController.php b/src/lib/Server/Controller/ObjectState/ObjectStatesForContentListController.php index 799da8429..8088f6fde 100644 --- a/src/lib/Server/Controller/ObjectState/ObjectStatesForContentListController.php +++ b/src/lib/Server/Controller/ObjectState/ObjectStatesForContentListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\ObjectState; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; @@ -20,6 +21,7 @@ #[Get( uriTemplate: '/content/objects/{contentId}/objectstates', name: 'Get Object states of content item', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns the Object states of a content item', tags: [ @@ -61,13 +63,11 @@ 'schema' => [ '$ref' => '#/components/schemas/ContentObjectStates', ], - 'x-ibexa-example-file' => '@IbexaRestBundle/Resources/api_platform/examples/content/objects/content_id/objectstates/PATCH/ContentObjectStates.response.xml.example', ], 'application/vnd.ibexa.api.ContentObjectStates+json' => [ 'schema' => [ - '$ref' => '#/components/schemas/ContentObjectStatesWrapper', + '$ref' => '#/components/schemas/ContentObjectStates', ], - 'x-ibexa-example-file' => '@IbexaRestBundle/Resources/api_platform/examples/content/objects/content_id/objectstates/GET/ContentObjectStates.json.example', ], ], ], diff --git a/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupListController.php b/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupListController.php index 9492283e9..c26fa9364 100644 --- a/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupListController.php +++ b/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Get( uriTemplate: '/user/groups/{path}/roles', name: 'Load Roles for User Group', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Roles assigned to the given User Group.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupLoadByIdController.php b/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupLoadByIdController.php index 5f50dff87..9210d1e73 100644 --- a/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupLoadByIdController.php +++ b/src/lib/Server/Controller/Role/RoleAssignmentForUserGroupLoadByIdController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values; @@ -17,6 +18,7 @@ #[Get( uriTemplate: '/user/groups/{path}/roles/{roleId}', name: 'Load User Group Role Assignment', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a Role assignment of the given User Group.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleAssignmentForUserListController.php b/src/lib/Server/Controller/Role/RoleAssignmentForUserListController.php index b88800121..e86878583 100644 --- a/src/lib/Server/Controller/Role/RoleAssignmentForUserListController.php +++ b/src/lib/Server/Controller/Role/RoleAssignmentForUserListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Get( uriTemplate: '/user/users/{userId}/roles', name: 'Load Roles for User', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Roles assigned to the given User.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleAssignmentForUserLoadByIdController.php b/src/lib/Server/Controller/Role/RoleAssignmentForUserLoadByIdController.php index 7f8c39d28..0d2b7a07c 100644 --- a/src/lib/Server/Controller/Role/RoleAssignmentForUserLoadByIdController.php +++ b/src/lib/Server/Controller/Role/RoleAssignmentForUserLoadByIdController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values; @@ -17,6 +18,7 @@ #[Get( uriTemplate: '/user/users/{userId}/roles/{roleId}', name: 'Load User Role Assignment', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a Role assignment to the given User.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleDeleteController.php b/src/lib/Server/Controller/Role/RoleDeleteController.php index 531789c9c..c6d883307 100644 --- a/src/lib/Server/Controller/Role/RoleDeleteController.php +++ b/src/lib/Server/Controller/Role/RoleDeleteController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Delete( uriTemplate: '/user/roles/{id}', name: 'Delete Role', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'The given Role and all assignments to Users or User Groups are deleted.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleDraftDeleteController.php b/src/lib/Server/Controller/Role/RoleDraftDeleteController.php index cb3030eeb..099edc143 100644 --- a/src/lib/Server/Controller/Role/RoleDraftDeleteController.php +++ b/src/lib/Server/Controller/Role/RoleDraftDeleteController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Delete( uriTemplate: '/user/roles/{id}/draft', name: 'Delete Role draft', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'The given Role draft is deleted.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleListController.php b/src/lib/Server/Controller/Role/RoleListController.php index 1799f938f..9de8437d9 100644 --- a/src/lib/Server/Controller/Role/RoleListController.php +++ b/src/lib/Server/Controller/Role/RoleListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException; use Ibexa\Rest\Server\Values; @@ -17,6 +18,7 @@ #[Get( uriTemplate: '/user/roles', name: 'Load Roles', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Roles.', tags: [ diff --git a/src/lib/Server/Controller/Role/RolePoliciesForUserListController.php b/src/lib/Server/Controller/Role/RolePoliciesForUserListController.php index 3d1510f9b..74d5a8c92 100644 --- a/src/lib/Server/Controller/Role/RolePoliciesForUserListController.php +++ b/src/lib/Server/Controller/Role/RolePoliciesForUserListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Request; @@ -16,6 +17,7 @@ #[Get( uriTemplate: '/user/policies', name: 'List Policies for User', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Search all Policies which are applied to a given User.', tags: [ diff --git a/src/lib/Server/Controller/Role/RolePolicyDeleteAllFromRoleController.php b/src/lib/Server/Controller/Role/RolePolicyDeleteAllFromRoleController.php index 98efa3a65..36bb13879 100644 --- a/src/lib/Server/Controller/Role/RolePolicyDeleteAllFromRoleController.php +++ b/src/lib/Server/Controller/Role/RolePolicyDeleteAllFromRoleController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Delete( uriTemplate: '/user/roles/{id}/policies', name: 'Delete Policies', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'All Policies of the given Role are deleted.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleUnassignFromUserController.php b/src/lib/Server/Controller/Role/RoleUnassignFromUserController.php index 39a077606..e5dc54a74 100644 --- a/src/lib/Server/Controller/Role/RoleUnassignFromUserController.php +++ b/src/lib/Server/Controller/Role/RoleUnassignFromUserController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Delete( uriTemplate: '/user/users/{userId}/roles/{roleId}', name: 'Unassign Role from User', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'The given Role is removed from the user.', tags: [ diff --git a/src/lib/Server/Controller/Role/RoleUnassignFromUserGroupController.php b/src/lib/Server/Controller/Role/RoleUnassignFromUserGroupController.php index a664df8d9..cc93ecb97 100644 --- a/src/lib/Server/Controller/Role/RoleUnassignFromUserGroupController.php +++ b/src/lib/Server/Controller/Role/RoleUnassignFromUserGroupController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Role; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -15,6 +16,7 @@ #[Delete( uriTemplate: '/user/groups/{path}/roles/{roleId}', name: 'Unassign Role from User Group', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'The given Role is removed from the User or User Group.', tags: [ diff --git a/src/lib/Server/Controller/Section/SectionListController.php b/src/lib/Server/Controller/Section/SectionListController.php index b53035afc..dc7e7dccb 100644 --- a/src/lib/Server/Controller/Section/SectionListController.php +++ b/src/lib/Server/Controller/Section/SectionListController.php @@ -8,8 +8,10 @@ namespace Ibexa\Rest\Server\Controller\Section; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\Content\Section; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Request; @@ -18,6 +20,7 @@ #[Get( uriTemplate: '/content/sections', name: 'Get Sections', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all Sections.', tags: [ @@ -60,6 +63,7 @@ ], ], ], + //Response::HTTP_NOT_FOUND => [], Response::HTTP_UNAUTHORIZED => [ 'description' => 'Error - The user has no permission to read the Section.', ], @@ -98,7 +102,7 @@ public function listSections(Request $request): Values\SectionList /** * Loads section by identifier. */ - public function loadSectionByIdentifier(Request $request): \Ibexa\Contracts\Core\Repository\Values\Content\Section + public function loadSectionByIdentifier(Request $request): Section { return $this->sectionService->loadSectionByIdentifier( // GET variable diff --git a/src/lib/Server/Controller/Trash/TrashEmptyController.php b/src/lib/Server/Controller/Trash/TrashEmptyController.php index 30e3df6de..ede4ff0a0 100644 --- a/src/lib/Server/Controller/Trash/TrashEmptyController.php +++ b/src/lib/Server/Controller/Trash/TrashEmptyController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Trash; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\TrashService; @@ -18,6 +19,7 @@ #[Delete( uriTemplate: '/content/trash', name: 'Empty Trash', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Empties the Trash.', tags: [ diff --git a/src/lib/Server/Controller/Trash/TrashItemListController.php b/src/lib/Server/Controller/Trash/TrashItemListController.php index 000a38fd8..58818141d 100644 --- a/src/lib/Server/Controller/Trash/TrashItemListController.php +++ b/src/lib/Server/Controller/Trash/TrashItemListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\Trash; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\TrashService; @@ -20,6 +21,7 @@ #[Get( uriTemplate: '/content/trash', name: 'List Trash items', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of all items in the Trash.', tags: [ diff --git a/src/lib/Server/Controller/URLAlias/URLAliasListGlobalController.php b/src/lib/Server/Controller/URLAlias/URLAliasListGlobalController.php index 48a10810e..c5950ee47 100644 --- a/src/lib/Server/Controller/URLAlias/URLAliasListGlobalController.php +++ b/src/lib/Server/Controller/URLAlias/URLAliasListGlobalController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\URLAlias; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; @@ -18,6 +19,7 @@ #[Get( uriTemplate: '/content/urlaliases', name: 'List global URL aliases', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns the list of global URL aliases.', tags: [ diff --git a/src/lib/Server/Controller/URLAlias/URLAliasListLocationController.php b/src/lib/Server/Controller/URLAlias/URLAliasListLocationController.php index 4b7b0abaa..639a01009 100644 --- a/src/lib/Server/Controller/URLAlias/URLAliasListLocationController.php +++ b/src/lib/Server/Controller/URLAlias/URLAliasListLocationController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\URLAlias; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\URLAliasService; @@ -19,6 +20,7 @@ #[Get( uriTemplate: '/content/locations/{path}/urlaliases', name: 'List URL aliases for Location', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns the list of URL aliases for a Location.', tags: [ diff --git a/src/lib/Server/Controller/URLWildcard/URLWildcardListController.php b/src/lib/Server/Controller/URLWildcard/URLWildcardListController.php index 6cca27558..eccf5fb9c 100644 --- a/src/lib/Server/Controller/URLWildcard/URLWildcardListController.php +++ b/src/lib/Server/Controller/URLWildcard/URLWildcardListController.php @@ -8,6 +8,7 @@ namespace Ibexa\Rest\Server\Controller\URLWildcard; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\URLWildcardService; use Ibexa\Rest\Server\Controller as RestController; @@ -17,6 +18,7 @@ #[Get( uriTemplate: '/content/urlwildcards', name: 'List URL wildcards', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Returns a list of URL wildcards.', tags: [ diff --git a/src/lib/Server/Controller/User/UserDraftListController.php b/src/lib/Server/Controller/User/UserDraftListController.php index 1695c1c09..40831c4c2 100644 --- a/src/lib/Server/Controller/User/UserDraftListController.php +++ b/src/lib/Server/Controller/User/UserDraftListController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\User; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\Values\Content\DraftList\ContentDraftListItemInterface; use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; @@ -19,10 +20,11 @@ #[Get( uriTemplate: '/user/users/{userId}/drafts', name: 'Load user drafts', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Loads user\'s drafts', tags: [ - '', + 'User', ], parameters: [ new Model\Parameter( diff --git a/src/lib/Server/Controller/User/UserGroupDeleteController.php b/src/lib/Server/Controller/User/UserGroupDeleteController.php index a0aea3ab6..76cf18ae3 100644 --- a/src/lib/Server/Controller/User/UserGroupDeleteController.php +++ b/src/lib/Server/Controller/User/UserGroupDeleteController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\User; use ApiPlatform\Metadata\Delete; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Exceptions; use Ibexa\Rest\Server\Values; @@ -17,6 +18,7 @@ #[Delete( uriTemplate: '/user/groups/{path}', name: 'Delete User Group', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'The given User Group is deleted.', tags: [ diff --git a/src/lib/Server/Controller/User/UserGroupListController.php b/src/lib/Server/Controller/User/UserGroupListController.php index d9f58a3a6..2671037a5 100644 --- a/src/lib/Server/Controller/User/UserGroupListController.php +++ b/src/lib/Server/Controller/User/UserGroupListController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\User; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment; @@ -21,6 +22,7 @@ #[Get( uriTemplate: '/user/groups', name: 'Load User Groups', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Loads User Groups for either an an ID or a remote ID or a Role.', tags: [ diff --git a/src/lib/Server/Controller/User/UserGroupOfRootLoadController.php b/src/lib/Server/Controller/User/UserGroupOfRootLoadController.php index 907cb5586..b1aacac44 100644 --- a/src/lib/Server/Controller/User/UserGroupOfRootLoadController.php +++ b/src/lib/Server/Controller/User/UserGroupOfRootLoadController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\User; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -16,6 +17,7 @@ #[Get( uriTemplate: '/user/groups/root', name: 'Get root User Group', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Redirects to the root User Group.', tags: [ diff --git a/src/lib/Server/Controller/User/UserRedirectToCurrentUserController.php b/src/lib/Server/Controller/User/UserRedirectToCurrentUserController.php index 12fd43d1c..591978e55 100644 --- a/src/lib/Server/Controller/User/UserRedirectToCurrentUserController.php +++ b/src/lib/Server/Controller/User/UserRedirectToCurrentUserController.php @@ -9,6 +9,7 @@ namespace Ibexa\Rest\Server\Controller\User; use ApiPlatform\Metadata\Get; +use ApiPlatform\OpenApi\Factory\OpenApiFactory; use ApiPlatform\OpenApi\Model; use Ibexa\Rest\Server\Values; use Symfony\Component\HttpFoundation\Response; @@ -18,10 +19,11 @@ #[Get( uriTemplate: '/user/current', name: 'Load current User', + extraProperties: [OpenApiFactory::OVERRIDE_OPENAPI_RESPONSES => false], openapi: new Model\Operation( summary: 'Loads the current user.', tags: [ - 'User Current', + 'User', ], parameters: [ new Model\Parameter(