update code

Author: rogerdz

app/code/Magento/Catalog/Block/Product/NewProduct.php

@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Block\Product;
 
 use Magento\Customer\Model\Context as CustomerContext;
-use Magento\Framework\App\Http\Context as HttpContext;
 
 /**
  * New products block
@@ -19,29 +18,29 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
     /**
      * Default value for products count that will be shown
      */
-    public const DEFAULT_PRODUCTS_COUNT = 10;
+    const DEFAULT_PRODUCTS_COUNT = 10;
 
     /**
-     * How much product should be displayed at once
+     * Products count
      *
      * @var int
      */
     protected $_productsCount;
 
     /**
-     * @var HttpContext
+     * @var \Magento\Framework\App\Http\Context
      */
     protected $httpContext;
 
     /**
-     * Catalog product visibility model
+     * Catalog product visibility
      *
      * @var \Magento\Catalog\Model\Product\Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Catalog product collection factory
+     * Product collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
      */
@@ -58,7 +57,7 @@ public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
-        HttpContext $httpContext,
+        \Magento\Framework\App\Http\Context $httpContext,
         array $data = []
     ) {
         $this->_productCollectionFactory = $productCollectionFactory;
@@ -96,15 +95,13 @@ protected function _construct()
      */
     public function getCacheKeyInfo()
     {
-        $store = $this->_storeManager->getStore();
         return [
            'CATALOG_PRODUCT_NEW',
-           $store->getId(),
+           $this->_storeManager->getStore()->getId(),
            $this->_design->getDesignTheme()->getId(),
            $this->httpContext->getValue(CustomerContext::CONTEXT_GROUP),
            'template' => $this->getTemplate(),
-           $this->getProductsCount(),
-           $this->httpContext->getValue(HttpContext::CONTEXT_CURRENCY) ?: $store->getDefaultCurrency()->getCode()
+           $this->getProductsCount()
         ];
     }
 

app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Product\Widget;
 
+use Magento\Framework\App\Http\Context as HttpContext;
+
 /**
  * New products widget
  */
@@ -13,29 +15,29 @@ class NewWidget extends \Magento\Catalog\Block\Product\NewProduct implements \Ma
     /**
      * Display products type - all products
      */
-    const DISPLAY_TYPE_ALL_PRODUCTS = 'all_products';
+    public const DISPLAY_TYPE_ALL_PRODUCTS = 'all_products';
 
     /**
      * Display products type - new products
      */
-    const DISPLAY_TYPE_NEW_PRODUCTS = 'new_products';
+    public const DISPLAY_TYPE_NEW_PRODUCTS = 'new_products';
 
     /**
      * Default value whether show pager or not
      */
-    const DEFAULT_SHOW_PAGER = false;
+    public const DEFAULT_SHOW_PAGER = false;
 
     /**
      * Default value for products per page
      */
-    const DEFAULT_PRODUCTS_PER_PAGE = 5;
+    public const DEFAULT_PRODUCTS_PER_PAGE = 5;
 
     /**
      * Name of request parameter for page number value
      *
      * @deprecated
      */
-    const PAGE_VAR_NAME = 'np';
+    public const PAGE_VAR_NAME = 'np';
 
     /**
      * Instance of pager block
@@ -134,13 +136,15 @@ public function getCurrentPage()
      */
     public function getCacheKeyInfo()
     {
+        $store = $this->_storeManager->getStore();
         return array_merge(
             parent::getCacheKeyInfo(),
             [
                 $this->getDisplayType(),
                 $this->getProductsPerPage(),
                 (int) $this->getRequest()->getParam($this->getData('page_var_name'), 1),
-                $this->serializer->serialize($this->getRequest()->getParams())
+                $this->serializer->serialize($this->getRequest()->getParams()),
+                $this->httpContext->getValue(HttpContext::CONTEXT_CURRENCY) ?: $store->getDefaultCurrency()->getCode()
             ]
         );
     }
@@ -268,7 +272,7 @@ public function getProductPriceHtml(
             ? $arguments['display_minimal_price']
             : true;
 
-            /** @var \Magento\Framework\Pricing\Render $priceRender */
+        /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
 
         $price = '';

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php

@@ -53,12 +53,10 @@ public function testGetCacheKeyInfo()
         $this->assertEquals('CATALOG_PRODUCT_NEW', $info[0]);
 
         $this->assertSame(1, array_shift($keys));
-
-        $currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Store\Model\StoreManagerInterface::class
-        )->getStore();
         $this->assertEquals(
-            $currentStore->getId(),
+            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Store\Model\StoreManagerInterface::class
+            )->getStore()->getId(),
             $info[1]
         );
 
@@ -86,9 +84,6 @@ public function testGetCacheKeyInfo()
          */
         $this->assertSame(4, array_shift($keys));
         $this->assertNotEquals('', $info[4]);
-
-        $this->assertSame(5, array_shift($keys));
-        $this->assertSame($currentStore->getDefaultCurrency()->getCode(), $info[5]);
     }
 
     public function testSetGetProductsCount()
@@ -141,5 +136,11 @@ public function testNewWidgetGetCacheKeyInfo()
 
         $this->assertEquals('CATALOG_PRODUCT_NEW', $info[0]);
         $this->assertEquals(json_encode($requestParams), $info[8]);
+
+        $currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->getStore();
+
+        $this->assertSame($currentStore->getDefaultCurrency()->getCode(), $info[9]);
     }
 }