Merge remote-tracking branch 'mainline/2.1' into MAGETWO-54677-patch21

Author: Olexandr Lysenko

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "proprietary"
     ],

app/code/Magento/Braintree/composer.json

@@ -23,7 +23,7 @@
         "magento/module-checkout-agreements": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "proprietary"
     ],

app/code/Magento/Catalog/composer.json

@@ -33,7 +33,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "101.0.0",
+    "version": "101.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogInventory/composer.json

@@ -13,7 +13,7 @@
         "magento/module-ui": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogRule/composer.json

@@ -17,7 +17,7 @@
         "magento/module-catalog-rule-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogRuleConfigurable/composer.json

@@ -8,13 +8,13 @@
         "magento/module-catalog-rule": "100.1.*",
         "magento/module-store": "100.1.*",
         "magento/module-customer": "100.1.*",
-      "magento/magento-composer-installer": "*"
+        "magento/magento-composer-installer": "*"
     },
     "suggest": {
         "magento/module-catalog-rule": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogSearch/composer.json

@@ -15,7 +15,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/composer.json

@@ -27,7 +27,7 @@
         "magento/module-cookie": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0",
+    "version": "100.1.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Cms/composer.json

@@ -18,7 +18,7 @@
         "magento/module-cms-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "101.0.0",
+    "version": "101.0.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php

@@ -127,8 +127,9 @@ public function afterInitialize(Helper $subject, ProductInterface $product)
      */
     private function setLinkedProducts(ProductInterface $product, ProductExtensionInterface $extensionAttributes)
     {
-        $associatedProductIds = $this->request->getPost('associated_product_ids', []);
-        $variationsMatrix = $this->getVariationMatrix();
+        $associatedProductIds = $product->hasData('associated_product_ids') ?
+            $product->getData('associated_product_ids') : [];
+        $variationsMatrix = $this->getVariationMatrixFromProduct($product);
 
         if ($associatedProductIds || $variationsMatrix) {
             $this->variationHandler->prepareAttributeSet($product);
@@ -141,10 +142,35 @@ private function setLinkedProducts(ProductInterface $product, ProductExtensionIn
         $extensionAttributes->setConfigurableProductLinks(array_filter($associatedProductIds));
     }
 
+    /**
+     * Get variation-matrix from product
+     *
+     * @param ProductInterface $product
+     * @return array
+     */
+    private function getVariationMatrixFromProduct(ProductInterface $product)
+    {
+        $result = [];
+
+        $configurableMatrix = $product->hasData('configurable-matrix') ? $product->getData('configurable-matrix') : [];
+        foreach ($configurableMatrix as $item) {
+            if ($item['newProduct']) {
+                $result[$item['variationKey']] = $this->mapData($item);
+
+                if (isset($item['qty'])) {
+                    $result[$item['variationKey']]['quantity_and_stock_status']['qty'] = $item['qty'];
+                }
+            }
+        }
+
+        return $result;
+    }
+
     /**
      * Get variation-matrix from request
      *
      * @return array
+     * @deprecated
      */
     protected function getVariationMatrix()
     {