magento-engcom/import-export-improvements#43: refactor the addCustomer method so that it does not use the DataObject

 - replace current usage,
 - keep BC by using the toArray method of the DataObject in the current public method

Author: dmanners

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

@@ -308,14 +308,13 @@ public function validateRow(array $rowData, $rowNumber)
                 // Add new customer data into customer storage for address entity instance
                 $websiteId = $this->_customerEntity->getWebsiteId($this->_currentWebsiteCode);
                 if (!$this->_addressEntity->getCustomerStorage()->getCustomerId($this->_currentEmail, $websiteId)) {
-                    $customerData = new \Magento\Framework\DataObject(
+                    $this->_addressEntity->getCustomerStorage()->addCustomerByArray(
                         [
                             'id' => $this->_nextCustomerId,
                             'email' => $this->_currentEmail,
                             'website_id' => $websiteId,
                         ]
                     );
-                    $this->_addressEntity->getCustomerStorage()->addCustomer($customerData);
                     $this->_nextCustomerId++;
                 }
 

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

@@ -81,30 +81,38 @@ public function load()
             $select->from($this->_customerCollection->getMainTable(), ['entity_id', 'website_id', 'email']);
             $results = $connection->fetchAll($select);
             foreach ($results as $customer) {
-                $email = strtolower(trim($customer['email']));
-                if (!isset($this->_customerIds[$email])) {
-                    $this->_customerIds[$email] = [];
-                }
-                $this->_customerIds[$email][$customer['website_id']] = $customer['entity_id'];
+                $this->addCustomerByArray($customer);
             }
 
             $this->_isCollectionLoaded = true;
         }
     }
 
+    /**
+     * @param array $customer
+     * @return $this
+     */
+    public function addCustomerByArray(array $customer)
+    {
+        $email = strtolower(trim($customer['email']));
+        if (!isset($this->_customerIds[$email])) {
+            $this->_customerIds[$email] = [];
+        }
+        $this->_customerIds[$email][$customer['website_id']] = $customer['entity_id'];
+
+        return $this;
+    }
+
     /**
      * Add customer to array
      *
+     * @deprecated @see addCustomerByArray
      * @param \Magento\Framework\DataObject|\Magento\Customer\Model\Customer $customer
      * @return $this
      */
     public function addCustomer(\Magento\Framework\DataObject $customer)
     {
-        $email = strtolower(trim($customer->getEmail()));
-        if (!isset($this->_customerIds[$email])) {
-            $this->_customerIds[$email] = [];
-        }
-        $this->_customerIds[$email][$customer->getWebsiteId()] = $customer->getId();
+        $this->addCustomerByArray($customer->toArray());
 
         return $this;
     }