ACPT-1429: PR stabilization

Author: adifucan

app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php

@@ -1156,16 +1156,23 @@ protected function _isReadyForSaving(array &$options, array &$titles, array $typ
      */
     protected function _getMultiRowFormat($rowData)
     {
+        if (!isset($rowData['custom_options'])) {
+            return [];
+        }
+
         if (is_array($rowData['custom_options'])) {
             $rowData = $this->parseStructuredCustomOptions($rowData);
-        } else {
+        } elseif (is_string($rowData['custom_options'])) {
             $rowData = $this->_parseCustomOptions($rowData);
+        } else {
+            return [];
         }
-        $multiRow = [];
+
         if (empty($rowData['custom_options']) || !is_array($rowData['custom_options'])) {
-            return $multiRow;
+            return [];
         }
 
+        $multiRow = [];
         $i = 0;
         foreach ($rowData['custom_options'] as $name => $customOption) {
             $i++;

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

@@ -17,7 +17,7 @@ class Json extends \Magento\ImportExport\Model\Import\AbstractSource
     /**
      * @var FileReadInterface
      */
-    protected FileReadInterface $_file;
+    private FileReadInterface $_file;
 
     /**
      * @var array