Merge branch 'MAGETWO-64833' into MAGETWO-64833-61505

Author: isavchuk-magento

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -1482,9 +1482,9 @@ protected function _exportAddressses($data)
     protected function _applyStreetAndRegionWorkarounds(\Magento\Framework\DataObject $address)
     {
         // merge street addresses into 1
-        if ($address->hasStreet2()) {
-            $address->setStreet(implode("\n", [$address->getStreet(), $address->getStreetLine(2)]));
-            $address->unsStreet2();
+        if ($address->getData('street2') !== null) {
+            $address->setStreet(implode("\n", [$address->getData('street'), $address->getData('street2')]));
+            $address->unsetData('street2');
         }
         // attempt to fetch region_id from directory
         if ($address->getCountryId() && $address->getRegion()) {

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -901,35 +901,19 @@ public function getCheckoutMethod()
      * @param Address $address
      * @param array $exportedAddress
      * @return void
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {
         // Exported data is more priority if we came from Express Checkout button
-        $isButton  = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
+        $isButton = (bool)$this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
         if (!$isButton) {
-            foreach ($exportedAddress->getExportedKeys() as $key) {
-                $oldData = $address->getDataUsingMethod($key);
-                $isEmpty = null;
-                if (is_array($oldData)) {
-                    foreach ($oldData as $val) {
-                        if (!empty($val)) {
-                            $isEmpty = false;
-                            break;
-                        }
-                        $isEmpty = true;
-                    }
-                }
-                if (empty($oldData) || $isEmpty === true) {
-                    $address->setDataUsingMethod($key, $exportedAddress->getData($key));
-                }
-            }
-        } else {
-            foreach ($exportedAddress->getExportedKeys() as $key) {
-                $data = $exportedAddress->getData($key);
-                if (!empty($data)) {
-                    $address->setDataUsingMethod($key, $data);
-                }
+            return;
+        }
+
+        foreach ($exportedAddress->getExportedKeys() as $key) {
+            $data = $exportedAddress->getData($key);
+            if (!empty($data)) {
+                $address->setDataUsingMethod($key, $data);
             }
         }
     }

app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php

@@ -194,9 +194,21 @@ public function testCallGetExpressCheckoutDetails()
             ->method('read')
             ->will($this->returnValue(
                 "\r\n" . 'ACK=Success&SHIPTONAME=Ship%20To%20Name'
+                . '&SHIPTOSTREET=testStreet'
+                . '&SHIPTOSTREET2=testApartment'
+                . '&BUSINESS=testCompany'
+                . '&SHIPTOCITY=testCity'
+                . '&PHONENUM=223322'
+                . '&STATE=testSTATE'
             ));
         $this->model->callGetExpressCheckoutDetails();
-        $this->assertEquals('Ship To Name', $this->model->getExportedShippingAddress()->getData('firstname'));
+        $address = $this->model->getExportedShippingAddress();
+        $this->assertEquals('Ship To Name', $address->getData('firstname'));
+        $this->assertEquals(implode("\n", ['testStreet','testApartment']), $address->getStreet());
+        $this->assertEquals('testCompany', $address->getCompany());
+        $this->assertEquals('testCity', $address->getCity());
+        $this->assertEquals('223322', $address->getTelephone());
+        $this->assertEquals('testSTATE', $address->getRegion());
     }
 
     public function testGetDebugReplacePrivateDataKeys()