MAGETWO-88905: Import Customer ("gender" field) issue

- Static tests fixes

Author: vprohorov

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

@@ -525,10 +525,8 @@ protected function _importData()
                         if (!isset($attributesToSave[$tableName])) {
                             $attributesToSave[$tableName] = [];
                         }
-                        $attributesToSave[$tableName] = array_diff_key(
-                                $attributesToSave[$tableName],
-                                $customerAttributes
-                            ) + $customerAttributes;
+                        $attributes = array_diff_key($attributesToSave[$tableName], $customerAttributes);
+                        $attributesToSave[$tableName] =  $attributes + $customerAttributes;
                     }
                 }
             }
@@ -584,13 +582,9 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                 $this->addRowError(self::ERROR_INVALID_STORE, $rowNumber);
             }
             // check password
-            if (isset(
-                    $rowData['password']
-                ) && strlen(
-                    $rowData['password']
-                ) && $this->string->strlen(
-                    $rowData['password']
-                ) < self::MIN_PASSWORD_LENGTH
+            if (isset($rowData['password'])
+                && strlen($rowData['password'])
+                && $this->string->strlen($rowData['password']) < self::MIN_PASSWORD_LENGTH
             ) {
                 $this->addRowError(self::ERROR_PASSWORD_LENGTH, $rowNumber);
             }