Merge branch 'ACP2E-3761' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-05-01-2025

Author: chittima

app/code/Magento/CatalogInventory/Model/Indexer/Stock.php

@@ -1,47 +1,51 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved
  */
 namespace Magento\CatalogInventory\Model\Indexer;
 
 use Magento\Framework\Indexer\CacheContext;
+use Magento\Framework\App\ObjectManager;
 
 class Stock implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Row
+     * @var Row
      */
     protected $_productStockIndexerRow;
 
     /**
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Rows
+     * @var Rows
      */
     protected $_productStockIndexerRows;
 
     /**
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Action\Full
+     * @var Full
      */
     protected $_productStockIndexerFull;
 
     /**
-     * @var \Magento\Framework\Indexer\CacheContext
+     * @var CacheContext
      */
     private $cacheContext;
 
     /**
      * @param Stock\Action\Row $productStockIndexerRow
      * @param Stock\Action\Rows $productStockIndexerRows
      * @param Stock\Action\Full $productStockIndexerFull
+     * @param CacheContext|null $cacheContext
      */
     public function __construct(
         \Magento\CatalogInventory\Model\Indexer\Stock\Action\Row $productStockIndexerRow,
         \Magento\CatalogInventory\Model\Indexer\Stock\Action\Rows $productStockIndexerRows,
-        \Magento\CatalogInventory\Model\Indexer\Stock\Action\Full $productStockIndexerFull
+        \Magento\CatalogInventory\Model\Indexer\Stock\Action\Full $productStockIndexerFull,
+        ?CacheContext $cacheContext = null
     ) {
         $this->_productStockIndexerRow = $productStockIndexerRow;
         $this->_productStockIndexerRows = $productStockIndexerRows;
         $this->_productStockIndexerFull = $productStockIndexerFull;
+        $this->cacheContext = $cacheContext ?: ObjectManager::getInstance()->get(CacheContext::class);
     }
 
     /**
@@ -99,14 +103,14 @@ public function executeRow($id)
     /**
      * Get cache context
      *
-     * @return \Magento\Framework\Indexer\CacheContext
+     * @return CacheContext
      * @deprecated 100.0.7
      * @see we don't add dependecies this way anymore
      */
     protected function getCacheContext()
     {
         if (!($this->cacheContext instanceof CacheContext)) {
-            return \Magento\Framework\App\ObjectManager::getInstance()->get(CacheContext::class);
+            return ObjectManager::getInstance()->get(CacheContext::class);
         } else {
             return $this->cacheContext;
         }

app/code/Magento/CatalogInventory/Test/Integration/Model/Indexer/SubscriptionsTest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Integration\Model\Indexer;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceIndexProcessor;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor as FulltextIndexProcessor;
+use PHPUnit\Framework\TestCase;
+
+class SubscriptionsTest extends TestCase
+{
+    /**
+     * @var PriceIndexProcessor
+     */
+    private PriceIndexProcessor $priceIndexProcessor;
+
+    /**
+     * @var FulltextIndexProcessor
+     */
+    private FulltextIndexProcessor $fulltextIndexProcessor;
+
+    protected function setUp(): void
+    {
+        $this->priceIndexProcessor = Bootstrap::getObjectManager()->create(PriceIndexProcessor::class);
+        $this->fulltextIndexProcessor = Bootstrap::getObjectManager()->create(FulltextIndexProcessor::class);
+    }
+
+    public function testSubscriptions(): void
+    {
+        $subscriptions = array_keys($this->priceIndexProcessor->getIndexer()->getView()->getSubscriptions());
+        $this->assertNotContains('cataloginventory_stock_item', $subscriptions);
+        $subscriptions = array_keys($this->fulltextIndexProcessor->getIndexer()->getView()->getSubscriptions());
+        $this->assertNotContains('cataloginventory_stock_item', $subscriptions);
+    }
+}

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/StockTest.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Test\Unit\Model\Indexer;
+
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Row;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Rows;
+use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
+use Magento\CatalogInventory\Model\Indexer\Stock;
+use Magento\Framework\Indexer\CacheContext;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class StockTest extends TestCase
+{
+    /**
+     * @var MockObject|Row
+     */
+    private $productStockIndexerRow;
+
+    /**
+     * @var MockObject|Rows
+     */
+    private $productStockIndexerRows;
+
+    /**
+     * @var MockObject|Full
+     */
+    private $productStockIndexerFull;
+
+    /**
+     * @var MockObject|CacheContext
+     */
+    private $cacheContext;
+
+    /**
+     * @var Stock
+     */
+    private $stock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->productStockIndexerRow = $this->createMock(Row::class);
+        $this->productStockIndexerRows = $this->createMock(Rows::class);
+        $this->productStockIndexerFull = $this->createMock(Full::class);
+        $this->cacheContext = $this->createMock(CacheContext::class);
+
+        $this->stock = new Stock(
+            $this->productStockIndexerRow,
+            $this->productStockIndexerRows,
+            $this->productStockIndexerFull,
+            $this->cacheContext
+        );
+    }
+
+    /**
+     * Validate that cache context not used during execution
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $ids = [1, 2, 3];
+        $this->productStockIndexerRows->expects($this->once())
+            ->method('execute')
+            ->with($ids);
+        $this->cacheContext->expects($this->never())
+            ->method('registerEntities');
+        $this->stock->execute($ids);
+    }
+}