From 0bd874bcdc9f69be8dd01edbe6ad78d00fe0063f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Chru=C5=9Bciel?= <lchrusciel@gmail.com>
Date: Tue, 10 Nov 2020 20:09:55 +0100
Subject: [PATCH] [UPGRADE] Mention about changes in namespaces

---
 UPGRADE-1.8.md                                            | 8 ++++++++
 .../CommandHandler/{ => Cart}/PickupCartHandler.php       | 2 +-
 .../serialization/Commands/Account/RegisterShopUser.xml   | 2 +-
 .../Resources/config/services/command_handlers.xml        | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename src/Sylius/Bundle/ApiBundle/CommandHandler/{ => Cart}/PickupCartHandler.php (98%)

diff --git a/UPGRADE-1.8.md b/UPGRADE-1.8.md
index 57647dff51ac..afc486ee01e4 100644
--- a/UPGRADE-1.8.md
+++ b/UPGRADE-1.8.md
@@ -68,6 +68,14 @@ If you are using they on your custom entity `api_resource` configuration or seri
 - `zone_member:read` changed to: `admin:zone_member:read`
 - removed redundant `zone_member:write` 
 
+1. Following namespaces has been changed:
+    * `\Sylius\Bundle\ApiBundle\Command\ChangeShopUserPassword` => `\Sylius\Bundle\ApiBundle\Command\Account\ChangeShopUserPassword`
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\ChangeShopUserPasswordHandler` => `\Sylius\Bundle\ApiBundle\CommandHandler\Account\ChangeShopUserPasswordHandler`
+    * `\Sylius\Bundle\ApiBundle\Command\RegisterShopUser` => `\Sylius\Bundle\ApiBundle\Command\Account\RegisterShopUser`
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\RegisterShopUserHandler` => `\Sylius\Bundle\ApiBundle\CommandHandler\Account\RegisterShopUserHandler`
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\ShopUserIdAwareInterface` => `\Sylius\Bundle\ApiBundle\CommandHandler\Account\ShopUserIdAwareInterface`
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\PickupCartHandler` => `\Sylius\Bundle\ApiBundle\CommandHandler\Cart\PickupCartHandler`
+
 # UPGRADE FROM `v1.8.4` TO `v1.8.6`
 
 1. Change configuration of new ApiBundle in your `config/packages/security.yaml` file:
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/PickupCartHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/PickupCartHandler.php
similarity index 98%
rename from src/Sylius/Bundle/ApiBundle/CommandHandler/PickupCartHandler.php
rename to src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/PickupCartHandler.php
index 9d71a5272717..bb2db9ca1f42 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/PickupCartHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Cart/PickupCartHandler.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Cart;
 
 use Doctrine\Persistence\ObjectManager;
 use Sylius\Bundle\AdminApiBundle\Model\UserInterface;
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Account/RegisterShopUser.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Account/RegisterShopUser.xml
index 3deebd2eaaaa..79fef2ba432a 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Account/RegisterShopUser.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Commands/Account/RegisterShopUser.xml
@@ -15,7 +15,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://symfony.com/schema/dic/serializer-mapping https://symfony.com/schema/dic/serializer-mapping/serializer-mapping-1.0.xsd"
 >
-    <class name="Sylius\Bundle\ApiBundle\Command\RegisterShopUser">
+    <class name="Sylius\Bundle\ApiBundle\Command\Account\RegisterShopUser">
         <attribute name="firstName">
             <group>shop:customer:create</group>
         </attribute>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 81c16ea0155a..d71cc3ba848f 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -24,7 +24,7 @@
             <tag name="messenger.message_handler" bus="sylius_default.bus"/>
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\CommandHandler\PickupCartHandler">
+        <service id="Sylius\Bundle\ApiBundle\CommandHandler\Cart\PickupCartHandler">
             <argument type="service" id="sylius.factory.order" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.repository.channel" />
@@ -96,7 +96,7 @@
             <tag name="messenger.message_handler" bus="sylius_default.bus"/>
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\CommandHandler\ChangeShopUserPasswordHandler">
+        <service id="Sylius\Bundle\ApiBundle\CommandHandler\Account\ChangeShopUserPasswordHandler">
             <argument type="service" id="sylius.security.password_updater" />
             <argument type="service" id="sylius.repository.shop_user" />
             <tag name="messenger.message_handler" bus="sylius_default.bus"/>