diff --git a/config/pimcore/config.yaml b/config/pimcore/config.yaml index e11cb1e36..cc4f1d6eb 100644 --- a/config/pimcore/config.yaml +++ b/config/pimcore/config.yaml @@ -4,5 +4,5 @@ pimcore: - studio pimcore_studio_backend: - openApiScanPaths: + open_api_scan_paths: - "%kernel.project_dir%/vendor/pimcore/studio-api-bundle/src" \ No newline at end of file diff --git a/config/services.yaml b/config/services.yaml index 7ac0a7241..e83f0cd6d 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -12,15 +12,6 @@ services: arguments: $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\StudioBackendBundle\Controller\: - resource: '../src/Controller' - public: true - tags: [ 'controller.service_arguments' ] - - - diff --git a/src/Response/Asset.php b/src/Asset/Schema/Asset.php similarity index 94% rename from src/Response/Asset.php rename to src/Asset/Schema/Asset.php index 9919d0dff..91a95ca86 100644 --- a/src/Response/Asset.php +++ b/src/Asset/Schema/Asset.php @@ -14,12 +14,13 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema; use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Response\Element; /** * @internal diff --git a/src/Response/Asset/Archive.php b/src/Asset/Schema/Type/Archive.php similarity index 82% rename from src/Response/Asset/Archive.php rename to src/Asset/Schema/Type/Archive.php index 889975dac..d50c7ecda 100644 --- a/src/Response/Asset/Archive.php +++ b/src/Asset/Schema/Type/Archive.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Archive', diff --git a/src/Response/Asset/Audio.php b/src/Asset/Schema/Type/Audio.php similarity index 82% rename from src/Response/Asset/Audio.php rename to src/Asset/Schema/Type/Audio.php index e4f0f4770..3c917708b 100644 --- a/src/Response/Asset/Audio.php +++ b/src/Asset/Schema/Type/Audio.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Audio', diff --git a/src/Response/Asset/Document.php b/src/Asset/Schema/Type/Document.php similarity index 94% rename from src/Response/Asset/Document.php rename to src/Asset/Schema/Type/Document.php index 7a730c557..7a9523b29 100644 --- a/src/Response/Asset/Document.php +++ b/src/Asset/Schema/Type/Document.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Document', diff --git a/src/Response/Asset/Folder.php b/src/Asset/Schema/Type/Folder.php similarity index 82% rename from src/Response/Asset/Folder.php rename to src/Asset/Schema/Type/Folder.php index f16df7f3f..eb8cf8d02 100644 --- a/src/Response/Asset/Folder.php +++ b/src/Asset/Schema/Type/Folder.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Folder', diff --git a/src/Response/Asset/Image.php b/src/Asset/Schema/Type/Image.php similarity index 95% rename from src/Response/Asset/Image.php rename to src/Asset/Schema/Type/Image.php index a838fa59a..24efa874c 100644 --- a/src/Response/Asset/Image.php +++ b/src/Asset/Schema/Type/Image.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Image', diff --git a/src/Response/Asset/MetaData.php b/src/Asset/Schema/Type/MetaData.php similarity index 95% rename from src/Response/Asset/MetaData.php rename to src/Asset/Schema/Type/MetaData.php index 0095a3694..203999e80 100644 --- a/src/Response/Asset/MetaData.php +++ b/src/Asset/Schema/Type/MetaData.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Asset/Permissions.php b/src/Asset/Schema/Type/Permissions.php similarity index 97% rename from src/Response/Asset/Permissions.php rename to src/Asset/Schema/Type/Permissions.php index 8ecb11f45..5fd11b6a6 100644 --- a/src/Response/Asset/Permissions.php +++ b/src/Asset/Schema/Type/Permissions.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/Response/Asset/Text.php b/src/Asset/Schema/Type/Text.php similarity index 82% rename from src/Response/Asset/Text.php rename to src/Asset/Schema/Type/Text.php index 0e5fb5f6c..7f39e64a6 100644 --- a/src/Response/Asset/Text.php +++ b/src/Asset/Schema/Type/Text.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Text', diff --git a/src/Response/Asset/Unknown.php b/src/Asset/Schema/Type/Unknown.php similarity index 82% rename from src/Response/Asset/Unknown.php rename to src/Asset/Schema/Type/Unknown.php index 5108023eb..0aa081c63 100644 --- a/src/Response/Asset/Unknown.php +++ b/src/Asset/Schema/Type/Unknown.php @@ -14,10 +14,10 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Unknown', diff --git a/src/Response/Asset/Video.php b/src/Asset/Schema/Type/Video.php similarity index 95% rename from src/Response/Asset/Video.php rename to src/Asset/Schema/Type/Video.php index 1067de998..161a6a758 100644 --- a/src/Response/Asset/Video.php +++ b/src/Asset/Schema/Type/Video.php @@ -14,11 +14,11 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response\Asset; +namespace Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; #[Schema( title: 'Video', diff --git a/src/DataIndex/Adapter/AssetSearchAdapter.php b/src/DataIndex/Adapter/AssetSearchAdapter.php index 13958c217..ad5f607b0 100644 --- a/src/DataIndex/Adapter/AssetSearchAdapter.php +++ b/src/DataIndex/Adapter/AssetSearchAdapter.php @@ -18,10 +18,10 @@ use Exception; use Pimcore\Bundle\GenericDataIndexBundle\Service\Search\SearchService\Asset\AssetSearchServiceInterface; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; 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/DataIndex/Adapter/AssetSearchAdapterInterface.php b/src/DataIndex/Adapter/AssetSearchAdapterInterface.php index 0ac267edd..5b4e5c9e5 100644 --- a/src/DataIndex/Adapter/AssetSearchAdapterInterface.php +++ b/src/DataIndex/Adapter/AssetSearchAdapterInterface.php @@ -16,9 +16,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Adapter; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; 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/DataIndex/Adapter/DataObjectSearchAdapter.php b/src/DataIndex/Adapter/DataObjectSearchAdapter.php index 8065dbd01..c96fa38b0 100644 --- a/src/DataIndex/Adapter/DataObjectSearchAdapter.php +++ b/src/DataIndex/Adapter/DataObjectSearchAdapter.php @@ -21,8 +21,8 @@ use Pimcore\Bundle\StaticResolverBundle\Models\Element\ServiceResolver; use Pimcore\Bundle\StudioBackendBundle\DataIndex\DataObjectSearchResult; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Query\QueryInterface; +use Pimcore\Bundle\StudioBackendBundle\DataObject\Schema\DataObject; 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/DataIndex/AssetSearchResult.php b/src/DataIndex/AssetSearchResult.php index 502eaeeb3..4e4fa3bf8 100644 --- a/src/DataIndex/AssetSearchResult.php +++ b/src/DataIndex/AssetSearchResult.php @@ -16,15 +16,15 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; -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; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; final readonly class AssetSearchResult { diff --git a/src/DataIndex/AssetSearchService.php b/src/DataIndex/AssetSearchService.php index 857120062..2110a1f3c 100644 --- a/src/DataIndex/AssetSearchService.php +++ b/src/DataIndex/AssetSearchService.php @@ -16,17 +16,17 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; 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/DataIndex/AssetSearchServiceInterface.php b/src/DataIndex/AssetSearchServiceInterface.php index 6ae8221b2..8c7731af5 100644 --- a/src/DataIndex/AssetSearchServiceInterface.php +++ b/src/DataIndex/AssetSearchServiceInterface.php @@ -16,16 +16,16 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; 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/DataIndex/Hydrator/Asset/ArchiveHydrator.php b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php index 290e082a0..18a532e72 100644 --- a/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php +++ b/src/DataIndex/Hydrator/Asset/ArchiveHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; final readonly class ArchiveHydrator implements ArchiveHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php index 0fc0e6c63..d3861fa36 100644 --- a/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/ArchiveHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Archive as ArchiveItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; interface ArchiveHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/AudioHydrator.php b/src/DataIndex/Hydrator/Asset/AudioHydrator.php index 7dadfa33b..2a0667e0a 100644 --- a/src/DataIndex/Hydrator/Asset/AudioHydrator.php +++ b/src/DataIndex/Hydrator/Asset/AudioHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; final readonly class AudioHydrator implements AudioHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php b/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php index a9dd83e8c..f2624541a 100644 --- a/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/AudioHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Audio as AudioItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; interface AudioHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/DocumentHydrator.php b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php index 371f8ab6a..7a644d605 100644 --- a/src/DataIndex/Hydrator/Asset/DocumentHydrator.php +++ b/src/DataIndex/Hydrator/Asset/DocumentHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; final readonly class DocumentHydrator implements DocumentHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php b/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php index 73c6b0376..3047431e9 100644 --- a/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/DocumentHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Document as DocumentItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; interface DocumentHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/FolderHydrator.php b/src/DataIndex/Hydrator/Asset/FolderHydrator.php index bbc36062e..892efe66b 100644 --- a/src/DataIndex/Hydrator/Asset/FolderHydrator.php +++ b/src/DataIndex/Hydrator/Asset/FolderHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; final readonly class FolderHydrator implements FolderHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php b/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php index 42c43a094..fa54422a3 100644 --- a/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/FolderHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Folder as FolderItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; interface FolderHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/ImageHydrator.php b/src/DataIndex/Hydrator/Asset/ImageHydrator.php index a326404dd..dd7d8a6a1 100644 --- a/src/DataIndex/Hydrator/Asset/ImageHydrator.php +++ b/src/DataIndex/Hydrator/Asset/ImageHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; final readonly class ImageHydrator implements ImageHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php b/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php index a5e4870ba..6679895f7 100644 --- a/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/ImageHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Image as ImageItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; interface ImageHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php b/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php index 01dee2097..a4a652c69 100644 --- a/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php +++ b/src/DataIndex/Hydrator/Asset/MetaDataHydrator.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\MetaData; final class MetaDataHydrator implements MetaDataHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php b/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php index 8128c8664..905a08670 100644 --- a/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/MetaDataHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetMetaData; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\MetaData; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\MetaData; interface MetaDataHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/TextHydrator.php b/src/DataIndex/Hydrator/Asset/TextHydrator.php index 688007749..210585a02 100644 --- a/src/DataIndex/Hydrator/Asset/TextHydrator.php +++ b/src/DataIndex/Hydrator/Asset/TextHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text as TextItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; final readonly class TextHydrator implements TextHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php b/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php index 76fcf3a2f..901e35504 100644 --- a/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/TextHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Text as TextItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; interface TextHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/UnknownHydrator.php b/src/DataIndex/Hydrator/Asset/UnknownHydrator.php index b2a8ae125..80f76b491 100644 --- a/src/DataIndex/Hydrator/Asset/UnknownHydrator.php +++ b/src/DataIndex/Hydrator/Asset/UnknownHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown as UnknownItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; final readonly class UnknownHydrator implements UnknownHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php b/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php index 524f618da..1383daa08 100644 --- a/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/UnknownHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Unknown as UnknownItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; interface UnknownHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/VideoHydrator.php b/src/DataIndex/Hydrator/Asset/VideoHydrator.php index 7da74abda..638806af3 100644 --- a/src/DataIndex/Hydrator/Asset/VideoHydrator.php +++ b/src/DataIndex/Hydrator/Asset/VideoHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video as VideoItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\PermissionsHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; final readonly class VideoHydrator implements VideoHydratorInterface { diff --git a/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php b/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php index 0fa3bf3d4..c6ddc0971 100644 --- a/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php +++ b/src/DataIndex/Hydrator/Asset/VideoHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\SearchResultItem\Video as VideoItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Video; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; interface VideoHydratorInterface { diff --git a/src/DataIndex/Hydrator/AssetHydrator.php b/src/DataIndex/Hydrator/AssetHydrator.php index 331a3e154..7908d60bb 100644 --- a/src/DataIndex/Hydrator/AssetHydrator.php +++ b/src/DataIndex/Hydrator/AssetHydrator.php @@ -17,9 +17,9 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; use Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator\Asset\MetaDataHydratorInterface; use Pimcore\Bundle\StudioBackendBundle\Icon\Service\IconServiceInterface; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; final readonly class AssetHydrator implements AssetHydratorInterface { diff --git a/src/DataIndex/Hydrator/AssetHydratorInterface.php b/src/DataIndex/Hydrator/AssetHydratorInterface.php index e6758d4ba..22da05682 100644 --- a/src/DataIndex/Hydrator/AssetHydratorInterface.php +++ b/src/DataIndex/Hydrator/AssetHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; interface AssetHydratorInterface { diff --git a/src/DataIndex/Hydrator/AssetHydratorService.php b/src/DataIndex/Hydrator/AssetHydratorService.php index 817c37b7d..298e92fec 100644 --- a/src/DataIndex/Hydrator/AssetHydratorService.php +++ b/src/DataIndex/Hydrator/AssetHydratorService.php @@ -17,7 +17,8 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type; use Symfony\Contracts\Service\ServiceProviderInterface; final readonly class AssetHydratorService implements AssetHydratorServiceInterface diff --git a/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php b/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php index 6fb829479..49820c30c 100644 --- a/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php +++ b/src/DataIndex/Hydrator/AssetHydratorServiceInterface.php @@ -17,15 +17,15 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Model\Search\Asset\SearchResult\AssetSearchResultItem; -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; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Asset; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; interface AssetHydratorServiceInterface { diff --git a/src/DataIndex/Hydrator/PermissionsHydrator.php b/src/DataIndex/Hydrator/PermissionsHydrator.php index 1455cbab1..abcd227db 100644 --- a/src/DataIndex/Hydrator/PermissionsHydrator.php +++ b/src/DataIndex/Hydrator/PermissionsHydrator.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Permission\AssetPermissions; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Permissions; final class PermissionsHydrator implements PermissionsHydratorInterface { diff --git a/src/DataIndex/Hydrator/PermissionsHydratorInterface.php b/src/DataIndex/Hydrator/PermissionsHydratorInterface.php index 6333f2997..4557f9a41 100644 --- a/src/DataIndex/Hydrator/PermissionsHydratorInterface.php +++ b/src/DataIndex/Hydrator/PermissionsHydratorInterface.php @@ -17,7 +17,7 @@ namespace Pimcore\Bundle\StudioBackendBundle\DataIndex\Hydrator; use Pimcore\Bundle\GenericDataIndexBundle\Permission\AssetPermissions; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Permissions; interface PermissionsHydratorInterface { diff --git a/src/Response/DataObject.php b/src/DataObject/Schema/DataObject.php similarity index 94% rename from src/Response/DataObject.php rename to src/DataObject/Schema/DataObject.php index ca54c562e..503de03c6 100644 --- a/src/Response/DataObject.php +++ b/src/DataObject/Schema/DataObject.php @@ -14,7 +14,7 @@ * @license http://www.pimcore.org/license GPLv3 and PCL */ -namespace Pimcore\Bundle\StudioBackendBundle\Response; +namespace Pimcore\Bundle\StudioBackendBundle\DataObject\Schema; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 4796b4a6b..3493e3eb6 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -50,7 +50,7 @@ public function getConfigTreeBuilder(): TreeBuilder private function addOpenApiScanPathsNode(ArrayNodeDefinition $node): void { $node->children() - ->arrayNode('openApiScanPaths') + ->arrayNode('open_api_scan_paths') ->prototype('scalar')->end() ->validate() ->always( @@ -88,7 +88,7 @@ private function addApiTokenNode(ArrayNodeDefinition $node): void private function addAllowedHostsForCorsNode(ArrayNodeDefinition $node): void { $node->children() - ->arrayNode('allowedHostsForCors') + ->arrayNode('allowed_hosts_for_cors') ->prototype('scalar')->end() ->validate() ->always( diff --git a/src/DependencyInjection/PimcoreStudioBackendExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php index 7513b5406..b551317eb 100644 --- a/src/DependencyInjection/PimcoreStudioBackendExtension.php +++ b/src/DependencyInjection/PimcoreStudioBackendExtension.php @@ -67,9 +67,9 @@ public function load(array $configs, ContainerBuilder $container): void $definition->setArgument('$tokenLifetime', $config['api_token']['lifetime']); $definition = $container->getDefinition(OpenApiServiceInterface::class); - $definition->setArgument('$openApiScanPaths', $config['openApiScanPaths']); + $definition->setArgument('$openApiScanPaths', $config['open_api_scan_paths']); $definition = $container->getDefinition(CorsSubscriber::class); - $definition->setArgument('$allowedHosts', $config['allowedHostsForCors']); + $definition->setArgument('$allowedHosts', $config['allowed_hosts_for_cors']); } } diff --git a/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php b/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php index 133b3df41..853f984d5 100644 --- a/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php +++ b/src/OpenApi/Attributes/Response/Property/DataObjectCollection.php @@ -19,7 +19,7 @@ use OpenApi\Attributes\Items; use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\DataObject; +use Pimcore\Bundle\StudioBackendBundle\DataObject\Schema\DataObject; /** * @internal diff --git a/src/Response/Element.php b/src/Response/Element.php index 032b80939..11da4572f 100644 --- a/src/Response/Element.php +++ b/src/Response/Element.php @@ -18,7 +18,7 @@ use OpenApi\Attributes\Property; use OpenApi\Attributes\Schema; -use Pimcore\Bundle\StudioBackendBundle\Response\Asset\Permissions; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Permissions; #[Schema( title: 'Element', diff --git a/src/Response/Schemas.php b/src/Response/Schemas.php index f89bab7e9..198efe244 100644 --- a/src/Response/Schemas.php +++ b/src/Response/Schemas.php @@ -16,14 +16,14 @@ namespace Pimcore\Bundle\StudioBackendBundle\Response; -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\Asset\Schema\Type\Archive; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Audio; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Document; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Folder; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Image; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Text; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Unknown; +use Pimcore\Bundle\StudioBackendBundle\Asset\Schema\Type\Video; use Pimcore\Bundle\StudioBackendBundle\Response\Schema\DevError; use Pimcore\Bundle\StudioBackendBundle\Response\Schema\Error;