Merge remote-tracking branch 'magento-tango/MC-21876' into MPI-PR-2019-10-18

Author: arnobsh

app/code/Magento/Quote/Model/Quote/Address.php

@@ -425,9 +425,11 @@ protected function _populateBeforeSaveData()
      */
     protected function _isSameAsBilling()
     {
+        $quoteSameAsBilling = $this->getSameAsBilling();
+
         return $this->getAddressType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING &&
-            ($this->_isNotRegisteredCustomer() ||
-            $this->_isDefaultShippingNullOrSameAsBillingAddress());
+            ($this->_isNotRegisteredCustomer() || $this->_isDefaultShippingNullOrSameAsBillingAddress()) &&
+            ($quoteSameAsBilling || $quoteSameAsBilling === 0 || $quoteSameAsBilling === null);
     }
 
     /**
@@ -471,7 +473,7 @@ protected function _isDefaultShippingNullOrSameAsBillingAddress()
     /**
      * Declare address quote model object
      *
-     * @param   \Magento\Quote\Model\Quote $quote
+     * @param \Magento\Quote\Model\Quote $quote
      * @return $this
      */
     public function setQuote(\Magento\Quote\Model\Quote $quote)
@@ -691,7 +693,7 @@ public function getItemQty($itemId = 0)
      */
     public function hasItems()
     {
-        return sizeof($this->getAllItems()) > 0;
+        return count($this->getAllItems()) > 0;
     }
 
     /**
@@ -1225,8 +1227,8 @@ public function setBaseShippingAmount($value, $alreadyExclTax = false)
     /**
      * Set total amount value
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function setTotalAmount($code, $amount)
@@ -1243,8 +1245,8 @@ public function setTotalAmount($code, $amount)
     /**
      * Set total amount value in base store currency
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function setBaseTotalAmount($code, $amount)
@@ -1261,8 +1263,8 @@ public function setBaseTotalAmount($code, $amount)
     /**
      * Add amount total amount value
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function addTotalAmount($code, $amount)
@@ -1276,8 +1278,8 @@ public function addTotalAmount($code, $amount)
     /**
      * Add amount total amount value in base store currency
      *
-     * @param   string $code
-     * @param   float $amount
+     * @param string $code
+     * @param float $amount
      * @return $this
      */
     public function addBaseTotalAmount($code, $amount)