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

Author: RuslanKostiv1

README.md

@@ -5,13 +5,13 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
 *	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -22,8 +22,8 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 

app/code/Magento/Backup/Model/Db.php

@@ -154,7 +154,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
 
                 if ($tableStatus->getDataLength() > self::BUFFER_LENGTH) {
                     if ($tableStatus->getAvgRowLength() < self::BUFFER_LENGTH) {
-                        $limit = floor(self::BUFFER_LENGTH / $tableStatus->getAvgRowLength());
+                        $limit = floor(self::BUFFER_LENGTH / max($tableStatus->getAvgRowLength(), 1));
                         $multiRowsLength = ceil($tableStatus->getRows() / $limit);
                     } else {
                         $limit = 1;

app/code/Magento/Bundle/Model/Product/CopyConstructor/Bundle.php

@@ -27,7 +27,17 @@ public function build(Product $product, Product $duplicate)
         $bundleOptions = $product->getExtensionAttributes()->getBundleProductOptions() ?: [];
         $duplicatedBundleOptions = [];
         foreach ($bundleOptions as $key => $bundleOption) {
-            $duplicatedBundleOptions[$key] = clone $bundleOption;
+            $duplicatedBundleOption = clone $bundleOption;
+            /**
+             * Set option and selection ids to 'null' in order to create new option(selection) for duplicated product,
+             * but not modifying existing one, which led to lost of option(selection) in original product.
+             */
+            $productLinks = $duplicatedBundleOption->getProductLinks() ?: [];
+            foreach ($productLinks as $productLink) {
+                $productLink->setSelectionId(null);
+            }
+            $duplicatedBundleOption->setOptionId(null);
+            $duplicatedBundleOptions[$key] = $duplicatedBundleOption;
         }
         $duplicate->getExtensionAttributes()->setBundleProductOptions($duplicatedBundleOptions);
     }

app/code/Magento/Bundle/Test/Unit/Model/Product/CopyConstructor/BundleTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Test\Unit\Model\Product\CopyConstructor;
 
 use Magento\Bundle\Api\Data\BundleOptionInterface;
+use Magento\Bundle\Model\Link;
 use Magento\Bundle\Model\Product\CopyConstructor\Bundle;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
@@ -45,6 +46,7 @@ public function testBuildNegative()
      */
     public function testBuildPositive()
     {
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $product */
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -60,18 +62,42 @@ public function testBuildPositive()
             ->method('getExtensionAttributes')
             ->willReturn($extensionAttributesProduct);
 
+        $productLink = $this->getMockBuilder(Link::class)
+            ->setMethods(['setSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productLink->expects($this->exactly(2))
+            ->method('setSelectionId')
+            ->with($this->identicalTo(null));
+        $firstOption = $this->getMockBuilder(BundleOptionInterface::class)
+            ->setMethods(['getProductLinks'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $firstOption->expects($this->once())
+            ->method('getProductLinks')
+            ->willReturn([$productLink]);
+        $firstOption->expects($this->once())
+            ->method('setOptionId')
+            ->with($this->identicalTo(null));
+        $secondOption = $this->getMockBuilder(BundleOptionInterface::class)
+            ->setMethods(['getProductLinks'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $secondOption->expects($this->once())
+            ->method('getProductLinks')
+            ->willReturn([$productLink]);
+        $secondOption->expects($this->once())
+            ->method('setOptionId')
+            ->with($this->identicalTo(null));
         $bundleOptions = [
-            $this->getMockBuilder(BundleOptionInterface::class)
-                ->disableOriginalConstructor()
-                ->getMockForAbstractClass(),
-            $this->getMockBuilder(BundleOptionInterface::class)
-                ->disableOriginalConstructor()
-                ->getMockForAbstractClass()
+            $firstOption,
+            $secondOption
         ];
         $extensionAttributesProduct->expects($this->once())
             ->method('getBundleProductOptions')
             ->willReturn($bundleOptions);
 
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $duplicate */
         $duplicate = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php

@@ -9,9 +9,10 @@
 use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProductModel;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
-use Magento\ImportExport\Controller\Adminhtml\Import;
 use Magento\ImportExport\Model\Import as ImportModel;
 use \Magento\Catalog\Model\Product\Type\AbstractType;
+use \Magento\Framework\App\ObjectManager;
+use \Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class RowCustomizer
@@ -105,6 +106,35 @@ class RowCustomizer implements RowCustomizerInterface
         AbstractType::SHIPMENT_SEPARATELY => 'separately',
     ];
 
+    /**
+     * @var \Magento\Bundle\Model\ResourceModel\Option\Collection[]
+     */
+    private $optionCollections = [];
+
+    /**
+     * @var array
+     */
+    private $storeIdToCode = [];
+
+    /**
+     * @var string
+     */
+    private $optionCollectionCacheKey = '_cache_instance_options_collection';
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @throws \RuntimeException
+     */
+    public function __construct(StoreManagerInterface $storeManager)
+    {
+        $this->storeManager = $storeManager;
+    }
+
     /**
      * Retrieve list of bundle specific columns
      * @return array
@@ -207,15 +237,13 @@ protected function populateBundleData($collection)
      */
     protected function getFormattedBundleOptionValues($product)
     {
-        /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
-        $optionsCollection = $product->getTypeInstance()
-            ->getOptionsCollection($product)
-            ->setOrder('position', Collection::SORT_ORDER_ASC);
-
+        $optionCollections = $this->getProductOptionCollections($product);
         $bundleData = '';
-        foreach ($optionsCollection as $option) {
+        $optionTitles = $this->getBundleOptionTitles($product);
+        foreach ($optionCollections->getItems() as $option) {
+            $optionValues = $this->getFormattedOptionValues($option, $optionTitles);
             $bundleData .= $this->getFormattedBundleSelections(
-                $this->getFormattedOptionValues($option),
+                $optionValues,
                 $product->getTypeInstance()
                     ->getSelectionsCollection([$option->getId()], $product)
                     ->setOrder('position', Collection::SORT_ORDER_ASC)
@@ -266,16 +294,23 @@ function ($value, $key) {
      * Retrieve option value of bundle product
      *
      * @param \Magento\Bundle\Model\Option $option
+     * @param string[] $optionTitles
      * @return string
      */
-    protected function getFormattedOptionValues($option)
+    protected function getFormattedOptionValues($option, $optionTitles = [])
     {
-        return 'name' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getTitle() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
-        . 'type' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getType() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
-        . 'required' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
-        . $option->getRequired();
+        $names = implode(ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR, array_map(
+            function ($title, $storeName) {
+                return $storeName . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR . $title;
+            },
+            $optionTitles[$option->getOptionId()],
+            array_keys($optionTitles[$option->getOptionId()])
+        ));
+        return $names . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+            . 'type' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
+            . $option->getType() . ImportModel::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
+            . 'required' . ImportProductModel::PAIR_NAME_VALUE_SEPARATOR
+            . $option->getRequired();
     }
 
     /**
@@ -380,4 +415,82 @@ private function parseAdditionalAttributes($additionalAttributes)
         }
         return $preparedAttributes;
     }
+
+    /**
+     * Get product options titles.
+     *
+     * Values for all store views (default) should be specified with 'name' key.
+     * If user want to specify value or change existing for non default store views it should be specified with
+     * 'name_' prefix and needed store view suffix.
+     *
+     * For example:
+     *  - 'name=All store views name' for all store views
+     *  - 'name_specific_store=Specific store name' for store view with 'specific_store' store code
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return array
+     */
+    private function getBundleOptionTitles(\Magento\Catalog\Model\Product $product): array
+    {
+        $optionCollections = $this->getProductOptionCollections($product);
+        $optionsTitles = [];
+        /** @var \Magento\Bundle\Model\Option $option */
+        foreach ($optionCollections->getItems() as $option) {
+            $optionsTitles[$option->getId()]['name'] = $option->getTitle();
+        }
+        $storeIds = $product->getStoreIds();
+        if (count($storeIds) > 1) {
+            foreach ($storeIds as $storeId) {
+                $optionCollections = $this->getProductOptionCollections($product, $storeId);
+                /** @var \Magento\Bundle\Model\Option $option */
+                foreach ($optionCollections->getItems() as $option) {
+                    $optionTitle = $option->getTitle();
+                    if ($optionsTitles[$option->getId()]['name'] != $optionTitle) {
+                        $optionsTitles[$option->getId()]['name_' . $this->getStoreCodeById($storeId)] = $optionTitle;
+                    }
+                }
+            }
+        }
+        return $optionsTitles;
+    }
+
+    /**
+     * Get product options collection by provided product model.
+     *
+     * Set given store id to the product if it was defined (default store id will be set if was not).
+     *
+     * @param \Magento\Catalog\Model\Product $product $product
+     * @param int $storeId
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     */
+    private function getProductOptionCollections(
+        \Magento\Catalog\Model\Product $product,
+        $storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID
+    ): \Magento\Bundle\Model\ResourceModel\Option\Collection {
+        $productSku = $product->getSku();
+        if (!isset($this->optionCollections[$productSku][$storeId])) {
+            $product->unsetData($this->optionCollectionCacheKey);
+            $product->setStoreId($storeId);
+            $this->optionCollections[$productSku][$storeId] = $product->getTypeInstance()
+                ->getOptionsCollection($product)
+                ->setOrder('position', Collection::SORT_ORDER_ASC);
+        }
+        return $this->optionCollections[$productSku][$storeId];
+    }
+
+    /**
+     * Retrieve store code by it's ID.
+     *
+     * Collect store id in $storeIdToCode[] private variable if it was not initialized earlier.
+     *
+     * @param int $storeId
+     * @return string
+     */
+    private function getStoreCodeById($storeId): string
+    {
+        if (!isset($this->storeIdToCode[$storeId])) {
+            $this->storeIdToCode[$storeId] = $this->storeManager->getStore($storeId)->getCode();
+        }
+        return $this->storeIdToCode[$storeId];
+    }
 }