Skip to content

Commit df54675

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #327 from magento-api/indexer
[PHP7 Indexer]: Remi PHP 7.0.1 failure on L1 segmentation fault on SOAP / REST
2 parents 31af91c + 6fd1729 commit df54675

File tree

8 files changed

+893
-410
lines changed

8 files changed

+893
-410
lines changed

app/code/Magento/Bundle/Test/Unit/Model/CartItemProcessorTest.php

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,16 @@ public function testConvertToBuyRequest()
7979
$dataObjectMock = $this->getMock('\Magento\Framework\DataObject');
8080
$optionExtensionMock = $this->getMock(
8181
'\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
82-
['getBundleOptions'],
82+
[
83+
'getBundleOptions',
84+
'getCustomOptions',
85+
'setCustomOptions',
86+
'setBundleOptions',
87+
'getDownloadableOption',
88+
'setDownloadableOption',
89+
'getConfigurableItemOptions',
90+
'setConfigurableItemOptions'
91+
],
8392
[],
8493
'',
8594
false
@@ -128,7 +137,16 @@ public function testProcessProductOptions()
128137
$productOptionMock = $this->getMock('\Magento\Quote\Model\Quote\ProductOption', [], [], '', false);
129138
$optionExtensionMock = $this->getMock(
130139
'\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
131-
['setBundleOptions'],
140+
[
141+
'getBundleOptions',
142+
'getCustomOptions',
143+
'setCustomOptions',
144+
'setBundleOptions',
145+
'getDownloadableOption',
146+
'setDownloadableOption',
147+
'getConfigurableItemOptions',
148+
'setConfigurableItemOptions'
149+
],
132150
[],
133151
'',
134152
false

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ public function execute($ids)
8989
foreach ($storeIds as $storeId) {
9090
$dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
9191
$saveHandler->deleteIndex([$dimension], new \ArrayObject($ids));
92-
$saveHandler->saveIndex(
93-
[$dimension],
94-
$this->fullAction->rebuildStoreIndex($storeId, $ids)
95-
);
92+
$saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId, $ids));
9693
}
9794
}
9895

@@ -111,10 +108,8 @@ public function executeFull()
111108
foreach ($storeIds as $storeId) {
112109
$dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
113110
$saveHandler->cleanIndex([$dimension]);
114-
$saveHandler->saveIndex(
115-
[$dimension],
116-
$this->fullAction->rebuildStoreIndex($storeId)
117-
);
111+
$saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId));
112+
118113
}
119114
$this->fulltextResource->resetSearchResults();
120115
$this->searchRequestConfig->reset();

0 commit comments

Comments
 (0)