fix/OP-5feature/OP-551-Plugin-to-Sylius-2.0

Paweł Piórkowski · Paweł Piórkowski · commit dcf3e9ddb7e5 · 2025-01-31T13:23:49.000+01:00
diff --git a/spec/Action/AddProductToWishlistActionSpec.php b/spec/Action/AddProductToWishlistActionSpec.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace spec\BitBag\SyliusWishlistPlugin\Controller\Action;
+namespace spec\BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Action\AddProductToWishlistAction;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
diff --git a/spec/Action/AddProductVariantToWishlistActionSpec.php b/spec/Action/AddProductVariantToWishlistActionSpec.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace spec\BitBag\SyliusWishlistPlugin\Controller\Action;
+namespace spec\BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Action\AddProductVariantToWishlistAction;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
diff --git a/spec/Action/ListWishlistProductsActionSpec.php b/spec/Action/ListWishlistProductsActionSpec.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace spec\BitBag\SyliusWishlistPlugin\Controller\Action;
+namespace spec\BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Action\ListWishlistProductsAction;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
diff --git a/spec/Action/RemoveProductFromWishlistActionSpec.php b/spec/Action/RemoveProductFromWishlistActionSpec.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace spec\BitBag\SyliusWishlistPlugin\Controller\Action;
+namespace spec\BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Action\RemoveProductFromWishlistAction;
 use BitBag\SyliusWishlistPlugin\Context\WishlistContextInterface;
diff --git a/spec/Action/RenderHeaderTemplateActionSpec.php b/spec/Action/RenderHeaderTemplateActionSpec.php
@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace spec\BitBag\SyliusWishlistPlugin\Controller\Action;
+namespace spec\BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Action\RenderHeaderTemplateAction;
 use BitBag\SyliusWishlistPlugin\Resolver\WishlistsResolverInterface;
diff --git a/src/Action/AddProductToWishlistAction.php b/src/Action/AddProductToWishlistAction.php
@@ -12,7 +12,6 @@
 namespace BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
-use BitBag\SyliusWishlistPlugin\Entity\WishlistProductInterface;
 use BitBag\SyliusWishlistPlugin\Exception\WishlistNotFoundException;
 use BitBag\SyliusWishlistPlugin\Factory\WishlistProductFactoryInterface;
 use BitBag\SyliusWishlistPlugin\Resolver\WishlistsResolverInterface;
