Skip to content

Commit a5e2370

Browse files
committed
ACPT-493: Upload csv with request parameter
1 parent 3aa62fa commit a5e2370

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

app/code/Magento/ImportExport/Model/Import.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,6 @@ class Import extends AbstractModel
193193
*/
194194
private $messageManager;
195195

196-
/**
197-
* @Deprecated Property isn't used
198-
* @var Random
199-
*/
200-
private $random;
201-
202196
/**
203197
* @var Upload
204198
*/
@@ -221,7 +215,6 @@ class Import extends AbstractModel
221215
* @param DateTime $localeDate
222216
* @param array $data
223217
* @param ManagerInterface|null $messageManager
224-
* @param Random|null $random
225218
* @param Upload|null $upload
226219
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
227220
*/
@@ -242,7 +235,6 @@ public function __construct(
242235
DateTime $localeDate,
243236
array $data = [],
244237
ManagerInterface $messageManager = null,
245-
Random $random = null,
246238
Upload $upload = null
247239
) {
248240
$this->_importExportData = $importExportData;
@@ -260,8 +252,6 @@ public function __construct(
260252
$this->localeDate = $localeDate;
261253
$this->messageManager = $messageManager ?: ObjectManager::getInstance()
262254
->get(ManagerInterface::class);
263-
$this->random = $random ?: ObjectManager::getInstance()
264-
->get(Random::class);
265255
$this->upload = $upload ?: ObjectManager::getInstance()
266256
->get(Upload::class);
267257
parent::__construct($logger, $filesystem, $data);

app/code/Magento/ImportExport/Model/Import/Adapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public static function findAdapterFor($source, $directory, $options = null)
7474
*/
7575
public static function findAdapterForData($source, $options = null)
7676
{
77-
return self::factory('Data', null, $source, $options);
77+
return self::factory('Base64EncodedCsvData', null, $source, $options);
7878
}
7979
}

app/code/Magento/ImportExport/Model/Import/Source/Data.php renamed to app/code/Magento/ImportExport/Model/Import/Source/Base64EncodedCsvData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
use Magento\ImportExport\Model\Import\AbstractSource;
1111

12-
class Data extends AbstractSource
12+
class Base64EncodedCsvData extends AbstractSource
1313
{
1414
/**
1515
* @var array

0 commit comments

Comments
 (0)