ACPT-1424: Import Customer Addresses

Author: adifucan

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -634,7 +634,8 @@ protected function _prepareDataForUpdate(array $rowData): array
 
                 $value = $rowData[$attributeAlias];
 
-                if ($rowData[$attributeAlias] === null || !strlen($rowData[$attributeAlias])) {
+                if ($rowData[$attributeAlias] === null
+                    || (is_string($rowData[$attributeAlias]) && !strlen($rowData[$attributeAlias]))) {
                     if ($attributeParams['is_required']) {
                         continue;
                     }
@@ -689,12 +690,12 @@ protected function _prepareDataForUpdate(array $rowData): array
     /**
      * Process row data, based on attirbute type
      *
-     * @param string $rowAttributeData
+     * @param string|array $rowAttributeData
      * @param array $attributeParams
      * @return \DateTime|int|string
      * @throws \Exception
      */
-    protected function getValueByAttributeType(string $rowAttributeData, array $attributeParams)
+    protected function getValueByAttributeType($rowAttributeData, array $attributeParams)
     {
         $multiSeparator = $this->getMultipleValueSeparator();
         $value = $rowAttributeData;
@@ -709,8 +710,14 @@ protected function getValueByAttributeType(string $rowAttributeData, array $attr
                 break;
             case 'multiselect':
                 $ids = [];
-                foreach (explode($multiSeparator, mb_strtolower($rowAttributeData)) as $subValue) {
-                    $ids[] = $this->getSelectAttrIdByValue($attributeParams, $subValue);
+                if (is_array($rowAttributeData)) {
+                    foreach ($rowAttributeData as $subValue) {
+                        $ids[] = $this->getSelectAttrIdByValue($attributeParams, mb_strtolower($subValue));
+                    }
+                } elseif (is_string($rowAttributeData)) {
+                    foreach (explode($multiSeparator, mb_strtolower($rowAttributeData)) as $subValue) {
+                        $ids[] = $this->getSelectAttrIdByValue($attributeParams, $subValue);
+                    }
                 }
                 $value = implode(',', $ids);
                 break;
@@ -880,7 +887,9 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
 
                     if (in_array($attributeCode, $this->_ignoredAttributes)) {
                         continue;
-                    } elseif (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
+                    } elseif (isset($rowData[$attributeCode])
+                        && ((is_string($rowData[$attributeCode]) && strlen($rowData[$attributeCode]))
+                            || (is_array($rowData[$attributeCode]) && count($rowData[$attributeCode])))) {
                         $this->isAttributeValid(
                             $attributeCode,
                             $attributeParams,

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

@@ -3,6 +3,8 @@
  * 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;
@@ -440,17 +442,13 @@ protected function _saveValidatedBunches()
                 $startNewBunch = false;
             }
             if ($source->valid()) {
-                $valid = true;
                 try {
                     $rowData = $source->current();
+                    $valid = true;
                     foreach ($rowData as $attrName => $element) {
-                        if (!mb_check_encoding($element, 'UTF-8')) {
-                            $valid = false;
-                            $this->addRowError(
-                                AbstractEntity::ERROR_CODE_ILLEGAL_CHARACTERS,
-                                $this->_processedRowsCount,
-                                $attrName
-                            );
+                        $valid = $this->validateEncoding($element, $attrName);
+                        if (!$valid) {
+                            break;
                         }
                     }
                 } catch (\InvalidArgumentException $e) {
@@ -495,6 +493,42 @@ protected function _saveValidatedBunches()
         return $this;
     }
 
+    /**
+     * Validates encoding.
+     *
+     * @param array|string|null $element
+     * @param string $attrName
+     * @return bool
+     */
+    private function validateEncoding(array|string|null $element, string $attrName): bool
+    {
+        if (is_array($element)) {
+            foreach ($element as $value) {
+                if (!mb_check_encoding($value, 'UTF-8')) {
+                    $this->addRowError(
+                        AbstractEntity::ERROR_CODE_ILLEGAL_CHARACTERS,
+                        $this->_processedRowsCount,
+                        $attrName
+                    );
+                    return false;
+                }
+            }
+        } elseif (is_string($element)) {
+            if (!mb_check_encoding($element, 'UTF-8')) {
+                $this->addRowError(
+                    AbstractEntity::ERROR_CODE_ILLEGAL_CHARACTERS,
+                    $this->_processedRowsCount,
+                    $attrName
+                );
+                return false;
+            }
+        } elseif (is_null($element)) {
+            return true;
+        }
+
+        return true;
+    }
+
     /**
      * Add error with corresponding current data source row number.
      *