Merge branch 'ACPT-747-2' into ACPT-757&ACPT-773&ACPT-747&ACPT-748&ACPT-675&ACPT-671&ACPT-746

Author: JacobBrownAustin

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

@@ -6,12 +6,9 @@
 namespace Magento\ImportExport\Model\Import;
 
 use Magento\Framework\Filesystem\Directory\Write;
-use Magento\ImportExport\Model\Import\Source\Factory;
 
 /**
  * Import adapter model
- * @Deprecated
- * @see \Magento\ImportExport\Model\Import\Source\Factory
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Adapter

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

@@ -5,15 +5,16 @@
  */
 namespace Magento\ImportExport\Model\Import\Source;
 
-use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\Filesystem\Directory\Read as DirectoryRead;
+use Magento\Framework\Filesystem\File\ReadInterface as FileReadInterface;
 
 /**
  * CSV import adapter
  */
 class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
 {
     /**
-     * @var \Magento\Framework\Filesystem\File\Write
+     * @var FileReadInterface
      */
     protected $_file;
 
@@ -42,27 +43,33 @@ class Csv extends \Magento\ImportExport\Model\Import\AbstractSource
      *
      * There must be column names in the first line
      *
-     * @param string $file
-     * @param Read $directory
+     * @param string|FileReadInterface $file
+     * @param DirectoryRead $directory
      * @param string $delimiter
      * @param string $enclosure
      * @throws \LogicException
      */
     public function __construct(
         $file,
-        Read $directory,
+        DirectoryRead $directory,
         $delimiter = ',',
         $enclosure = '"'
     ) {
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         register_shutdown_function([$this, 'destruct']);
-        try {
-            $this->filePath = $directory->getRelativePath($file);
-            $this->_file = $directory->openFile($this->filePath, 'r');
+        if ($file instanceof FileReadInterface) {
+            $this->filePath = '';
+            $this->_file = $file;
             $this->_file->seek(0);
-            self::$openFiles[$this->filePath] = true;
-        } catch (\Magento\Framework\Exception\FileSystemException $e) {
-            throw new \LogicException("Unable to open file: '{$file}'");
+        } else {
+            try {
+                $this->filePath = $directory->getRelativePath($file);
+                $this->_file = $directory->openFile($this->filePath, 'r');
+                $this->_file->seek(0);
+                self::$openFiles[$this->filePath] = true;
+            } catch (\Magento\Framework\Exception\FileSystemException $e) {
+                throw new \LogicException("Unable to open file: '{$file}'");
+            }
         }
         if ($delimiter) {
             $this->_delimiter = $delimiter;