Skip to content

Commit fe25502

Browse files
committed
Merge branch 'release/3.15.0-dev' into epic/MAGE-997
2 parents 0060662 + 52ba952 commit fe25502

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function rebuildProductIndex(int $storeId, ?array $productIds, int $page,
126126
$this->productIndexBuilder->buildIndexFull(
127127
$storeId,
128128
[
129-
'productIds' => $productIds,
129+
'entityIds' => $productIds,
130130
'page' => $page,
131131
'pageSize' => $pageSize,
132132
'useTmpIndex' => $useTmpIndex

Service/Product/MissingPriceIndexHandler.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Magento\Framework\Indexer\IndexerInterface;
1212
use Magento\Framework\Indexer\IndexerRegistry;
1313
use Magento\Framework\Indexer\StateInterface;
14-
use Zend_Db_Select;
1514

1615
class MissingPriceIndexHandler
1716
{
@@ -125,7 +124,7 @@ protected function getProductIdsFromCollection(ProductCollection $collection): a
125124

126125
$select = clone $collection->getSelect();
127126
try {
128-
$joins = $select->getPart(Zend_Db_Select::FROM);
127+
$joins = $select->getPart(Select::FROM);
129128
} catch (\Zend_Db_Select_Exception $e) {
130129
$this->diagnostics->error("Unable to build query for missing product prices: " . $e->getMessage());
131130
return [];
@@ -147,20 +146,20 @@ protected function getProductIdsFromCollection(ProductCollection $collection): a
147146
protected function expandPricingJoin(array &$joins, string $priceIndexJoin): void
148147
{
149148
$modifyJoin = &$joins[$priceIndexJoin];
150-
$modifyJoin['joinType'] = Zend_Db_Select::LEFT_JOIN;
149+
$modifyJoin['joinType'] = Select::LEFT_JOIN;
151150
}
152151

153152
protected function rebuildJoins(Select $select, array $joins): void
154153
{
155-
$select->reset(Zend_Db_Select::COLUMNS);
156-
$select->reset(Zend_Db_Select::FROM);
154+
$select->reset(Select::COLUMNS);
155+
$select->reset(Select::FROM);
157156
foreach ($joins as $alias => $joinData) {
158-
if ($joinData['joinType'] === Zend_Db_Select::FROM) {
157+
if ($joinData['joinType'] === Select::FROM) {
159158
$select->from(
160159
[$alias => $joinData['tableName']],
161160
'entity_id'
162161
);
163-
} elseif ($joinData['joinType'] === Zend_Db_Select::LEFT_JOIN) {
162+
} elseif ($joinData['joinType'] === Select::LEFT_JOIN) {
164163
$select->joinLeft(
165164
[$alias => $joinData['tableName']],
166165
$joinData['joinCondition'],

0 commit comments

Comments
 (0)