ACPT-1429: Stabilize Import Product

Author: adifucan

app/code/Magento/DownloadableImportExport/Helper/Data.php

@@ -18,12 +18,22 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param array $rowData
      * @return bool
      */
-    public function isRowDownloadableEmptyOptions(array $rowData)
+    public function isRowDownloadableEmptyOptions(array $rowData): bool
     {
-        $links = $rowData[Downloadable::COL_DOWNLOADABLE_LINKS] ?? '';
-        $samples = $rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES] ?? '';
+        return $this->isDataEmpty($rowData, Downloadable::COL_DOWNLOADABLE_LINKS)
+            && $this->isDataEmpty($rowData, Downloadable::COL_DOWNLOADABLE_SAMPLES);
+    }
 
-        return empty($links) && empty($samples);
+    /**
+     * Check whether the data is empty.
+     *
+     * @param array $data
+     * @param string $key
+     * @return bool
+     */
+    private function isDataEmpty(array $data, string $key): bool
+    {
+        return isset($data[$key]) && ($data[$key] == '' || $data[$key] == []);
     }
 
     /**
@@ -32,11 +42,10 @@ public function isRowDownloadableEmptyOptions(array $rowData)
      * @param array $rowData
      * @return bool
      */
-    public function isRowDownloadableNoValid(array $rowData)
+    public function isRowDownloadableNoValid(array $rowData): bool
     {
-        $result = isset($rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES]) ||
+        return isset($rowData[Downloadable::COL_DOWNLOADABLE_SAMPLES]) ||
             isset($rowData[Downloadable::COL_DOWNLOADABLE_LINKS]);
-        return $result;
     }
 
     /**

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

@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
 namespace Magento\ImportExport\Model\Import;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;

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

@@ -7,20 +7,13 @@
 
 namespace Magento\ImportExport\Model\Import\Source;
 
-use Magento\Framework\Exception\ValidatorException;
-use Magento\Framework\Filesystem\Directory\Read as DirectoryRead;
-use Magento\Framework\Filesystem\File\ReadInterface as FileReadInterface;
+use Magento\ImportExport\Model\Import\AbstractSource;
 
 /**
  * JSON import adapter
  */
-class Json extends \Magento\ImportExport\Model\Import\AbstractSource
+class Json extends AbstractSource
 {
-    /**
-     * @var FileReadInterface
-     */
-    private FileReadInterface $_file;
-
     /**
      * @var array
      */
@@ -37,40 +30,17 @@ class Json extends \Magento\ImportExport\Model\Import\AbstractSource
     private array $colNames = [];
 
     /**
-     * Open file and decode JSON data
-     *
-     * @param string|FileReadInterface $file
-     * @param DirectoryRead $directory
-     * @throws ValidatorException
+     * @param array $items
      */
-    public function __construct(
-        $file,
-        DirectoryRead $directory
-    ) {
-        if ($file instanceof FileReadInterface) {
-            $this->_file = $file;
-            $this->_file->seek(0);
-        } else {
-            try {
-                $filePath = $directory->getRelativePath($file);
-                $this->_file = $directory->openFile($filePath, 'r');
-                $this->_file->seek(0);
-            } catch (\Magento\Framework\Exception\FileSystemException $e) {
-                throw new \LogicException("Unable to open file: '{$file}'");
-            }
-        }
-        $jsonData = '';
-        while (!$this->_file->eof()) {
-            $chunk = $this->_file->read(1024);
-            $jsonData .= $chunk;
-        }
-        $this->items = json_decode($jsonData, true) ?: [];
+    public function __construct(array $items)
+    {
         // convert all scalar values to strings
         $this->items = array_map(function ($item) {
             return array_map(function ($value) {
-                return is_scalar($value) ? (string) $value : $value;
+                return is_scalar($value) ? (string)$value : $value;
             }, $item);
-        }, $this->items);
+        }, $items);
+
         if (isset($this->items[0])) {
             $this->colNames = array_keys($this->items[0]);
         }
@@ -108,10 +78,11 @@ public function rewind()
      * @param int $position
      * @return void
      */
-    #[\ReturnTypeWillChange]
     public function seek($position)
     {
+        if ($position < 0 || $position >= count($this->items)) {
+            throw new \OutOfBoundsException("Invalid seek position ($position)");
+        }
         $this->position = $position;
-        parent::__construct($this->_getNextRow());
     }
 }

lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php

@@ -528,7 +528,8 @@ public function convertValue($data, $type)
      * @throws SerializationException
      * @throws InvalidArgumentException
      */
-    private function processComplexTypes($data, $type) {
+    private function processComplexTypes($data, $type)
+    {
         $isArrayType = $this->typeProcessor->isArrayType($type);
 
         if (!$isArrayType) {