Merge branch 'ACP2E-2621' of https://github.com/magento-l3/magento2ce into PR-01-26-2024

Author: chittima

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

@@ -18,11 +18,14 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
     /**
      * Default value for products count that will be shown
      */
-    const DEFAULT_PRODUCTS_COUNT = 10;
+    public const DEFAULT_PRODUCTS_COUNT = 10;
+
+    /**
+     * Block cache tag
+     */
+    public const CACHE_TAG = 'cat_p_new';
 
     /**
-     * Products count
-     *
      * @var int
      */
     protected $_productsCount;
@@ -33,15 +36,11 @@ class NewProduct extends \Magento\Catalog\Block\Product\AbstractProduct implemen
     protected $httpContext;
 
     /**
-     * Catalog product visibility
-     *
      * @var \Magento\Catalog\Model\Product\Visibility
      */
     protected $_catalogProductVisibility;
 
     /**
-     * Product collection factory
-     *
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
      */
     protected $_productCollectionFactory;
@@ -199,6 +198,6 @@ public function getProductsCount()
      */
     public function getIdentities()
     {
-        return [\Magento\Catalog\Model\Product::CACHE_TAG];
+        return [self::CACHE_TAG];
     }
 }

app/code/Magento/Catalog/Model/Product.php

@@ -2380,6 +2380,7 @@ private function getProductCategoryIdentities(array $categoryIds): array
      * Get identities
      *
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getIdentities()
     {
@@ -2406,6 +2407,12 @@ public function getIdentities()
             $identities[] = self::CACHE_TAG;
         }
 
+        $isProductNew = $this->getOrigData('news_from_date') != $this->getData('news_from_date')
+            || $this->isObjectNew();
+        if ($isProductNew && ($isStatusChanged || $this->getStatus() == Status::STATUS_ENABLED)) {
+            $identities[] = \Magento\Catalog\Block\Product\NewProduct::CACHE_TAG;
+        }
+
         return array_unique($identities);
     }
 

app/code/Magento/Catalog/Test/Unit/Block/Product/NewProductTest.php

@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Block\Product\ListProduct;
 use Magento\Catalog\Block\Product\NewProduct;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
@@ -33,7 +32,7 @@ protected function tearDown(): void
 
     public function testGetIdentities()
     {
-        $this->assertEquals([Product::CACHE_TAG], $this->block->getIdentities());
+        $this->assertEquals([NewProduct::CACHE_TAG], $this->block->getIdentities());
     }
 
     public function testScope()

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -983,7 +983,7 @@ private function getNoStockStatusChangesData(MockObject $extensionAttributesMock
     private function getNewProductProviderData(): array
     {
         return [
-            ['cat_p_1', 'cat_c_p_1'],
+            ['cat_p_1', 'cat_c_p_1', 'cat_p_new'],
             null,
             [
                 'id' => 1,