Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-89402

Author: Sergii Kovalenko

README.md

@@ -35,7 +35,7 @@ The members of this team have been recognized for their outstanding commitment t
 </a>
 
 <h3>Top Contributors</h3>
-Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
 <a href="https://magento.com/magento-contributors">
     <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
 </a>

app/code/Magento/Backend/Model/Url.php

@@ -202,33 +202,36 @@ public function getUrl($routePath = null, $routeParams = null)
         }
 
         $cacheSecretKey = false;
-        if (is_array($routeParams) && isset($routeParams['_cache_secret_key'])) {
+        if (isset($routeParams['_cache_secret_key'])) {
             unset($routeParams['_cache_secret_key']);
             $cacheSecretKey = true;
         }
         $result = parent::getUrl($routePath, $routeParams);
         if (!$this->useSecretKey()) {
             return $result;
         }
+
+        $this->getRouteParamsResolver()->unsetData('route_params');
         $this->_setRoutePath($routePath);
+        $extraParams = $this->getRouteParamsResolver()->getRouteParams();
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);
-        if ($cacheSecretKey) {
-            $secret = [self::SECRET_KEY_PARAM_NAME => "\${$routeName}/{$controllerName}/{$actionName}\$"];
-        } else {
-            $secret = [
-                self::SECRET_KEY_PARAM_NAME => $this->getSecretKey($routeName, $controllerName, $actionName),
-            ];
-        }
-        if (is_array($routeParams)) {
-            $routeParams = array_merge($secret, $routeParams);
-        } else {
-            $routeParams = $secret;
+
+        if (!isset($routeParams[self::SECRET_KEY_PARAM_NAME])) {
+            if (!is_array($routeParams)) {
+                $routeParams = [];
+            }
+            $secretKey = $cacheSecretKey
+                ? "\${$routeName}/{$controllerName}/{$actionName}\$"
+                : $this->getSecretKey($routeName, $controllerName, $actionName);
+            $routeParams[self::SECRET_KEY_PARAM_NAME] = $secretKey;
         }
-        if (is_array($this->_getRouteParams())) {
-            $routeParams = array_merge($this->_getRouteParams(), $routeParams);
+
+        if (!empty($extraParams)) {
+            $routeParams = array_merge($extraParams, $routeParams);
         }
+
         return parent::getUrl("{$routeName}/{$controllerName}/{$actionName}", $routeParams);
     }
 

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -468,7 +468,7 @@ public function testGetCustomAttributes()
         );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->category->setData($customAttributeCode, $newCustomAttributeValue);
+        $this->category->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->category->getCustomAttributes()));
         $this->assertNotNull($this->category->getCustomAttribute($customAttributeCode));
         $this->assertEquals(

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1305,7 +1305,7 @@ public function testGetCustomAttributes()
         );
 
         //Change the attribute value, should reflect in getCustomAttribute
-        $this->model->setData($customAttributeCode, $newCustomAttributeValue);
+        $this->model->setCustomAttribute($customAttributeCode, $newCustomAttributeValue);
         $this->assertEquals(1, count($this->model->getCustomAttributes()));
         $this->assertNotNull($this->model->getCustomAttribute($customAttributeCode));
         $this->assertEquals(

app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

@@ -22,6 +22,7 @@
         <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
+        <input type="hidden" name="item"  value="<?= /* @noEscape */ $block->getRequest()->getParam('id') ?>" />
         <?= $block->getBlockHtml('formkey') ?>
         <?= $block->getChildHtml('form_top') ?>
         <?php if (!$block->hasOptions()):?>

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

@@ -1703,7 +1703,7 @@ protected function _saveProducts()
                 $storeId = !empty($rowData[self::COL_STORE])
                     ? $this->getStoreIdByCode($rowData[self::COL_STORE])
                     : Store::DEFAULT_STORE_ID;
-                if (isset($rowData['_media_is_disabled'])) {
+                if (isset($rowData['_media_is_disabled']) && strlen(trim($rowData['_media_is_disabled']))) {
                     $disabledImages = array_flip(
                         explode($this->getMultipleValueSeparator(), $rowData['_media_is_disabled'])
                     );

app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php

@@ -503,7 +503,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
             if ($attrParams['is_static']) {
                 continue;
             }
-            if (isset($rowData[$attrCode]) && strlen($rowData[$attrCode])) {
+            if (isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode]))) {
                 if (in_array($attrParams['type'], ['select', 'boolean'])) {
                     $resultAttrs[$attrCode] = $attrParams['options'][strtolower($rowData[$attrCode])];
                 } elseif ('multiselect' == $attrParams['type']) {

app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php

@@ -77,7 +77,7 @@ public function getEnableQtyIncrements($storeId = null);
 
     /**
      * @param int $storeId
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null);
 

app/code/Magento/CatalogInventory/Model/Configuration.php

@@ -273,7 +273,7 @@ public function getEnableQtyIncrements($store = null)
 
     /**
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @return int
+     * @return float
      */
     public function getQtyIncrements($store = null)
     {

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

@@ -392,7 +392,7 @@ public function getUseConfigQtyIncrements()
     /**
      * Retrieve Quantity Increments
      *
-     * @return int|false
+     * @return int|float|false
      */
     public function getQtyIncrements()
     {
@@ -401,7 +401,13 @@ public function getQtyIncrements()
                 if ($this->getUseConfigQtyIncrements()) {
                     $this->qtyIncrements = $this->stockConfiguration->getQtyIncrements($this->getStoreId());
                 } else {
-                    $this->qtyIncrements = (int) $this->getData(static::QTY_INCREMENTS);
+                    $this->qtyIncrements = $this->getData(static::QTY_INCREMENTS);
+                }
+
+                if ($this->getIsQtyDecimal()) { // Cast accordingly to decimal qty usage
+                    $this->qtyIncrements = (float) $this->qtyIncrements;
+                } else {
+                    $this->qtyIncrements = (int) $this->qtyIncrements;
                 }
             }
             if ($this->qtyIncrements <= 0) {