Skip to content

Commit 7058d21

Browse files
author
Yaroslav Onischenko
committed
MAGETWO-43302: Prepare pull request for M11 nord changes
1 parent 941fc57 commit 7058d21

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct(
6060
$this->importModel = $importModel;
6161
$this->csvSourceFactory = $csvSourceFactory;
6262
$this->indexerCollectionFactory = $indexerCollectionFactory;
63-
$this->filesystem = $readFactory;
63+
$this->readFactory = $readFactory;
6464
$this->componentRegistrar = $componentRegistrar;
6565
}
6666

@@ -84,7 +84,7 @@ public function install()
8484
[
8585
'file' => 'fixtures/products.csv',
8686
'directory' => $this->readFactory->create(
87-
$this->componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_SampleData')
87+
$this->componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_ConfigurableSampleData')
8888
)
8989
]
9090
);

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\DownloadableSampleData\Model;
77

8+
use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
9+
810
/**
911
* Setup downloadable product
1012
*/
@@ -25,6 +27,33 @@ class Product extends \Magento\CatalogSampleData\Model\Product
2527
*/
2628
protected $downloadableData = [];
2729

30+
/**
31+
* @param SampleDataContext $sampleDataContext
32+
* @param \Magento\Catalog\Model\ProductFactory $productFactory
33+
* @param \Magento\Catalog\Model\ConfigFactory $catalogConfig
34+
* @param Product\Converter $converter
35+
* @param \Magento\CatalogSampleData\Model\Product\Gallery $gallery
36+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
37+
*/
38+
public function __construct(
39+
SampleDataContext $sampleDataContext,
40+
\Magento\Catalog\Model\ProductFactory $productFactory,
41+
\Magento\Catalog\Model\ConfigFactory $catalogConfig,
42+
\Magento\DownloadableSampleData\Model\Product\Converter $converter,
43+
\Magento\CatalogSampleData\Model\Product\Gallery $gallery,
44+
\Magento\Store\Model\StoreManagerInterface $storeManager
45+
)
46+
{
47+
parent::__construct(
48+
$sampleDataContext,
49+
$productFactory,
50+
$catalogConfig,
51+
$converter,
52+
$gallery,
53+
$storeManager
54+
);
55+
}
56+
2857
/**
2958
* {@inheritdoc}
3059
*/

0 commit comments

Comments
 (0)