Merge pull request #327 from magento-api/indexer

[PHP7 Indexer]: Remi PHP 7.0.1 failure on L1 segmentation fault on SOAP / REST
magento · Jan 20, 2016 · df54675 · df54675
2 parents 31af91c + 6fd1729
commit df54675
Show file tree

Hide file tree

Showing 8 changed files with 893 additions and 410 deletions.
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/CartItemProcessorTest.php b/app/code/Magento/Bundle/Test/Unit/Model/CartItemProcessorTest.php
@@ -79,7 +79,16 @@ public function testConvertToBuyRequest()
         $dataObjectMock = $this->getMock('\Magento\Framework\DataObject');
         $optionExtensionMock = $this->getMock(
             '\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
-            ['getBundleOptions'],
+            [
+                'getBundleOptions',
+                'getCustomOptions',
+                'setCustomOptions',
+                'setBundleOptions',
+                'getDownloadableOption',
+                'setDownloadableOption',
+                'getConfigurableItemOptions',
+                'setConfigurableItemOptions'
+            ],
             [],
             '',
             false
@@ -128,7 +137,16 @@ public function testProcessProductOptions()
         $productOptionMock = $this->getMock('\Magento\Quote\Model\Quote\ProductOption', [], [], '', false);
         $optionExtensionMock = $this->getMock(
             '\Magento\Quote\Api\Data\ProductOptionExtensionInterface',
-            ['setBundleOptions'],
+            [
+                'getBundleOptions',
+                'getCustomOptions',
+                'setCustomOptions',
+                'setBundleOptions',
+                'getDownloadableOption',
+                'setDownloadableOption',
+                'getConfigurableItemOptions',
+                'setConfigurableItemOptions'
+            ],
             [],
             '',
             false

diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -89,10 +89,7 @@ public function execute($ids)
         foreach ($storeIds as $storeId) {
             $dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
             $saveHandler->deleteIndex([$dimension], new \ArrayObject($ids));
-            $saveHandler->saveIndex(
-                [$dimension],
-                $this->fullAction->rebuildStoreIndex($storeId, $ids)
-            );
+            $saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId, $ids));
         }
     }
 
@@ -111,10 +108,8 @@ public function executeFull()
         foreach ($storeIds as $storeId) {
             $dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
             $saveHandler->cleanIndex([$dimension]);
-            $saveHandler->saveIndex(
-                [$dimension],
-                $this->fullAction->rebuildStoreIndex($storeId)
-            );
+            $saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId));
+
         }
         $this->fulltextResource->resetSearchResults();
         $this->searchRequestConfig->reset();