diff --git a/src/Action/AddSelectedProductsToCartAction.php b/src/Action/AddSelectedProductsToCartAction.php
@@ -21,7 +21,6 @@
 
 final class AddSelectedProductsToCartAction extends BaseWishlistProductsAction
 {
-
     protected function handleCommand(FormInterface $form): void
     {
         try {
diff --git a/src/Action/ApiPlatform/RemoveProductFromWishlistAction.php b/src/Action/ApiPlatform/RemoveProductFromWishlistAction.php
@@ -19,9 +19,9 @@
 
 final readonly class RemoveProductFromWishlistAction
 {
-
     public function __construct(
-        private MessageBusInterface $messageBus)
+        private MessageBusInterface $messageBus,
+    )
     {
     }
 
diff --git a/src/Action/ApiPlatform/RemoveProductVariantFromWishlistAction.php b/src/Action/ApiPlatform/RemoveProductVariantFromWishlistAction.php
@@ -20,7 +20,8 @@
 final readonly class RemoveProductVariantFromWishlistAction
 {
     public function __construct(
-        private MessageBusInterface $messageBus)
+        private MessageBusInterface $messageBus,
+    )
     {
     }
 
diff --git a/src/Action/ApiPlatform/RemoveWishlistAction.php b/src/Action/ApiPlatform/RemoveWishlistAction.php
@@ -20,9 +20,8 @@
 final readonly class RemoveWishlistAction
 {
     public function __construct(
-        private MessageBusInterface $messageBus
-    )
-    {
+        private MessageBusInterface $messageBus,
+    ) {
     }
 
     public function __invoke(Request $request): JsonResponse
diff --git a/src/Action/ExportSelectedProductsToCsvAction.php b/src/Action/ExportSelectedProductsToCsvAction.php
@@ -32,21 +32,20 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-final readonly class ExportSelectedProductsToCsvAction
+final class ExportSelectedProductsToCsvAction
 {
     private string $wishlistName;
 
     public function __construct(
-        private CartContextInterface              $cartContext,
-        private FormFactoryInterface              $formFactory,
-        private RequestStack                      $requestStack,
-        private WishlistCommandProcessorInterface $wishlistCommandProcessor,
-        private UrlGeneratorInterface             $urlGenerator,
-        private TranslatorInterface               $translator,
-        private WishlistRepositoryInterface       $wishlistRepository,
-        private MessageBusInterface               $messageBus,
-    )
-    {
+        private readonly CartContextInterface $cartContext,
+        private readonly FormFactoryInterface $formFactory,
+        private readonly RequestStack $requestStack,
+        private readonly WishlistCommandProcessorInterface $wishlistCommandProcessor,
+        private readonly UrlGeneratorInterface $urlGenerator,
+        private readonly TranslatorInterface $translator,
+        private readonly WishlistRepositoryInterface $wishlistRepository,
+        private readonly MessageBusInterface $messageBus,
+    ) {
     }
 
     public function __invoke(int $wishlistId, Request $request): Response
@@ -80,7 +79,7 @@ private function createForm(int $wishlistId): FormInterface
         $wishlist = $this->wishlistRepository->find($wishlistId);
         $cart = $this->cartContext->getCart();
 
-        $this->wishlistName = (string)$wishlist->getName();
+        $this->wishlistName = (string) $wishlist->getName();
 
         $commandsArray = $this->wishlistCommandProcessor->createWishlistItemsCollection($wishlist->getWishlistProducts());
 
diff --git a/src/Action/ImportWishlistFromCsvAction.php b/src/Action/ImportWishlistFromCsvAction.php
@@ -30,12 +30,11 @@
 {
     public function __construct(
         private FormFactoryInterface $formFactory,
-        private RequestStack               $requestStack,
-        private Environment                $twigEnvironment,
+        private RequestStack $requestStack,
+        private Environment $twigEnvironment,
         private WishlistsResolverInterface $wishlistsResolver,
-        private MessageBusInterface        $messageBus,
-    )
-    {
+        private MessageBusInterface $messageBus,
+    ) {
     }
 
     public function __invoke(Request $request): Response
@@ -78,7 +77,7 @@ private function handleCommand(FormInterface $form, Request $request): Response
         /** @var Wishlist $wishlist */
         $wishlist = $form->get('wishlists')->getData();
 
-        $command = new ImportWishlistFromCsv($file->getFileInfo(), $request, (int)$wishlist->getId());
+        $command = new ImportWishlistFromCsv($file->getFileInfo(), $request, (int) $wishlist->getId());
 
         return $this->messageBus->dispatch($command);
     }
diff --git a/src/Action/RemoveProductFromWishlistAction.php b/src/Action/RemoveProductFromWishlistAction.php
@@ -12,7 +12,6 @@
 namespace BitBag\SyliusWishlistPlugin\Action;
 
 use BitBag\SyliusWishlistPlugin\Context\WishlistContextInterface;
-use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
diff --git a/src/BitBagSyliusWishlistPlugin.php b/src/BitBagSyliusWishlistPlugin.php
@@ -27,7 +27,6 @@ public function getPath(): string
         return \dirname(__DIR__);
     }
 
-
     public function getContainerExtension(): ?ExtensionInterface
     {
         $this->containerExtension = $this->createContainerExtension() ?? false;
diff --git a/src/Command/AddProductsToCart.php b/src/Command/AddProductsToCart.php
@@ -16,7 +16,8 @@
 final readonly class AddProductsToCart implements AddProductsToCartInterface
 {
     public function __construct(
-        private Collection $wishlistProducts)
+        private Collection $wishlistProducts,
+    )
     {
     }
 
diff --git a/src/Controller/OrderItemController.php b/src/Controller/OrderItemController.php
@@ -83,6 +83,5 @@ public function addAction(Request $request): Response
                 'variantId' => $variant->getId(),
             ]));
         }
-
     }
 }
diff --git a/src/DataTransformer/Wishlist/WishlistTokenValueAwareInputCommandDataTransformer.php b/src/DataTransformer/Wishlist/WishlistTokenValueAwareInputCommandDataTransformer.php
@@ -11,13 +11,13 @@
 
 namespace BitBag\SyliusWishlistPlugin\DataTransformer\Wishlist;
 
-use ApiPlatform\Core\Serializer\AbstractItemNormalizer;
 use BitBag\SyliusWishlistPlugin\Command\WishlistTokenValueAwareInterface;
 use BitBag\SyliusWishlistPlugin\Entity\WishlistInterface;
-use Sylius\Bundle\ApiBundle\DataTransformer\CommandDataTransformerInterface;
 
