Merge pull request #8 from mpysiak/fix-bug-after-qa

Fix add to wishlist for logged user

Author: GSadee

spec/Processor/AddProductVariantToWishlistProcessorSpec.php

@@ -75,7 +75,7 @@ public function it_throws_resource_not_found_exception_when_wishlist_is_not_foun
         $wishlistIdToFind = 999;
 
         $security->getUser()->willReturn($user);
-        $wishlistExtension->findAllByShopUserAndToken()->willReturn([$firstWishlist, $secondWishlist]);
+        $wishlistExtension->findAllByShopUserAndToken($user)->willReturn([$firstWishlist, $secondWishlist]);
 
         $wishlistRepository->find($wishlistIdToFind)->willReturn(null);
 
@@ -91,7 +91,7 @@ public function it_throws_error_if_no_wishlists_are_found_for_single_wishlist_sc
     ): void {
         $security->getUser()->willReturn($user);
 
-        $wishlistExtension->findAllByShopUserAndToken()->willReturn([]);
+        $wishlistExtension->findAllByShopUserAndToken($user)->willReturn([]);
 
         $this->shouldThrow(ResourceNotFoundException::class)
             ->during('process', [$productVariant, null]);
@@ -116,7 +116,7 @@ public function it_adds_product_to_the_single_wishlist_for_logged_in_user(
         $wishlist->getId()->willReturn($wishlistId);
 
         $security->getUser()->willReturn($user);
-        $wishlistExtension->findAllByShopUserAndToken()->willReturn([$wishlist]);
+        $wishlistExtension->findAllByShopUserAndToken($user)->willReturn([$wishlist]);
 
         $wishlist->hasProductVariant($productVariant)->willReturn(false);
         $wishlistProductFactory->createForWishlistAndVariant($wishlist, $productVariant)->willReturn($wishlistProduct);
@@ -157,7 +157,7 @@ public function it_adds_product_to_a_specific_wishlist_for_logged_in_user_with_m
         $targetWishlist->getId()->willReturn($targetWishlistId);
 
         $security->getUser()->willReturn($user);
-        $wishlistExtension->findAllByShopUserAndToken()->willReturn([$otherWishlist, $targetWishlist]);
+        $wishlistExtension->findAllByShopUserAndToken($user)->willReturn([$otherWishlist, $targetWishlist]);
 
         $wishlistRepository->find($targetWishlistId)->willReturn($targetWishlist);
 
@@ -245,7 +245,7 @@ public function it_adds_flash_error_if_product_variant_is_already_in_wishlist(
         $product->getName()->willReturn($productName);
 
         $security->getUser()->willReturn($user);
-        $wishlistExtension->findAllByShopUserAndToken()->willReturn([$wishlist]);
+        $wishlistExtension->findAllByShopUserAndToken($user)->willReturn([$wishlist]);
 
         $wishlist->hasProductVariant($productVariant)->willReturn(true);
         $wishlistProductFactory->createForWishlistAndVariant($wishlist, $productVariant)->willReturn($wishlistProduct);

src/Processor/AddProductVariantToWishlistProcessor.php

@@ -26,6 +26,7 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class AddProductVariantToWishlistProcessor implements AddProductVariantToWishlistProcessorInterface
@@ -44,10 +45,11 @@ public function __construct(
 
     public function process(ProductVariantInterface $productVariant, ?int $wishlistId = null): RedirectResponse
     {
+        /** @var UserInterface|null $user */
         $user = $this->security->getUser();
 
         $wishlists = null !== $user
-            ? $this->wishlistExtension->findAllByShopUserAndToken()
+            ? $this->wishlistExtension->findAllByShopUserAndToken($user)
             : $this->wishlistExtension->findAllByAnonymousAndChannel($this->channelContext->getChannel());
 
         $isSingleWishlist = count($wishlists) < 2;

src/Twig/WishlistExtension.php

@@ -92,7 +92,7 @@ public function findAllByAnonymous(): ?array
         return $this->wishlists[$cacheKey];
     }
 
-    public function findAllByShopUserAndToken(UserInterface $user = null): ?array
+    public function findAllByShopUserAndToken(?UserInterface $user = null): ?array
     {
         $wishlistCookieToken = $this->wishlistCookieTokenResolver->resolve();