MAGETWO-59871: [GITHUB] Updating customer via REST API without address unsets default billing and default shipping address #7380

- fixed static

Author: vzabaznov

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -146,12 +146,10 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
     {
         $prevCustomerData = null;
         $prevCustomerDataArr = null;
-
         if ($customer->getId()) {
             $prevCustomerData = $this->getById($customer->getId());
             $prevCustomerDataArr = $prevCustomerData->__toArray();
         }
-
         /** @var $customer \Magento\Customer\Model\Data\Customer */
         $customerArr = $customer->__toArray();
         $customer = $this->imageProcessor->save(
@@ -191,7 +189,6 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             $customerModel->setRpToken(null);
             $customerModel->setRpTokenCreatedAt(null);
         }
-
         if (!array_key_exists('default_billing', $customerArr) &&
             null !== $prevCustomerDataArr &&
             array_key_exists('default_billing', $prevCustomerDataArr)

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php

@@ -101,29 +101,22 @@ protected function setUp()
             $this->getMock(\Magento\Customer\Model\ResourceModel\Customer::class, [], [], '', false);
         $this->customerRegistry = $this->getMock(\Magento\Customer\Model\CustomerRegistry::class, [], [], '', false);
         $this->dataObjectHelper = $this->getMock(\Magento\Framework\Api\DataObjectHelper::class, [], [], '', false);
-        $this->customerFactory  = $this->getMock(
-            \Magento\Customer\Model\CustomerFactory::class,
-            ['create'],
-            [],
-            '',
-            false
-        );
+        $this->customerFactory  =
+            $this->getMock(\Magento\Customer\Model\CustomerFactory::class, ['create'], [], '', false);
         $this->customerSecureFactory  = $this->getMock(
             \Magento\Customer\Model\Data\CustomerSecureFactory::class,
             ['create'],
             [],
             '',
             false
         );
-
         $this->addressRepository = $this->getMock(
             \Magento\Customer\Model\ResourceModel\AddressRepository::class,
             [],
             [],
             '',
             false
         );
-
         $this->customerMetadata = $this->getMockForAbstractClass(
             \Magento\Customer\Api\CustomerMetadataInterface::class,
             [],
@@ -179,10 +172,8 @@ protected function setUp()
                 '__toArray'
             ]
         );
-
         $this->collectionProcessorMock = $this->getMockBuilder(CollectionProcessorInterface::class)
             ->getMock();
-
         $this->model = new \Magento\Customer\Model\ResourceModel\CustomerRepository(
             $this->customerFactory,
             $this->customerSecureFactory,