[API][BC-Break] Move commands and handlers to common namespace

Sylius · Aug 12, 2021 · 4416d81 · 4416d81
1 parent 0610988
commit 4416d81
Show file tree

Hide file tree

Showing 72 changed files with 155 additions and 109 deletions.
diff --git a/UPGRADE-API-1.11.md b/UPGRADE-API-1.11.md
@@ -22,8 +22,6 @@
         product_image_prefix: 'media/image'
     ```
 
-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.
@@ -121,3 +119,35 @@
 
 1. The service `Sylius\Bundle\ApiBundle\Serializer\CommandFieldItemIriToIdentifierDenormalizer` has changed its name to `Sylius\Bundle\ApiBundle\Serializer\CommandArgumentsDenormalizer`
     and also its service definition.
+
+1. Following namespaces has been changed:
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\AddProductReviewHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Catalog\AddProductReviewHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\BlameCartHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Cart\BlameCartHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\RequestResetPasswordTokenHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\RequestResetPasswordTokenHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\ResendVerificationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\ResendVerificationEmailHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\ResetPasswordHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\ResetPasswordHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\SendAccountRegistrationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendAccountRegistrationEmailHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\SendAccountVerificationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendAccountVerificationEmailHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\SendOrderConfirmationHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Checkout\SendOrderConfirmationHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\SendResetPasswordEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendResetPasswordEmailHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\SendShipmentConfirmationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Checkout\SendShipmentConfirmationEmailHandler'
+	* '\Sylius\Bundle\ApiBundle\CommandHandler\VerifyCustomerAccountHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\VerifyCustomerAccountHandler'
+	* '\Sylius\Bundle\ApiBundle\Command\AddProductReview' => '\Sylius\Bundle\ApiBundle\Command\Catalog\AddProductReview'
+	* '\Sylius\Bundle\ApiBundle\Command\BlameCart' => '\Sylius\Bundle\ApiBundle\Command\Cart\BlameCart'
+	* '\Sylius\Bundle\ApiBundle\Command\RequestResetPasswordToken' => '\Sylius\Bundle\ApiBundle\Command\Account\RequestResetPasswordToken'
+	* '\Sylius\Bundle\ApiBundle\Command\ResendVerificationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail'
+	* '\Sylius\Bundle\ApiBundle\Command\ResetPassword' => '\Sylius\Bundle\ApiBundle\Command\Account\ResetPassword'
+	* '\Sylius\Bundle\ApiBundle\Command\SendAccountRegistrationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail'
+	* '\Sylius\Bundle\ApiBundle\Command\SendAccountVerificationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendAccountVerificationEmail'
+	* '\Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation' => '\Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation'
+	* '\Sylius\Bundle\ApiBundle\Command\SendResetPasswordEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail'
+	* '\Sylius\Bundle\ApiBundle\Command\SendShipmentConfirmationEmail' => '\Sylius\Bundle\ApiBundle\Command\Checkout\SendShipmentConfirmationEmail'
+	* '\Sylius\Bundle\ApiBundle\Command\VerifyCustomerAccount' => '\Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount'
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\ChangeShopUserPasswordHandler` => `\Sylius\Bundle\ApiBundle\CommandHandler\Account\ChangeShopUserPasswordHandler`
+    * `\Sylius\Bundle\ApiBundle\CommandHandler\PickupCartHandler` => `\Sylius\Bundle\ApiBundle\CommandHandler\Cart\PickupCartHandler`
+    * `\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\Command\ChangeShopUserPassword` => `\Sylius\Bundle\ApiBundle\Command\Account\ChangeShopUserPassword`
+    * `\Sylius\Bundle\ApiBundle\Command\RegisterShopUser` => `\Sylius\Bundle\ApiBundle\Command\Account\RegisterShopUser`
+    * `\Sylius\Bundle\ApiBundle\Doctrine\Filters\ExchangeRateFilter` => `\Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter`
+    * `\Sylius\Bundle\ApiBundle\Doctrine\Filters\TranslationOrderNameAndLocaleFilter` => `Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter`
diff --git a/src/Sylius/Behat/Context/Setup/UserContext.php b/src/Sylius/Behat/Context/Setup/UserContext.php
@@ -16,7 +16,7 @@
 use Behat\Behat\Context\Context;
 use Doctrine\Persistence\ObjectManager;
 use Sylius\Behat\Service\SharedStorageInterface;
-use Sylius\Bundle\ApiBundle\Command\ChangeShopUserPassword;
+use Sylius\Bundle\ApiBundle\Command\Account\ChangeShopUserPassword;
 use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Model\UserInterface;

