MC-40417: Unexpected behavior when updating a Product with a Customizable Option (File) in the Wish List

Author: OlgaVasyltsun

app/code/Magento/Wishlist/Controller/Index/Add.php

@@ -6,15 +6,20 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\App\Action;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Wishlist\Controller\WishlistProviderInterface;
 
 /**
  * Wish list Add controller
@@ -24,12 +29,12 @@
 class Add extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
 {
     /**
-     * @var \Magento\Wishlist\Controller\WishlistProviderInterface
+     * @var WishlistProviderInterface
      */
     protected $wishlistProvider;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $_customerSession;
 
@@ -43,23 +48,29 @@ class Add extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPost
      */
     protected $formKeyValidator;
 
+    /**
+     * @var RedirectInterface
+     */
     private $redirect;
 
+    /**
+     * @var mixed UrlInterface
+     */
     private $urlBuilder;
 
     /**
-     * @param Action\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
+     * @param Context $context
+     * @param Session $customerSession
+     * @param WishlistProviderInterface $wishlistProvider
      * @param ProductRepositoryInterface $productRepository
      * @param Validator $formKeyValidator
-     * @param RedirectInterface $redirect
-     * @param UrlInterface $urlBuilder
+     * @param RedirectInterface|null $redirect
+     * @param UrlInterface|null $urlBuilder
      */
     public function __construct(
-        Action\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
+        Context $context,
+        Session $customerSession,
+        WishlistProviderInterface $wishlistProvider,
         ProductRepositoryInterface $productRepository,
         Validator $formKeyValidator,
         RedirectInterface $redirect = null,
@@ -75,15 +86,17 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\Controller\ResultInterface
+     * Adding new item
+     *
+     * @return ResultInterface
      * @throws NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function execute()
     {
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         if (!$this->formKeyValidator->validate($this->getRequest())) {
             return $resultRedirect->setPath('*/');
@@ -126,7 +139,7 @@ public function execute()
 
             $result = $wishlist->addNewItem($product, $buyRequest);
             if (is_string($result)) {
-                throw new \Magento\Framework\Exception\LocalizedException(__($result));
+                throw new LocalizedException(__($result));
             }
             if ($wishlist->isObjectNew()) {
                 $wishlist->save();
@@ -153,7 +166,7 @@ public function execute()
                 ]
             );
             // phpcs:disable Magento2.Exceptions.ThrowCatch
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage(
                 __('We can\'t add the item to Wish List right now: %1.', $e->getMessage())
             );

app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddSimpleProductWithCustomizableFileOptionToWishlistTest.xml

@@ -10,7 +10,8 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontAddSimpleProductWithCustomizableFileOptionToWishlistTest">
         <annotations>
-            <stories value="Wishlist"/>
+            <features value="Wishlist"/>
+            <stories value="Add product to wishlist"/>
             <title value="Add simple product with customizable file option to wishlist"/>
             <description value="Add simple Product with customizable file option to Wishlist and verify customizable options are preserved"/>
             <severity value="CRITICAL"/>