Apply suggestions from code review

src/Sylius/Bundle/CoreBundle/Command/Shop/Account/SendAccountRegistrationEmail.php

@@ -20,8 +20,8 @@ class SendAccountRegistrationEmail
 {
     public function __construct(
         public readonly string $shopUserEmail,
-        public readonly string $localeCode,
         public readonly string $channelCode,
+        public readonly string $localeCode,
     ) {
     }
 }

src/Sylius/Bundle/CoreBundle/Command/Shop/Account/VerifyShopUser.php

@@ -19,9 +19,9 @@ namespace Sylius\Bundle\CoreBundle\Command\Shop\Account;
 class VerifyShopUser
 {
     public function __construct(
+        public readonly string $token,
         public readonly string $channelCode,
         public readonly string $localeCode,
-        public readonly string $token,
     ) {
     }
 }

src/Sylius/Bundle/CoreBundle/CommandHandler/Shop/Account/SendAccountRegistrationEmailHandler.php

@@ -20,9 +20,10 @@ use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Webmozart\Assert\Assert;
 
 #[AsMessageHandler]
-final class SendAccountRegistrationEmailHandler
+final readonly class SendAccountRegistrationEmailHandler
 {
     public function __construct(
         private UserRepositoryInterface $shopUserRepository,
@@ -35,19 +36,11 @@ final class SendAccountRegistrationEmailHandler
     {
         /** @var ShopUserInterface|null $shopUser */
         $shopUser = $this->shopUserRepository->findOneByEmail($command->shopUserEmail);
-        if (null === $shopUser) {
+        Assert::notNull($shopUser, sprintf('There is no shop user with %s email', $command->shopUserEmail));
-            throw new \InvalidArgumentException(
-                sprintf('There is no shop user with %s email', $command->shopUserEmail),
-            );
-        }
 
         /** @var ChannelInterface|null $channel */
         $channel = $this->channelRepository->findOneByCode($command->channelCode);
-        if (null === $channel) {
+        Assert::notNull($channel, sprintf('There is no channel with %s email', $command->channelCode));
-            throw new \InvalidArgumentException(
-                sprintf('There is no channel with %s code', $command->channelCode),
-            );
-        }
 
         if ($channel->isAccountVerificationRequired() && !$shopUser->isEnabled()) {
             return;

src/Sylius/Bundle/CoreBundle/CommandHandler/Shop/Account/VerifyShopUserHandler.php

@@ -21,6 +21,7 @@ use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
+use Webmozart\Assert\Assert;
 
 #[AsMessageHandler]
 final readonly class VerifyShopUserHandler
@@ -37,18 +38,14 @@ final readonly class VerifyShopUserHandler
     {
         /** @var ShopUserInterface|null $user */
         $user = $this->shopUserRepository->findOneBy(['emailVerificationToken' => $command->token]);
-        if (null === $user) {
+        Assert::notNull($user, sprintf('There is no shop user with %s email verification token', $command->token));
-            throw new \InvalidArgumentException(
-                sprintf('There is no shop user with %s email verification token', $command->token),
-            );
-        }
 
         $user->setVerifiedAt($this->clock->now());
         $user->setEmailVerificationToken(null);
         $user->enable();
 
         $this->commandBus->dispatch(
-            new SendAccountRegistrationEmail($user->getEmail(), $command->localeCode, $command->channelCode),
+            new SendAccountRegistrationEmail($user->getEmail(), $command->channelCode, $command->localeCode),
             [new DispatchAfterCurrentBusStamp()],
         );
     }

src/Sylius/Bundle/ShopBundle/Controller/VerifyShopUserAction.php

@@ -55,9 +55,9 @@ final readonly class VerifyShopUserAction
         }
 
         $this->messageBus->dispatch(new VerifyShopUser(
+            $token,
             $this->channelContext->getChannel()->getCode(),
             $this->localeContext->getLocaleCode(),
-            $token,
         ));
 
         FlashBagProvider::getFlashBag($this->requestStack)->add('success', 'sylius.user.verify_email');