Try to restructure more

pimcore · Apr 25, 2024 · 95b8e54 · 95b8e54
1 parent 64bd343
commit 95b8e54
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/config/filters.yaml b/config/filters.yaml
@@ -0,0 +1,13 @@
+services:
+  _defaults:
+    autowire: true
+    autoconfigure: true
+    public: false
+
+  #Factory
+
+  Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceProviderInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceProvider
+
+  Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceLoaderInterface:
+    class: Pimcore\Bundle\StudioBackendBundle\Filter\Service\Loader\TaggedIteratorAdapter
diff --git a/config/providers.yaml b/config/providers.yaml
diff --git a/src/Asset/Controller/CollectionController.php b/src/Asset/Controller/CollectionController.php
@@ -22,6 +22,7 @@
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\ElementParameters;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceProviderInterface;
 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;
@@ -39,7 +40,6 @@
 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;

diff --git a/src/DataObject/Controller/CollectionController.php b/src/DataObject/Controller/CollectionController.php
@@ -22,6 +22,7 @@
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\OpenSearchFilterInterface;
 use Pimcore\Bundle\StudioBackendBundle\DataIndex\Request\DataObjectParameters;
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidQueryTypeException;
+use Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceProviderInterface;
 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;
@@ -40,7 +41,6 @@
 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;

diff --git a/src/DependencyInjection/PimcoreStudioBackendExtension.php b/src/DependencyInjection/PimcoreStudioBackendExtension.php
@@ -56,9 +56,9 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('data_objects.yaml');
         $loader->load('event_subscribers.yaml');
         $loader->load('factories.yaml');
+        $loader->load('filters.yaml');
         $loader->load('icon.yaml');
         $loader->load('open_api.yaml');
-        $loader->load('providers.yaml');
         $loader->load('security.yaml');
         $loader->load('services.yaml');
         $loader->load('translation.yaml');

diff --git a/...Provider/FilterServiceLoaderInterface.php → .../Service/FilterServiceLoaderInterface.php b/...Provider/FilterServiceLoaderInterface.php → .../Service/FilterServiceLoaderInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Provider;
+namespace Pimcore\Bundle\StudioBackendBundle\Filter\Service;
 
 /**
  * @internal

diff --git a/src/Provider/FilterServiceProvider.php → src/Filter/Service/FilterServiceProvider.php b/src/Provider/FilterServiceProvider.php → src/Filter/Service/FilterServiceProvider.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Provider;
+namespace Pimcore\Bundle\StudioBackendBundle\Filter\Service;
 
 use Pimcore\Bundle\StudioBackendBundle\Exception\InvalidFilterServiceTypeException;
 

diff --git a/...ovider/FilterServiceProviderInterface.php → ...ervice/FilterServiceProviderInterface.php b/...ovider/FilterServiceProviderInterface.php → ...ervice/FilterServiceProviderInterface.php
@@ -14,7 +14,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Provider;
+namespace Pimcore\Bundle\StudioBackendBundle\Filter\Service;
 
 interface FilterServiceProviderInterface
 {

diff --git a/...Provider/Loader/TaggedIteratorAdapter.php → .../Service/Loader/TaggedIteratorAdapter.php b/...Provider/Loader/TaggedIteratorAdapter.php → .../Service/Loader/TaggedIteratorAdapter.php
@@ -14,9 +14,9 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\StudioBackendBundle\Provider\Loader;
+namespace Pimcore\Bundle\StudioBackendBundle\Filter\Service\Loader;
 
-use Pimcore\Bundle\StudioBackendBundle\Provider\FilterServiceLoaderInterface;
+use Pimcore\Bundle\StudioBackendBundle\Filter\Service\FilterServiceLoaderInterface;
 use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 
 /**