From 7fcc65cf25a9bab9b115de2868185bf4a82cbd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= <lchrusciel@gmail.com>
Date: Tue, 27 Jul 2021 12:40:53 +0200
Subject: [PATCH] [API] Unification of filtration namespaces

---
 UPGRADE-API-1.11.md                                           | 2 ++
 .../Doctrine/{Filters => Filter}/ExchangeRateFilter.php       | 2 +-
 .../TranslationOrderNameAndLocaleFilter.php                   | 2 +-
 .../Bundle/ApiBundle/Resources/config/services/filters.xml    | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/Sylius/Bundle/ApiBundle/Doctrine/{Filters => Filter}/ExchangeRateFilter.php (96%)
 rename src/Sylius/Bundle/ApiBundle/Doctrine/{Filters => Filter}/TranslationOrderNameAndLocaleFilter.php (98%)

diff --git a/UPGRADE-API-1.11.md b/UPGRADE-API-1.11.md
index f5192ffcde..39d115b5a1 100644
--- a/UPGRADE-API-1.11.md
+++ b/UPGRADE-API-1.11.md
@@ -1,5 +1,7 @@
 # UPGRADE FROM `v1.10.X` TO `v1.11.0`
 
+1. `Sylius\Bundle\ApiBundle\Doctrine\Filters\ExchangeRateFilter` and `Sylius\Bundle\ApiBundle\Doctrine\Filters\TranslationOrderNameAndLocaleFilter` has been moved to `Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter` and `Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter` respectively.
+
 1. `Sylius\Bundle\ApiBundle\View\CartShippingMethodInterface` and `Sylius\Bundle\ApiBundle\View\CartShippingMethod` have been removed.
 
 1. `Sylius\Bundle\ApiBundle\View\Factory\CartShippingMethodFactoryInterface` and `Sylius\Bundle\ApiBundle\View\Factory\CartShippingMethodFactory` have been removed.
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/Filters/ExchangeRateFilter.php b/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/ExchangeRateFilter.php
similarity index 96%
rename from src/Sylius/Bundle/ApiBundle/Doctrine/Filters/ExchangeRateFilter.php
rename to src/Sylius/Bundle/ApiBundle/Doctrine/Filter/ExchangeRateFilter.php
index a1dfd69f20..ade75a9211 100644
--- a/src/Sylius/Bundle/ApiBundle/Doctrine/Filters/ExchangeRateFilter.php
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/ExchangeRateFilter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Doctrine\Filters;
+namespace Sylius\Bundle\ApiBundle\Doctrine\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/Filters/TranslationOrderNameAndLocaleFilter.php b/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/TranslationOrderNameAndLocaleFilter.php
similarity index 98%
rename from src/Sylius/Bundle/ApiBundle/Doctrine/Filters/TranslationOrderNameAndLocaleFilter.php
rename to src/Sylius/Bundle/ApiBundle/Doctrine/Filter/TranslationOrderNameAndLocaleFilter.php
index 6397751756..705cfbcf3b 100644
--- a/src/Sylius/Bundle/ApiBundle/Doctrine/Filters/TranslationOrderNameAndLocaleFilter.php
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/Filter/TranslationOrderNameAndLocaleFilter.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Doctrine\Filters;
+namespace Sylius\Bundle\ApiBundle\Doctrine\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Common\Filter\OrderFilterInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Filter\AbstractContextAwareFilter;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
index c9fe1c75b6..3441aaba28 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/filters.xml
@@ -97,12 +97,12 @@
             <tag name="api_platform.filter" />
         </service>
 
-        <service id="sylius.api.exchange_rate_filter" class="Sylius\Bundle\ApiBundle\Doctrine\Filters\ExchangeRateFilter">
+        <service id="sylius.api.exchange_rate_filter" class="Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter">
             <argument type="service" id="doctrine" />
             <tag name="api_platform.filter" />
         </service>
 
-        <service id="sylius.api.translation_order_name_and_locale_filter" class="Sylius\Bundle\ApiBundle\Doctrine\Filters\TranslationOrderNameAndLocaleFilter">
+        <service id="sylius.api.translation_order_name_and_locale_filter" class="Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter">
             <argument type="service" id="doctrine" />
             <tag name="api_platform.filter" />
         </service>