MAGETWO-33109 : Refactor code that uses customer builders in Quote module

 -- fixed static code failures

Author: Robert He

dev/tests/integration/testsuite/Magento/Customer/Api/AddressRepositoryTest.php

@@ -388,7 +388,8 @@ public function searchAddressDataProvider()
     private function _createFirstAddress()
     {
         $address = $this->_addressFactory->create();
-        $this->dataObjectHelper->mergeDataObjects('\Magento\Customer\Api\Data\AddressInterface',
+        $this->dataObjectHelper->mergeDataObjects(
+            '\Magento\Customer\Api\Data\AddressInterface',
             $address,
             $this->_expectedAddresses[0]
         );

dev/tests/unit/testsuite/Magento/Framework/Api/DataObjectHelperTest.php

@@ -261,10 +261,12 @@ public function testMergeDataObjects($data1, $data2)
 
         $firstRegionDataObject->setRegionId($data1['region']['region_id']);
         $firstRegionDataObject->setRegion($data1['region']['region']);
-        if(isset($data1['id']))
+        if(isset($data1['id'])) {
             $firstAddressDataObject->setId($data1['id']);
-        if(isset($data1['country_id']))
+        }
+        if(isset($data1['country_id'])) {
             $firstAddressDataObject->setCountryId($data1['country_id']);
+        }
         $firstAddressDataObject->setStreet($data1['street']);
         $firstAddressDataObject->setIsDefaultShipping($data1['default_shipping']);
         $firstAddressDataObject->setRegion($firstRegionDataObject);
@@ -286,14 +288,16 @@ public function testMergeDataObjects($data1, $data2)
 
         $secondRegionDataObject->setRegionId($data2['region']['region_id']);
         $secondRegionDataObject->setRegion($data2['region']['region']);
-        if(isset($data2['id']))
+        if(isset($data2['id'])) {
             $secondAddressDataObject->setId($data2['id']);
-        if(isset($data2['country_id']))
+        }
+        if(isset($data2['country_id'])) {
             $secondAddressDataObject->setCountryId($data2['country_id']);
+        }
         $secondAddressDataObject->setStreet($data2['street']);
         $secondAddressDataObject->setIsDefaultShipping($data2['default_shipping']);
         $secondAddressDataObject->setRegion($secondRegionDataObject);
-        
+
         $this->objectProcessorMock->expects($this->once())
             ->method('buildOutputDataArray')
             ->with($secondAddressDataObject, get_class($firstAddressDataObject))
@@ -311,8 +315,11 @@ public function testMergeDataObjects($data1, $data2)
             ->with('\Magento\Customer\Api\Data\RegionInterface', [])
             ->willReturn($secondRegionDataObject);
 
-        $this->dataObjectHelper->mergeDataObjects(get_class($firstAddressDataObject), $firstAddressDataObject,
-            $secondAddressDataObject);
+        $this->dataObjectHelper->mergeDataObjects(
+            get_class($firstAddressDataObject),
+            $firstAddressDataObject,
+            $secondAddressDataObject
+        );
 
         $this->assertSame($firstAddressDataObject->getId(), $secondAddressDataObject->getId());
         $this->assertSame($firstAddressDataObject->getCountryId(), $secondAddressDataObject->getCountryId());