Merge branch 'MAGETWO-66065' of github.com:magento-troll/magento2ce into MAGETWO-65622

Author: slopukhov

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -9,6 +9,8 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Widget\Block\BlockInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Catalog Products List widget block
@@ -85,6 +87,13 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     private $priceCurrency;
 
+    /**
+     * Json Serializer Instance
+     *
+     * @var Json
+     */
+    private $json;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -94,6 +103,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\CatalogWidget\Model\Rule $rule
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
+     * @param Json|null $json
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -103,14 +113,16 @@ public function __construct(
         \Magento\Rule\Model\Condition\Sql\Builder $sqlBuilder,
         \Magento\CatalogWidget\Model\Rule $rule,
         \Magento\Widget\Helper\Conditions $conditionsHelper,
-        array $data = []
+        array $data = [],
+        Json $json = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
         $this->httpContext = $httpContext;
         $this->sqlBuilder = $sqlBuilder;
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
+        $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
         parent::__construct(
             $context,
             $data
@@ -155,7 +167,7 @@ public function getCacheKeyInfo()
             intval($this->getRequest()->getParam($this->getData('page_var_name'), 1)),
             $this->getProductsPerPage(),
             $conditions,
-            serialize($this->getRequest()->getParams())
+            $this->json->serialize($this->getRequest()->getParams())
         ];
     }
 

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -116,7 +116,8 @@ protected function setUp()
                 'rule' => $this->rule,
                 'conditionsHelper' => $this->widgetConditionsHelper,
                 'storeManager' => $this->storeManager,
-                'design' => $this->design
+                'design' => $this->design,
+                'json' => $this->serializer
             ]
         );
         $this->request = $arguments['context']->getRequest();
@@ -150,6 +151,12 @@ public function testGetCacheKeyInfo()
         $this->request->expects($this->once())->method('getParams')->willReturn('request_params');
         $this->priceCurrency->expects($this->once())->method('getCurrencySymbol')->willReturn('$');
 
+        $this->serializer->expects($this->any())
+            ->method('serialize')
+            ->willReturnCallback(function ($value) {
+                return json_encode($value);
+            });
+
         $cacheKey = [
             'CATALOG_PRODUCTS_LIST_WIDGET',
             '$',
@@ -159,7 +166,7 @@ public function testGetCacheKeyInfo()
             1,
             5,
             'some_serialized_conditions',
-            serialize('request_params')
+            json_encode('request_params')
         ];
         $this->assertEquals($cacheKey, $this->productsList->getCacheKeyInfo());
     }