MAGETWO-94402: [2.3.0] PayPal Billing Address for Registered Customers

- remove unused variable from tests and avoid using type coercion

Author: krissyhiserote

app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php

@@ -63,7 +63,7 @@ public function getConfig()
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
                     'isRequiredBillingAddress' =>
-                        $this->config->isRequiredBillingAddress() == $requireBillingAddressAll
+                        (int)$this->config->isRequiredBillingAddress() === $requireBillingAddressAll
                 ]
             ]
         ];

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

@@ -616,7 +616,8 @@ public function returnFromPaypal($token)
 
         $this->ignoreAddressValidation();
 
-        $isButton = $quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON) == 1;
+        // check if we came from the Express Checkout button
+        $isButton = (bool)$quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_BUTTON);
 
         // import shipping address
         $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress();
@@ -651,9 +652,9 @@ public function returnFromPaypal($token)
         }
 
         // import billing address
-        $requireBillingAddress = $this->_config->getValue(
+        $requireBillingAddress = (int)$this->_config->getValue(
             'requireBillingAddress'
-        ) == \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
+        ) === \Magento\Paypal\Model\Config::REQUIRE_BILLING_ADDRESS_ALL;
 
         if ($isButton && !$requireBillingAddress && !$quote->isVirtual()) {
             $billingAddress = clone $shippingAddress;

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

@@ -310,19 +310,18 @@ public function testReturnFromPaypalButton()
         $shippingAddress = $quote->getShippingAddress();
         $billingAddress = $quote->getBillingAddress();
         $exportedShippingData = $this->getExportedData()['shipping'];
-        $prefix = '';
-
-        $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet());
-        $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname());
-        $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity());
-        $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone());
-        $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail());
-
-        $this->assertEquals([$prefix . $exportedShippingData['street']], $billingAddress->getStreet());
-        $this->assertEquals($prefix . $exportedShippingData['firstname'], $billingAddress->getFirstname());
-        $this->assertEquals($prefix . $exportedShippingData['city'], $billingAddress->getCity());
-        $this->assertEquals($prefix . $exportedShippingData['telephone'], $billingAddress->getTelephone());
-        $this->assertEquals($prefix . $exportedShippingData['email'], $billingAddress->getEmail());
+
+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
+
+        $this->assertEquals([$exportedShippingData['street']], $billingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $billingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $billingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $billingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $billingAddress->getEmail());
     }
 
     /**
@@ -350,19 +349,18 @@ public function testReturnFromPaypalButtonWithReturnBillingAddress()
         $billingAddress = $quote->getBillingAddress();
         $exportedBillingData = $this->getExportedData()['billing'];
         $exportedShippingData = $this->getExportedData()['shipping'];
-        $prefix = '';
-
-        $this->assertEquals([$prefix . $exportedShippingData['street']], $shippingAddress->getStreet());
-        $this->assertEquals($prefix . $exportedShippingData['firstname'], $shippingAddress->getFirstname());
-        $this->assertEquals($prefix . $exportedShippingData['city'], $shippingAddress->getCity());
-        $this->assertEquals($prefix . $exportedShippingData['telephone'], $shippingAddress->getTelephone());
-        $this->assertEquals($prefix . $exportedShippingData['email'], $shippingAddress->getEmail());
 
-        $this->assertEquals([$prefix . $exportedBillingData['street']], $billingAddress->getStreet());
-        $this->assertEquals($prefix . $exportedBillingData['firstname'], $billingAddress->getFirstname());
-        $this->assertEquals($prefix . $exportedBillingData['city'], $billingAddress->getCity());
-        $this->assertEquals($prefix . $exportedBillingData['telephone'], $billingAddress->getTelephone());
-        $this->assertEquals($prefix . $exportedBillingData['email'], $billingAddress->getEmail());
+        $this->assertEquals([$exportedShippingData['street']], $shippingAddress->getStreet());
+        $this->assertEquals($exportedShippingData['firstname'], $shippingAddress->getFirstname());
+        $this->assertEquals($exportedShippingData['city'], $shippingAddress->getCity());
+        $this->assertEquals($exportedShippingData['telephone'], $shippingAddress->getTelephone());
+        $this->assertEquals($exportedShippingData['email'], $shippingAddress->getEmail());
+
+        $this->assertEquals([$exportedBillingData['street']], $billingAddress->getStreet());
+        $this->assertEquals($exportedBillingData['firstname'], $billingAddress->getFirstname());
+        $this->assertEquals($exportedBillingData['city'], $billingAddress->getCity());
+        $this->assertEquals($exportedBillingData['telephone'], $billingAddress->getTelephone());
+        $this->assertEquals($exportedBillingData['email'], $billingAddress->getEmail());
     }
 
     /**