MAGETWO-43302: Prepare pull request for M11 nord changes

Author: Alex Bomko

app/code/Magento/CatalogSampleData/Model/Category.php

@@ -52,21 +52,18 @@ class Category
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\SampleData\Helper\Deploy $deployHelper
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Catalog\Model\Resource\Category\TreeFactory $resourceCategoryTreeFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\SampleData\Helper\Deploy $deployHelper
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
         $this->categoryFactory = $categoryFactory;
         $this->resourceCategoryTreeFactory = $resourceCategoryTreeFactory;
         $this->storeManager = $storeManager;
-        $this->deployHelper = $deployHelper;
     }
 
     /**

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

@@ -5,8 +5,6 @@
  */
 namespace Magento\DownloadableSampleData\Model;
 
-use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
-
 /**
  * Setup downloadable product
  */
@@ -17,11 +15,6 @@ class Product extends \Magento\CatalogSampleData\Model\Product
      */
     protected $productType = \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE;
 
-    /**
-     * @var \Magento\SampleData\Helper\Deploy
-     */
-    protected $deployHelper;
-
     /**
      * @var \Magento\DownloadableSampleData\Model\Product\Converter $converter
      */
@@ -32,35 +25,6 @@ class Product extends \Magento\CatalogSampleData\Model\Product
      */
     protected $downloadableData = [];
 
-    /**
-     * @param SampleDataContext $sampleDataContext
-     * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @param \Magento\Catalog\Model\ConfigFactory $catalogConfig
-     * @param \Magento\DownloadableSampleData\Model\Product\Converter $converter
-     * @param \Magento\CatalogSampleData\model\Product\Gallery $gallery
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     */
-    public function __construct(
-        SampleDataContext $sampleDataContext,
-        \Magento\Catalog\Model\ProductFactory $productFactory,
-        \Magento\Catalog\Model\ConfigFactory $catalogConfig,
-        \Magento\DownloadableSampleData\Model\Product\Converter $converter,
-        \Magento\CatalogSampleData\Model\Product\Gallery $gallery,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\SampleData\Helper\Deploy $deployHelper
-    )
-    {
-        $this->deployHelper = $deployHelper;
-        parent::__construct(
-            $sampleDataContext,
-            $productFactory,
-            $catalogConfig,
-            $converter,
-            $gallery,
-            $storeManager
-        );
-    }
-
     /**
      * {@inheritdoc}
      */