diff --git a/...Bundle/Command/ChangeShopUserPassword.php → ...ommand/Account/ChangeShopUserPassword.php b/...Bundle/Command/ChangeShopUserPassword.php → ...ommand/Account/ChangeShopUserPassword.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /** @experimental */
 class ChangeShopUserPassword implements ShopUserIdAwareInterface

diff --git a/...le/ApiBundle/Command/RegisterShopUser.php → ...ndle/Command/Account/RegisterShopUser.php b/...le/ApiBundle/Command/RegisterShopUser.php → ...ndle/Command/Account/RegisterShopUser.php
@@ -11,7 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
+
+use Sylius\Bundle\ApiBundle\Command\ChannelCodeAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\LocaleCodeAwareInterface;
 
 /**
  * @experimental

diff --git a/...dle/Command/RequestResetPasswordToken.php → ...and/Account/RequestResetPasswordToken.php b/...dle/Command/RequestResetPasswordToken.php → ...and/Account/RequestResetPasswordToken.php
@@ -11,7 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
+
+use Sylius\Bundle\ApiBundle\Command\ChannelCodeAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\LocaleCodeAwareInterface;
 
 /** @experimental */
 class RequestResetPasswordToken implements ChannelCodeAwareInterface, LocaleCodeAwareInterface, IriToIdentifierConversionAwareInterface

diff --git a/...undle/Command/ResendVerificationEmail.php → ...mmand/Account/ResendVerificationEmail.php b/...undle/Command/ResendVerificationEmail.php → ...mmand/Account/ResendVerificationEmail.php
@@ -11,7 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
+
+use Sylius\Bundle\ApiBundle\Command\ChannelCodeAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
+use Sylius\Bundle\ApiBundle\Command\LocaleCodeAwareInterface;
 
 /** @experimental */
 class ResendVerificationEmail implements ChannelCodeAwareInterface, LocaleCodeAwareInterface, IriToIdentifierConversionAwareInterface

diff --git a/...undle/ApiBundle/Command/ResetPassword.php → ...iBundle/Command/Account/ResetPassword.php b/...undle/ApiBundle/Command/ResetPassword.php → ...iBundle/Command/Account/ResetPassword.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /** @experimental */
 class ResetPassword

diff --git a/.../Command/SendAccountRegistrationEmail.php → .../Account/SendAccountRegistrationEmail.php b/.../Command/SendAccountRegistrationEmail.php → .../Account/SendAccountRegistrationEmail.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /**
  * @experimental

diff --git a/.../Command/SendAccountVerificationEmail.php → .../Account/SendAccountVerificationEmail.php b/.../Command/SendAccountVerificationEmail.php → .../Account/SendAccountVerificationEmail.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /**
  * @experimental

diff --git a/...Bundle/Command/SendResetPasswordEmail.php → ...ommand/Account/SendResetPasswordEmail.php b/...Bundle/Command/SendResetPasswordEmail.php → ...ommand/Account/SendResetPasswordEmail.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /** @experimental */
 class SendResetPasswordEmail

diff --git a/...ndle/Command/ShopUserIdAwareInterface.php → ...mand/Account/ShopUserIdAwareInterface.php b/...ndle/Command/ShopUserIdAwareInterface.php → ...mand/Account/ShopUserIdAwareInterface.php
@@ -11,7 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
+
+use Sylius\Bundle\ApiBundle\Command\CommandAwareDataTransformerInterface;
 
 /** @experimental */
 interface ShopUserIdAwareInterface extends CommandAwareDataTransformerInterface

diff --git a/...iBundle/Command/VerifyCustomerAccount.php → ...Command/Account/VerifyCustomerAccount.php b/...iBundle/Command/VerifyCustomerAccount.php → ...Command/Account/VerifyCustomerAccount.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Account;
 
 /**
  * @experimental

diff --git a/...us/Bundle/ApiBundle/Command/BlameCart.php → ...ndle/ApiBundle/Command/Cart/BlameCart.php b/...us/Bundle/ApiBundle/Command/BlameCart.php → ...ndle/ApiBundle/Command/Cart/BlameCart.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Cart;
 
 /** @experimental */
 class BlameCart

