Merge branch 'ACP2E-2811' of https://github.com/adobe-commerce-tier-4/magento2ce into 2.4-develop

Author: thiaramus

app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProduct.php

@@ -146,7 +146,7 @@ public function execute(Rule $rule, $batchCount, $useAdditionalTable = false)
                             'sort_order' => $sortOrder,
                         ];
 
-                        if (count($rows) === $batchCount) {
+                        if (count($rows) === (int) $batchCount) {
                             $connection->insertMultiple($indexTable, $rows);
                             $rows = [];
                         }

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductTest.php

@@ -191,6 +191,28 @@ function ($table, $rows) use ($batchRows, $rowsNotInBatch) {
         self::assertTrue($this->model->execute($this->ruleMock, 2, true));
     }
 
+    public function testExecuteWithCustomBatchSize()
+    {
+        $websiteId = 3;
+        $productIds = [
+            4 => [$websiteId => 1],
+            5 => [$websiteId => 1],
+            6 => [$websiteId => 1]
+        ];
+
+        $this->prepareResourceMock();
+        $this->prepareRuleMock([3], $productIds, [10]);
+
+        $this->localeDateMock->method('getConfigTimezone')
+            ->willReturnMap([
+                [ScopeInterface::SCOPE_WEBSITE, self::ADMIN_WEBSITE_ID, $this->adminTimeZone],
+                [ScopeInterface::SCOPE_WEBSITE, $websiteId, $this->websiteTz]
+            ]);
+
+        $this->connectionMock->expects($this->exactly(2))->method('insertMultiple');
+        self::assertTrue($this->model->execute($this->ruleMock, '2', true));
+    }
+
     /**
      * @param array $websitesIds
      * @param array $productIds