magento-engcom#30: Do required attribute check before attribute validation. Add check if the required attribute is not empty after trimming.

Author: carstenpfeifer

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

@@ -593,6 +593,12 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 if (in_array($attributeCode, $this->_ignoredAttributes)) {
                     continue;
                 }
+                if ($attributeParams['is_required']
+                    && ((!isset($rowData[$attributeCode]) && !$this->_getCustomerId($email, $website))
+                    || (isset($rowData[$attributeCode])  && '' === trim($rowData[$attributeCode])))) {
+                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
+                    continue;
+                }
                 if (isset($rowData[$attributeCode]) && strlen($rowData[$attributeCode])) {
                     $this->isAttributeValid(
                         $attributeCode,
@@ -603,8 +609,6 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                             ? $this->_parameters[Import::FIELD_FIELD_MULTIPLE_VALUE_SEPARATOR]
                             : Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
                     );
-                } elseif ($attributeParams['is_required'] && !$this->_getCustomerId($email, $website)) {
-                    $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, $attributeCode);
                 }
             }
         }