Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-49796

Author: Bohdan Korablov

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -142,7 +142,7 @@ public function getDefaultValues()
      */
     protected function _getSelectedOptions()
     {
-        if (is_null($this->_selectedOptions)) {
+        if ($this->_selectedOptions === null) {
             $this->_selectedOptions = [];
 
             /** @var \Magento\Bundle\Model\Option $option */
@@ -152,17 +152,29 @@ protected function _getSelectedOptions()
                 $selectionId = $this->getProduct()->getPreconfiguredValues()->getData(
                     'bundle_option/' . $option->getId()
                 );
-                if ($selectionId && $option->getSelectionById($selectionId)) {
-                    $this->_selectedOptions = $selectionId;
-                } elseif (!$option->getRequired()) {
-                    $this->_selectedOptions = 'None';
-                }
+                $this->assignSelection($option, $selectionId);
             }
         }
 
         return $this->_selectedOptions;
     }
 
+    /**
+     * Set selected options.
+     *
+     * @param \Magento\Bundle\Model\Option $option
+     * @param mixed $selectionId
+     * @return void
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if ($selectionId && $option->getSelectionById($selectionId)) {
+            $this->_selectedOptions = $selectionId;
+        } elseif (!$option->getRequired()) {
+            $this->_selectedOptions = 'None';
+        }
+    }
+
     /**
      * Define if selection is selected
      *

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

@@ -17,4 +17,20 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      * @var string
      */
     protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+
+    /**
+     * @inheritdoc
+     */
+    protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
+    {
+        if (is_array($selectionId)) {
+            foreach ($selectionId as $id) {
+                if ($id && $option->getSelectionById($id)) {
+                    $this->_selectedOptions[] = $id;
+                }
+            }
+        } else {
+            parent::assignSelection($option, $selectionId);
+        }
+    }
 }

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml

@@ -11,8 +11,9 @@
 <?php
 $product = $block->getProduct();
 $helper = $this->helper('Magento\Catalog\Helper\Output');
+$stripSelection = $product->getConfigureMode() ? true : false;
+$options = $block->decorateArray($block->getOptions($stripSelection));
 ?>
-<?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if ($product->isSaleable()):?>
     <?php if (count($options)): ?>
 <script type="text/x-magento-init">

app/code/Magento/Catalog/Model/Product/Option/Repository.php

@@ -172,7 +172,9 @@ public function save(\Magento\Catalog\Api\Data\ProductCustomOptionInterface $opt
             $originalValues = $persistedOption->getValues();
             $newValues = $option->getData('values');
             if ($newValues) {
-                $newValues = $this->markRemovedValues($newValues, $originalValues);
+                if (isset($originalValues)) {
+                    $newValues = $this->markRemovedValues($newValues, $originalValues);
+                }
                 $option->setData('values', $newValues);
             }
         }

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php

@@ -267,4 +267,29 @@ public function testSave()
         ]);
         $this->assertEquals($this->optionMock, $this->optionRepository->save($this->optionMock));
     }
+
+    public function testSaveWhenOptionTypeWasChanged()
+    {
+        $productSku = 'simple_product';
+        $optionId = 1;
+        $this->optionMock->expects($this->once())->method('getProductSku')->willReturn($productSku);
+        $this->productRepositoryMock
+            ->expects($this->once())
+            ->method('get')
+            ->with($productSku)
+            ->willReturn($this->productMock);
+        $this->optionMock->expects($this->any())->method('getOptionId')->willReturn($optionId);
+        $this->productMock->expects($this->once())->method('getOptions')->willReturn([]);
+        $this->optionMock->expects($this->once())->method('getData')->with('values')->willReturn([
+            ['option_type_id' => 4],
+            ['option_type_id' => 5]
+        ]);
+        $optionCollection = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Option\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionCollection->expects($this->once())->method('getProductOptions')->willReturn([$this->optionMock]);
+        $this->optionCollectionFactory->expects($this->once())->method('create')->willReturn($optionCollection);
+        $this->optionMock->expects($this->once())->method('getValues')->willReturn(null);
+        $this->assertEquals($this->optionMock, $this->optionRepository->save($this->optionMock));
+    }
 }

app/code/Magento/CatalogImportExport/Model/Export/Product.php

@@ -153,14 +153,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     /**
      * Items per page for collection limitation
      *
-     * @var null
+     * @var int|null
      */
     protected $_itemsPerPage = null;
 
     /**
      * Header columns for export file
      *
      * @var array
+     * @deprecated
      */
     protected $_headerColumns = [];
 
