Merge branch '2.4-develop' into cron-log

Author: engcom-Charlie

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/Indexer/Product/Full.php

@@ -6,7 +6,9 @@
 
 namespace Magento\Catalog\Model\Indexer\Product;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\ActionInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 
 /**
@@ -24,26 +26,35 @@ class Full implements ActionInterface
      */
     private $indexerList;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
     /**
      * Initialize dependencies
      *
      * @param IndexerRegistry $indexerRegistry
      * @param string[] $indexerList
+     * @param ConfigInterface|null $config
      */
     public function __construct(
         IndexerRegistry $indexerRegistry,
-        array $indexerList
+        array $indexerList,
+        ?ConfigInterface $config = null
     ) {
         $this->indexerRegistry = $indexerRegistry;
         $this->indexerList = $indexerList;
+        $this->config = $config
+            ?? ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function executeFull()
     {
-        foreach ($this->indexerList as $indexerName) {
+        foreach ($this->getIndexerList() as $indexerName) {
             $indexer = $this->indexerRegistry->get($indexerName);
             if (!$indexer->isScheduled()) {
                 $indexer->reindexAll();
@@ -52,12 +63,12 @@ public function executeFull()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function executeList(array $ids)
     {
         if (!empty($ids)) {
-            foreach ($this->indexerList as $indexerName) {
+            foreach ($this->getIndexerList() as $indexerName) {
                 $indexer = $this->indexerRegistry->get($indexerName);
                 if (!$indexer->isScheduled()) {
                     $indexer->reindexList($ids);
@@ -67,17 +78,34 @@ public function executeList(array $ids)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function executeRow($id)
     {
         if (!empty($id)) {
-            foreach ($this->indexerList as $indexerName) {
+            foreach ($this->getIndexerList() as $indexerName) {
                 $indexer = $this->indexerRegistry->get($indexerName);
                 if (!$indexer->isScheduled()) {
                     $indexer->reindexRow($id);
                 }
             }
         }
     }
+
+    /**
+     * Returns indexers in the order according to dependency tree
+     *
+     * @return array
+     */
+    private function getIndexerList(): array
+    {
+        $indexers = [];
+        foreach (array_keys($this->config->getIndexers()) as $indexerId) {
+            if (in_array($indexerId, $this->indexerList, true)) {
+                $indexers[] = $indexerId;
+            }
+        }
+
+        return $indexers;
+    }
 }

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);
     }