Merge branch 'MDVA-237' into 2.0.5_backlog

Author: isitnikov

app/code/Magento/Catalog/Setup/InstallData.php

@@ -22,6 +22,20 @@ class InstallData implements InstallDataInterface
      */
     private $categorySetupFactory;
 
+    /**
+     * Root category ID
+     *
+     * @var int
+     */
+    const ROOT_CATEGORY_ID = 1;
+
+    /**
+     * Default category ID
+     *
+     * @var int
+     */
+    const DEFAULT_CATEGORY_ID = 2;
+
     /**
      * Init
      *
@@ -46,28 +60,29 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $categorySetup->installEntities();
         // Create Root Catalog Node
         $categorySetup->createCategory()
-            ->load(1)
-            ->setId(1)
+            ->load(self::ROOT_CATEGORY_ID)
+            ->setId(self::ROOT_CATEGORY_ID)
             ->setStoreId(0)
-            ->setPath('1')
+            ->setPath(self::ROOT_CATEGORY_ID)
             ->setLevel(0)
             ->setPosition(0)
             ->setChildrenCount(0)
             ->setName('Root Catalog')
             ->setInitialSetupFlag(true)
             ->save();
 
+        // Create Default Catalog Node
         $category = $categorySetup->createCategory();
-
-        $categorySetup->createCategory()
+        $category->load(self::DEFAULT_CATEGORY_ID)
+            ->setId(self::DEFAULT_CATEGORY_ID)
             ->setStoreId(0)
-            ->setPath('1')
+            ->setPath(self::ROOT_CATEGORY_ID . '/' . self::DEFAULT_CATEGORY_ID)
             ->setName('Default Category')
             ->setDisplayMode('PRODUCTS')
-            ->setAttributeSetId($category->getDefaultAttributeSetId())
             ->setIsActive(1)
             ->setLevel(1)
             ->setInitialSetupFlag(true)
+            ->setAttributeSetId($category->getDefaultAttributeSetId())
             ->save();
 
         $data = [

app/code/Magento/Store/Setup/InstallSchema.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use \Magento\Framework\DB\Ddl\Table;
+use \Magento\Catalog\Setup\InstallData;
 
 /**
  * @codeCoverageIgnore
@@ -259,7 +260,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'group_id' => 1,
                 'website_id' => 1,
                 'name' => 'Main Website Store',
-                'root_category_id' => 2,
+                'root_category_id' => InstallData::DEFAULT_CATEGORY_ID,
                 'default_store_id' => 1
             ]
         );