Merge remote-tracking branch 'mainline-ce/develop' into develop

Conflicts:
	app/code/Magento/CatalogImportExport/Model/Import/Product.php
	app/code/Magento/CatalogSearch/Model/Advanced.php

Author: marcozheng

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

@@ -22,8 +22,6 @@ interface EavAttributeInterface extends \Magento\Eav\Api\Data\AttributeInterface
 
     const APPLY_TO = 'apply_to';
 
-    const IS_CONFIGURABLE = 'is_configurable';
-
     const IS_SEARCHABLE = 'is_searchable';
 
     const IS_VISIBLE_IN_ADVANCED_SEARCH = 'is_visible_in_advanced_search';
@@ -95,12 +93,6 @@ public function getPosition();
      */
     public function getApplyTo();
 
-    /**
-     * Whether the attribute can be used for configurable products
-     *
-     * @return string|null
-     */
-    public function getIsConfigurable();
     /**
      * Whether the attribute can be used in Quick Search
      *

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

@@ -118,16 +118,6 @@ public function setApplyTo($applyTo)
         return $this;
     }
 
-    /**
-     * @param string|null $isConfigurable
-     * @return $this
-     */
-    public function setIsConfigurable($isConfigurable)
-    {
-        $this->_set('is_configurable', $isConfigurable);
-        return $this;
-    }
-
     /**
      * @param string|null $isSearchable
      * @return $this

app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php

@@ -83,14 +83,6 @@ public function getIsSearchable()
         return $this->getData(self::IS_SEARCHABLE);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getIsConfigurable()
-    {
-        return $this->getData(self::IS_CONFIGURABLE);
-    }
-
     /**
      * {@inheritdoc}
      */

app/code/Magento/Catalog/Api/Data/ProductAttributeDataBuilder.php

@@ -223,6 +223,8 @@ public function deleteChildren(\Magento\Framework\Object $object)
      *
      * @param \Magento\Framework\Object $object
      * @return $this
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _beforeSave(\Magento\Framework\Object $object)
     {
@@ -231,21 +233,27 @@ protected function _beforeSave(\Magento\Framework\Object $object)
         if (!$object->getChildrenCount()) {
             $object->setChildrenCount(0);
         }
-        if ($object->getLevel() === null) {
-            $object->setLevel(1);
-        }
 
-        if (!$object->getId()) {
-            $object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
+        if ($object->isObjectNew()) {
+            if (is_null($object->getPosition())) {
+                $object->setPosition($this->_getMaxPosition($object->getPath()) + 1);
+            }
             $path = explode('/', $object->getPath());
-            $level = count($path);
-            $object->setLevel($level);
-            if ($level) {
+            $level = count($path)  - ($object->getId() ? 1 : 0);
+            $toUpdateChild = array_diff($path, [$object->getId()]);
+
+            if (!$object->hasPosition()) {
+                $object->setPosition($this->_getMaxPosition(implode('/', $toUpdateChild)) + 1);
+            }
+            if (!$object->hasLevel()) {
+                $object->setLevel($level);
+            }
+            if (!$object->hasParentId() && $level) {
                 $object->setParentId($path[$level - 1]);
             }
-            $object->setPath($object->getPath() . '/');
-
-            $toUpdateChild = explode('/', $object->getPath());
+            if (!$object->getId()) {
+                $object->setPath($object->getPath() . '/');
+            }
 
             $this->_getWriteAdapter()->update(
                 $this->getEntityTable(),

app/code/Magento/Catalog/Model/Category/Attribute.php

@@ -544,14 +544,6 @@ public function getPosition()
         return $this->getData(self::POSITION);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getIsConfigurable()
-    {
-        return $this->getData(self::IS_CONFIGURABLE);
-    }
-
     /**
      * {@inheritdoc}
      */

app/code/Magento/Catalog/Model/Resource/Category.php

@@ -14,7 +14,7 @@
     ->load(1)
     ->setId(1)
     ->setStoreId(0)
-    ->setPath(1)
+    ->setPath('1')
     ->setLevel(0)
     ->setPosition(0)
     ->setChildrenCount(0)
@@ -26,11 +26,12 @@
 
 $installer->createCategory()
     ->setStoreId(0)
+    ->setPath('1')
     ->setName('Default Category')
     ->setDisplayMode('PRODUCTS')
     ->setAttributeSetId($category->getDefaultAttributeSetId())
     ->setIsActive(1)
-    ->setPath('1')
+    ->setLevel(1)
     ->setInitialSetupFlag(true)
     ->save();