diff --git a/...le/ApiBundle/Command/AddProductReview.php → ...ndle/Command/Catalog/AddProductReview.php b/...le/ApiBundle/Command/AddProductReview.php → ...ndle/Command/Catalog/AddProductReview.php
@@ -11,7 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Catalog;
+
+use Sylius\Bundle\ApiBundle\Command\CommandAwareDataTransformerInterface;
+use Sylius\Bundle\ApiBundle\Command\IriToIdentifierConversionAwareInterface;
 
 /** @experimental */
 class AddProductReview implements CommandAwareDataTransformerInterface, IriToIdentifierConversionAwareInterface

diff --git a/...iBundle/Command/SendOrderConfirmation.php → ...ommand/Checkout/SendOrderConfirmation.php b/...iBundle/Command/SendOrderConfirmation.php → ...ommand/Checkout/SendOrderConfirmation.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Checkout;
 
 /** @experimental */
 class SendOrderConfirmation

diff --git a/...Command/SendShipmentConfirmationEmail.php → ...heckout/SendShipmentConfirmationEmail.php b/...Command/SendShipmentConfirmationEmail.php → ...heckout/SendShipmentConfirmationEmail.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\Command;
+namespace Sylius\Bundle\ApiBundle\Command\Checkout;
 
 /** @experimental */
 class SendShipmentConfirmationEmail

diff --git a/...Handler/ChangeShopUserPasswordHandler.php → ...Account/ChangeShopUserPasswordHandler.php b/...Handler/ChangeShopUserPasswordHandler.php → ...Account/ChangeShopUserPasswordHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\ChangeShopUserPassword;
+use Sylius\Bundle\ApiBundle\Command\Account\ChangeShopUserPassword;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\PasswordUpdaterInterface;

diff --git a/...ommandHandler/RegisterShopUserHandler.php → ...ndler/Account/RegisterShopUserHandler.php b/...ommandHandler/RegisterShopUserHandler.php → ...ndler/Account/RegisterShopUserHandler.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
 use Doctrine\Persistence\ObjectManager;
-use Sylius\Bundle\ApiBundle\Command\RegisterShopUser;
-use Sylius\Bundle\ApiBundle\Command\SendAccountRegistrationEmail;
-use Sylius\Bundle\ApiBundle\Command\SendAccountVerificationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendAccountVerificationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\RegisterShopUser;
 use Sylius\Bundle\ApiBundle\Provider\CustomerProviderInterface;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;

diff --git a/...dler/RequestResetPasswordTokenHandler.php → ...ount/RequestResetPasswordTokenHandler.php b/...dler/RequestResetPasswordTokenHandler.php → ...ount/RequestResetPasswordTokenHandler.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\RequestResetPasswordToken;
-use Sylius\Bundle\ApiBundle\Command\SendResetPasswordEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\RequestResetPasswordToken;
+use Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;

diff --git a/...andler/ResendVerificationEmailHandler.php → ...ccount/ResendVerificationEmailHandler.php b/...andler/ResendVerificationEmailHandler.php → ...ccount/ResendVerificationEmailHandler.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\ResendVerificationEmail;
-use Sylius\Bundle\ApiBundle\Command\SendAccountVerificationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendAccountVerificationEmail;
 use Sylius\Component\User\Model\UserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;

diff --git a/...e/CommandHandler/ResetPasswordHandler.php → ...dHandler/Account/ResetPasswordHandler.php b/...e/CommandHandler/ResetPasswordHandler.php → ...dHandler/Account/ResetPasswordHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\ResetPassword;
+use Sylius\Bundle\ApiBundle\Command\Account\ResetPassword;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Resource\Metadata\MetadataInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;

diff --git a/...r/SendAccountRegistrationEmailHandler.php → ...t/SendAccountRegistrationEmailHandler.php b/...r/SendAccountRegistrationEmailHandler.php → ...t/SendAccountRegistrationEmailHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\SendAccountRegistrationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail;
 use Sylius\Bundle\CoreBundle\Mailer\Emails;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;

diff --git a/...r/SendAccountVerificationEmailHandler.php → ...t/SendAccountVerificationEmailHandler.php b/...r/SendAccountVerificationEmailHandler.php → ...t/SendAccountVerificationEmailHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\SendAccountVerificationEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendAccountVerificationEmail;
 use Sylius\Bundle\CoreBundle\Mailer\Emails;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;

diff --git a/...Handler/SendResetPasswordEmailHandler.php → ...Account/SendResetPasswordEmailHandler.php b/...Handler/SendResetPasswordEmailHandler.php → ...Account/SendResetPasswordEmailHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
-use Sylius\Bundle\ApiBundle\Command\SendResetPasswordEmail;
+use Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail;
 use Sylius\Bundle\CoreBundle\Mailer\Emails;
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Mailer\Sender\SenderInterface;

