MAGETWO-59649: Current store resolver does not work for global scope

Author: le0n4eg

app/code/Magento/BundleSampleData/Setup/Installer.php

@@ -6,6 +6,8 @@
 namespace Magento\BundleSampleData\Setup;
 
 use Magento\Framework\Setup;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Launches setup of sample data for Bundle module
@@ -19,23 +21,33 @@ class Installer implements Setup\SampleData\InstallerInterface
      */
     protected $bundleProduct;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\BundleSampleData\Model\Product $bundleProduct
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Magento\BundleSampleData\Model\Product $bundleProduct
+        \Magento\BundleSampleData\Model\Product $bundleProduct,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->bundleProduct = $bundleProduct;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
      * {@inheritdoc}
      */
     public function install()
     {
+        $this->storeManager->setCurrentStore(Store::DISTRO_STORE_ID);
         $this->bundleProduct->install(
             ['Magento_BundleSampleData::fixtures/yoga_bundle.csv'],
             ['Magento_BundleSampleData::fixtures/images_yoga_bundle.csv']
         );
     }
-}
+}

app/code/Magento/BundleSampleData/composer.json

@@ -5,7 +5,8 @@
         "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
         "magento/module-bundle": "100.2.*",
         "magento/module-sample-data": "100.2.*",
-        "magento/module-catalog-sample-data": "100.2.*"
+        "magento/module-catalog-sample-data": "100.2.*",
+        "magento/module-store": "100.2.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/DownloadableSampleData/Setup/Installer.php

@@ -6,36 +6,60 @@
 namespace Magento\DownloadableSampleData\Setup;
 
 use Magento\Framework\Setup;
+use Magento\CatalogSampleData\Model\Category;
+use Magento\CatalogSampleData\Model\Attribute;
+use Magento\DownloadableSampleData\Model\Product;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 
 class Installer implements Setup\SampleData\InstallerInterface
 {
     /**
-     * Setup class for products
-     *
-     * @var \Magento\DownloadableSampleData\Model\Product
+     * @var \Magento\CatalogSampleData\Model\Category
      */
-    protected $productSetup;
+    protected $category;
 
     /**
-     * @param \Magento\CatalogSampleData\Model\Category $category
-     * @param \Magento\CatalogSampleData\Model\Attribute $attribute
-     * @param \Magento\DownloadableSampleData\Model\Product $product
+     * @var Attribute
+     */
+    private $attribute;
+
+    /**
+     * @var Product
+     */
+    private $downloadableProduct;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param Category  $category
+     * @param Attribute $attribute
+     * @param Product   $product
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Magento\CatalogSampleData\Model\Category $category,
-        \Magento\CatalogSampleData\Model\Attribute $attribute,
-        \Magento\DownloadableSampleData\Model\Product $product
+        Category $category,
+        Attribute $attribute,
+        Product $product,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->category = $category;
         $this->attribute = $attribute;
         $this->downloadableProduct = $product;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
      * {@inheritdoc}
      */
     public function install()
     {
+        $this->storeManager->setCurrentStore(Store::DISTRO_STORE_ID);
+
         $this->attribute->install(['Magento_DownloadableSampleData::fixtures/attributes.csv']);
         $this->category->install(['Magento_DownloadableSampleData::fixtures/categories.csv']);
         $this->downloadableProduct->install(
@@ -44,4 +68,4 @@ public function install()
             ['Magento_DownloadableSampleData::fixtures/downloadable_data_training_video_download.csv']
         );
     }
-}
+}

app/code/Magento/DownloadableSampleData/composer.json

@@ -6,7 +6,8 @@
         "magento/module-sample-data": "100.2.*",
         "magento/module-catalog-sample-data": "100.2.*",
         "magento/module-downloadable": "100.2.*",
-        "magento/sample-data-media": "100.2.*"
+        "magento/sample-data-media": "100.2.*",
+        "magento/module-store": "100.2.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/GroupedProductSampleData/Setup/Installer.php

@@ -6,6 +6,8 @@
 namespace Magento\GroupedProductSampleData\Setup;
 
 use Magento\Framework\Setup;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 
 class Installer implements Setup\SampleData\InstallerInterface
 {
@@ -16,21 +18,33 @@ class Installer implements Setup\SampleData\InstallerInterface
      */
     protected $groupedProduct;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\GroupedProductSampleData\Model\Product $groupedProduct
+     * @param StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\GroupedProductSampleData\Model\Product $groupedProduct) {
+    public function __construct(
+        \Magento\GroupedProductSampleData\Model\Product $groupedProduct,
+        StoreManagerInterface $storeManager = null
+    ) {
         $this->groupedProduct = $groupedProduct;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
      * {@inheritdoc}
      */
     public function install()
     {
+        $this->storeManager->setCurrentStore(Store::DISTRO_STORE_ID);
         $this->groupedProduct->install(
             ['Magento_GroupedProductSampleData::fixtures/yoga_grouped.csv'],
             ['Magento_GroupedProductSampleData::fixtures/images_yoga_grouped.csv']
         );
     }
-}
+}

app/code/Magento/GroupedProductSampleData/composer.json

@@ -5,7 +5,8 @@
         "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
         "magento/module-sample-data": "100.2.*",
         "magento/module-catalog-sample-data": "100.2.*",
-        "magento/module-grouped-product": "100.2.*"
+        "magento/module-grouped-product": "100.2.*",
+        "magento/module-store": "100.2.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",