Merge pull request #109 from magento-borg/MC-15057-ObjectManager-To-Constructor

Mc 15057 object manager to constructor

Author: pdohogne-magento

app/code/Magento/DownloadableSampleData/Model/Product/Converter.php

@@ -24,6 +24,35 @@ class Converter extends \Magento\CatalogSampleData\Model\Product\Converter
      */
     private $filesystem;
 
+    public function __construct(
+        \Magento\Catalog\Model\Category\TreeFactory $categoryTreeFactory,
+        \Magento\Catalog\Model\ResourceModel\Category\TreeFactory $categoryResourceTreeFactory,
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
+        \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory $fileContentFactory = null,
+        Filesystem $filesystem = null
+    ) {
+        parent::__construct(
+            $categoryTreeFactory,
+            $categoryResourceTreeFactory,
+            $eavConfig,
+            $categoryCollectionFactory,
+            $attributeCollectionFactory,
+            $attrOptionCollectionFactory,
+            $productCollectionFactory
+        );
+        $this->fileContentFactory = $fileContentFactory ?: ObjectManager::getInstance()->get(
+            \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
+        );
+        $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(
+            Filesystem::class
+        );
+    }
+
+
     /**
      * Get downloadable data from array
      *
@@ -159,11 +188,6 @@ public function getSamplesInfo()
      */
     private function getFileContent()
     {
-        if (!$this->fileContentFactory) {
-            $this->fileContentFactory = ObjectManager::getInstance()->create(
-                \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory::class
-            );
-        }
         return $this->fileContentFactory->create();
     }
 
@@ -173,11 +197,6 @@ private function getFileContent()
      */
     private function getFilesystem()
     {
-        if (!$this->filesystem) {
-            $this->filesystem = ObjectManager::getInstance()->create(
-                Filesystem::class
-            );
-        }
         return $this->filesystem;
     }
 }