-final class WishlistTokenValueAwareInputCommandDataTransformer implements CommandDataTransformerInterface
+final class WishlistTokenValueAwareInputCommandDataTransformer
 {
+    public const OBJECT_TO_POPULATE = 'object_to_populate';
+
     /**
      * @param WishlistTokenValueAwareInterface|mixed $object
      */
@@ -27,7 +27,7 @@ public function transform(
         array $context = [],
     ): WishlistTokenValueAwareInterface {
         /** @var WishlistInterface $wishlist */
-        $wishlist = $context[AbstractItemNormalizer::OBJECT_TO_POPULATE];
+        $wishlist = $context[self::OBJECT_TO_POPULATE];
 
         $object->setWishlist($wishlist);
 
diff --git a/src/Entity/Wishlist.php b/src/Entity/Wishlist.php
@@ -32,7 +32,6 @@ class Wishlist implements WishlistInterface
 
     protected ?ShopUserInterface $shopUser = null;
 
-    /** @var WishlistTokenInterface|null */
     protected ?WishlistTokenInterface $token;
 
     protected ?ChannelInterface $channel;
diff --git a/src/EventSubscriber/LoggedUserWishlistSubscriber.php b/src/EventSubscriber/LoggedUserWishlistSubscriber.php
@@ -26,9 +26,9 @@
 final readonly class LoggedUserWishlistSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private SectionProviderInterface   $uriBasedSectionContext,
+        private SectionProviderInterface $uriBasedSectionContext,
         private WishlistsResolverInterface $wishlistsResolver,
-        private EntityManagerInterface     $entityManager,
+        private EntityManagerInterface $entityManager,
     ) {
     }
 
diff --git a/src/Form/Type/AddProductsToCartType.php b/src/Form/Type/AddProductsToCartType.php
@@ -28,8 +28,8 @@
 final class AddProductsToCartType extends AbstractType
 {
     public function __construct(
-        private readonly AddToCartCommandFactoryInterface   $addToCartCommandFactory,
-        private readonly CartItemFactoryInterface           $cartItemFactory,
+        private readonly AddToCartCommandFactoryInterface $addToCartCommandFactory,
+        private readonly CartItemFactoryInterface $cartItemFactory,
         private readonly OrderItemQuantityModifierInterface $orderItemQuantityModifier,
     ) {
     }
diff --git a/src/Form/Type/WishlistCollectionType.php b/src/Form/Type/WishlistCollectionType.php
@@ -28,7 +28,7 @@
 final class WishlistCollectionType extends AbstractType
 {
     public function __construct(
-        private readonly TranslatorInterface                        $translator,
+        private readonly TranslatorInterface $translator,
         private readonly SelectedWishlistProductsProcessorInterface $selectedWishlistProductsProcessor,
     ) {
     }
diff --git a/src/Resolver/WishlistsResolver.php b/src/Resolver/WishlistsResolver.php
@@ -18,7 +18,6 @@
 use Sylius\Component\Channel\Context\ChannelNotFoundException;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
-use Symfony\Component\Messenger\HandleTrait;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 
diff --git a/src/Twig/WishlistExtension.php b/src/Twig/WishlistExtension.php
@@ -38,7 +38,7 @@ final class WishlistExtension extends AbstractExtension
     private array $wishlists = [];
 
     public function __construct(
-        private readonly WishlistRepositoryInterface          $wishlistRepository,
+        private readonly WishlistRepositoryInterface $wishlistRepository,
         private readonly WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
     ) {
     }
diff --git a/src/Voter/WishlistVoter.php b/src/Voter/WishlistVoter.php
@@ -25,8 +25,7 @@ final class WishlistVoter extends Voter
 
     public function __construct(
         private readonly Security $security,
-    )
-    {
+    ) {
     }
 
     protected function supports(string $attribute, mixed $subject): bool
@@ -36,15 +35,14 @@ protected function supports(string $attribute, mixed $subject): bool
             self::DELETE,
         ];
 
-        return ($subject instanceof WishlistInterface || in_array($attribute, $attributes, true));
+        return $subject instanceof WishlistInterface || in_array($attribute, $attributes, true);
     }
 
     protected function voteOnAttribute(
-        string         $attribute,
-                       $subject,
+        string $attribute,
+        $subject,
         TokenInterface $token,
-    ): bool
-    {
+    ): bool {
         $user = $token->getUser();
 
         if (!$user instanceof ShopUserInterface) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`final class AddSelectedProductsToCartAction extends BaseWishlistProductsAction`
`23`	`23`	`{`
`24`		`-`
`25`	`24`	`protected function handleCommand(FormInterface $form): void`
`26`	`25`	`{`
`27`	`26`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`
`20`	`20`	`final readonly class RemoveProductFromWishlistAction`
`21`	`21`	`{`
`22`		`-`
`23`	`22`	`public function __construct(`
`24`		`- private MessageBusInterface $messageBus)`
	`23`	`+ private MessageBusInterface $messageBus,`
	`24`	`+ )`
`25`	`25`	`{`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@`
`20`	`20`	`final readonly class RemoveProductVariantFromWishlistAction`
`21`	`21`	`{`
`22`	`22`	`public function __construct(`
`23`		`- private MessageBusInterface $messageBus)`
	`23`	`+ private MessageBusInterface $messageBus,`
	`24`	`+ )`
`24`	`25`	`{`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,8 @@`
`20`	`20`	`final readonly class RemoveWishlistAction`
`21`	`21`	`{`
`22`	`22`	`public function __construct(`
`23`		`- private MessageBusInterface $messageBus`
`24`		`- )`
`25`		`- {`
	`23`	`+ private MessageBusInterface $messageBus,`
	`24`	`+ ) {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`public function __invoke(Request $request): JsonResponse`