MAGETWO-50224: Inconsistent data during installation of Store

Author: Alex Bomko

app/code/Magento/Catalog/Helper/DefaultCategory.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Helper;
+
+/**
+ * Default Category helper
+ */
+class DefaultCategory
+{
+    /**
+     * Default Category ID
+     *
+     * @var int
+     */
+    private $defaultCategoryId = 2;
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->defaultCategoryId;
+    }
+}

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

@@ -9,6 +9,7 @@
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Catalog\Helper\DefaultCategory;
 
 /**
  * @codeCoverageIgnore
@@ -23,18 +24,22 @@ class InstallData implements InstallDataInterface
     private $categorySetupFactory;
 
     /**
-     * Root category ID
-     *
-     * @var int
+     * @var DefaultCategory
      */
-    const ROOT_CATEGORY_ID = 1;
+    private $defaultCategory;
 
     /**
-     * Default category ID
-     *
-     * @var int
+     * @deprecated
+     * @return DefaultCategory
      */
-    const DEFAULT_CATEGORY_ID = 2;
+    private function getDefaultCategory()
+    {
+        if ($this->defaultCategory === null) {
+            $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(DefaultCategory::class);
+        }
+        return $this->defaultCategory;
+    }
 
     /**
      * Init
@@ -56,14 +61,16 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
     {
         /** @var \Magento\Catalog\Setup\CategorySetup $categorySetup */
         $categorySetup = $this->categorySetupFactory->create(['setup' => $setup]);
+        $rootCategoryId = \Magento\Catalog\Model\Category::TREE_ROOT_ID;
+        $defaultCategoryId = $this->getDefaultCategory()->getId();
 
         $categorySetup->installEntities();
         // Create Root Catalog Node
         $categorySetup->createCategory()
-            ->load(self::ROOT_CATEGORY_ID)
-            ->setId(self::ROOT_CATEGORY_ID)
+            ->load($rootCategoryId)
+            ->setId($rootCategoryId)
             ->setStoreId(0)
-            ->setPath(self::ROOT_CATEGORY_ID)
+            ->setPath($rootCategoryId)
             ->setLevel(0)
             ->setPosition(0)
             ->setChildrenCount(0)
@@ -73,10 +80,10 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
 
         // Create Default Catalog Node
         $category = $categorySetup->createCategory();
-        $category->load(self::DEFAULT_CATEGORY_ID)
-            ->setId(self::DEFAULT_CATEGORY_ID)
+        $category->load($defaultCategoryId)
+            ->setId($defaultCategoryId)
             ->setStoreId(0)
-            ->setPath(self::ROOT_CATEGORY_ID . '/' . self::DEFAULT_CATEGORY_ID)
+            ->setPath($rootCategoryId . '/' . $defaultCategoryId)
             ->setName('Default Category')
             ->setDisplayMode('PRODUCTS')
             ->setIsActive(1)

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

@@ -9,14 +9,32 @@
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use \Magento\Framework\DB\Ddl\Table;
-use \Magento\Catalog\Setup\InstallData;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Catalog\Helper\DefaultCategory;
 
 /**
  * @codeCoverageIgnore
  */
 class InstallSchema implements InstallSchemaInterface
 {
+    /**
+     * @var DefaultCategory
+     */
+    private $defaultCategory;
+
+    /**
+     * @deprecated
+     * @return DefaultCategory
+     */
+    private function getDefaultCategory()
+    {
+        if ($this->defaultCategory === null) {
+            $this->defaultCategory = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(DefaultCategory::class);
+        }
+        return $this->defaultCategory;
+    }
+
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -260,7 +278,7 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'group_id' => 1,
                 'website_id' => 1,
                 'name' => 'Main Website Store',
-                'root_category_id' => InstallData::DEFAULT_CATEGORY_ID,
+                'root_category_id' => $this->getDefaultCategory()->getId(),
                 'default_store_id' => 1
             ]
         );