@@ -234,17 +235,15 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
     protected $_fieldsMap = [
         'image' => 'base_image',
         'image_label' => "base_image_label",
-        'image' => 'base_image',
-        'image_label' => 'base_image_label',
         'thumbnail' => 'thumbnail_image',
         'thumbnail_label' => 'thumbnail_image_label',
         self::COL_MEDIA_IMAGE => 'additional_images',
         '_media_image_label' => 'additional_image_labels',
-        Product::COL_STORE => 'store_view_code',
-        Product::COL_ATTR_SET => 'attribute_set_code',
-        Product::COL_TYPE => 'product_type',
-        Product::COL_CATEGORY => 'categories',
-        Product::COL_PRODUCT_WEBSITES => 'product_websites',
+        self::COL_STORE => 'store_view_code',
+        self::COL_ATTR_SET => 'attribute_set_code',
+        self::COL_TYPE => 'product_type',
+        self::COL_CATEGORY => 'categories',
+        self::COL_PRODUCT_WEBSITES => 'product_websites',
         'status' => 'product_online',
         'news_from_date' => 'new_from_date',
         'news_to_date' => 'new_to_date',
@@ -691,7 +690,7 @@ protected function updateDataWithCategoryColumns(&$dataRow, &$rowCategories, $pr
      */
     public function _getHeaderColumns()
     {
-        return $this->_customHeadersMapping($this->_headerColumns);
+        return $this->_customHeadersMapping($this->rowCustomizer->addHeaderColumns($this->_headerColumns));
     }
 
     /**
@@ -700,13 +699,13 @@ public function _getHeaderColumns()
      * @param array $customOptionsData
      * @param array $stockItemRows
      * @return void
+     * @deprecated Logic will be moved to _getHeaderColumns in future release
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function setHeaderColumns($customOptionsData, $stockItemRows)
     {
         if (!$this->_headerColumns) {
-            $customOptCols = [
-                'custom_options',
-            ];
             $this->_headerColumns = array_merge(
                 [
                     self::COL_SKU,
@@ -719,21 +718,19 @@ protected function setHeaderColumns($customOptionsData, $stockItemRows)
                 $this->_getExportMainAttrCodes(),
                 [self::COL_ADDITIONAL_ATTRIBUTES],
                 reset($stockItemRows) ? array_keys(end($stockItemRows)) : [],
-                [],
                 [
                     'related_skus',
                     'related_position',
                     'crosssell_skus',
                     'crosssell_position',
                     'upsell_skus',
-                    'upsell_position'
-                ],
-                ['additional_images', 'additional_image_labels', 'hide_from_product_page']
+                    'upsell_position',
+                    'additional_images',
+                    'additional_image_labels',
+                    'hide_from_product_page',
+                    'custom_options'
+                ]
             );
-            // have we merge custom options columns
-            if ($customOptionsData) {
-                $this->_headerColumns = array_merge($this->_headerColumns, $customOptCols);
-            }
         }
     }
 
@@ -892,10 +889,12 @@ protected function getExportData()
             $productIds = array_keys($rawData);
             $stockItemRows = $this->prepareCatalogInventory($productIds);
 
-            $this->rowCustomizer->prepareData($this->_getEntityCollection(), $productIds);
+            $this->rowCustomizer->prepareData(
+                $this->_prepareEntityCollection($this->_entityCollectionFactory->create()),
+                $productIds
+            );
 
             $this->setHeaderColumns($multirawData['customOptionsData'], $stockItemRows);
-            $this->_headerColumns = $this->rowCustomizer->addHeaderColumns($this->_headerColumns);
 
             foreach ($rawData as $productId => $productData) {
                 foreach ($productData as $storeId => $dataRow) {
@@ -1231,9 +1230,6 @@ private function appendMultirowData(&$dataRow, &$multiRawData)
             return null;
         } elseif ($storeId != Store::DEFAULT_STORE_ID) {
             $dataRow[self::COL_STORE] = $this->_storeIdToCode[$storeId];
-            if (isset($productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY])) {
-                $dataRow[self::COL_VISIBILITY] = $productData[Store::DEFAULT_STORE_ID][self::COL_VISIBILITY];
-            }
         }
         $dataRow[self::COL_SKU] = $sku;
         return $dataRow;

app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php

@@ -270,11 +270,15 @@ public function testGetHeaderColumns()
         $headerColumnsValue = ['headerColumns value'];
         $expectedResult = 'result';
         $this->setPropertyValue($product, '_headerColumns', $headerColumnsValue);
-        $product
-            ->expects($this->once())
+        $this->setPropertyValue($product, 'rowCustomizer', $this->rowCustomizer);
+        $product->expects($this->once())
             ->method('_customHeadersMapping')
             ->with($headerColumnsValue)
             ->willReturn($expectedResult);
+        $this->rowCustomizer->expects($this->once())
+            ->method('addHeaderColumns')
+            ->with($headerColumnsValue)
+            ->willReturn($headerColumnsValue);
 
         $result = $product->_getHeaderColumns();
 

app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php

@@ -77,6 +77,7 @@ class StockItemRepository implements StockItemRepositoryInterface
 
     /**
      * @var Processor
+     * @deprecated
      */
     protected $indexProcessor;
 
@@ -181,8 +182,6 @@ public function save(\Magento\CatalogInventory\Api\Data\StockItemInterface $stoc
             $stockItem->setStockId($stockItem->getStockId());
 
             $this->resource->save($stockItem);
-
-            $this->indexProcessor->reindexRow($stockItem->getProductId());
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(__('Unable to save Stock Item'), $exception);
         }

app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockItemRepositoryTest.php

@@ -304,7 +304,6 @@ public function testSave()
             ->method('save')
             ->with($this->stockItemMock)
             ->willReturnSelf();
-        $this->indexProcessorMock->expects($this->once())->method('reindexRow')->with($productId);
 
         $this->assertEquals($this->stockItemMock, $this->model->save($this->stockItemMock));
     }

app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php

@@ -5,17 +5,18 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
+use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator;
-use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class ProductScopeRewriteGenerator
@@ -63,6 +64,11 @@ class ProductScopeRewriteGenerator
      */
     private $mergeDataProviderPrototype;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * @param StoreViewService $storeViewService
      * @param StoreManagerInterface $storeManager
@@ -72,6 +78,7 @@ class ProductScopeRewriteGenerator
      * @param CurrentUrlRewritesRegenerator $currentUrlRewritesRegenerator
      * @param AnchorUrlRewriteGenerator $anchorUrlRewriteGenerator
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
+     * @param CategoryRepositoryInterface|null $categoryRepository
      */
     public function __construct(
         StoreViewService $storeViewService,
@@ -81,7 +88,8 @@ public function __construct(
         CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator,
         CurrentUrlRewritesRegenerator $currentUrlRewritesRegenerator,
         AnchorUrlRewriteGenerator $anchorUrlRewriteGenerator,
-        MergeDataProviderFactory $mergeDataProviderFactory = null
+        MergeDataProviderFactory $mergeDataProviderFactory = null,
+        CategoryRepositoryInterface $categoryRepository = null
     ) {
         $this->storeViewService = $storeViewService;
         $this->storeManager = $storeManager;
@@ -94,6 +102,8 @@ public function __construct(
             $mergeDataProviderFactory = ObjectManager::getInstance()->get(MergeDataProviderFactory::class);
         }
         $this->mergeDataProviderPrototype = $mergeDataProviderFactory->create();
+        $this->categoryRepository = $categoryRepository ?:
+            ObjectManager::getInstance()->get(CategoryRepositoryInterface::class);
     }
 
     /**
@@ -150,10 +160,14 @@ public function generateForSpecificStoreView($storeId, $productCategories, Produ
         $mergeDataProvider = clone $this->mergeDataProviderPrototype;
         $categories = [];
         foreach ($productCategories as $category) {
-            if ($this->isCategoryProperForGenerating($category, $storeId)) {
-                $categories[] = $category;
+            if (!$this->isCategoryProperForGenerating($category, $storeId)) {
+                continue;
             }
+
+            // category should be loaded per appropriate store if category's URL key has been changed
+            $categories[] = $this->getCategoryWithOverriddenUrlKey($storeId, $category);
         }
+
         $productCategories = $this->objectRegistryFactory->create(['entities' => $categories]);
 
         $mergeDataProvider->merge(
@@ -199,4 +213,26 @@ public function isCategoryProperForGenerating(Category $category, $storeId)
         }
         return false;
     }
+
+    /**
+     * Checks if URL key has been changed for provided category and returns reloaded category,
+     * in other case - returns provided category.
+     *
+     * @param $storeId
+     * @param Category $category
+     * @return Category
+     */
+    private function getCategoryWithOverriddenUrlKey($storeId, Category $category)
+    {
+        $isUrlKeyOverridden = $this->storeViewService->doesEntityHaveOverriddenUrlKeyForStore(
+            $storeId,
+            $category->getEntityId(),
+            Category::ENTITY
+        );
+
+        if (!$isUrlKeyOverridden) {
+            return $category;
+        }
+        return $this->categoryRepository->get($category->getEntityId(), $storeId);
+    }
 }