Merge pull request #2 from pogorivan/patch-1

Update MergeUserWishlistItemsListener.php

Author: bitbager

spec/EventListener/MergeUserWishlistItemsListenerSpec.php

@@ -69,7 +69,7 @@ function it_adds_cookie_items_to_user_items_if_both_exist(
         $token->getUser()->willReturn($shopUser);
         $interactiveLoginEvent->getRequest()->willReturn($request);
         $request->cookies = $parameterBag;
-        $parameterBag->get('bitbag_sylius_wishlist')->willReturn("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId");
+        $parameterBag->get('bitbag_sylius_wishlist', '')->willReturn("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId");
         $wishlistRepository->findByToken("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId")->willReturn($cookieWishlist);
         $wishlistRepository->findByShopUser($shopUser)->willReturn($userWishlist);
         $cookieWishlist->getWishlistProducts()->willReturn(new ArrayCollection([$wishlistProduct->getWrappedObject()]));
@@ -94,7 +94,7 @@ function it_associates_anon_wishlsit_with_a_user_if_user_does_not_have_one(
         $token->getUser()->willReturn($shopUser);
         $interactiveLoginEvent->getRequest()->willReturn($request);
         $request->cookies = $parameterBag;
-        $parameterBag->get('bitbag_sylius_wishlist')->willReturn("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId");
+        $parameterBag->get('bitbag_sylius_wishlist', '')->willReturn("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId");
         $wishlistRepository->findByToken("Fq8N4W6mk12i9J2HX0U60POGG5UEzSgGW37OWd6sv2dd8FlBId")->willReturn($cookieWishlist);
         $wishlistRepository->findByShopUser($shopUser)->willReturn(null);
 

src/EventListener/MergeUserWishlistItemsListener.php

@@ -58,7 +58,7 @@ public function onInteractiveLogin(InteractiveLoginEvent $interactiveLoginEvent)
 
     private function resolveWishlist(Request $request, ShopUserInterface $shopUser): void
     {
-        $cookieWishlistToken = $request->cookies->get($this->wishlistCookieToken);
+        $cookieWishlistToken = $request->cookies->get($this->wishlistCookieToken, '');
         /** @var WishlistInterface|null $cookieWishlist */
         $cookieWishlist = $this->wishlistRepository->findByToken($cookieWishlistToken);
         $userWishlist = $this->wishlistRepository->findByShopUser($shopUser);