diff --git a/...dHandler/VerifyCustomerAccountHandler.php → .../Account/VerifyCustomerAccountHandler.php b/...dHandler/VerifyCustomerAccountHandler.php → .../Account/VerifyCustomerAccountHandler.php
@@ -11,10 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
 
 use InvalidArgumentException;
-use Sylius\Bundle\ApiBundle\Command\VerifyCustomerAccount;
+use Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 use Sylius\Component\User\Model\UserInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;

diff --git a/...undle/CommandHandler/BlameCartHandler.php → .../CommandHandler/Cart/BlameCartHandler.php b/...undle/CommandHandler/BlameCartHandler.php → .../CommandHandler/Cart/BlameCartHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Cart;
 
-use Sylius\Bundle\ApiBundle\Command\BlameCart;
+use Sylius\Bundle\ApiBundle\Command\Cart\BlameCart;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;

diff --git a/...ndle/CommandHandler/PickupCartHandler.php → ...CommandHandler/Cart/PickupCartHandler.php b/...ndle/CommandHandler/PickupCartHandler.php → ...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\ApiBundle\Command\Cart\PickupCart;

diff --git a/...ommandHandler/AddProductReviewHandler.php → ...ndler/Catalog/AddProductReviewHandler.php b/...ommandHandler/AddProductReviewHandler.php → ...ndler/Catalog/AddProductReviewHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Catalog;
 
-use Sylius\Bundle\ApiBundle\Command\AddProductReview;
+use Sylius\Bundle\ApiBundle\Command\Catalog\AddProductReview;
 use Sylius\Bundle\ApiBundle\Provider\CustomerProviderInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\ProductInterface;

diff --git a/...dHandler/SendOrderConfirmationHandler.php → ...Checkout/SendOrderConfirmationHandler.php b/...dHandler/SendOrderConfirmationHandler.php → ...Checkout/SendOrderConfirmationHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Checkout;
 
-use Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation;
+use Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation;
 use Sylius\Bundle\CoreBundle\Mailer\Emails;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;

diff --git a/.../SendShipmentConfirmationEmailHandler.php → .../SendShipmentConfirmationEmailHandler.php b/.../SendShipmentConfirmationEmailHandler.php → .../SendShipmentConfirmationEmailHandler.php
@@ -11,9 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ApiBundle\CommandHandler;
+namespace Sylius\Bundle\ApiBundle\CommandHandler\Checkout;
 
-use Sylius\Bundle\ApiBundle\Command\SendShipmentConfirmationEmail;
+use Sylius\Bundle\ApiBundle\Command\Checkout\SendShipmentConfirmationEmail;
 use Sylius\Bundle\CoreBundle\Mailer\Emails;
 use Sylius\Component\Core\Model\ShipmentInterface;
 use Sylius\Component\Core\Repository\ShipmentRepositoryInterface;

diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/ShipShipmentHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Checkout/ShipShipmentHandler.php
@@ -14,8 +14,8 @@
 namespace Sylius\Bundle\ApiBundle\CommandHandler\Checkout;
 
 use SM\Factory\FactoryInterface;
+use Sylius\Bundle\ApiBundle\Command\Checkout\SendShipmentConfirmationEmail;
 use Sylius\Bundle\ApiBundle\Command\Checkout\ShipShipment;
-use Sylius\Bundle\ApiBundle\Command\SendShipmentConfirmationEmail;
 use Sylius\Component\Core\Model\ShipmentInterface;
 use Sylius\Component\Core\Repository\ShipmentRepositoryInterface;
 use Sylius\Component\Shipping\ShipmentTransitions;

diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/ResetPasswordItemDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/ResetPasswordItemDataProvider.php
@@ -15,7 +15,7 @@
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use Sylius\Bundle\ApiBundle\Command\ResetPassword;
+use Sylius\Bundle\ApiBundle\Command\Account\ResetPassword;
 
 /** @experimental */
 final class ResetPasswordItemDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface

diff --git a/src/Sylius/Bundle/ApiBundle/DataProvider/VerifyCustomerAccountItemDataProvider.php b/src/Sylius/Bundle/ApiBundle/DataProvider/VerifyCustomerAccountItemDataProvider.php
@@ -15,7 +15,7 @@
 
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
-use Sylius\Bundle\ApiBundle\Command\VerifyCustomerAccount;
+use Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount;
 
 /** @experimental  */
 final class VerifyCustomerAccountItemDataProvider implements RestrictedDataProviderInterface, ItemDataProviderInterface