From dfe4ba38a4cc7d3eb0ba05f01c40cdadebf637b0 Mon Sep 17 00:00:00 2001 From: Matthias Schuhmayer <38959016+mattamon@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:18:26 +0200 Subject: [PATCH] Try to restructure project setup (#43) * Try to restructure folders * More restructuring * Split up security * Restructure and rename * Apply php-cs-fixer changes --------- Co-authored-by: mattamon --- .github/ci/files/config/bundles.php | 2 +- .github/ci/files/config/services.yaml | 6 +- codeception.dist.yml | 4 +- composer.json | 8 +- config/assets.yaml | 12 +++ config/authorization.yaml | 17 ++++ config/data_index.yaml | 73 ++++++++++++++ config/data_index_filters.yaml | 37 +++++++ config/data_objects.yaml | 12 +++ config/event_subscribers.yaml | 4 +- config/factories.yaml | 4 +- config/filters.yaml | 37 ------- config/open_api.yaml | 17 ++++ config/pimcore/config.yaml | 6 +- config/pimcore/routing.yaml | 2 +- config/providers.yaml | 8 +- config/security.yaml | 19 ++++ config/services.yaml | 97 +------------------ config/translation.yaml | 15 +++ doc/01_Installation.md | 9 +- docker-compose.yml | 2 +- public/css/swagger-ui/index.css | 2 +- qodana.sarif.json | 8 +- .../Controller}/CollectionController.php | 50 +++++----- .../Controller}/GetController.php | 22 ++--- .../Controller}/AuthorizationController.php | 30 +++--- src/{Dto/Token => Authorization}/Info.php | 2 +- .../Schema}/Credentials.php | 2 +- .../Schema}/Refresh.php | 2 +- .../Schema}/Token.php | 2 +- .../Service/TokenService.php | 6 +- .../Service/TokenServiceInterface.php | 4 +- src/Controller/Api/AbstractApiController.php | 2 +- .../Adapter}/AssetSearchAdapter.php | 10 +- .../Adapter}/AssetSearchAdapterInterface.php | 8 +- .../Adapter}/DataObjectSearchAdapter.php | 10 +- .../DataObjectSearchAdapterInterface.php | 6 +- .../AssetSearchResult.php | 20 ++-- .../AssetSearchService.php | 24 ++--- .../AssetSearchServiceInterface.php | 22 ++--- .../DataObjectSearchResult.php | 2 +- .../DataObjectSearchService.php | 6 +- .../DataObjectSearchServiceInterface.php | 4 +- .../Filter/DataObject/ClassNameFilter.php | 12 +-- .../Filter/ExcludeFolderFilter.php | 8 +- .../Filter/FilterInterface.php | 6 +- .../Filter/FilterLoaderInterface.php | 2 +- .../V1 => DataIndex}/Filter/Filters.php | 2 +- src/{ => DataIndex}/Filter/IdSearchFilter.php | 8 +- .../Filter/Loader/TaggedIteratorAdapter.php | 6 +- src/{ => DataIndex}/Filter/PageFilter.php | 6 +- src/{ => DataIndex}/Filter/PageSizeFilter.php | 6 +- src/{ => DataIndex}/Filter/ParentIdFilter.php | 8 +- src/{ => DataIndex}/Filter/PathFilter.php | 8 +- .../Hydrator/Asset/ArchiveHydrator.php | 8 +- .../Asset/ArchiveHydratorInterface.php | 4 +- .../Hydrator/Asset/AudioHydrator.php | 8 +- .../Hydrator/Asset/AudioHydratorInterface.php | 4 +- .../Hydrator/Asset/DocumentHydrator.php | 8 +- .../Asset/DocumentHydratorInterface.php | 4 +- .../Hydrator/Asset/FolderHydrator.php | 8 +- .../Asset/FolderHydratorInterface.php | 4 +- .../Hydrator/Asset/ImageHydrator.php | 8 +- .../Hydrator/Asset/ImageHydratorInterface.php | 4 +- .../Hydrator/Asset/MetaDataHydrator.php | 4 +- .../Asset/MetaDataHydratorInterface.php | 4 +- .../Hydrator/Asset/TextHydrator.php | 8 +- .../Hydrator/Asset/TextHydratorInterface.php | 4 +- .../Hydrator/Asset/UnknownHydrator.php | 8 +- .../Asset/UnknownHydratorInterface.php | 4 +- .../Hydrator/Asset/VideoHydrator.php | 8 +- .../Hydrator/Asset/VideoHydratorInterface.php | 4 +- .../Hydrator/AssetHydrator.php | 8 +- .../Hydrator/AssetHydratorInterface.php | 4 +- .../Hydrator/AssetHydratorService.php | 4 +- .../AssetHydratorServiceInterface.php | 20 ++-- .../Hydrator/PermissionsHydrator.php | 4 +- .../Hydrator/PermissionsHydratorInterface.php | 4 +- .../Filter => DataIndex}/OpenSearchFilter.php | 16 +-- .../OpenSearchFilterInterface.php | 8 +- .../Provider}/AssetQueryProvider.php | 4 +- .../Provider}/AssetQueryProviderInterface.php | 4 +- .../Provider}/DataObjectQueryProvider.php | 4 +- .../DataObjectQueryProviderInterface.php | 4 +- .../V1 => DataIndex/Query}/AssetQuery.php | 2 +- .../Query}/DataObjectQuery.php | 4 +- .../V1 => DataIndex/Query}/QueryInterface.php | 2 +- .../Request}/DataObjectParameters.php | 2 +- .../DataObjectParametersInterface.php | 2 +- .../Request}/ElementParameters.php | 4 +- .../Request}/ElementParametersInterface.php | 4 +- .../Controller}/CollectionController.php | 52 +++++----- .../CompilerPass/FilterPass.php | 10 +- src/DependencyInjection/Configuration.php | 8 +- ....php => PimcoreStudioBackendExtension.php} | 19 ++-- src/Dto/Dependency.php | 2 +- src/Dto/Property.php | 2 +- src/Dto/ResetPasswordRequest.php | 2 +- src/Dto/Task.php | 2 +- src/Dto/User.php | 2 +- src/Dto/Version.php | 2 +- .../ApiExceptionSubscriber.php | 7 +- src/EventSubscriber/CorsSubscriber.php | 11 ++- src/Exception/AbstractApiException.php | 2 +- src/Exception/AccessDeniedException.php | 2 +- .../ClassDefinitionNotFoundException.php | 2 +- .../InvalidFilterServiceTypeException.php | 2 +- src/Exception/InvalidFilterTypeException.php | 2 +- src/Exception/InvalidHostException.php | 2 +- src/Exception/InvalidPathException.php | 2 +- src/Exception/InvalidQueryTypeException.php | 2 +- src/Exception/InvalidSearchException.php | 2 +- .../MustImplementInterfaceException.php | 2 +- src/Exception/NoRequestException.php | 2 +- .../NonPublicTranslationException.php | 2 +- src/Exception/NotAuthorizedException.php | 2 +- src/Factory/QueryFactory.php | 10 +- src/Factory/QueryFactoryInterface.php | 6 +- src/Installer.php | 4 +- .../Parameters/Path/IdParameter.php | 2 +- .../Parameters/Query/ClassNameParameter.php | 2 +- .../Query/ExcludeFoldersParameter.php | 2 +- .../Query/IdSearchTermParameter.php | 2 +- .../Parameters/Query/PageParameter.php | 2 +- .../Parameters/Query/PageSizeParameter.php | 2 +- .../Parameters/Query/ParentIdParameter.php | 2 +- .../Query/PathIncludeDescendantsParameter.php | 2 +- .../Query/PathIncludeParentParameter.php | 2 +- .../Parameters/Query/PathParameter.php | 2 +- .../Request/CredentialsRequestBody.php | 4 +- .../Attributes/Request/TokenRequestBody.php | 4 +- .../Request/TranslationRequestBody.php | 4 +- .../Response/Content/CollectionJson.php | 2 +- .../Response/Content/OneOfAssetJson.php | 4 +- .../Response/Error/BadRequestResponse.php | 4 +- .../Error/MethodNotAllowedResponse.php | 4 +- .../Response/Error/UnauthorizedResponse.php | 4 +- .../Error/UnprocessableContentResponse.php | 2 +- .../Error/UnsupportedMediaTypeResponse.php | 4 +- .../Response/Property/AnyOfAsset.php | 4 +- .../Property/DataObjectCollection.php | 4 +- .../Attributes/Response/SuccessResponse.php | 2 +- .../OpenApi => OpenApi/Config}/Security.php | 2 +- .../OpenApi => OpenApi/Config}/Spec.php | 4 +- src/{ => OpenApi}/Config/Tags.php | 2 +- .../Controller}/OpenApiController.php | 6 +- src/{ => OpenApi}/Service/OpenApiService.php | 15 +-- .../Service/OpenApiServiceInterface.php | 2 +- ...dle.php => PimcoreStudioBackendBundle.php} | 22 ++--- src/Provider/FilterServiceLoaderInterface.php | 2 +- src/Provider/FilterServiceProvider.php | 4 +- .../FilterServiceProviderInterface.php | 2 +- src/Provider/Loader/TaggedIteratorAdapter.php | 4 +- .../Filter => }/CollectionParameters.php | 2 +- .../CollectionParametersInterface.php | 2 +- src/Response/Asset.php | 4 +- src/Response/Asset/Archive.php | 4 +- src/Response/Asset/Audio.php | 4 +- src/Response/Asset/Document.php | 4 +- src/Response/Asset/Folder.php | 4 +- src/Response/Asset/Image.php | 4 +- src/Response/Asset/MetaData.php | 2 +- src/Response/Asset/Permissions.php | 2 +- src/Response/Asset/Text.php | 4 +- src/Response/Asset/Unknown.php | 4 +- src/Response/Asset/Video.php | 4 +- src/Response/Collection.php | 2 +- src/Response/DataObject.php | 2 +- src/Response/Element.php | 4 +- src/Response/Schema/DevError.php | 2 +- src/Response/Schema/Error.php | 2 +- src/Response/Schemas.php | 22 ++--- src/Security/Voter/AuthorizationVoter.php | 10 +- .../Voter/PublicAuthorizationVoter.php | 14 +-- src/Service/FilterServiceInterface.php | 2 +- src/Service/IconService.php | 2 +- src/Service/IconServiceInterface.php | 2 +- src/Service/SecurityService.php | 6 +- src/Service/SecurityServiceInterface.php | 4 +- .../Controller}/TranslationController.php | 21 ++-- .../Schema}/Translation.php | 4 +- .../Service/TranslatorService.php | 4 +- .../Service/TranslatorServiceInterface.php | 4 +- src/Util/Constants/PublicTranslations.php | 2 +- .../Traits/MustImplementInterfaceTrait.php | 4 +- src/Util/Traits/PaginatedResponseTrait.php | 4 +- src/Util/Traits/PublicTranslationTrait.php | 6 +- src/Util/Traits/RequestTrait.php | 6 +- .../Traits/StudioBackendPathTrait.php} | 8 +- templates/swagger-ui/index.html.twig | 12 +-- tests/Unit.suite.dist.yml | 2 +- tests/Unit/DefaultTest.php | 2 +- tests/Unit/Dto/Token/CreateTest.php | 4 +- tests/Unit/Dto/Token/InfoTest.php | 4 +- tests/Unit/Dto/Token/RefreshTest.php | 4 +- tests/Unit/Dto/TranslationTest.php | 4 +- .../Unit/Service/Factory/QueryFactoryTest.php | 16 +-- .../Service/OpenApi/OpenApiServiceTest.php | 4 +- .../Service/Security/SecurityServiceTest.php | 10 +- .../Translator/TranslatorServiceTest.php | 8 +- 200 files changed, 780 insertions(+), 682 deletions(-) create mode 100644 config/assets.yaml create mode 100644 config/authorization.yaml create mode 100644 config/data_index.yaml create mode 100644 config/data_index_filters.yaml create mode 100644 config/data_objects.yaml delete mode 100644 config/filters.yaml create mode 100644 config/open_api.yaml create mode 100644 config/security.yaml create mode 100644 config/translation.yaml rename src/{Controller/Api/Assets => Asset/Controller}/CollectionController.php (54%) rename src/{Controller/Api/Assets => Asset/Controller}/GetController.php (65%) rename src/{Controller/Api/Authorization => Authorization/Controller}/AuthorizationController.php (70%) rename src/{Dto/Token => Authorization}/Info.php (92%) rename src/{Request => Authorization/Schema}/Credentials.php (94%) rename src/{Request/Query => Authorization/Schema}/Refresh.php (93%) rename src/{Response => Authorization/Schema}/Token.php (95%) rename src/{ => Authorization}/Service/TokenService.php (92%) rename src/{ => Authorization}/Service/TokenServiceInterface.php (84%) rename src/{Service/GenericData/V1 => DataIndex/Adapter}/AssetSearchAdapter.php (83%) rename src/{Service/GenericData => DataIndex/Adapter}/AssetSearchAdapterInterface.php (71%) rename src/{Service/GenericData/V1 => DataIndex/Adapter}/DataObjectSearchAdapter.php (87%) rename src/{Service/GenericData => DataIndex/Adapter}/DataObjectSearchAdapterInterface.php (77%) rename src/{Service => DataIndex}/AssetSearchResult.php (67%) rename src/{Service => DataIndex}/AssetSearchService.php (56%) rename src/{Service => DataIndex}/AssetSearchServiceInterface.php (50%) rename src/{Service => DataIndex}/DataObjectSearchResult.php (95%) rename src/{Service => DataIndex}/DataObjectSearchService.php (81%) rename src/{Service => DataIndex}/DataObjectSearchServiceInterface.php (84%) rename src/{ => DataIndex}/Filter/DataObject/ClassNameFilter.php (68%) rename src/{ => DataIndex}/Filter/ExcludeFolderFilter.php (75%) rename src/{ => DataIndex}/Filter/FilterInterface.php (74%) rename src/{Service/GenericData/V1 => DataIndex}/Filter/FilterLoaderInterface.php (88%) rename src/{Service/GenericData/V1 => DataIndex}/Filter/Filters.php (93%) rename src/{ => DataIndex}/Filter/IdSearchFilter.php (75%) rename src/{Service/GenericData/V1 => DataIndex}/Filter/Loader/TaggedIteratorAdapter.php (87%) rename src/{ => DataIndex}/Filter/PageFilter.php (77%) rename src/{ => DataIndex}/Filter/PageSizeFilter.php (77%) rename src/{ => DataIndex}/Filter/ParentIdFilter.php (75%) rename src/{ => DataIndex}/Filter/PathFilter.php (78%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/ArchiveHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/ArchiveHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/AudioHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/AudioHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/DocumentHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/DocumentHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/FolderHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/FolderHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/ImageHydrator.php (86%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/ImageHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/MetaDataHydrator.php (88%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/MetaDataHydratorInterface.php (84%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/TextHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/TextHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/UnknownHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/UnknownHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/VideoHydrator.php (86%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/Asset/VideoHydratorInterface.php (82%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/AssetHydrator.php (85%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/AssetHydratorInterface.php (84%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/AssetHydratorService.php (90%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/AssetHydratorServiceInterface.php (58%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/PermissionsHydrator.php (88%) rename src/{Service/GenericData/V1 => DataIndex}/Hydrator/PermissionsHydratorInterface.php (82%) rename src/{Service/GenericData/V1/Filter => DataIndex}/OpenSearchFilter.php (76%) rename src/{Service/GenericData/V1/Filter => DataIndex}/OpenSearchFilterInterface.php (74%) rename src/{Service/GenericData/V1 => DataIndex/Provider}/AssetQueryProvider.php (81%) rename src/{Service/GenericData/V1 => DataIndex/Provider}/AssetQueryProviderInterface.php (80%) rename src/{Service/GenericData/V1 => DataIndex/Provider}/DataObjectQueryProvider.php (86%) rename src/{Service/GenericData/V1 => DataIndex/Provider}/DataObjectQueryProviderInterface.php (80%) rename src/{Service/GenericData/V1 => DataIndex/Query}/AssetQuery.php (97%) rename src/{Service/GenericData/V1 => DataIndex/Query}/DataObjectQuery.php (95%) rename src/{Service/GenericData/V1 => DataIndex/Query}/QueryInterface.php (93%) rename src/{Request/Query/Filter => DataIndex/Request}/DataObjectParameters.php (95%) rename src/{Request/Query/Filter => DataIndex/Request}/DataObjectParametersInterface.php (90%) rename src/{Request/Query/Filter => DataIndex/Request}/ElementParameters.php (92%) rename src/{Request/Query/Filter => DataIndex/Request}/ElementParametersInterface.php (86%) rename src/{Controller/Api/DataObjects => DataObject/Controller}/CollectionController.php (54%) rename src/DependencyInjection/{PimcoreStudioApiExtension.php => PimcoreStudioBackendExtension.php} (73%) rename src/{ => OpenApi}/Attributes/Parameters/Path/IdParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/ClassNameParameter.php (94%) rename src/{ => OpenApi}/Attributes/Parameters/Query/ExcludeFoldersParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/IdSearchTermParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/PageParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/PageSizeParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/ParentIdParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/PathIncludeParentParameter.php (92%) rename src/{ => OpenApi}/Attributes/Parameters/Query/PathParameter.php (92%) rename src/{ => OpenApi}/Attributes/Request/CredentialsRequestBody.php (85%) rename src/{ => OpenApi}/Attributes/Request/TokenRequestBody.php (85%) rename src/{ => OpenApi}/Attributes/Request/TranslationRequestBody.php (85%) rename src/{ => OpenApi}/Attributes/Response/Content/CollectionJson.php (91%) rename src/{ => OpenApi}/Attributes/Response/Content/OneOfAssetJson.php (85%) rename src/{ => OpenApi}/Attributes/Response/Error/BadRequestResponse.php (88%) rename src/{ => OpenApi}/Attributes/Response/Error/MethodNotAllowedResponse.php (88%) rename src/{ => OpenApi}/Attributes/Response/Error/UnauthorizedResponse.php (88%) rename src/{ => OpenApi}/Attributes/Response/Error/UnprocessableContentResponse.php (91%) rename src/{ => OpenApi}/Attributes/Response/Error/UnsupportedMediaTypeResponse.php (88%) rename src/{ => OpenApi}/Attributes/Response/Property/AnyOfAsset.php (87%) rename src/{ => OpenApi}/Attributes/Response/Property/DataObjectCollection.php (86%) rename src/{ => OpenApi}/Attributes/Response/SuccessResponse.php (92%) rename src/{Config/OpenApi => OpenApi/Config}/Security.php (92%) rename src/{Config/OpenApi => OpenApi/Config}/Spec.php (91%) rename src/{ => OpenApi}/Config/Tags.php (94%) rename src/{Controller/Api => OpenApi/Controller}/OpenApiController.php (84%) rename src/{ => OpenApi}/Service/OpenApiService.php (59%) rename src/{ => OpenApi}/Service/OpenApiServiceInterface.php (90%) rename src/{PimcoreStudioApiBundle.php => PimcoreStudioBackendBundle.php} (66%) rename src/Request/{Query/Filter => }/CollectionParameters.php (95%) rename src/Request/{Query/Filter => }/CollectionParametersInterface.php (90%) rename src/{Controller/Api => Translation/Controller}/TranslationController.php (71%) rename src/{Request/Query => Translation/Schema}/Translation.php (90%) rename src/{ => Translation}/Service/TranslatorService.php (92%) rename src/{ => Translation}/Service/TranslatorServiceInterface.php (83%) rename src/{EventSubscriber/StudioApiPathTrait.php => Util/Traits/StudioBackendPathTrait.php} (71%) diff --git a/.github/ci/files/config/bundles.php b/.github/ci/files/config/bundles.php index a2e0070be..a4a38f688 100644 --- a/.github/ci/files/config/bundles.php +++ b/.github/ci/files/config/bundles.php @@ -1,5 +1,5 @@ ['all' => true], + 'Pimcore\\Bundle\\StudioBackendBundle\\PimcoreStudioBackendBundle' => ['all' => true], ]; diff --git a/.github/ci/files/config/services.yaml b/.github/ci/files/config/services.yaml index 6645972f9..db4abcca7 100644 --- a/.github/ci/files/config/services.yaml +++ b/.github/ci/files/config/services.yaml @@ -10,14 +10,14 @@ services: # # INSTALLER # - Pimcore\Bundle\StudioApiBundle\Installer: + Pimcore\Bundle\StudioBackendBundle\Installer: public: true arguments: - $bundle: "@=service('kernel').getBundle('PimcoreStudioApiBundle')" + $bundle: "@=service('kernel').getBundle('PimcoreStudioBackendBundle')" # controllers are imported separately to make sure they're public # and have a tag that allows actions to type-hint services - Pimcore\Bundle\StudioApiBundle\Controller\: + Pimcore\Bundle\StudioBackendBundle\Controller\: resource: '../src/Controller' public: true tags: [ 'controller.service_arguments' ] \ No newline at end of file diff --git a/codeception.dist.yml b/codeception.dist.yml index e0a17def9..4c02def7b 100644 --- a/codeception.dist.yml +++ b/codeception.dist.yml @@ -1,4 +1,4 @@ -namespace: Pimcore\Bundle\StudioApiBundle\Tests +namespace: Pimcore\Bundle\StudioBackendBundle\Tests bootstrap: _bootstrap.php settings: @@ -21,4 +21,4 @@ coverage: - src/DependencyInjection/* - src/Repository/* - src/Installer.php - - src/PimcoreStudioApiBundle.php \ No newline at end of file + - src/PimcoreStudioBackendBundle.php \ No newline at end of file diff --git a/composer.json b/composer.json index 99a299de9..f6543c9b9 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "pimcore/studio-api-bundle", "license": "proprietary", "type": "pimcore-bundle", - "description": "Pimcore Studio Api Bundle", + "description": "Pimcore Studio Backend Bundle", "config": { "discard-changes": true, "sort-packages": true, @@ -39,19 +39,19 @@ }, "autoload": { "psr-4": { - "Pimcore\\Bundle\\StudioApiBundle\\": "src/", + "Pimcore\\Bundle\\StudioBackendBundle\\": "src/", "Pimcore\\": "core-extension/Pimcore/" } }, "autoload-dev": { "psr-4": { - "Pimcore\\Bundle\\StudioApiBundle\\Tests\\": "tests" + "Pimcore\\Bundle\\StudioBackendBundle\\Tests\\": "tests" } }, "extra": { "pimcore": { "bundles": [ - "Pimcore\\Bundle\\StudioApiBundle\\PimcoreStudioApiBundle" + "PimcoreStudioBackendBundle" ] } } diff --git a/config/assets.yaml b/config/assets.yaml new file mode 100644 index 000000000..f7b0b248f --- /dev/null +++ b/config/assets.yaml @@ -0,0 +1,12 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Pimcore\Bundle\StudioBackendBundle\Asset\Controller\: + resource: '../src/Asset/Controller' + public: true + tags: [ 'controller.service_arguments' ] \ No newline at end of file diff --git a/config/authorization.yaml b/config/authorization.yaml new file mode 100644 index 000000000..d346910cf --- /dev/null +++ b/config/authorization.yaml @@ -0,0 +1,17 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Pimcore\Bundle\StudioBackendBundle\Authorization\Controller\: + resource: '../src/Authorization/Controller' + public: true + tags: [ 'controller.service_arguments' ] + + + Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenService \ No newline at end of file diff --git a/config/data_index.yaml b/config/data_index.yaml new file mode 100644 index 000000000..140ea00c7 --- /dev/null +++ b/config/data_index.yaml @@ -0,0 +1,73 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + # Hydrators + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ArchiveHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ArchiveHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\AudioHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\AudioHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\DocumentHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\DocumentHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\FolderHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\FolderHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ImageHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ImageHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\TextHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\TextHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\UnknownHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\UnknownHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\VideoHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\VideoHydrator + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\MetaDataHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\MetaDataHydrator + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydrator + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydrator + + # Services + Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydratorServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydratorService + arguments: + $assetHydratorLocator: '@open_search.asset_hydrator.service_locator' + + + # Assets + Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchService + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\AssetSearchAdapterInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\AssetSearchAdapter + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\AssetQueryProviderInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\AssetQueryProvider + + #Data Objects + Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchService + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\DataObjectSearchAdapterInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\DataObjectSearchAdapter + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\DataObjectQueryProviderInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\DataObjectQueryProvider + + + #Service Locator + open_search.asset_hydrator.service_locator: + class: Symfony\Component\DependencyInjection\ServiceLocator + tags: [ 'container.service_locator' ] + arguments: + - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ArchiveHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\AudioHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\DocumentHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\FolderHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\ImageHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\TextHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\UnknownHydratorInterface' + Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video: '@Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\VideoHydratorInterface' \ No newline at end of file diff --git a/config/data_index_filters.yaml b/config/data_index_filters.yaml new file mode 100644 index 000000000..4a6f5f552 --- /dev/null +++ b/config/data_index_filters.yaml @@ -0,0 +1,37 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + #Filter + + #Common + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\FilterLoaderInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\Loader\TaggedIteratorAdapter + + Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface: + class: Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilter + tags: [ 'pimcore.studio_api.filter_service' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\PageFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\PageSizeFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\ExcludeFolderFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\IdSearchFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\ParentIdFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\PathFilter: + tags: [ 'pimcore.studio_api.open_search.filter' ] + + # DataObject + Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\DataObject\ClassNameFilter: + tags: [ 'pimcore.studio_api.open_search.data_object.filter' ] \ No newline at end of file diff --git a/config/data_objects.yaml b/config/data_objects.yaml new file mode 100644 index 000000000..4cc019292 --- /dev/null +++ b/config/data_objects.yaml @@ -0,0 +1,12 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Pimcore\Bundle\StudioBackendBundle\DataObject\Controller\: + resource: '../src/DataObject/Controller' + public: true + tags: [ 'controller.service_arguments' ] \ No newline at end of file diff --git a/config/event_subscribers.yaml b/config/event_subscribers.yaml index 76beeb7f8..b7dd5c11b 100644 --- a/config/event_subscribers.yaml +++ b/config/event_subscribers.yaml @@ -5,9 +5,9 @@ services: public: false #Subscriber - Pimcore\Bundle\StudioApiBundle\EventSubscriber\CorsSubscriber: + Pimcore\Bundle\StudioBackendBundle\EventSubscriber\CorsSubscriber: tags: [ 'kernel.event_subscriber' ] - Pimcore\Bundle\StudioApiBundle\EventSubscriber\ApiExceptionSubscriber: + Pimcore\Bundle\StudioBackendBundle\EventSubscriber\ApiExceptionSubscriber: tags: [ 'kernel.event_subscriber' ] arguments: ["%kernel.environment%"] \ No newline at end of file diff --git a/config/factories.yaml b/config/factories.yaml index 2193d0bd1..0ae440626 100644 --- a/config/factories.yaml +++ b/config/factories.yaml @@ -5,5 +5,5 @@ services: public: false #Factory - Pimcore\Bundle\StudioApiBundle\Factory\QueryFactoryInterface: - class: Pimcore\Bundle\StudioApiBundle\Factory\QueryFactory + Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactoryInterface: + class: Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactory diff --git a/config/filters.yaml b/config/filters.yaml deleted file mode 100644 index 9dc70a3e7..000000000 --- a/config/filters.yaml +++ /dev/null @@ -1,37 +0,0 @@ -services: - _defaults: - autowire: true - autoconfigure: true - public: false - - #Filter - - #Common - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\FilterLoaderInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\Loader\TaggedIteratorAdapter - - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\OpenSearchFilterInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\OpenSearchFilter - tags: [ 'pimcore.studio_api.filter_service' ] - - Pimcore\Bundle\StudioApiBundle\Filter\PageFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - Pimcore\Bundle\StudioApiBundle\Filter\PageSizeFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - Pimcore\Bundle\StudioApiBundle\Filter\ExcludeFolderFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - Pimcore\Bundle\StudioApiBundle\Filter\IdSearchFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - Pimcore\Bundle\StudioApiBundle\Filter\ParentIdFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - Pimcore\Bundle\StudioApiBundle\Filter\PathFilter: - tags: [ 'pimcore.studio_api.open_search.filter' ] - - # DataObject - Pimcore\Bundle\StudioApiBundle\Filter\DataObject\ClassNameFilter: - tags: [ 'pimcore.studio_api.open_search.data_object.filter' ] \ No newline at end of file diff --git a/config/open_api.yaml b/config/open_api.yaml new file mode 100644 index 000000000..80dd9cab6 --- /dev/null +++ b/config/open_api.yaml @@ -0,0 +1,17 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Pimcore\Bundle\StudioBackendBundle\OpenApi\Controller\: + resource: '../src/OpenApi/Controller' + public: true + tags: [ 'controller.service_arguments' ] + + + Pimcore\Bundle\StudioBackendBundle\OpenApi\Service\OpenApiServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\OpenApi\Service\OpenApiService \ No newline at end of file diff --git a/config/pimcore/config.yaml b/config/pimcore/config.yaml index 2eb253bf2..e11cb1e36 100644 --- a/config/pimcore/config.yaml +++ b/config/pimcore/config.yaml @@ -1,4 +1,8 @@ pimcore: translations: domains: - - studio \ No newline at end of file + - studio + +pimcore_studio_backend: + openApiScanPaths: + - "%kernel.project_dir%/vendor/pimcore/studio-api-bundle/src" \ No newline at end of file diff --git a/config/pimcore/routing.yaml b/config/pimcore/routing.yaml index 3e32ab892..d00029434 100644 --- a/config/pimcore/routing.yaml +++ b/config/pimcore/routing.yaml @@ -1,5 +1,5 @@ studio_api: - resource: "../../src/Controller/Api" + resource: "../../src/" type: annotation prefix: /studio/api options: diff --git a/config/providers.yaml b/config/providers.yaml index 8107c0a1f..2c8e69ff7 100644 --- a/config/providers.yaml +++ b/config/providers.yaml @@ -6,8 +6,8 @@ services: #Factory - Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceProviderInterface: - class: Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceProvider + Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceProviderInterface: + class: Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceProvider - Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceLoaderInterface: - class: Pimcore\Bundle\StudioApiBundle\Provider\Loader\TaggedIteratorAdapter + Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceLoaderInterface: + class: Pimcore\Bundle\StudioBackendBundle\Provider\Loader\TaggedIteratorAdapter diff --git a/config/security.yaml b/config/security.yaml new file mode 100644 index 000000000..726a23cef --- /dev/null +++ b/config/security.yaml @@ -0,0 +1,19 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + #Voters + Pimcore\Bundle\StudioBackendBundle\Security\Voter\AuthorizationVoter: + arguments: ['@request_stack'] + tags: + - { name: security.voter } + + Pimcore\Bundle\StudioBackendBundle\Security\Voter\PublicAuthorizationVoter: + arguments: [ '@request_stack' ] + tags: + - { name: security.voter } + + Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\Service\SecurityService \ No newline at end of file diff --git a/config/services.yaml b/config/services.yaml index 9c30893eb..68822630d 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -7,114 +7,27 @@ services: # # INSTALLER # - Pimcore\Bundle\StudioApiBundle\Installer: + Pimcore\Bundle\StudioBackendBundle\Installer: public: true arguments: - $bundle: "@=service('kernel').getBundle('PimcoreStudioApiBundle')" + $bundle: "@=service('kernel').getBundle('PimcoreStudioBackendBundle')" # controllers are imported separately to make sure they're public # and have a tag that allows actions to type-hint services - Pimcore\Bundle\StudioApiBundle\Controller\: + Pimcore\Bundle\StudioBackendBundle\Controller\: resource: '../src/Controller' public: true tags: [ 'controller.service_arguments' ] - # Hydrators - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ArchiveHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ArchiveHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\AudioHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\AudioHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\DocumentHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\DocumentHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\FolderHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\FolderHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ImageHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ImageHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\TextHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\TextHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\UnknownHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\UnknownHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\VideoHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\VideoHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\MetaDataHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\MetaDataHydrator - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\AssetHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\AssetHydrator + Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\Service\IconService - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydrator - # Services - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\AssetHydratorServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\AssetHydratorService - arguments: - $assetHydratorLocator: '@generic_data_index.asset_hydrator.service_locator' - - - # Assets - Pimcore\Bundle\StudioApiBundle\Service\AssetSearchServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\AssetSearchService - - Pimcore\Bundle\StudioApiBundle\Service\GenericData\AssetSearchAdapterInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetSearchAdapter - - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetQueryProviderInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetQueryProvider - - #Data Objects - Pimcore\Bundle\StudioApiBundle\Service\DataObjectSearchServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\DataObjectSearchService - - Pimcore\Bundle\StudioApiBundle\Service\GenericData\DataObjectSearchAdapterInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectSearchAdapter - Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQueryProviderInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQueryProvider - Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\IconService - Pimcore\Bundle\StudioApiBundle\Service\TranslatorServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\TranslatorService - Pimcore\Bundle\StudioApiBundle\Service\TokenServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\TokenService - Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\SecurityService - - Pimcore\Bundle\StudioApiBundle\Service\OpenApiServiceInterface: - class: Pimcore\Bundle\StudioApiBundle\Service\OpenApiService - - #Voters - Pimcore\Bundle\StudioApiBundle\Security\Voter\AuthorizationVoter: - arguments: ['@request_stack'] - tags: - - { name: security.voter } - - Pimcore\Bundle\StudioApiBundle\Security\Voter\PublicAuthorizationVoter: - arguments: [ '@request_stack' ] - tags: - - { name: security.voter } - - #Decorators - #Pimcore\Bundle\StudioApiBundle\ApiPlatform\OpenApiFactoryDecorator: - #decorates: 'api_platform.openapi.factory' - - #Service Locator - generic_data_index.asset_hydrator.service_locator: - class: Symfony\Component\DependencyInjection\ServiceLocator - tags: ['container.service_locator'] - arguments: - - - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ArchiveHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\AudioHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\DocumentHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\FolderHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\ImageHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\TextHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\UnknownHydratorInterface' - Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video: '@Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\VideoHydratorInterface' diff --git a/config/translation.yaml b/config/translation.yaml new file mode 100644 index 000000000..290ab48b8 --- /dev/null +++ b/config/translation.yaml @@ -0,0 +1,15 @@ +services: + _defaults: + autowire: true + autoconfigure: true + public: false + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + Pimcore\Bundle\StudioBackendBundle\Translation\Controller\: + resource: '../src/Translation/Controller' + public: true + tags: [ 'controller.service_arguments' ] + + Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface: + class: Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorService \ No newline at end of file diff --git a/doc/01_Installation.md b/doc/01_Installation.md index 27dcbcb9f..9e1b939b0 100644 --- a/doc/01_Installation.md +++ b/doc/01_Installation.md @@ -13,16 +13,17 @@ To install the Studio Api Bundle, follow the three steps below: 1) Install the required dependencies: ```bash -composer require pimcore/studio-api-bundle +composer require pimcore/studio-backend-bundle ``` 2) Make sure the bundle is enabled in the `config/bundles.php` file. The following lines should be added: + ```php -use Pimcore\Bundle\StudioApiBundle\PimcoreStudioApiBundle; +use Pimcore\Bundle\StudioBackendBundle\PimcoreStudioBackendBundle; // ... return [ // ... - PimcoreStudioApiBundle::class => ['all' => true], + PimcoreStudioBackendBundle::class => ['all' => true], // ... ]; ``` @@ -30,5 +31,5 @@ return [ 3) Install the bundle: ```bash -bin/console pimcore:bundle:install PimcoreStudioApiBundle +bin/console pimcore:bundle:install PimcoreStudioBackendBundle ``` diff --git a/docker-compose.yml b/docker-compose.yml index 506ff2443..210020e65 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.0' services: - php-studio-api-bundle: + php-studio-backend-bundle: image: pimcore/pimcore:php8.2-debug-latest environment: PHP_IDE_CONFIG: serverName=localhost diff --git a/public/css/swagger-ui/index.css b/public/css/swagger-ui/index.css index 56e3e46cf..20c601275 100644 --- a/public/css/swagger-ui/index.css +++ b/public/css/swagger-ui/index.css @@ -34,6 +34,6 @@ body { position: fixed; bottom: 2px; right: 2px; - background: url(/bundles/pimcorestudioapi/img/api-icon.png) center center no-repeat; + background: url(/bundles/pimcorestudiobackend/img/api-icon.png) center center no-repeat; background-size: 24px 24px; } diff --git a/qodana.sarif.json b/qodana.sarif.json index 873d3cdef..5b8a22689 100644 --- a/qodana.sarif.json +++ b/qodana.sarif.json @@ -37209,11 +37209,11 @@ "language": "en-US", "versionControlProvenance": [ { - "repositoryUri": "https://github.com/pimcore/studio-api-bundle.git", + "repositoryUri": "https://github.com/pimcore/studio-backend-bundle.git", "revisionId": "d44e6fe87239160c64004cbe3387f1b4779cf343", "branch": "0x-First-Prototype", "properties": { - "repoUrl": "https://github.com/pimcore/studio-api-bundle.git", + "repoUrl": "https://github.com/pimcore/studio-backend-bundle.git", "lastAuthorName": "mattamon", "vcsType": "Git", "lastAuthorEmail": "matthias.schuhmayer@pimcore.com" @@ -37478,7 +37478,7 @@ "charOffset": 2687, "charLength": 215, "snippet": { - "text": "use Pimcore\\Bundle\\StudioApiBundle\\Service\\GenericData\\V1\\Hydrator\\Asset\\VideoHydratorInterface;\n\nfinal readonly class AssetHydratorService implements AssetHydratorServiceInterface\n{\n public function __construct(" + "text": "use Pimcore\\Bundle\\StudioBackendBundle\\Service\\GenericData\\V1\\Hydrator\\Asset\\VideoHydratorInterface;\n\nfinal readonly class AssetHydratorService implements AssetHydratorServiceInterface\n{\n public function __construct(" }, "sourceLanguage": "PHP" } @@ -37564,7 +37564,7 @@ "id": "project/qodana/2024-03-06", "guid": "8da1f312-bbe5-4efb-91a8-5929ccb22f55", "properties": { - "jobUrl": "https://github.com/pimcore/studio-api-bundle/actions/runs/8173608135" + "jobUrl": "https://github.com/pimcore/studio-backend-bundle/actions/runs/8173608135" } }, "newlineSequences": [ diff --git a/src/Controller/Api/Assets/CollectionController.php b/src/Asset/Controller/CollectionController.php similarity index 54% rename from src/Controller/Api/Assets/CollectionController.php rename to src/Asset/Controller/CollectionController.php index b59d0f06e..4dafc8f8f 100644 --- a/src/Controller/Api/Assets/CollectionController.php +++ b/src/Asset/Controller/CollectionController.php @@ -14,33 +14,33 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api\Assets; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Controller; use OpenApi\Attributes\Get; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\ExcludeFoldersParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\IdSearchTermParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PageParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PageSizeParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\ParentIdParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathIncludeDescendantsParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathIncludeParentParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Content\CollectionJson; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\BadRequestResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\MethodNotAllowedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnauthorizedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnprocessableContentResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnsupportedMediaTypeResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Property\AnyOfAsset; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\SuccessResponse; -use Pimcore\Bundle\StudioApiBundle\Config\Tags; -use Pimcore\Bundle\StudioApiBundle\Controller\Api\AbstractApiController; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceProviderInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\ElementParameters; -use Pimcore\Bundle\StudioApiBundle\Service\AssetSearchServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\OpenSearchFilterInterface; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\PaginatedResponseTrait; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParameters; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ExcludeFoldersParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\IdSearchTermParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PageParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PageSizeParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ParentIdParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathIncludeDescendantsParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathIncludeParentParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\CollectionJson; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\BadRequestResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Property\AnyOfAsset; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags; +use Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\PaginatedResponseTrait; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Attribute\MapQueryString; use Symfony\Component\Routing\Attribute\Route; diff --git a/src/Controller/Api/Assets/GetController.php b/src/Asset/Controller/GetController.php similarity index 65% rename from src/Controller/Api/Assets/GetController.php rename to src/Asset/Controller/GetController.php index 7c1c9dd15..953d4d8fb 100644 --- a/src/Controller/Api/Assets/GetController.php +++ b/src/Asset/Controller/GetController.php @@ -14,19 +14,19 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api\Assets; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Controller; use OpenApi\Attributes\Get; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Path\IdParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Content\OneOfAssetJson; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\MethodNotAllowedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnauthorizedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnprocessableContentResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnsupportedMediaTypeResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\SuccessResponse; -use Pimcore\Bundle\StudioApiBundle\Config\Tags; -use Pimcore\Bundle\StudioApiBundle\Controller\Api\AbstractApiController; -use Pimcore\Bundle\StudioApiBundle\Service\AssetSearchServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path\IdParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\OneOfAssetJson; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\Routing\Attribute\Route; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Controller/Api/Authorization/AuthorizationController.php b/src/Authorization/Controller/AuthorizationController.php similarity index 70% rename from src/Controller/Api/Authorization/AuthorizationController.php rename to src/Authorization/Controller/AuthorizationController.php index 8f7f095fa..e6db7dbc4 100644 --- a/src/Controller/Api/Authorization/AuthorizationController.php +++ b/src/Authorization/Controller/AuthorizationController.php @@ -14,24 +14,24 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api\Authorization; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Controller; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Post; -use Pimcore\Bundle\StudioApiBundle\Attributes\Request\CredentialsRequestBody; -use Pimcore\Bundle\StudioApiBundle\Attributes\Request\TokenRequestBody; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\MethodNotAllowedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnauthorizedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnprocessableContentResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnsupportedMediaTypeResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\SuccessResponse; -use Pimcore\Bundle\StudioApiBundle\Config\Tags; -use Pimcore\Bundle\StudioApiBundle\Controller\Api\AbstractApiController; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Refresh; -use Pimcore\Bundle\StudioApiBundle\Response\Token; -use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Service\TokenServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Refresh; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Token; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\CredentialsRequestBody; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\TokenRequestBody; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags; +use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface; use Pimcore\Security\User\User; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Attribute\MapRequestPayload; diff --git a/src/Dto/Token/Info.php b/src/Authorization/Info.php similarity index 92% rename from src/Dto/Token/Info.php rename to src/Authorization/Info.php index 3de5fe099..0c73337a6 100644 --- a/src/Dto/Token/Info.php +++ b/src/Authorization/Info.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto\Token; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization; /** * @internal diff --git a/src/Request/Credentials.php b/src/Authorization/Schema/Credentials.php similarity index 94% rename from src/Request/Credentials.php rename to src/Authorization/Schema/Credentials.php index 65d17dbe4..e97b25ba0 100644 --- a/src/Request/Credentials.php +++ b/src/Authorization/Schema/Credentials.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Request/Query/Refresh.php b/src/Authorization/Schema/Refresh.php similarity index 93% rename from src/Request/Query/Refresh.php rename to src/Authorization/Schema/Refresh.php index 0ea3c6972..88d3bc1e5 100644 --- a/src/Request/Query/Refresh.php +++ b/src/Authorization/Schema/Refresh.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Token.php b/src/Authorization/Schema/Token.php similarity index 95% rename from src/Response/Token.php rename to src/Authorization/Schema/Token.php index 47cdb0f75..ed6f75a57 100644 --- a/src/Response/Token.php +++ b/src/Authorization/Schema/Token.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Service/TokenService.php b/src/Authorization/Service/TokenService.php similarity index 92% rename from src/Service/TokenService.php rename to src/Authorization/Service/TokenService.php index fc03a9181..7740ab1a2 100644 --- a/src/Service/TokenService.php +++ b/src/Authorization/Service/TokenService.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service; use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface; -use Pimcore\Bundle\StudioApiBundle\Dto\Token\Info; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Info; use Symfony\Component\Security\Core\Exception\TokenNotFoundException; use Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface; @@ -26,7 +26,7 @@ */ final class TokenService implements TokenServiceInterface { - private const TMP_STORE_TAG = 'studio-api-token-tag-user-{userId}'; + private const TMP_STORE_TAG = 'studio-backend-token-tag-user-{userId}'; private const TMP_STORE_TAG_PLACEHOLDER = '{userId}'; diff --git a/src/Service/TokenServiceInterface.php b/src/Authorization/Service/TokenServiceInterface.php similarity index 84% rename from src/Service/TokenServiceInterface.php rename to src/Authorization/Service/TokenServiceInterface.php index d8ffb47c6..f0af144df 100644 --- a/src/Service/TokenServiceInterface.php +++ b/src/Authorization/Service/TokenServiceInterface.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Authorization\Service; -use Pimcore\Bundle\StudioApiBundle\Dto\Token\Info; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Info; /** * @internal diff --git a/src/Controller/Api/AbstractApiController.php b/src/Controller/Api/AbstractApiController.php index db0369f3e..15c0388b6 100644 --- a/src/Controller/Api/AbstractApiController.php +++ b/src/Controller/Api/AbstractApiController.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api; +namespace Pimcore\Bundle\StudioBackendBundle\Controller\Api; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; diff --git a/src/Service/GenericData/V1/AssetSearchAdapter.php b/src/DataIndex/Adapter/AssetSearchAdapter.php similarity index 83% rename from src/Service/GenericData/V1/AssetSearchAdapter.php rename to src/DataIndex/Adapter/AssetSearchAdapter.php index 6ab1462cc..13958c217 100644 --- a/src/Service/GenericData/V1/AssetSearchAdapter.php +++ b/src/DataIndex/Adapter/AssetSearchAdapter.php @@ -14,14 +14,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter; use Exception; use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\Asset\AssetSearchServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Service\AssetSearchResult; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\AssetSearchAdapterInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\AssetHydratorServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchResult; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\AssetHydratorServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; final readonly class AssetSearchAdapter implements AssetSearchAdapterInterface { diff --git a/src/Service/GenericData/AssetSearchAdapterInterface.php b/src/DataIndex/Adapter/AssetSearchAdapterInterface.php similarity index 71% rename from src/Service/GenericData/AssetSearchAdapterInterface.php rename to src/DataIndex/Adapter/AssetSearchAdapterInterface.php index 69c14cbdc..0ac267edd 100644 --- a/src/Service/GenericData/AssetSearchAdapterInterface.php +++ b/src/DataIndex/Adapter/AssetSearchAdapterInterface.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Service\AssetSearchResult; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\AssetSearchResult; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; interface AssetSearchAdapterInterface { diff --git a/src/Service/GenericData/V1/DataObjectSearchAdapter.php b/src/DataIndex/Adapter/DataObjectSearchAdapter.php similarity index 87% rename from src/Service/GenericData/V1/DataObjectSearchAdapter.php rename to src/DataIndex/Adapter/DataObjectSearchAdapter.php index 4d7813085..8065dbd01 100644 --- a/src/Service/GenericData/V1/DataObjectSearchAdapter.php +++ b/src/DataIndex/Adapter/DataObjectSearchAdapter.php @@ -14,15 +14,15 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\DataObject\DataObjectSearchInterface; use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\DataObject\DataObjectSearchServiceInterface; use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolver; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidSearchException; -use Pimcore\Bundle\StudioApiBundle\Response\DataObject; -use Pimcore\Bundle\StudioApiBundle\Service\DataObjectSearchResult; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\DataObjectSearchAdapterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchResult; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidSearchException; +use Pimcore\Bundle\StudioBackendBundle\Response\DataObject; use Pimcore\Model\DataObject\Concrete; use Pimcore\Model\Element\ElementInterface; diff --git a/src/Service/GenericData/DataObjectSearchAdapterInterface.php b/src/DataIndex/Adapter/DataObjectSearchAdapterInterface.php similarity index 77% rename from src/Service/GenericData/DataObjectSearchAdapterInterface.php rename to src/DataIndex/Adapter/DataObjectSearchAdapterInterface.php index 47f63779a..854268509 100644 --- a/src/Service/GenericData/DataObjectSearchAdapterInterface.php +++ b/src/DataIndex/Adapter/DataObjectSearchAdapterInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter; -use Pimcore\Bundle\StudioApiBundle\Service\DataObjectSearchResult; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchResult; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; use Pimcore\Model\Element\ElementInterface; interface DataObjectSearchAdapterInterface diff --git a/src/Service/AssetSearchResult.php b/src/DataIndex/AssetSearchResult.php similarity index 67% rename from src/Service/AssetSearchResult.php rename to src/DataIndex/AssetSearchResult.php index c48ef6f73..502eaeeb3 100644 --- a/src/Service/AssetSearchResult.php +++ b/src/DataIndex/AssetSearchResult.php @@ -14,17 +14,17 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; final readonly class AssetSearchResult { diff --git a/src/Service/AssetSearchService.php b/src/DataIndex/AssetSearchService.php similarity index 56% rename from src/Service/AssetSearchService.php rename to src/DataIndex/AssetSearchService.php index a7e373c3c..857120062 100644 --- a/src/Service/AssetSearchService.php +++ b/src/DataIndex/AssetSearchService.php @@ -14,19 +14,19 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\AssetSearchAdapterInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\AssetSearchAdapterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; final readonly class AssetSearchService implements AssetSearchServiceInterface { diff --git a/src/Service/AssetSearchServiceInterface.php b/src/DataIndex/AssetSearchServiceInterface.php similarity index 50% rename from src/Service/AssetSearchServiceInterface.php rename to src/DataIndex/AssetSearchServiceInterface.php index 5a49605a5..6ae8221b2 100644 --- a/src/Service/AssetSearchServiceInterface.php +++ b/src/DataIndex/AssetSearchServiceInterface.php @@ -14,18 +14,18 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; interface AssetSearchServiceInterface { diff --git a/src/Service/DataObjectSearchResult.php b/src/DataIndex/DataObjectSearchResult.php similarity index 95% rename from src/Service/DataObjectSearchResult.php rename to src/DataIndex/DataObjectSearchResult.php index bea5f8345..98d579b38 100644 --- a/src/Service/DataObjectSearchResult.php +++ b/src/DataIndex/DataObjectSearchResult.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; final readonly class DataObjectSearchResult { diff --git a/src/Service/DataObjectSearchService.php b/src/DataIndex/DataObjectSearchService.php similarity index 81% rename from src/Service/DataObjectSearchService.php rename to src/DataIndex/DataObjectSearchService.php index c09c8ee2a..c3d6dd09b 100644 --- a/src/Service/DataObjectSearchService.php +++ b/src/DataIndex/DataObjectSearchService.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\DataObjectSearchAdapterInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter\DataObjectSearchAdapterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; use Pimcore\Model\DataObject\Concrete; final readonly class DataObjectSearchService implements DataObjectSearchServiceInterface diff --git a/src/Service/DataObjectSearchServiceInterface.php b/src/DataIndex/DataObjectSearchServiceInterface.php similarity index 84% rename from src/Service/DataObjectSearchServiceInterface.php rename to src/DataIndex/DataObjectSearchServiceInterface.php index a485dabda..f59690277 100644 --- a/src/Service/DataObjectSearchServiceInterface.php +++ b/src/DataIndex/DataObjectSearchServiceInterface.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; use Pimcore\Model\DataObject\Concrete; interface DataObjectSearchServiceInterface diff --git a/src/Filter/DataObject/ClassNameFilter.php b/src/DataIndex/Filter/DataObject/ClassNameFilter.php similarity index 68% rename from src/Filter/DataObject/ClassNameFilter.php rename to src/DataIndex/Filter/DataObject/ClassNameFilter.php index 578f390ba..7a317b34e 100644 --- a/src/Filter/DataObject/ClassNameFilter.php +++ b/src/DataIndex/Filter/DataObject/ClassNameFilter.php @@ -14,14 +14,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter\DataObject; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\DataObject; use Exception; -use Pimcore\Bundle\StudioApiBundle\Filter\FilterInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\DataObjectParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQuery; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\FilterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\DataObjectQuery; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\DataObjectParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Filter/ExcludeFolderFilter.php b/src/DataIndex/Filter/ExcludeFolderFilter.php similarity index 75% rename from src/Filter/ExcludeFolderFilter.php rename to src/DataIndex/Filter/ExcludeFolderFilter.php index 957d702ea..f9b0dbcac 100644 --- a/src/Filter/ExcludeFolderFilter.php +++ b/src/DataIndex/Filter/ExcludeFolderFilter.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\ElementParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Filter/FilterInterface.php b/src/DataIndex/Filter/FilterInterface.php similarity index 74% rename from src/Filter/FilterInterface.php rename to src/DataIndex/Filter/FilterInterface.php index 04bbc1066..9b57a9b30 100644 --- a/src/Filter/FilterInterface.php +++ b/src/DataIndex/Filter/FilterInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Service/GenericData/V1/Filter/FilterLoaderInterface.php b/src/DataIndex/Filter/FilterLoaderInterface.php similarity index 88% rename from src/Service/GenericData/V1/Filter/FilterLoaderInterface.php rename to src/DataIndex/Filter/FilterLoaderInterface.php index 1dcb1d5f7..fb570c42e 100644 --- a/src/Service/GenericData/V1/Filter/FilterLoaderInterface.php +++ b/src/DataIndex/Filter/FilterLoaderInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; /** * @internal diff --git a/src/Service/GenericData/V1/Filter/Filters.php b/src/DataIndex/Filter/Filters.php similarity index 93% rename from src/Service/GenericData/V1/Filter/Filters.php rename to src/DataIndex/Filter/Filters.php index 953218984..26af0b40e 100644 --- a/src/Service/GenericData/V1/Filter/Filters.php +++ b/src/DataIndex/Filter/Filters.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; /** * @internal diff --git a/src/Filter/IdSearchFilter.php b/src/DataIndex/Filter/IdSearchFilter.php similarity index 75% rename from src/Filter/IdSearchFilter.php rename to src/DataIndex/Filter/IdSearchFilter.php index 4c32e508f..56028cdf7 100644 --- a/src/Filter/IdSearchFilter.php +++ b/src/DataIndex/Filter/IdSearchFilter.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\ElementParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Service/GenericData/V1/Filter/Loader/TaggedIteratorAdapter.php b/src/DataIndex/Filter/Loader/TaggedIteratorAdapter.php similarity index 87% rename from src/Service/GenericData/V1/Filter/Loader/TaggedIteratorAdapter.php rename to src/DataIndex/Filter/Loader/TaggedIteratorAdapter.php index affaa7875..5ed426143 100644 --- a/src/Service/GenericData/V1/Filter/Loader/TaggedIteratorAdapter.php +++ b/src/DataIndex/Filter/Loader/TaggedIteratorAdapter.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\Loader; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\Loader; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\FilterLoaderInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\Filters; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\FilterLoaderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\Filters; use Symfony\Component\DependencyInjection\Attribute\TaggedIterator; /** diff --git a/src/Filter/PageFilter.php b/src/DataIndex/Filter/PageFilter.php similarity index 77% rename from src/Filter/PageFilter.php rename to src/DataIndex/Filter/PageFilter.php index 6ff42bdbc..1e58de673 100644 --- a/src/Filter/PageFilter.php +++ b/src/DataIndex/Filter/PageFilter.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Filter/PageSizeFilter.php b/src/DataIndex/Filter/PageSizeFilter.php similarity index 77% rename from src/Filter/PageSizeFilter.php rename to src/DataIndex/Filter/PageSizeFilter.php index c7de050fa..7b5649ae9 100644 --- a/src/Filter/PageSizeFilter.php +++ b/src/DataIndex/Filter/PageSizeFilter.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Filter/ParentIdFilter.php b/src/DataIndex/Filter/ParentIdFilter.php similarity index 75% rename from src/Filter/ParentIdFilter.php rename to src/DataIndex/Filter/ParentIdFilter.php index ba49a4109..81090a8be 100644 --- a/src/Filter/ParentIdFilter.php +++ b/src/DataIndex/Filter/ParentIdFilter.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\ElementParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Filter/PathFilter.php b/src/DataIndex/Filter/PathFilter.php similarity index 78% rename from src/Filter/PathFilter.php rename to src/DataIndex/Filter/PathFilter.php index 5bfc5a4c9..ffaf94558 100644 --- a/src/Filter/PathFilter.php +++ b/src/DataIndex/Filter/PathFilter.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\ElementParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydrator.php b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydrator.php rename to src/DataIndex/Hydrator/Asset/ArchiveHydrator.php index 7a35e12e4..14f6fd319 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydrator.php +++ b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class ArchiveHydrator implements ArchiveHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php index 1e2c017bb..0fc0e6c63 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/ArchiveHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; interface ArchiveHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/AudioHydrator.php b/src/DataIndex/Hydrator/Asset/AudioHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/AudioHydrator.php rename to src/DataIndex/Hydrator/Asset/AudioHydrator.php index 68ec0e55a..77c242206 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/AudioHydrator.php +++ b/src/DataIndex/Hydrator/Asset/AudioHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class AudioHydrator implements AudioHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/AudioHydratorInterface.php b/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/AudioHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php index e6411c56b..a9dd83e8c 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/AudioHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; interface AudioHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/DocumentHydrator.php b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/DocumentHydrator.php rename to src/DataIndex/Hydrator/Asset/DocumentHydrator.php index 3a3c1e712..0fe5916c7 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/DocumentHydrator.php +++ b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class DocumentHydrator implements DocumentHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/DocumentHydratorInterface.php b/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/DocumentHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php index f91e0637d..73c6b0376 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/DocumentHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; interface DocumentHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/FolderHydrator.php b/src/DataIndex/Hydrator/Asset/FolderHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/FolderHydrator.php rename to src/DataIndex/Hydrator/Asset/FolderHydrator.php index 96473ab2b..0fbfd36be 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/FolderHydrator.php +++ b/src/DataIndex/Hydrator/Asset/FolderHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class FolderHydrator implements FolderHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/FolderHydratorInterface.php b/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/FolderHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php index cf31ecda3..42c43a094 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/FolderHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; interface FolderHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/ImageHydrator.php b/src/DataIndex/Hydrator/Asset/ImageHydrator.php similarity index 86% rename from src/Service/GenericData/V1/Hydrator/Asset/ImageHydrator.php rename to src/DataIndex/Hydrator/Asset/ImageHydrator.php index 7fa92a44b..f376f89d8 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/ImageHydrator.php +++ b/src/DataIndex/Hydrator/Asset/ImageHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class ImageHydrator implements ImageHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/ImageHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/ImageHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php index e962c8c50..a5e4870ba 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/ImageHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; interface ImageHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydrator.php b/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php similarity index 88% rename from src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydrator.php rename to src/DataIndex/Hydrator/Asset/MetaDataHydrator.php index 6357c2d5c..01dee2097 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydrator.php +++ b/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\MetaData; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData; final class MetaDataHydrator implements MetaDataHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydratorInterface.php b/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php similarity index 84% rename from src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php index 0c2f8eaa1..8128c8664 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/MetaDataHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\MetaData; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData; interface MetaDataHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/TextHydrator.php b/src/DataIndex/Hydrator/Asset/TextHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/TextHydrator.php rename to src/DataIndex/Hydrator/Asset/TextHydrator.php index 66a1d50ed..2a0ed47a0 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/TextHydrator.php +++ b/src/DataIndex/Hydrator/Asset/TextHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text as TextItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class TextHydrator implements TextHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/TextHydratorInterface.php b/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/TextHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/TextHydratorInterface.php index d646b5464..76fcf3a2f 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/TextHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text as TextItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; interface TextHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/UnknownHydrator.php b/src/DataIndex/Hydrator/Asset/UnknownHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/Asset/UnknownHydrator.php rename to src/DataIndex/Hydrator/Asset/UnknownHydrator.php index 090172add..975b17e0f 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/UnknownHydrator.php +++ b/src/DataIndex/Hydrator/Asset/UnknownHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown as UnknownItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class UnknownHydrator implements UnknownHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/UnknownHydratorInterface.php b/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/UnknownHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php index cd782cb64..524f618da 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/UnknownHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown as UnknownItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; interface UnknownHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/VideoHydrator.php b/src/DataIndex/Hydrator/Asset/VideoHydrator.php similarity index 86% rename from src/Service/GenericData/V1/Hydrator/Asset/VideoHydrator.php rename to src/DataIndex/Hydrator/Asset/VideoHydrator.php index b4aab81e5..ee4799b49 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/VideoHydrator.php +++ b/src/DataIndex/Hydrator/Asset/VideoHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video as VideoItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\PermissionsHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class VideoHydrator implements VideoHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/Asset/VideoHydratorInterface.php b/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/Asset/VideoHydratorInterface.php rename to src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php index a99391af6..0fa3bf3d4 100644 --- a/src/Service/GenericData/V1/Hydrator/Asset/VideoHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video as VideoItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; interface VideoHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/AssetHydrator.php b/src/DataIndex/Hydrator/AssetHydrator.php similarity index 85% rename from src/Service/GenericData/V1/Hydrator/AssetHydrator.php rename to src/DataIndex/Hydrator/AssetHydrator.php index 908fc73ba..506f9a489 100644 --- a/src/Service/GenericData/V1/Hydrator/AssetHydrator.php +++ b/src/DataIndex/Hydrator/AssetHydrator.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator\Asset\MetaDataHydratorInterface; -use Pimcore\Bundle\StudioApiBundle\Service\IconServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\MetaDataHydratorInterface; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Service\IconServiceInterface; final readonly class AssetHydrator implements AssetHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/AssetHydratorInterface.php b/src/DataIndex/Hydrator/AssetHydratorInterface.php similarity index 84% rename from src/Service/GenericData/V1/Hydrator/AssetHydratorInterface.php rename to src/DataIndex/Hydrator/AssetHydratorInterface.php index 38c1d8523..e6758d4ba 100644 --- a/src/Service/GenericData/V1/Hydrator/AssetHydratorInterface.php +++ b/src/DataIndex/Hydrator/AssetHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; interface AssetHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/AssetHydratorService.php b/src/DataIndex/Hydrator/AssetHydratorService.php similarity index 90% rename from src/Service/GenericData/V1/Hydrator/AssetHydratorService.php rename to src/DataIndex/Hydrator/AssetHydratorService.php index 0be2fc651..817c37b7d 100644 --- a/src/Service/GenericData/V1/Hydrator/AssetHydratorService.php +++ b/src/DataIndex/Hydrator/AssetHydratorService.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; use Symfony\Contracts\Service\ServiceProviderInterface; final readonly class AssetHydratorService implements AssetHydratorServiceInterface diff --git a/src/Service/GenericData/V1/Hydrator/AssetHydratorServiceInterface.php b/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php similarity index 58% rename from src/Service/GenericData/V1/Hydrator/AssetHydratorServiceInterface.php rename to src/DataIndex/Hydrator/AssetHydratorServiceInterface.php index 662b886ea..6fb829479 100644 --- a/src/Service/GenericData/V1/Hydrator/AssetHydratorServiceInterface.php +++ b/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php @@ -14,18 +14,18 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; interface AssetHydratorServiceInterface { diff --git a/src/Service/GenericData/V1/Hydrator/PermissionsHydrator.php b/src/DataIndex/Hydrator/PermissionsHydrator.php similarity index 88% rename from src/Service/GenericData/V1/Hydrator/PermissionsHydrator.php rename to src/DataIndex/Hydrator/PermissionsHydrator.php index 7f8ab3580..1455cbab1 100644 --- a/src/Service/GenericData/V1/Hydrator/PermissionsHydrator.php +++ b/src/DataIndex/Hydrator/PermissionsHydrator.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Permission\AssetPermissions; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; final class PermissionsHydrator implements PermissionsHydratorInterface { diff --git a/src/Service/GenericData/V1/Hydrator/PermissionsHydratorInterface.php b/src/DataIndex/Hydrator/PermissionsHydratorInterface.php similarity index 82% rename from src/Service/GenericData/V1/Hydrator/PermissionsHydratorInterface.php rename to src/DataIndex/Hydrator/PermissionsHydratorInterface.php index dd4e6a026..6333f2997 100644 --- a/src/Service/GenericData/V1/Hydrator/PermissionsHydratorInterface.php +++ b/src/DataIndex/Hydrator/PermissionsHydratorInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Hydrator; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Permission\AssetPermissions; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; interface PermissionsHydratorInterface { diff --git a/src/Service/GenericData/V1/Filter/OpenSearchFilter.php b/src/DataIndex/OpenSearchFilter.php similarity index 76% rename from src/Service/GenericData/V1/Filter/OpenSearchFilter.php rename to src/DataIndex/OpenSearchFilter.php index a161ce980..4d78bba1b 100644 --- a/src/Service/GenericData/V1/Filter/OpenSearchFilter.php +++ b/src/DataIndex/OpenSearchFilter.php @@ -14,14 +14,16 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidFilterTypeException; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Factory\QueryFactoryInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\FilterServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\FilterLoaderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\Filters; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidFilterTypeException; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; +use Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactoryInterface; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; +use Pimcore\Bundle\StudioBackendBundle\Service\FilterServiceInterface; /** * @internal diff --git a/src/Service/GenericData/V1/Filter/OpenSearchFilterInterface.php b/src/DataIndex/OpenSearchFilterInterface.php similarity index 74% rename from src/Service/GenericData/V1/Filter/OpenSearchFilterInterface.php rename to src/DataIndex/OpenSearchFilterInterface.php index 0060ea4ec..72c679667 100644 --- a/src/Service/GenericData/V1/Filter/OpenSearchFilterInterface.php +++ b/src/DataIndex/OpenSearchFilterInterface.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\CollectionParametersInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Service/GenericData/V1/AssetQueryProvider.php b/src/DataIndex/Provider/AssetQueryProvider.php similarity index 81% rename from src/Service/GenericData/V1/AssetQueryProvider.php rename to src/DataIndex/Provider/AssetQueryProvider.php index 5c5a2180f..427cc2300 100644 --- a/src/Service/GenericData/V1/AssetQueryProvider.php +++ b/src/DataIndex/Provider/AssetQueryProvider.php @@ -14,9 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider; use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\SearchProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\AssetQuery; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; final readonly class AssetQueryProvider implements AssetQueryProviderInterface { diff --git a/src/Service/GenericData/V1/AssetQueryProviderInterface.php b/src/DataIndex/Provider/AssetQueryProviderInterface.php similarity index 80% rename from src/Service/GenericData/V1/AssetQueryProviderInterface.php rename to src/DataIndex/Provider/AssetQueryProviderInterface.php index c8a0addaa..4a815c22e 100644 --- a/src/Service/GenericData/V1/AssetQueryProviderInterface.php +++ b/src/DataIndex/Provider/AssetQueryProviderInterface.php @@ -14,7 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider; + +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; interface AssetQueryProviderInterface { diff --git a/src/Service/GenericData/V1/DataObjectQueryProvider.php b/src/DataIndex/Provider/DataObjectQueryProvider.php similarity index 86% rename from src/Service/GenericData/V1/DataObjectQueryProvider.php rename to src/DataIndex/Provider/DataObjectQueryProvider.php index be8265ae6..b022deb22 100644 --- a/src/Service/GenericData/V1/DataObjectQueryProvider.php +++ b/src/DataIndex/Provider/DataObjectQueryProvider.php @@ -14,11 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\DataObject\DataObjectSearch; use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\SearchProviderInterface; use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassDefinitionResolverInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\DataObjectQuery; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; final readonly class DataObjectQueryProvider implements DataObjectQueryProviderInterface { diff --git a/src/Service/GenericData/V1/DataObjectQueryProviderInterface.php b/src/DataIndex/Provider/DataObjectQueryProviderInterface.php similarity index 80% rename from src/Service/GenericData/V1/DataObjectQueryProviderInterface.php rename to src/DataIndex/Provider/DataObjectQueryProviderInterface.php index a602b8ab1..2822b3cf6 100644 --- a/src/Service/GenericData/V1/DataObjectQueryProviderInterface.php +++ b/src/DataIndex/Provider/DataObjectQueryProviderInterface.php @@ -14,7 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider; + +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; interface DataObjectQueryProviderInterface { diff --git a/src/Service/GenericData/V1/AssetQuery.php b/src/DataIndex/Query/AssetQuery.php similarity index 97% rename from src/Service/GenericData/V1/AssetQuery.php rename to src/DataIndex/Query/AssetQuery.php index 9aa4ce354..30f5776f3 100644 --- a/src/Service/GenericData/V1/AssetQuery.php +++ b/src/DataIndex/Query/AssetQuery.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Query; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Interfaces\SearchInterface; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Filter\Basic\ExcludeFoldersFilter; diff --git a/src/Service/GenericData/V1/DataObjectQuery.php b/src/DataIndex/Query/DataObjectQuery.php similarity index 95% rename from src/Service/GenericData/V1/DataObjectQuery.php rename to src/DataIndex/Query/DataObjectQuery.php index 6d088c13f..f4b1fc9a9 100644 --- a/src/Service/GenericData/V1/DataObjectQuery.php +++ b/src/DataIndex/Query/DataObjectQuery.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Query; use Exception; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\DataObject\DataObjectSearch; @@ -23,7 +23,7 @@ use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\Filter\Tree\PathFilter; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Modifier\FullTextSearch\ElementKeySearch; use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassDefinitionResolverInterface; -use Pimcore\Bundle\StudioApiBundle\Exception\ClassDefinitionNotFoundException; +use Pimcore\Bundle\StudioBackendBundle\Exception\ClassDefinitionNotFoundException; final class DataObjectQuery implements QueryInterface { diff --git a/src/Service/GenericData/V1/QueryInterface.php b/src/DataIndex/Query/QueryInterface.php similarity index 93% rename from src/Service/GenericData/V1/QueryInterface.php rename to src/DataIndex/Query/QueryInterface.php index 45a8648fd..c4f58d3ec 100644 --- a/src/Service/GenericData/V1/QueryInterface.php +++ b/src/DataIndex/Query/QueryInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Query; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Interfaces\SearchInterface; diff --git a/src/Request/Query/Filter/DataObjectParameters.php b/src/DataIndex/Request/DataObjectParameters.php similarity index 95% rename from src/Request/Query/Filter/DataObjectParameters.php rename to src/DataIndex/Request/DataObjectParameters.php index 491faac58..a546f601a 100644 --- a/src/Request/Query/Filter/DataObjectParameters.php +++ b/src/DataIndex/Request/DataObjectParameters.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request; /** * @internal diff --git a/src/Request/Query/Filter/DataObjectParametersInterface.php b/src/DataIndex/Request/DataObjectParametersInterface.php similarity index 90% rename from src/Request/Query/Filter/DataObjectParametersInterface.php rename to src/DataIndex/Request/DataObjectParametersInterface.php index b8e0a0137..1a9960db2 100644 --- a/src/Request/Query/Filter/DataObjectParametersInterface.php +++ b/src/DataIndex/Request/DataObjectParametersInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request; /** * @internal diff --git a/src/Request/Query/Filter/ElementParameters.php b/src/DataIndex/Request/ElementParameters.php similarity index 92% rename from src/Request/Query/Filter/ElementParameters.php rename to src/DataIndex/Request/ElementParameters.php index 72a36353a..2f7af3b2b 100644 --- a/src/Request/Query/Filter/ElementParameters.php +++ b/src/DataIndex/Request/ElementParameters.php @@ -14,7 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request; + +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParameters; /** * @internal diff --git a/src/Request/Query/Filter/ElementParametersInterface.php b/src/DataIndex/Request/ElementParametersInterface.php similarity index 86% rename from src/Request/Query/Filter/ElementParametersInterface.php rename to src/DataIndex/Request/ElementParametersInterface.php index c000b768c..08033732b 100644 --- a/src/Request/Query/Filter/ElementParametersInterface.php +++ b/src/DataIndex/Request/ElementParametersInterface.php @@ -14,7 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Request; + +use Pimcore\Bundle\StudioBackendBundle\Request\CollectionParametersInterface; /** * @internal diff --git a/src/Controller/Api/DataObjects/CollectionController.php b/src/DataObject/Controller/CollectionController.php similarity index 54% rename from src/Controller/Api/DataObjects/CollectionController.php rename to src/DataObject/Controller/CollectionController.php index 3adb65def..d321b1669 100644 --- a/src/Controller/Api/DataObjects/CollectionController.php +++ b/src/DataObject/Controller/CollectionController.php @@ -14,34 +14,34 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api\DataObjects; +namespace Pimcore\Bundle\StudioBackendBundle\DataObject\Controller; use OpenApi\Attributes\Get; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\ClassNameParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\ExcludeFoldersParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\IdSearchTermParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PageParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PageSizeParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\ParentIdParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathIncludeDescendantsParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathIncludeParentParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query\PathParameter; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Content\CollectionJson; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\BadRequestResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\MethodNotAllowedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnauthorizedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnprocessableContentResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnsupportedMediaTypeResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Property\DataObjectCollection; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\SuccessResponse; -use Pimcore\Bundle\StudioApiBundle\Config\Tags; -use Pimcore\Bundle\StudioApiBundle\Controller\Api\AbstractApiController; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceProviderInterface; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Filter\DataObjectParameters; -use Pimcore\Bundle\StudioApiBundle\Service\DataObjectSearchServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\OpenSearchFilterInterface; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\PaginatedResponseTrait; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\DataObjectParameters; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ClassNameParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ExcludeFoldersParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\IdSearchTermParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PageParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PageSizeParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\ParentIdParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathIncludeDescendantsParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathIncludeParentParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query\PathParameter; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content\CollectionJson; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\BadRequestResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Property\DataObjectCollection; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags; +use Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\PaginatedResponseTrait; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Attribute\MapQueryString; use Symfony\Component\Routing\Attribute\Route; diff --git a/src/DependencyInjection/CompilerPass/FilterPass.php b/src/DependencyInjection/CompilerPass/FilterPass.php index 60efa94c4..a418e2c9e 100644 --- a/src/DependencyInjection/CompilerPass/FilterPass.php +++ b/src/DependencyInjection/CompilerPass/FilterPass.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\DependencyInjection\CompilerPass; +namespace Pimcore\Bundle\StudioBackendBundle\DependencyInjection\CompilerPass; -use Pimcore\Bundle\StudioApiBundle\Exception\MustImplementInterfaceException; -use Pimcore\Bundle\StudioApiBundle\Filter\FilterInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\Filter\Loader\TaggedIteratorAdapter; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\MustImplementInterfaceTrait; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\FilterInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Filter\Loader\TaggedIteratorAdapter; +use Pimcore\Bundle\StudioBackendBundle\Exception\MustImplementInterfaceException; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\MustImplementInterfaceTrait; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 4f4db2fd4..4796b4a6b 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\DependencyInjection; +namespace Pimcore\Bundle\StudioBackendBundle\DependencyInjection; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidHostException; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidPathException; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidHostException; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidPathException; use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -29,7 +29,7 @@ */ class Configuration implements ConfigurationInterface { - public const ROOT_NODE = 'pimcore_studio_api'; + public const ROOT_NODE = 'pimcore_studio_backend'; /** * {@inheritdoc} diff --git a/src/DependencyInjection/PimcoreStudioApiExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php similarity index 73% rename from src/DependencyInjection/PimcoreStudioApiExtension.php rename to src/DependencyInjection/PimcoreStudioBackendExtension.php index ef499d418..bc47c007b 100644 --- a/src/DependencyInjection/PimcoreStudioApiExtension.php +++ b/src/DependencyInjection/PimcoreStudioBackendExtension.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\DependencyInjection; +namespace Pimcore\Bundle\StudioBackendBundle\DependencyInjection; use Exception; -use Pimcore\Bundle\StudioApiBundle\EventSubscriber\CorsSubscriber; -use Pimcore\Bundle\StudioApiBundle\Service\OpenApiServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Service\TokenServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Service\TokenServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\EventSubscriber\CorsSubscriber; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Service\OpenApiServiceInterface; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; @@ -34,7 +34,7 @@ /** * @internal */ -class PimcoreStudioApiExtension extends Extension +class PimcoreStudioBackendExtension extends Extension { /** * {@inheritdoc} @@ -49,11 +49,18 @@ public function load(array $configs, ContainerBuilder $container): void // Load services and configuration $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../config')); + $loader->load('assets.yaml'); + $loader->load('authorization.yaml'); $loader->load('event_subscribers.yaml'); + $loader->load('data_objects.yaml'); $loader->load('factories.yaml'); - $loader->load('filters.yaml'); $loader->load('providers.yaml'); + $loader->load('data_index.yaml'); + $loader->load('data_index_filters.yaml'); + $loader->load('open_api.yaml'); + $loader->load('security.yaml'); $loader->load('services.yaml'); + $loader->load('translation.yaml'); $definition = $container->getDefinition(TokenServiceInterface::class); $definition->setArgument('$tokenLifetime', $config['api_token']['lifetime']); diff --git a/src/Dto/Dependency.php b/src/Dto/Dependency.php index 2cd3674d5..840b73539 100644 --- a/src/Dto/Dependency.php +++ b/src/Dto/Dependency.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; readonly class Dependency { diff --git a/src/Dto/Property.php b/src/Dto/Property.php index 17bd472cb..0624796dc 100644 --- a/src/Dto/Property.php +++ b/src/Dto/Property.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; readonly class Property { diff --git a/src/Dto/ResetPasswordRequest.php b/src/Dto/ResetPasswordRequest.php index 771edf479..7a638407b 100644 --- a/src/Dto/ResetPasswordRequest.php +++ b/src/Dto/ResetPasswordRequest.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Dto/Task.php b/src/Dto/Task.php index 3fe86c3d0..8ae9349bb 100644 --- a/src/Dto/Task.php +++ b/src/Dto/Task.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; readonly class Task { diff --git a/src/Dto/User.php b/src/Dto/User.php index ea177610b..db69b3904 100644 --- a/src/Dto/User.php +++ b/src/Dto/User.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; use Pimcore\Model\User as ModelUser; diff --git a/src/Dto/Version.php b/src/Dto/Version.php index 513fd316a..e22120e17 100644 --- a/src/Dto/Version.php +++ b/src/Dto/Version.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Dto; use Pimcore\Model\User; use Pimcore\Model\Version as ModelVersion; diff --git a/src/EventSubscriber/ApiExceptionSubscriber.php b/src/EventSubscriber/ApiExceptionSubscriber.php index b11bed4f1..8c0ce2ea9 100644 --- a/src/EventSubscriber/ApiExceptionSubscriber.php +++ b/src/EventSubscriber/ApiExceptionSubscriber.php @@ -14,8 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\EventSubscriber; +namespace Pimcore\Bundle\StudioBackendBundle\EventSubscriber; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\StudioBackendPathTrait; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; @@ -27,7 +28,7 @@ */ final class ApiExceptionSubscriber implements EventSubscriberInterface { - use StudioApiPathTrait; + use StudioBackendPathTrait; public function __construct(private readonly string $environment) { @@ -45,7 +46,7 @@ public function onKernelException(ExceptionEvent $event): void $exception = $event->getThrowable(); $request = $event->getRequest(); - if(!$this->isStudioApiPath($request->getPathInfo())) { + if(!$this->isStudioBackendPath($request->getPathInfo())) { return; } diff --git a/src/EventSubscriber/CorsSubscriber.php b/src/EventSubscriber/CorsSubscriber.php index c24b0d7fa..6afae9cc4 100644 --- a/src/EventSubscriber/CorsSubscriber.php +++ b/src/EventSubscriber/CorsSubscriber.php @@ -14,8 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\EventSubscriber; +namespace Pimcore\Bundle\StudioBackendBundle\EventSubscriber; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\StudioBackendPathTrait; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Event\RequestEvent; @@ -25,7 +26,7 @@ final class CorsSubscriber implements EventSubscriberInterface { - use StudioApiPathTrait; + use StudioBackendPathTrait; private array $routeMethods; @@ -34,7 +35,7 @@ public function __construct( private readonly array $allowedHosts = [] ) { foreach($this->router->getRouteCollection()->getIterator() as $route) { - if($this->isStudioApiPath($route->getPath())) { + if($this->isStudioBackendPath($route->getPath())) { $this->routeMethods[$route->getPath()] = implode(', ', $route->getMethods()); } } @@ -57,7 +58,7 @@ public function onKernelRequest(RequestEvent $event): void $request = $event->getRequest(); - if(!$this->isStudioApiPath($request->getPathInfo())) { + if(!$this->isStudioBackendPath($request->getPathInfo())) { return; } @@ -78,7 +79,7 @@ public function onKernelResponse(ResponseEvent $event): void { $request = $event->getRequest(); - if (!$this->isStudioApiPath($request->getPathInfo())) { + if (!$this->isStudioBackendPath($request->getPathInfo())) { return; } // Run CORS check in here to ensure domain is in the system diff --git a/src/Exception/AbstractApiException.php b/src/Exception/AbstractApiException.php index d975a061b..f29bf8440 100644 --- a/src/Exception/AbstractApiException.php +++ b/src/Exception/AbstractApiException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; use Symfony\Component\HttpKernel\Exception\HttpException; diff --git a/src/Exception/AccessDeniedException.php b/src/Exception/AccessDeniedException.php index efbabd3a6..57bc941ac 100644 --- a/src/Exception/AccessDeniedException.php +++ b/src/Exception/AccessDeniedException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/ClassDefinitionNotFoundException.php b/src/Exception/ClassDefinitionNotFoundException.php index aabf081a3..fbf3ea3ee 100644 --- a/src/Exception/ClassDefinitionNotFoundException.php +++ b/src/Exception/ClassDefinitionNotFoundException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/InvalidFilterServiceTypeException.php b/src/Exception/InvalidFilterServiceTypeException.php index bd9ee21bd..f002b12f2 100644 --- a/src/Exception/InvalidFilterServiceTypeException.php +++ b/src/Exception/InvalidFilterServiceTypeException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/InvalidFilterTypeException.php b/src/Exception/InvalidFilterTypeException.php index 17bcd3746..2452dee1a 100644 --- a/src/Exception/InvalidFilterTypeException.php +++ b/src/Exception/InvalidFilterTypeException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/InvalidHostException.php b/src/Exception/InvalidHostException.php index c5e48b67d..e5ab8ee4c 100644 --- a/src/Exception/InvalidHostException.php +++ b/src/Exception/InvalidHostException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; use Exception; diff --git a/src/Exception/InvalidPathException.php b/src/Exception/InvalidPathException.php index 6f81b0f2d..0f77690dc 100644 --- a/src/Exception/InvalidPathException.php +++ b/src/Exception/InvalidPathException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; use Exception; diff --git a/src/Exception/InvalidQueryTypeException.php b/src/Exception/InvalidQueryTypeException.php index c0fecb5a4..7fe74e23f 100644 --- a/src/Exception/InvalidQueryTypeException.php +++ b/src/Exception/InvalidQueryTypeException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/InvalidSearchException.php b/src/Exception/InvalidSearchException.php index 74f362717..b9c52ad50 100644 --- a/src/Exception/InvalidSearchException.php +++ b/src/Exception/InvalidSearchException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; final class InvalidSearchException extends AbstractApiException { diff --git a/src/Exception/MustImplementInterfaceException.php b/src/Exception/MustImplementInterfaceException.php index fa2131cfa..8ab128b8c 100644 --- a/src/Exception/MustImplementInterfaceException.php +++ b/src/Exception/MustImplementInterfaceException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; use Exception; diff --git a/src/Exception/NoRequestException.php b/src/Exception/NoRequestException.php index 6e28637c7..91d3fc747 100644 --- a/src/Exception/NoRequestException.php +++ b/src/Exception/NoRequestException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/NonPublicTranslationException.php b/src/Exception/NonPublicTranslationException.php index fa9a6dc4a..721b6f845 100644 --- a/src/Exception/NonPublicTranslationException.php +++ b/src/Exception/NonPublicTranslationException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Exception/NotAuthorizedException.php b/src/Exception/NotAuthorizedException.php index 1ab2d001c..891c5ab4d 100644 --- a/src/Exception/NotAuthorizedException.php +++ b/src/Exception/NotAuthorizedException.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Exception; +namespace Pimcore\Bundle\StudioBackendBundle\Exception; /** * @internal diff --git a/src/Factory/QueryFactory.php b/src/Factory/QueryFactory.php index ab82029a0..acbc10388 100644 --- a/src/Factory/QueryFactory.php +++ b/src/Factory/QueryFactory.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Factory; +namespace Pimcore\Bundle\StudioBackendBundle\Factory; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetQueryProviderInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQueryProviderInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\AssetQueryProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\DataObjectQueryProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; /** * @internal diff --git a/src/Factory/QueryFactoryInterface.php b/src/Factory/QueryFactoryInterface.php index 90e5011c4..328213692 100644 --- a/src/Factory/QueryFactoryInterface.php +++ b/src/Factory/QueryFactoryInterface.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Factory; +namespace Pimcore\Bundle\StudioBackendBundle\Factory; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; /** * @internal diff --git a/src/Installer.php b/src/Installer.php index bc979b98c..5ead04119 100644 --- a/src/Installer.php +++ b/src/Installer.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle; +namespace Pimcore\Bundle\StudioBackendBundle; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception; @@ -22,7 +22,7 @@ use Doctrine\DBAL\Schema\Comparator; use Doctrine\DBAL\Schema\Schema; use Doctrine\DBAL\Schema\SchemaException; -use Pimcore\Bundle\StudioApiBundle\Service\TranslatorService; +use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorService; use Pimcore\Extension\Bundle\Installer\Exception\InstallationException; use Pimcore\Extension\Bundle\Installer\SettingsStoreAwareInstaller; use Symfony\Component\HttpKernel\Bundle\BundleInterface; diff --git a/src/Attributes/Parameters/Path/IdParameter.php b/src/OpenApi/Attributes/Parameters/Path/IdParameter.php similarity index 92% rename from src/Attributes/Parameters/Path/IdParameter.php rename to src/OpenApi/Attributes/Parameters/Path/IdParameter.php index 8a1c06b2a..8e7a35276 100644 --- a/src/Attributes/Parameters/Path/IdParameter.php +++ b/src/OpenApi/Attributes/Parameters/Path/IdParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Path; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Path; use Attribute; use OpenApi\Attributes\PathParameter; diff --git a/src/Attributes/Parameters/Query/ClassNameParameter.php b/src/OpenApi/Attributes/Parameters/Query/ClassNameParameter.php similarity index 94% rename from src/Attributes/Parameters/Query/ClassNameParameter.php rename to src/OpenApi/Attributes/Parameters/Query/ClassNameParameter.php index 1d7cc8a15..4e6305cf7 100644 --- a/src/Attributes/Parameters/Query/ClassNameParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/ClassNameParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/ExcludeFoldersParameter.php b/src/OpenApi/Attributes/Parameters/Query/ExcludeFoldersParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/ExcludeFoldersParameter.php rename to src/OpenApi/Attributes/Parameters/Query/ExcludeFoldersParameter.php index ec2846619..c89cbaea9 100644 --- a/src/Attributes/Parameters/Query/ExcludeFoldersParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/ExcludeFoldersParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/IdSearchTermParameter.php b/src/OpenApi/Attributes/Parameters/Query/IdSearchTermParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/IdSearchTermParameter.php rename to src/OpenApi/Attributes/Parameters/Query/IdSearchTermParameter.php index a1a3f75b5..80f3b1cc2 100644 --- a/src/Attributes/Parameters/Query/IdSearchTermParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/IdSearchTermParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/PageParameter.php b/src/OpenApi/Attributes/Parameters/Query/PageParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/PageParameter.php rename to src/OpenApi/Attributes/Parameters/Query/PageParameter.php index fc960c335..ce73bd629 100644 --- a/src/Attributes/Parameters/Query/PageParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/PageParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/PageSizeParameter.php b/src/OpenApi/Attributes/Parameters/Query/PageSizeParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/PageSizeParameter.php rename to src/OpenApi/Attributes/Parameters/Query/PageSizeParameter.php index 2ac0a3f00..7b572e13f 100644 --- a/src/Attributes/Parameters/Query/PageSizeParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/PageSizeParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/ParentIdParameter.php b/src/OpenApi/Attributes/Parameters/Query/ParentIdParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/ParentIdParameter.php rename to src/OpenApi/Attributes/Parameters/Query/ParentIdParameter.php index 98129cbd7..950e214ad 100644 --- a/src/Attributes/Parameters/Query/ParentIdParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/ParentIdParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php b/src/OpenApi/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php rename to src/OpenApi/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php index 8ea6a4ed8..620e214e0 100644 --- a/src/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/PathIncludeDescendantsParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/PathIncludeParentParameter.php b/src/OpenApi/Attributes/Parameters/Query/PathIncludeParentParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/PathIncludeParentParameter.php rename to src/OpenApi/Attributes/Parameters/Query/PathIncludeParentParameter.php index fd1d00e19..218b9b2aa 100644 --- a/src/Attributes/Parameters/Query/PathIncludeParentParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/PathIncludeParentParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Parameters/Query/PathParameter.php b/src/OpenApi/Attributes/Parameters/Query/PathParameter.php similarity index 92% rename from src/Attributes/Parameters/Query/PathParameter.php rename to src/OpenApi/Attributes/Parameters/Query/PathParameter.php index b388de774..fe78751fc 100644 --- a/src/Attributes/Parameters/Query/PathParameter.php +++ b/src/OpenApi/Attributes/Parameters/Query/PathParameter.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Parameters\Query; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Parameters\Query; use Attribute; use OpenApi\Attributes\QueryParameter; diff --git a/src/Attributes/Request/CredentialsRequestBody.php b/src/OpenApi/Attributes/Request/CredentialsRequestBody.php similarity index 85% rename from src/Attributes/Request/CredentialsRequestBody.php rename to src/OpenApi/Attributes/Request/CredentialsRequestBody.php index db9afb706..0a512ed31 100644 --- a/src/Attributes/Request/CredentialsRequestBody.php +++ b/src/OpenApi/Attributes/Request/CredentialsRequestBody.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Request; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\RequestBody; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class CredentialsRequestBody extends RequestBody diff --git a/src/Attributes/Request/TokenRequestBody.php b/src/OpenApi/Attributes/Request/TokenRequestBody.php similarity index 85% rename from src/Attributes/Request/TokenRequestBody.php rename to src/OpenApi/Attributes/Request/TokenRequestBody.php index 72e0363be..8ff3bf837 100644 --- a/src/Attributes/Request/TokenRequestBody.php +++ b/src/OpenApi/Attributes/Request/TokenRequestBody.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Request; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\RequestBody; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Refresh; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Refresh; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class TokenRequestBody extends RequestBody diff --git a/src/Attributes/Request/TranslationRequestBody.php b/src/OpenApi/Attributes/Request/TranslationRequestBody.php similarity index 85% rename from src/Attributes/Request/TranslationRequestBody.php rename to src/OpenApi/Attributes/Request/TranslationRequestBody.php index 9b48aa56e..6ff8134cc 100644 --- a/src/Attributes/Request/TranslationRequestBody.php +++ b/src/OpenApi/Attributes/Request/TranslationRequestBody.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Request; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\RequestBody; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Translation; +use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class TranslationRequestBody extends RequestBody diff --git a/src/Attributes/Response/Content/CollectionJson.php b/src/OpenApi/Attributes/Response/Content/CollectionJson.php similarity index 91% rename from src/Attributes/Response/Content/CollectionJson.php rename to src/OpenApi/Attributes/Response/Content/CollectionJson.php index 11188cfeb..539d98d3e 100644 --- a/src/Attributes/Response/Content/CollectionJson.php +++ b/src/OpenApi/Attributes/Response/Content/CollectionJson.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Content; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Property; diff --git a/src/Attributes/Response/Content/OneOfAssetJson.php b/src/OpenApi/Attributes/Response/Content/OneOfAssetJson.php similarity index 85% rename from src/Attributes/Response/Content/OneOfAssetJson.php rename to src/OpenApi/Attributes/Response/Content/OneOfAssetJson.php index afaa0b80c..83dd20292 100644 --- a/src/Attributes/Response/Content/OneOfAssetJson.php +++ b/src/OpenApi/Attributes/Response/Content/OneOfAssetJson.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Content; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Content; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; /** * @internal diff --git a/src/Attributes/Response/Error/BadRequestResponse.php b/src/OpenApi/Attributes/Response/Error/BadRequestResponse.php similarity index 88% rename from src/Attributes/Response/Error/BadRequestResponse.php rename to src/OpenApi/Attributes/Response/Error/BadRequestResponse.php index 6140f9f25..1a6eb06ac 100644 --- a/src/Attributes/Response/Error/BadRequestResponse.php +++ b/src/OpenApi/Attributes/Response/Error/BadRequestResponse.php @@ -14,13 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Response; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class BadRequestResponse extends Response diff --git a/src/Attributes/Response/Error/MethodNotAllowedResponse.php b/src/OpenApi/Attributes/Response/Error/MethodNotAllowedResponse.php similarity index 88% rename from src/Attributes/Response/Error/MethodNotAllowedResponse.php rename to src/OpenApi/Attributes/Response/Error/MethodNotAllowedResponse.php index 943828f99..bc4632e42 100644 --- a/src/Attributes/Response/Error/MethodNotAllowedResponse.php +++ b/src/OpenApi/Attributes/Response/Error/MethodNotAllowedResponse.php @@ -14,13 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Response; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class MethodNotAllowedResponse extends Response diff --git a/src/Attributes/Response/Error/UnauthorizedResponse.php b/src/OpenApi/Attributes/Response/Error/UnauthorizedResponse.php similarity index 88% rename from src/Attributes/Response/Error/UnauthorizedResponse.php rename to src/OpenApi/Attributes/Response/Error/UnauthorizedResponse.php index dd25c2f46..78fdd1c3a 100644 --- a/src/Attributes/Response/Error/UnauthorizedResponse.php +++ b/src/OpenApi/Attributes/Response/Error/UnauthorizedResponse.php @@ -14,13 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Response; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class UnauthorizedResponse extends Response diff --git a/src/Attributes/Response/Error/UnprocessableContentResponse.php b/src/OpenApi/Attributes/Response/Error/UnprocessableContentResponse.php similarity index 91% rename from src/Attributes/Response/Error/UnprocessableContentResponse.php rename to src/OpenApi/Attributes/Response/Error/UnprocessableContentResponse.php index 26d052d96..29e0bc394 100644 --- a/src/Attributes/Response/Error/UnprocessableContentResponse.php +++ b/src/OpenApi/Attributes/Response/Error/UnprocessableContentResponse.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error; use Attribute; use OpenApi\Attributes\Response; diff --git a/src/Attributes/Response/Error/UnsupportedMediaTypeResponse.php b/src/OpenApi/Attributes/Response/Error/UnsupportedMediaTypeResponse.php similarity index 88% rename from src/Attributes/Response/Error/UnsupportedMediaTypeResponse.php rename to src/OpenApi/Attributes/Response/Error/UnsupportedMediaTypeResponse.php index e96fd4d38..d5a6018d2 100644 --- a/src/Attributes/Response/Error/UnsupportedMediaTypeResponse.php +++ b/src/OpenApi/Attributes/Response/Error/UnsupportedMediaTypeResponse.php @@ -14,13 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error; use Attribute; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Response; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)] final class UnsupportedMediaTypeResponse extends Response diff --git a/src/Attributes/Response/Property/AnyOfAsset.php b/src/OpenApi/Attributes/Response/Property/AnyOfAsset.php similarity index 87% rename from src/Attributes/Response/Property/AnyOfAsset.php rename to src/OpenApi/Attributes/Response/Property/AnyOfAsset.php index 577fb6871..2690cc47a 100644 --- a/src/Attributes/Response/Property/AnyOfAsset.php +++ b/src/OpenApi/Attributes/Response/Property/AnyOfAsset.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Property; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Property; use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Schemas; +use Pimcore\Bundle\StudioBackendBundle\Response\Schemas; /** * @internal diff --git a/src/Attributes/Response/Property/DataObjectCollection.php b/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php similarity index 86% rename from src/Attributes/Response/Property/DataObjectCollection.php rename to src/OpenApi/Attributes/Response/Property/DataObjectCollection.php index bc3d09c2b..133b3df41 100644 --- a/src/Attributes/Response/Property/DataObjectCollection.php +++ b/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response\Property; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Property; use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\DataObject; +use Pimcore\Bundle\StudioBackendBundle\Response\DataObject; /** * @internal diff --git a/src/Attributes/Response/SuccessResponse.php b/src/OpenApi/Attributes/Response/SuccessResponse.php similarity index 92% rename from src/Attributes/Response/SuccessResponse.php rename to src/OpenApi/Attributes/Response/SuccessResponse.php index 51a2a9eb2..431e4d77e 100644 --- a/src/Attributes/Response/SuccessResponse.php +++ b/src/OpenApi/Attributes/Response/SuccessResponse.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Attributes\Response; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response; use Attribute; use OpenApi\Attributes\Response; diff --git a/src/Config/OpenApi/Security.php b/src/OpenApi/Config/Security.php similarity index 92% rename from src/Config/OpenApi/Security.php rename to src/OpenApi/Config/Security.php index 8b81fee65..d25ff43f0 100644 --- a/src/Config/OpenApi/Security.php +++ b/src/OpenApi/Config/Security.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Config\OpenApi; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Config; use OpenApi\Attributes\SecurityScheme; diff --git a/src/Config/OpenApi/Spec.php b/src/OpenApi/Config/Spec.php similarity index 91% rename from src/Config/OpenApi/Spec.php rename to src/OpenApi/Config/Spec.php index d00d102a6..6d86b295b 100644 --- a/src/Config/OpenApi/Spec.php +++ b/src/OpenApi/Config/Spec.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Config\OpenApi; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Config; use OpenApi\Attributes\Info; use OpenApi\Attributes\License; @@ -26,7 +26,7 @@ #[Info( version: '0.0.1', description: 'API for Studio generated by OpenApi Generator via zircote/swagger-php', - title: 'Studio API' + title: 'Studio Backend API' )] #[License( name: 'GNU General Public License version 3 & Pimcore Commercial License', diff --git a/src/Config/Tags.php b/src/OpenApi/Config/Tags.php similarity index 94% rename from src/Config/Tags.php rename to src/OpenApi/Config/Tags.php index 62c6c5add..e6ab5cc14 100644 --- a/src/Config/Tags.php +++ b/src/OpenApi/Config/Tags.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Config; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Config; use OpenApi\Attributes\Tag; diff --git a/src/Controller/Api/OpenApiController.php b/src/OpenApi/Controller/OpenApiController.php similarity index 84% rename from src/Controller/Api/OpenApiController.php rename to src/OpenApi/Controller/OpenApiController.php index 03b7b5c45..69bdabbb3 100644 --- a/src/Controller/Api/OpenApiController.php +++ b/src/OpenApi/Controller/OpenApiController.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Controller; -use Pimcore\Bundle\StudioApiBundle\Service\OpenApiServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Service\OpenApiServiceInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; @@ -34,7 +34,7 @@ public function __construct(private readonly OpenApiServiceInterface $openApiSer #[Route('/docs', name: 'pimcore_studio_api_docs', methods: ['GET'], condition: "'dev' === '%kernel.environment%'")] public function index(): Response { - return $this->render('@PimcoreStudioApi/swagger-ui/index.html.twig'); + return $this->render('@PimcoreStudioBackend/swagger-ui/index.html.twig'); } #[Route('/docs.json', name: 'pimcore_studio_api_docs_json', methods: ['GET'])] diff --git a/src/Service/OpenApiService.php b/src/OpenApi/Service/OpenApiService.php similarity index 59% rename from src/Service/OpenApiService.php rename to src/OpenApi/Service/OpenApiService.php index ff3a50021..4b51190b1 100644 --- a/src/Service/OpenApiService.php +++ b/src/OpenApi/Service/OpenApiService.php @@ -14,23 +14,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Service; use OpenApi\Annotations\OpenApi; use OpenApi\Generator; final class OpenApiService implements OpenApiServiceInterface { - private const PATH_PREFIX = __DIR__ . '/../../'; - - private const PATHS = [ - self::PATH_PREFIX . 'src/Attributes/', - self::PATH_PREFIX . 'src/Config/', - self::PATH_PREFIX . 'src/Controller/Api/', - self::PATH_PREFIX . 'src/Dto/', - self::PATH_PREFIX . 'src/Request/', - self::PATH_PREFIX . 'src/Response/', - ]; + private const PATH_PREFIX = __DIR__ . '/../../../../'; public function __construct(private readonly array $openApiScanPaths = []) { @@ -38,6 +29,6 @@ public function __construct(private readonly array $openApiScanPaths = []) public function getConfig(): OpenApi { - return Generator::scan([...self::PATHS, ...$this->openApiScanPaths]); + return Generator::scan([...$this->openApiScanPaths]); } } diff --git a/src/Service/OpenApiServiceInterface.php b/src/OpenApi/Service/OpenApiServiceInterface.php similarity index 90% rename from src/Service/OpenApiServiceInterface.php rename to src/OpenApi/Service/OpenApiServiceInterface.php index b0c6af025..609c989b5 100644 --- a/src/Service/OpenApiServiceInterface.php +++ b/src/OpenApi/Service/OpenApiServiceInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\OpenApi\Service; use OpenApi\Annotations\OpenApi; diff --git a/src/PimcoreStudioApiBundle.php b/src/PimcoreStudioBackendBundle.php similarity index 66% rename from src/PimcoreStudioApiBundle.php rename to src/PimcoreStudioBackendBundle.php index 3436c892c..ebdb5435a 100644 --- a/src/PimcoreStudioApiBundle.php +++ b/src/PimcoreStudioBackendBundle.php @@ -14,18 +14,18 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle; +namespace Pimcore\Bundle\StudioBackendBundle; use Pimcore\Bundle\GenericDataIndexBundle\PimcoreGenericDataIndexBundle; use Pimcore\Bundle\StaticResolverBundle\PimcoreStaticResolverBundle; -use Pimcore\Bundle\StudioApiBundle\DependencyInjection\CompilerPass\FilterPass; +use Pimcore\Bundle\StudioBackendBundle\DependencyInjection\CompilerPass\FilterPass; use Pimcore\Extension\Bundle\AbstractPimcoreBundle; use Pimcore\Extension\Bundle\Installer\InstallerInterface; use Pimcore\HttpKernel\Bundle\DependentBundleInterface; use Pimcore\HttpKernel\BundleCollection\BundleCollection; use Symfony\Component\DependencyInjection\ContainerBuilder; -class PimcoreStudioApiBundle extends AbstractPimcoreBundle implements DependentBundleInterface +class PimcoreStudioBackendBundle extends AbstractPimcoreBundle implements DependentBundleInterface { public function getPath(): string { @@ -35,20 +35,20 @@ public function getPath(): string public function getJsPaths(): array { return [ - '/bundles/pimcorestudioapi/js/swagger-ui/swagger-ui.js', - '/bundles/pimcorestudioapi/js/swagger-ui/swagger-ui-bundle.js', - '/bundles/pimcorestudioapi/js/swagger-ui/swagger-ui-es-bundle.js', - '/bundles/pimcorestudioapi/js/swagger-ui/swagger-ui-es-bundle-core.js', - '/bundles/pimcorestudioapi/js/swagger-ui/swagger-ui-standalone-preset.js', + '/bundles/pimcorestudiobackend/js/swagger-ui/swagger-ui.js', + '/bundles/pimcorestudiobackend/js/swagger-ui/swagger-ui-bundle.js', + '/bundles/pimcorestudiobackend/js/swagger-ui/swagger-ui-es-bundle.js', + '/bundles/pimcorestudiobackend/js/swagger-ui/swagger-ui-es-bundle-core.js', + '/bundles/pimcorestudiobackend/js/swagger-ui/swagger-ui-standalone-preset.js', ]; } public function getCssPaths(): array { return [ - '/bundles/pimcorestudioapi/css/styles.css', - '/bundles/pimcorestudioapi/css/swagger-ui/index.css', - '/bundles/pimcorestudioapi/css/swagger-ui/swagger-ui.css', + '/bundles/pimcorestudiobackend/css/styles.css', + '/bundles/pimcorestudiobackend/css/swagger-ui/index.css', + '/bundles/pimcorestudiobackend/css/swagger-ui/swagger-ui.css', ]; } diff --git a/src/Provider/FilterServiceLoaderInterface.php b/src/Provider/FilterServiceLoaderInterface.php index e29f92e09..a74691291 100644 --- a/src/Provider/FilterServiceLoaderInterface.php +++ b/src/Provider/FilterServiceLoaderInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Provider; +namespace Pimcore\Bundle\StudioBackendBundle\Provider; /** * @internal diff --git a/src/Provider/FilterServiceProvider.php b/src/Provider/FilterServiceProvider.php index 56086dccc..82c947907 100644 --- a/src/Provider/FilterServiceProvider.php +++ b/src/Provider/FilterServiceProvider.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Provider; +namespace Pimcore\Bundle\StudioBackendBundle\Provider; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidFilterServiceTypeException; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidFilterServiceTypeException; final class FilterServiceProvider implements FilterServiceProviderInterface { diff --git a/src/Provider/FilterServiceProviderInterface.php b/src/Provider/FilterServiceProviderInterface.php index 471b1011b..8a62b085e 100644 --- a/src/Provider/FilterServiceProviderInterface.php +++ b/src/Provider/FilterServiceProviderInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Provider; +namespace Pimcore\Bundle\StudioBackendBundle\Provider; interface FilterServiceProviderInterface { diff --git a/src/Provider/Loader/TaggedIteratorAdapter.php b/src/Provider/Loader/TaggedIteratorAdapter.php index 1f9ada4c3..436ca1ecb 100644 --- a/src/Provider/Loader/TaggedIteratorAdapter.php +++ b/src/Provider/Loader/TaggedIteratorAdapter.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Provider\Loader; +namespace Pimcore\Bundle\StudioBackendBundle\Provider\Loader; -use Pimcore\Bundle\StudioApiBundle\Provider\FilterServiceLoaderInterface; +use Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceLoaderInterface; use Symfony\Component\DependencyInjection\Attribute\TaggedIterator; /** diff --git a/src/Request/Query/Filter/CollectionParameters.php b/src/Request/CollectionParameters.php similarity index 95% rename from src/Request/Query/Filter/CollectionParameters.php rename to src/Request/CollectionParameters.php index 5e2f05dd7..6d0a7233b 100644 --- a/src/Request/Query/Filter/CollectionParameters.php +++ b/src/Request/CollectionParameters.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\Request; use Pimcore\ValueObject\Integer\PositiveInteger; use Symfony\Component\Validator\Constraints\NotBlank; diff --git a/src/Request/Query/Filter/CollectionParametersInterface.php b/src/Request/CollectionParametersInterface.php similarity index 90% rename from src/Request/Query/Filter/CollectionParametersInterface.php rename to src/Request/CollectionParametersInterface.php index 12e7a5362..7da7fbe87 100644 --- a/src/Request/Query/Filter/CollectionParametersInterface.php +++ b/src/Request/CollectionParametersInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query\Filter; +namespace Pimcore\Bundle\StudioBackendBundle\Request; /** * @internal diff --git a/src/Response/Asset.php b/src/Response/Asset.php index e613c7f20..9919d0dff 100644 --- a/src/Response/Asset.php +++ b/src/Response/Asset.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Response; use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; /** * @internal diff --git a/src/Response/Asset/Archive.php b/src/Response/Asset/Archive.php index 8d31294b4..889975dac 100644 --- a/src/Response/Asset/Archive.php +++ b/src/Response/Asset/Archive.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Archive', diff --git a/src/Response/Asset/Audio.php b/src/Response/Asset/Audio.php index 0509ec722..e4f0f4770 100644 --- a/src/Response/Asset/Audio.php +++ b/src/Response/Asset/Audio.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Audio', diff --git a/src/Response/Asset/Document.php b/src/Response/Asset/Document.php index 60b13b481..7a730c557 100644 --- a/src/Response/Asset/Document.php +++ b/src/Response/Asset/Document.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Document', diff --git a/src/Response/Asset/Folder.php b/src/Response/Asset/Folder.php index 56bcc298e..f16df7f3f 100644 --- a/src/Response/Asset/Folder.php +++ b/src/Response/Asset/Folder.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Folder', diff --git a/src/Response/Asset/Image.php b/src/Response/Asset/Image.php index 21766f65a..a838fa59a 100644 --- a/src/Response/Asset/Image.php +++ b/src/Response/Asset/Image.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Image', diff --git a/src/Response/Asset/MetaData.php b/src/Response/Asset/MetaData.php index 880ac34bf..0095a3694 100644 --- a/src/Response/Asset/MetaData.php +++ b/src/Response/Asset/MetaData.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Asset/Permissions.php b/src/Response/Asset/Permissions.php index c6f92152f..8ecb11f45 100644 --- a/src/Response/Asset/Permissions.php +++ b/src/Response/Asset/Permissions.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Asset/Text.php b/src/Response/Asset/Text.php index 5f82f10f2..0e5fb5f6c 100644 --- a/src/Response/Asset/Text.php +++ b/src/Response/Asset/Text.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Text', diff --git a/src/Response/Asset/Unknown.php b/src/Response/Asset/Unknown.php index 0c9b3e159..5108023eb 100644 --- a/src/Response/Asset/Unknown.php +++ b/src/Response/Asset/Unknown.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Unknown', diff --git a/src/Response/Asset/Video.php b/src/Response/Asset/Video.php index f34cdfbfe..1067de998 100644 --- a/src/Response/Asset/Video.php +++ b/src/Response/Asset/Video.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset; #[Schema( title: 'Video', diff --git a/src/Response/Collection.php b/src/Response/Collection.php index 9d8c8e85c..5aeb8342f 100644 --- a/src/Response/Collection.php +++ b/src/Response/Collection.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Response; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/DataObject.php b/src/Response/DataObject.php index ceeea56bb..ca54c562e 100644 --- a/src/Response/DataObject.php +++ b/src/Response/DataObject.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Response; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Element.php b/src/Response/Element.php index 762f06a31..032b80939 100644 --- a/src/Response/Element.php +++ b/src/Response/Element.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Response; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; #[Schema( title: 'Element', diff --git a/src/Response/Schema/DevError.php b/src/Response/Schema/DevError.php index b4fc9cc9a..bfbf1678f 100644 --- a/src/Response/Schema/DevError.php +++ b/src/Response/Schema/DevError.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Schema; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Schema/Error.php b/src/Response/Schema/Error.php index e6e4d6bd2..d20680688 100644 --- a/src/Response/Schema/Error.php +++ b/src/Response/Schema/Error.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response\Schema; +namespace Pimcore\Bundle\StudioBackendBundle\Response\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Schemas.php b/src/Response/Schemas.php index c7f2ead0c..f89bab7e9 100644 --- a/src/Response/Schemas.php +++ b/src/Response/Schemas.php @@ -14,18 +14,18 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Response; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Archive; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Audio; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Document; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Folder; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Image; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Text; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Unknown; -use Pimcore\Bundle\StudioApiBundle\Response\Asset\Video; -use Pimcore\Bundle\StudioApiBundle\Response\Schema\DevError; -use Pimcore\Bundle\StudioApiBundle\Response\Schema\Error; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Response\Schema\DevError; +use Pimcore\Bundle\StudioBackendBundle\Response\Schema\Error; /** * @internal diff --git a/src/Security/Voter/AuthorizationVoter.php b/src/Security/Voter/AuthorizationVoter.php index b988ba1e7..743581067 100644 --- a/src/Security/Voter/AuthorizationVoter.php +++ b/src/Security/Voter/AuthorizationVoter.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Security\Voter; +namespace Pimcore\Bundle\StudioBackendBundle\Security\Voter; -use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException; -use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException; -use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\RequestTrait; +use Pimcore\Bundle\StudioBackendBundle\Exception\NoRequestException; +use Pimcore\Bundle\StudioBackendBundle\Exception\NotAuthorizedException; +use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\RequestTrait; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authorization\Voter\Voter; diff --git a/src/Security/Voter/PublicAuthorizationVoter.php b/src/Security/Voter/PublicAuthorizationVoter.php index 7e4099bee..d6d61d8dd 100644 --- a/src/Security/Voter/PublicAuthorizationVoter.php +++ b/src/Security/Voter/PublicAuthorizationVoter.php @@ -14,14 +14,14 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Security\Voter; +namespace Pimcore\Bundle\StudioBackendBundle\Security\Voter; -use Pimcore\Bundle\StudioApiBundle\Exception\NonPublicTranslationException; -use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException; -use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException; -use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\PublicTranslationTrait; -use Pimcore\Bundle\StudioApiBundle\Util\Traits\RequestTrait; +use Pimcore\Bundle\StudioBackendBundle\Exception\NonPublicTranslationException; +use Pimcore\Bundle\StudioBackendBundle\Exception\NoRequestException; +use Pimcore\Bundle\StudioBackendBundle\Exception\NotAuthorizedException; +use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\PublicTranslationTrait; +use Pimcore\Bundle\StudioBackendBundle\Util\Traits\RequestTrait; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpKernel\Attribute\MapRequestPayload; diff --git a/src/Service/FilterServiceInterface.php b/src/Service/FilterServiceInterface.php index c7f587842..a4f311336 100644 --- a/src/Service/FilterServiceInterface.php +++ b/src/Service/FilterServiceInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Service; interface FilterServiceInterface { diff --git a/src/Service/IconService.php b/src/Service/IconService.php index b0856c27b..141609cfa 100644 --- a/src/Service/IconService.php +++ b/src/Service/IconService.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Service; final class IconService implements IconServiceInterface { diff --git a/src/Service/IconServiceInterface.php b/src/Service/IconServiceInterface.php index 43997b850..ad0fb5394 100644 --- a/src/Service/IconServiceInterface.php +++ b/src/Service/IconServiceInterface.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Service; interface IconServiceInterface { diff --git a/src/Service/SecurityService.php b/src/Service/SecurityService.php index 2eb4115a1..8268a5e67 100644 --- a/src/Service/SecurityService.php +++ b/src/Service/SecurityService.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Service; use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface; -use Pimcore\Bundle\StudioApiBundle\Exception\AccessDeniedException; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Exception\AccessDeniedException; use Pimcore\Security\User\UserProvider; use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; use Symfony\Component\Security\Core\Exception\UserNotFoundException; diff --git a/src/Service/SecurityServiceInterface.php b/src/Service/SecurityServiceInterface.php index 71e98d769..7f4eada26 100644 --- a/src/Service/SecurityServiceInterface.php +++ b/src/Service/SecurityServiceInterface.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Service; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; /** diff --git a/src/Controller/Api/TranslationController.php b/src/Translation/Controller/TranslationController.php similarity index 71% rename from src/Controller/Api/TranslationController.php rename to src/Translation/Controller/TranslationController.php index 0cbf60c5d..4bda6fb34 100644 --- a/src/Controller/Api/TranslationController.php +++ b/src/Translation/Controller/TranslationController.php @@ -14,19 +14,20 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Controller\Api; +namespace Pimcore\Bundle\StudioBackendBundle\Translation\Controller; use OpenApi\Attributes\JsonContent; use OpenApi\Attributes\Post; -use Pimcore\Bundle\StudioApiBundle\Attributes\Request\TranslationRequestBody; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\MethodNotAllowedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnauthorizedResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnprocessableContentResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\Error\UnsupportedMediaTypeResponse; -use Pimcore\Bundle\StudioApiBundle\Attributes\Response\SuccessResponse; -use Pimcore\Bundle\StudioApiBundle\Config\Tags; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Translation; -use Pimcore\Bundle\StudioApiBundle\Service\TranslatorServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Request\TranslationRequestBody; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\MethodNotAllowedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnauthorizedResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnprocessableContentResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\Error\UnsupportedMediaTypeResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Attributes\Response\SuccessResponse; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Config\Tags; +use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation; +use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpKernel\Attribute\MapRequestPayload; use Symfony\Component\Routing\Attribute\Route; diff --git a/src/Request/Query/Translation.php b/src/Translation/Schema/Translation.php similarity index 90% rename from src/Request/Query/Translation.php rename to src/Translation/Schema/Translation.php index 94328355f..17d77b7bc 100644 --- a/src/Request/Query/Translation.php +++ b/src/Translation/Schema/Translation.php @@ -14,12 +14,12 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Request\Query; +namespace Pimcore\Bundle\StudioBackendBundle\Translation\Schema; use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioApiBundle\Util\Constants\PublicTranslations; +use Pimcore\Bundle\StudioBackendBundle\Util\Constants\PublicTranslations; /** * @internal diff --git a/src/Service/TranslatorService.php b/src/Translation/Service/TranslatorService.php similarity index 92% rename from src/Service/TranslatorService.php rename to src/Translation/Service/TranslatorService.php index 60b6ecab7..2f38853a3 100644 --- a/src/Service/TranslatorService.php +++ b/src/Translation/Service/TranslatorService.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Translation\Service; use InvalidArgumentException; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Translation; +use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation; use Symfony\Component\Translation\TranslatorBagInterface; use Symfony\Contracts\Translation\TranslatorInterface; diff --git a/src/Service/TranslatorServiceInterface.php b/src/Translation/Service/TranslatorServiceInterface.php similarity index 83% rename from src/Service/TranslatorServiceInterface.php rename to src/Translation/Service/TranslatorServiceInterface.php index 95768b0a4..8e41e3be2 100644 --- a/src/Service/TranslatorServiceInterface.php +++ b/src/Translation/Service/TranslatorServiceInterface.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Service; +namespace Pimcore\Bundle\StudioBackendBundle\Translation\Service; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Translation; +use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation; /** * @internal diff --git a/src/Util/Constants/PublicTranslations.php b/src/Util/Constants/PublicTranslations.php index 27784c484..113b91a01 100644 --- a/src/Util/Constants/PublicTranslations.php +++ b/src/Util/Constants/PublicTranslations.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Util\Constants; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Constants; /** * @internal diff --git a/src/Util/Traits/MustImplementInterfaceTrait.php b/src/Util/Traits/MustImplementInterfaceTrait.php index 44f2d71b2..1a656279e 100644 --- a/src/Util/Traits/MustImplementInterfaceTrait.php +++ b/src/Util/Traits/MustImplementInterfaceTrait.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Util\Traits; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits; -use Pimcore\Bundle\StudioApiBundle\Exception\MustImplementInterfaceException; +use Pimcore\Bundle\StudioBackendBundle\Exception\MustImplementInterfaceException; /** * @internal diff --git a/src/Util/Traits/PaginatedResponseTrait.php b/src/Util/Traits/PaginatedResponseTrait.php index afe1391e2..db3fd0fed 100644 --- a/src/Util/Traits/PaginatedResponseTrait.php +++ b/src/Util/Traits/PaginatedResponseTrait.php @@ -14,9 +14,9 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Util\Traits; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits; -use Pimcore\Bundle\StudioApiBundle\Response\Collection; +use Pimcore\Bundle\StudioBackendBundle\Response\Collection; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\Serializer\SerializerInterface; diff --git a/src/Util/Traits/PublicTranslationTrait.php b/src/Util/Traits/PublicTranslationTrait.php index 47c44ee63..44bb12a9c 100644 --- a/src/Util/Traits/PublicTranslationTrait.php +++ b/src/Util/Traits/PublicTranslationTrait.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Util\Traits; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits; -use Pimcore\Bundle\StudioApiBundle\Exception\NonPublicTranslationException; -use Pimcore\Bundle\StudioApiBundle\Util\Constants\PublicTranslations; +use Pimcore\Bundle\StudioBackendBundle\Exception\NonPublicTranslationException; +use Pimcore\Bundle\StudioBackendBundle\Util\Constants\PublicTranslations; use Symfony\Component\HttpFoundation\InputBag; /** diff --git a/src/Util/Traits/RequestTrait.php b/src/Util/Traits/RequestTrait.php index 3128a9678..cc04dcba5 100644 --- a/src/Util/Traits/RequestTrait.php +++ b/src/Util/Traits/RequestTrait.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Util\Traits; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits; -use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException; -use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException; +use Pimcore\Bundle\StudioBackendBundle\Exception\NoRequestException; +use Pimcore\Bundle\StudioBackendBundle\Exception\NotAuthorizedException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; diff --git a/src/EventSubscriber/StudioApiPathTrait.php b/src/Util/Traits/StudioBackendPathTrait.php similarity index 71% rename from src/EventSubscriber/StudioApiPathTrait.php rename to src/Util/Traits/StudioBackendPathTrait.php index 4c15cfc78..ac4094087 100644 --- a/src/EventSubscriber/StudioApiPathTrait.php +++ b/src/Util/Traits/StudioBackendPathTrait.php @@ -14,16 +14,16 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\EventSubscriber; +namespace Pimcore\Bundle\StudioBackendBundle\Util\Traits; -use Pimcore\Bundle\StudioApiBundle\Controller\Api\AbstractApiController; +use Pimcore\Bundle\StudioBackendBundle\Controller\Api\AbstractApiController; /** * @internal */ -trait StudioApiPathTrait +trait StudioBackendPathTrait { - private function isStudioApiPath(string $path): bool + private function isStudioBackendPath(string $path): bool { return str_starts_with($path, AbstractApiController::API_PATH); } diff --git a/templates/swagger-ui/index.html.twig b/templates/swagger-ui/index.html.twig index 4bda73f78..804d5443c 100644 --- a/templates/swagger-ui/index.html.twig +++ b/templates/swagger-ui/index.html.twig @@ -3,9 +3,9 @@ - Pimcore Studio Api - - + Pimcore Studio Backend Api + + @@ -16,9 +16,9 @@
- - - + + + diff --git a/tests/Unit.suite.dist.yml b/tests/Unit.suite.dist.yml index e28e40175..122708133 100644 --- a/tests/Unit.suite.dist.yml +++ b/tests/Unit.suite.dist.yml @@ -1 +1 @@ -suite_namespace: Pimcore\Bundle\StudioApiBundle\Tests \ No newline at end of file +suite_namespace: Pimcore\Bundle\StudioBackendBundle\Tests \ No newline at end of file diff --git a/tests/Unit/DefaultTest.php b/tests/Unit/DefaultTest.php index 770c038e7..f492961d8 100644 --- a/tests/Unit/DefaultTest.php +++ b/tests/Unit/DefaultTest.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit; use Codeception\Test\Unit; diff --git a/tests/Unit/Dto/Token/CreateTest.php b/tests/Unit/Dto/Token/CreateTest.php index 7d2831bda..53c0e211c 100644 --- a/tests/Unit/Dto/Token/CreateTest.php +++ b/tests/Unit/Dto/Token/CreateTest.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Dto\Token; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Dto\Token; use Codeception\Test\Unit; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; final class CreateTest extends Unit { diff --git a/tests/Unit/Dto/Token/InfoTest.php b/tests/Unit/Dto/Token/InfoTest.php index fb341b581..2988f8897 100644 --- a/tests/Unit/Dto/Token/InfoTest.php +++ b/tests/Unit/Dto/Token/InfoTest.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Dto\Token; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Dto\Token; use Codeception\Test\Unit; -use Pimcore\Bundle\StudioApiBundle\Dto\Token\Info; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Info; final class InfoTest extends Unit { diff --git a/tests/Unit/Dto/Token/RefreshTest.php b/tests/Unit/Dto/Token/RefreshTest.php index e0cd23e5b..96510fbbb 100644 --- a/tests/Unit/Dto/Token/RefreshTest.php +++ b/tests/Unit/Dto/Token/RefreshTest.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Dto\Token; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Dto\Token; use Codeception\Test\Unit; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Refresh; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Refresh; final class RefreshTest extends Unit { diff --git a/tests/Unit/Dto/TranslationTest.php b/tests/Unit/Dto/TranslationTest.php index 964e962eb..541a1da6f 100644 --- a/tests/Unit/Dto/TranslationTest.php +++ b/tests/Unit/Dto/TranslationTest.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Dto; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Dto; use Codeception\Test\Unit; -use Pimcore\Bundle\StudioApiBundle\Request\Query\Translation; +use Pimcore\Bundle\StudioBackendBundle\Translation\Schema\Translation; final class TranslationTest extends Unit { diff --git a/tests/Unit/Service/Factory/QueryFactoryTest.php b/tests/Unit/Service/Factory/QueryFactoryTest.php index 5179df8af..15eb16087 100644 --- a/tests/Unit/Service/Factory/QueryFactoryTest.php +++ b/tests/Unit/Service/Factory/QueryFactoryTest.php @@ -14,20 +14,20 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Service\Factory; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Service\Factory; use Codeception\Test\Unit; use Exception; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\DataObject\DataObjectSearch; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Interfaces\SearchInterface; use Pimcore\Bundle\StaticResolverBundle\Models\DataObject\ClassDefinitionResolverInterface; -use Pimcore\Bundle\StudioApiBundle\Exception\InvalidQueryTypeException; -use Pimcore\Bundle\StudioApiBundle\Factory\QueryFactory; -use Pimcore\Bundle\StudioApiBundle\Factory\QueryFactoryInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetQuery; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\AssetQueryProviderInterface; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQuery; -use Pimcore\Bundle\StudioApiBundle\Service\GenericData\V1\DataObjectQueryProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\AssetQueryProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Provider\DataObjectQueryProviderInterface; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\AssetQuery; +use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\DataObjectQuery; +use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException; +use Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactory; +use Pimcore\Bundle\StudioBackendBundle\Factory\QueryFactoryInterface; final class QueryFactoryTest extends Unit { diff --git a/tests/Unit/Service/OpenApi/OpenApiServiceTest.php b/tests/Unit/Service/OpenApi/OpenApiServiceTest.php index 91ab0473e..a386fb0ab 100644 --- a/tests/Unit/Service/OpenApi/OpenApiServiceTest.php +++ b/tests/Unit/Service/OpenApi/OpenApiServiceTest.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Service\OpenApi; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Service\OpenApi; use Codeception\Test\Unit; use ErrorException; -use Pimcore\Bundle\StudioApiBundle\Service\OpenApiService; +use Pimcore\Bundle\StudioBackendBundle\OpenApi\Service\OpenApiService; final class OpenApiServiceTest extends Unit { diff --git a/tests/Unit/Service/Security/SecurityServiceTest.php b/tests/Unit/Service/Security/SecurityServiceTest.php index e83dc2e79..00336f137 100644 --- a/tests/Unit/Service/Security/SecurityServiceTest.php +++ b/tests/Unit/Service/Security/SecurityServiceTest.php @@ -14,15 +14,15 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Service\Security; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Service\Security; use Codeception\Test\Unit; use Exception; use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface; -use Pimcore\Bundle\StudioApiBundle\Exception\AccessDeniedException; -use Pimcore\Bundle\StudioApiBundle\Request\Credentials; -use Pimcore\Bundle\StudioApiBundle\Service\SecurityService; -use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Authorization\Schema\Credentials; +use Pimcore\Bundle\StudioBackendBundle\Exception\AccessDeniedException; +use Pimcore\Bundle\StudioBackendBundle\Service\SecurityService; +use Pimcore\Bundle\StudioBackendBundle\Service\SecurityServiceInterface; use Pimcore\Model\Tool\TmpStore; use Pimcore\Security\User\User; use Pimcore\Security\User\UserProvider; diff --git a/tests/Unit/Service/Translator/TranslatorServiceTest.php b/tests/Unit/Service/Translator/TranslatorServiceTest.php index 1342955ce..9c154081a 100644 --- a/tests/Unit/Service/Translator/TranslatorServiceTest.php +++ b/tests/Unit/Service/Translator/TranslatorServiceTest.php @@ -14,13 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioApiBundle\Tests\Unit\Service\Translator; +namespace Pimcore\Bundle\StudioBackendBundle\Tests\Unit\Service\Translator; use Codeception\Test\Unit; use Exception; -use Pimcore\Bundle\StudioApiBundle\Service\TranslatorService; -use Pimcore\Bundle\StudioApiBundle\Service\TranslatorServiceInterface; -use Pimcore\Bundle\StudioApiBundle\Util\Constants\PublicTranslations; +use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorService; +use Pimcore\Bundle\StudioBackendBundle\Translation\Service\TranslatorServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Util\Constants\PublicTranslations; use Pimcore\Translation\Translator; final class TranslatorServiceTest extends Unit