MAGETWO-64833: [Github] PayPal Express Checkout Discards Address Line 2 For Billing and Shipping Addresses #8313

- Code refactoring

Author: isavchuk-magento

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

@@ -900,7 +900,6 @@ public function getCheckoutMethod()
      * @param Address $address
      * @param array $exportedAddress
      * @return void
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _setExportedAddressData($address, $exportedAddress)
     {

dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php

@@ -25,7 +25,7 @@ class CheckoutTest extends \PHPUnit_Framework_TestCase
     /**
      * @var ObjectManagerInterface
      */
-    private $_objectManager;
+    private $objectManager;
 
     /**
      * @var Info
@@ -59,7 +59,7 @@ class CheckoutTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->_objectManager = Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
 
         $this->paypalInfo = $this->getMockBuilder(Info::class)
             ->disableOriginalConstructor()
@@ -101,19 +101,19 @@ public function testPrepareCustomerQuote()
         $quote->setCheckoutMethod(Onepage::METHOD_CUSTOMER); // to dive into _prepareCustomerQuote() on switch
         $quote->getShippingAddress()->setSameAsBilling(0);
         $quote->setReservedOrderId(null);
-        $customer = $this->_objectManager->create(\Magento\Customer\Model\Customer::class)->load(1);
+        $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class)->load(1);
         $customer->setDefaultBilling(false)
             ->setDefaultShipping(false)
             ->save();
 
         /** @var \Magento\Customer\Model\Session $customerSession */
-        $customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+        $customerSession = $this->objectManager->get(\Magento\Customer\Model\Session::class);
         $customerSession->loginById(1);
         $checkout = $this->_getCheckout($quote);
         $checkout->place('token');
 
         /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerService */
-        $customerService = $this->_objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
+        $customerService = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
         $customer = $customerService->getById($quote->getCustomerId());
 
         $this->assertEquals(1, $quote->getCustomerId());
@@ -166,7 +166,7 @@ public function testPlaceGuestQuote()
      */
     protected function _getCheckout(Quote $quote)
     {
-        return $this->_objectManager->create(
+        return $this->objectManager->create(
             Checkout::class,
             [
                 'params' => [
@@ -187,7 +187,7 @@ protected function _getCheckout(Quote $quote)
     public function testReturnFromPaypal()
     {
         $quote = $this->_getFixtureQuote();
-        $this->checkoutModel = $this->_objectManager->create(
+        $this->checkoutModel = $this->objectManager->create(
             Checkout::class,
             [
                 'params' => ['quote' => $quote, 'config' => $this->paypalConfig],
@@ -294,7 +294,7 @@ public function testReturnFromPaypalIfCheckout()
      */
     private function prepareCheckoutModel(Quote $quote)
     {
-        $this->checkoutModel = $this->_objectManager->create(
+        $this->checkoutModel = $this->objectManager->create(
             Checkout::class,
             [
                 'params'         => ['quote' => $quote, 'config' => $this->paypalConfig],
@@ -365,7 +365,7 @@ protected function _getExportedAddressFixture(array $addressData)
     protected function _getFixtureQuote()
     {
         /** @var \Magento\Quote\Model\ResourceModel\Quote\Collection $quoteCollection */
-        $quoteCollection = $this->_objectManager->create(\Magento\Quote\Model\ResourceModel\Quote\Collection::class);
+        $quoteCollection = $this->objectManager->create(\Magento\Quote\Model\ResourceModel\Quote\Collection::class);
 
         return $quoteCollection->getLastItem();
     }