Merge pull request magento#47 from magento-ogre/MAGETWO-40848-components-from-vendor

[Ogres] Components from vendor

Author: Kopylova,Olga(okopylova)

app/code/Magento/SampleData/Module/ConfigurableProduct/Setup/Product.php

@@ -5,10 +5,11 @@
  */
 namespace Magento\SampleData\Module\ConfigurableProduct\Setup;
 
-use Magento\SampleData\Model\SetupInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\SampleData\Model\SetupInterface;
 
 /**
  * Setup configurable product
@@ -31,22 +32,28 @@ class Product implements SetupInterface
     private $csvSourceFactory;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var \Magento\Framework\Filesystem\Directory\ReadFactory
      */
-    private $filesystem;
+    private $readFactory;
 
     /**
      * @var \Magento\Indexer\Model\Indexer\CollectionFactory
      */
     private $indexerCollectionFactory;
 
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar
+     */
+    private $componentRegistrar;
+
     /**
      * @param \Magento\SampleData\Model\Logger $logger
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\ImportExport\Model\Import $importModel
      * @param \Magento\ImportExport\Model\Import\Source\CsvFactory $csvSourceFactory
      * @param \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory
-     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
+     * @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @codingStandardsIgnoreStart
      */
@@ -56,14 +63,16 @@ public function __construct(
         \Magento\ImportExport\Model\Import $importModel,
         \Magento\ImportExport\Model\Import\Source\CsvFactory $csvSourceFactory,
         \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory,
-        \Magento\Framework\Filesystem $filesystem
+        \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
+        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
     ) {
         $this->logger = $logger;
         $this->eavConfig = $eavConfig;
         $this->importModel = $importModel;
         $this->csvSourceFactory = $csvSourceFactory;
         $this->indexerCollectionFactory = $indexerCollectionFactory;
-        $this->filesystem = $filesystem;
+        $this->readFactory = $readFactory;
+        $this->componentRegistrar = $componentRegistrar;
 
     }
     // @codingStandardsIgnoreEnd
@@ -88,13 +97,15 @@ public function run()
 
         $source = $this->csvSourceFactory->create(
             [
-                'file' => 'Magento/SampleData/fixtures/ConfigurableProduct/import-export_products-img.csv',
-                'directory' => $this->filesystem->getDirectoryWrite(DirectoryList::MODULES)
+                'file' => 'fixtures/ConfigurableProduct/import-export_products-img.csv',
+                'directory' => $this->readFactory->create(
+                    $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_SampleData')
+                )
             ]
         );
 
         $currentPath = getcwd();
-        chdir($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath());
+        chdir(BP);
 
         $importModel->validateSource($source);
         $importModel->importSource();

app/code/Magento/SampleData/composer.json

@@ -3,16 +3,13 @@
     "description": "Sample Data fixtures",
     "version": "1.0.0-beta",
     "require": {
-        "magento/framework": "~1.0.0-beta",
-        "magento/magento-composer-installer": "*"
+        "magento/framework": "~1.0.0-beta"
     },
     "type": "magento2-module",
-    "extra": {
-        "map": [
-            [
-                "*",
-                "Magento/SampleData"
-            ]
-        ]
+    "autoload": {
+        "files": [ "registration.php" ],
+        "psr-4": {
+            "Magento\\SampleData\\": ""
+        }
     }
 }

app/code/Magento/SampleData/etc/di.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:library:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">

app/code/Magento/SampleData/etc/module.xml

@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:library:framework:Module/etc/module.xsd">
     <module name="Magento_SampleData" setup_version="2.0.0">
     </module>
 </config>

app/code/Magento/SampleData/registration.php

@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_SampleData',
+    __DIR__
+);