MAGETWO-66067: Remove usages of unserialize in module Magento/Wishlist

- Removed unserialize
- Added Unit test

Author: Oleksandr Dubovyk

app/code/Magento/Wishlist/Model/Wishlist.php

@@ -10,6 +10,8 @@
 use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory;
 use Magento\Wishlist\Model\ResourceModel\Wishlist as ResourceWishlist;
 use Magento\Wishlist\Model\ResourceModel\Wishlist\Collection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Wishlist model
@@ -118,6 +120,13 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      */
     protected $productRepository;
 
+    /**
+     * Json Serializer Instance
+     *
+     * @var Json
+     */
+    protected $serializer;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -135,6 +144,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * @param ProductRepositoryInterface $productRepository
      * @param bool $useCurrentWebsite
      * @param array $data
+     * @param Json|null $serializer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -153,7 +163,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         ProductRepositoryInterface $productRepository,
         $useCurrentWebsite = true,
-        array $data = []
+        array $data = [],
+        Json $serializer = null
     ) {
         $this->_useCurrentWebsite = $useCurrentWebsite;
         $this->_catalogProduct = $catalogProduct;
@@ -165,6 +176,7 @@ public function __construct(
         $this->_productFactory = $productFactory;
         $this->mathRandom = $mathRandom;
         $this->dateTime = $dateTime;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->productRepository = $productRepository;
     }
@@ -403,7 +415,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
         if ($buyRequest instanceof \Magento\Framework\DataObject) {
             $_buyRequest = $buyRequest;
         } elseif (is_string($buyRequest)) {
-            $_buyRequest = new \Magento\Framework\DataObject(unserialize($buyRequest));
+             $_buyRequest = new \Magento\Framework\DataObject($this->serializer->unserialize($buyRequest));
         } elseif (is_array($buyRequest)) {
             $_buyRequest = new \Magento\Framework\DataObject($buyRequest);
         } else {

app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php

@@ -87,6 +87,11 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
      */
     protected $productRepository;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $serializer;
+
     protected function setUp()
     {
         $context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
@@ -134,6 +139,9 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->productRepository = $this->getMock(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $this->serializer = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $context->expects($this->once())
             ->method('getEventDispatcher')
@@ -154,7 +162,9 @@ protected function setUp()
             $this->mathRandom,
             $this->dateTime,
             $this->productRepository,
-            false
+            false,
+            [],
+            $this->serializer
         );
     }
 
@@ -286,7 +296,61 @@ public function testUpdateItem($itemId, $buyRequest, $param)
     public function updateItemDataProvider()
     {
         return [
-            '0' => [1, new \Magento\Framework\DataObject(), null],
+            '0' => [1, new \Magento\Framework\DataObject(), null]
         ];
     }
+
+    public function testAddNewItem()
+    {
+        $productId = 1;
+        $storeId = 1;
+        $buyRequest = json_encode([
+            'number' => 42,
+            'string' => 'string_value',
+            'boolean' => true,
+            'collection' => [1, 2, 3],
+            'product' => 1,
+            'form_key' => 'abc'
+        ]);
+        $result = 'product';
+
+        $instanceType = $this->getMockBuilder(\Magento\Catalog\Model\Product\Type\AbstractType::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $instanceType->expects($this->once())
+            ->method('processConfiguration')
+            ->willReturn('product');
+
+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'hasWishlistStoreId', 'getStoreId', 'getTypeInstance'])
+            ->getMock();
+        $productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($productId);
+        $productMock->expects($this->once())
+            ->method('hasWishlistStoreId')
+            ->willReturn(false);
+        $productMock->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $productMock->expects($this->once())
+            ->method('getTypeInstance')
+            ->willReturn($instanceType);
+
+        $this->productRepository->expects($this->once())
+            ->method('getById')
+            ->with($productId, false, $storeId)
+            ->willReturn($productMock);
+
+        $this->serializer->expects($this->once())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($value) {
+                    return json_decode($value, true);
+                }
+            );
+
+        $this->assertEquals($result, $this->wishlist->addNewItem($productMock, $buyRequest));
+    }
 }