Cleanup

pimcore · Apr 24, 2024 · d96f577 · d96f577
1 parent 322c625
commit d96f577
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 40 deletions.
diff --git a/src/Controller/Api/Assets/CollectionController.php b/src/Controller/Api/Assets/CollectionController.php
@@ -56,7 +56,7 @@ final class CollectionController extends AbstractApiController
     public function __construct(
         SerializerInterface $serializer,
         private readonly AssetSearchServiceInterface $assetSearchService,
-        private readonly FilterServiceProviderInterface $filterServiceFactory
+        private readonly FilterServiceProviderInterface $filterServiceProvider
     ) {
         parent::__construct($serializer);
     }
@@ -93,7 +93,7 @@ public function __construct(
     #[UnprocessableContentResponse]
     public function getAssets(#[MapQueryString] ElementParameters $parameters): JsonResponse
     {
-        $filterService = $this->filterServiceFactory->create(OpenSearchFilterInterface::SERVICE_TYPE);
+        $filterService = $this->filterServiceProvider->create(OpenSearchFilterInterface::SERVICE_TYPE);
 
         $assetQuery = $filterService->applyFilters(
             $parameters,

diff --git a/src/Controller/Api/DataObjects/CollectionController.php b/src/Controller/Api/DataObjects/CollectionController.php
@@ -54,7 +54,7 @@ final class CollectionController extends AbstractApiController
     public function __construct(
         SerializerInterface $serializer,
         private readonly DataObjectSearchServiceInterface $dataObjectSearchService,
-        private readonly FilterServiceProviderInterface $filterServiceFactory
+        private readonly FilterServiceProviderInterface $filterServiceProvider
     ) {
         parent::__construct($serializer);
     }
@@ -92,7 +92,7 @@ public function __construct(
     #[UnprocessableContentResponse]
     public function getDataObjects(#[MapQueryString] DataObjectParameters $parameters): JsonResponse
     {
-        $filterService = $this->filterServiceFactory->create(OpenSearchFilterInterface::SERVICE_TYPE);
+        $filterService = $this->filterServiceProvider->create(OpenSearchFilterInterface::SERVICE_TYPE);
 
         $dataObjectQuery = $filterService->applyFilters($parameters, 'dataObject');
 

diff --git a/src/Exception/AbstractApiException.php b/src/Exception/AbstractApiException.php
@@ -18,6 +18,6 @@
 
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-abstract class AbstractApiException extends HttpException implements ApiExceptionInterface
+abstract class AbstractApiException extends HttpException
 {
 }
diff --git a/src/Exception/ApiExceptionInterface.php b/src/Exception/ApiExceptionInterface.php
diff --git a/src/Request/Query/Filter/ElementParametersInterface.php b/src/Request/Query/Filter/ElementParametersInterface.php
@@ -19,7 +19,7 @@
 /**
  * @internal
  */
-interface ElementParametersInterface
+interface ElementParametersInterface extends CollectionParametersInterface
 {
     public function getPage(): int;
 

diff --git a/src/Security/Voter/AuthorizationVoter.php b/src/Security/Voter/AuthorizationVoter.php
@@ -18,8 +18,8 @@
 
 use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException;
 use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException;
-use Pimcore\Bundle\StudioApiBundle\Security\Trait\RequestTrait;
 use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioApiBundle\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
@@ -19,9 +19,9 @@
 use Pimcore\Bundle\StudioApiBundle\Exception\NonPublicTranslationException;
 use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException;
 use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException;
-use Pimcore\Bundle\StudioApiBundle\Security\Trait\PublicTranslationTrait;
-use Pimcore\Bundle\StudioApiBundle\Security\Trait\RequestTrait;
 use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface;
+use Pimcore\Bundle\StudioApiBundle\Util\Traits\PublicTranslationTrait;
+use Pimcore\Bundle\StudioApiBundle\Util\Traits\RequestTrait;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;

diff --git a/src/Util/Traits/PaginatedResponseTrait.php b/src/Util/Traits/PaginatedResponseTrait.php
@@ -29,10 +29,10 @@ trait PaginatedResponseTrait
 
     protected function getPaginatedCollection(
         SerializerInterface $serializer,
-        array $data,
+        array $items,
         int $totalItems = 0
     ): JsonResponse {
-        $serialized = $serializer->serialize(new Collection($totalItems, $data), 'json');
+        $serialized = $serializer->serialize(new Collection($totalItems, $items), 'json');
 
         return new JsonResponse($serialized, 200, [self::HEADER_TOTAL_ITEMS => $totalItems], true);
     }

diff --git a/...Security/Trait/PublicTranslationTrait.php → src/Util/Traits/PublicTranslationTrait.php b/...Security/Trait/PublicTranslationTrait.php → src/Util/Traits/PublicTranslationTrait.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioApiBundle\Security\Trait;
+namespace Pimcore\Bundle\StudioApiBundle\Util\Traits;
 
 use Pimcore\Bundle\StudioApiBundle\Exception\NonPublicTranslationException;
 use Pimcore\Bundle\StudioApiBundle\Util\Constants\PublicTranslations;

diff --git a/src/Security/Trait/RequestTrait.php → src/Util/Traits/RequestTrait.php b/src/Security/Trait/RequestTrait.php → src/Util/Traits/RequestTrait.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioApiBundle\Security\Trait;
+namespace Pimcore\Bundle\StudioApiBundle\Util\Traits;
 
 use Pimcore\Bundle\StudioApiBundle\Exception\NoRequestException;
 use Pimcore\Bundle\StudioApiBundle\Exception\NotAuthorizedException;