Merge branch 'ACP2E-1772' of https://github.com/magento-l3/magento2ce into PR-VK-2023-04-05-CE

Author: chittima

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

@@ -90,7 +90,7 @@ public function clean(array $productIds, callable $reindex)
             $this->cacheContext->registerEntities(Product::CACHE_TAG, array_unique($productIds));
             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
             $categoryIds = $this->getCategoryIdsByProductIds($productIds);
-            if ($categoryIds){
+            if ($categoryIds) {
                 $this->cacheContext->registerEntities(Category::CACHE_TAG, array_unique($categoryIds));
                 $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
             }
@@ -162,7 +162,7 @@ private function getProductIdsForCacheClean(array $productStatusesBefore, array
             }
         }
 
-        return $productIds;
+        return array_map('intval', $productIds);
     }
 
     /**
@@ -176,7 +176,7 @@ private function getCategoryIdsByProductIds(array $productIds): array
         $categoryProductTable = $this->resource->getTableName('catalog_category_product');
         $select = $this->getConnection()->select()
             ->from(['catalog_category_product' => $categoryProductTable], ['category_id'])
-            ->where('product_id IN (?)', $productIds);
+            ->where('product_id IN (?)', $productIds, \Zend_Db::INT_TYPE);
 
         return $this->getConnection()->fetchCol($select);
     }

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php

@@ -122,9 +122,6 @@ public function testClean($stockStatusBefore, $stockStatusAfter, $qtyAfter, $sto
         $this->selectMock->expects($this->any())
             ->method('from')
             ->willReturnSelf();
-        $this->selectMock->expects($this->any())
-            ->method('where')
-            ->willReturnSelf();
         $this->selectMock->expects($this->any())
             ->method('joinLeft')
             ->willReturnSelf();
@@ -141,6 +138,21 @@ public function testClean($stockStatusBefore, $stockStatusAfter, $qtyAfter, $sto
                     ['product_id' => $productId, 'stock_status' => $stockStatusAfter, 'qty' => $qtyAfter],
                 ]
             );
+        $this->connectionMock->expects($this->exactly(3))
+            ->method('select')
+            ->willReturn($this->selectMock);
+        $this->selectMock->expects($this->exactly(7))
+            ->method('where')
+            ->withConsecutive(
+                ['product_id IN (?)'],
+                ['stock_id = ?'],
+                ['website_id = ?'],
+                ['product_id IN (?)'],
+                ['stock_id = ?'],
+                ['website_id = ?'],
+                ['product_id IN (?)', [123], \Zend_Db::INT_TYPE]
+            )
+            ->willReturnSelf();
         $this->connectionMock->expects($this->exactly(1))
             ->method('fetchCol')
             ->willReturn([$categoryId]);