ACPT-1429: Stabilize Import Product

Author: adifucan

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

@@ -254,8 +254,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
      */
     private function validateByAttributeType(string $attrCode, array $attrParams, array $rowData): bool
     {
-        $valid = false;
-
         switch ($attrParams['type']) {
             case 'varchar':
             case 'text':
@@ -270,19 +268,7 @@ private function validateByAttributeType(string $attrCode, array $attrParams, ar
                 $valid = $this->validateOption($attrCode, $attrParams['options'], $rowData[$attrCode]);
                 break;
             case 'multiselect':
-                $values = $this->context->parseMultiselectValues($rowData[$attrCode]);
-                foreach ($values as $value) {
-                    $valid = $this->validateOption($attrCode, $attrParams['options'], $value);
-                    if (!$valid) {
-                        break;
-                    }
-                }
-
-                $uniqueValues = array_unique($values);
-                if (count($uniqueValues) != count($values)) {
-                    $valid = false;
-                    $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES]);
-                }
+                $valid = $this->validateMultiselect($attrCode, $attrParams['options'], $rowData[$attrCode]);
                 break;
             case 'datetime':
                 $val = trim($rowData[$attrCode]);
@@ -299,6 +285,35 @@ private function validateByAttributeType(string $attrCode, array $attrParams, ar
         return $valid;
     }
 
+    /**
+     * Validate multiselect attribute.
+     *
+     * @param string $attrCode
+     * @param array $options
+     * @param array|string $rowData
+     * @return bool
+     */
+    private function validateMultiselect(string $attrCode, array $options, array|string $rowData): bool
+    {
+        $valid = true;
+
+        $values = $this->context->parseMultiselectValues($rowData);
+        foreach ($values as $value) {
+            $valid = $this->validateOption($attrCode, $options, $value);
+            if (!$valid) {
+                break;
+            }
+        }
+
+        $uniqueValues = array_unique($values);
+        if (count($uniqueValues) != count($values)) {
+            $valid = false;
+            $this->_addMessages([RowValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES]);
+        }
+
+        return $valid;
+    }
+
     /**
      * Set invalid attribute
      *

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

@@ -461,8 +461,7 @@ protected function _prepareDataForUpdate(array $rowData)
                     $attribute->getBackend()->beforeSave($this->_customerModel->setData($attributeCode, $value));
                     $value = $this->_customerModel->getData($attributeCode);
                 }
-                $attributesToSave[$attribute->getBackend()
-                    ->getTable()][$entityId][$attributeParameters['id']] = $value;
+                $attributesToSave[$attribute->getBackend()->getTable()][$entityId][$attributeParameters['id']] = $value;
 
                 // restore 'backend_model' to avoid default setting
                 $attribute->setBackendModel($backendModel);
@@ -617,7 +616,7 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 $isFieldRequired = $attributeParams['is_required'];
                 $isFieldNotSetAndCustomerDoesNotExist =
                     !isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website);
-                $isFieldSetAndTrimmedValueIsEmpty = true;
+                $isFieldSetAndTrimmedValueIsEmpty = false;
                 $isFieldValueNotEmpty = false;
 
                 if (isset($rowData[$attributeCode])) {
@@ -626,7 +625,7 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                         $isFieldValueNotEmpty = count(array_filter($rowData[$attributeCode], 'strlen')) > 0;
                     } else {
                         $isFieldSetAndTrimmedValueIsEmpty = '' === trim((string)$rowData[$attributeCode]);
-                        $isFieldValueNotEmpty = strlen($rowData[$attributeCode]) > 0;
+                        $isFieldValueNotEmpty = strlen((string)$rowData[$attributeCode]) > 0;
                     }
                 }
 

app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php

@@ -831,7 +831,7 @@ protected function prepareSampleData($rowCol, $entityId = null)
      * Prepare samples data in structured format.
      *
      * @param array $samples
-     * @param $entityId
+     * @param string|int|null $entityId
      * @return array
      */
     private function prepareStructuredSampleData(array $samples, $entityId = null): array
@@ -885,7 +885,7 @@ protected function prepareLinkData($rowCol, $entityId = null)
      * Prepare links data in structured format.
      *
      * @param array $links
-     * @param $entityId
+     * @param string|int|null $entityId
      * @return array
      */
     private function prepareStructuredLinkData(array $links, $entityId = null): array

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

@@ -28,6 +28,7 @@
  * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @since 100.0.2
  */
 abstract class AbstractEntity implements EntityInterface
@@ -522,7 +523,7 @@ private function validateEncoding(array|string|null $element, string $attrName):
                 );
                 return false;
             }
-        } elseif (is_null($element)) {
+        } elseif ($element === null) {
             return true;
         }
 

lib/internal/Magento/Framework/Reflection/TypeProcessor.php

@@ -31,6 +31,7 @@ class TypeProcessor
     public const INT_TYPE = 'integer';
     public const BOOLEAN_TYPE = 'bool';
     public const ANY_TYPE = 'mixed';
+    public const UNSTRUCTURED_ARRAY = 'UnstructuredArray';
     /**#@-*/
 
     /**#@+
@@ -144,7 +145,8 @@ public function register($type)
         }
         if (!$this->isTypeSimple($typeName) && !$this->isTypeAny($typeName)) {
             $typeSimple = $this->getArrayItemType($type);
-            if (!(class_exists($typeSimple) || interface_exists($typeSimple))) {
+            if (!(class_exists($typeSimple) || interface_exists($typeSimple))
+                && ($typeSimple !== self::UNSTRUCTURED_ARRAY)) {
                 throw new \LogicException(
                     sprintf(
                         'The "%s" class doesn\'t exist and the namespace must be specified. Verify and try again.',
@@ -174,6 +176,11 @@ protected function _processComplexType($class)
     {
         $typeName = $this->translateTypeName($class);
         $this->_types[$typeName] = [];
+        if ($typeName === self::UNSTRUCTURED_ARRAY) {
+            $this->_types[$typeName]['documentation'] = '';
+            $this->_types[$typeName]['parameters'] = [];
+            return $this->_types[$typeName];
+        }
         if ($this->isArrayType($class)) {
             $this->register($this->getArrayItemType($class));
         } else {
@@ -448,6 +455,9 @@ public function translateTypeName($class)
 
             return ucfirst($moduleNamespace . $moduleName . implode('', $typeNameParts));
         }
+        if ($class === self::UNSTRUCTURED_ARRAY) {
+            return $class;
+        }
         throw new \InvalidArgumentException(
             sprintf('The "%s" parameter type is invalid. Verify the parameter and try again.', $class)
         );