MAGETWO-98832: Multistore Allowed Countries List Problem

Author: ysapiga

app/code/Magento/Customer/Model/AccountManagement.php

@@ -377,6 +377,7 @@ class AccountManagement implements AccountManagementInterface
      * @param CollectionFactory|null $visitorCollectionFactory
      * @param SearchCriteriaBuilder|null $searchCriteriaBuilder
      * @param AddressRegistry|null $addressRegistry
+     * @param AllowedCountries|null $allowedCountriesReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

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

@@ -408,6 +408,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param \Magento\Sales\Model\OrderIncrementIdChecker|null $orderIncrementIdChecker
+     * @param AllowedCountries|null $allowedCountriesReader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -953,7 +954,8 @@ public function assignCustomerWithAddressChange(
                     /** @var \Magento\Quote\Model\Quote\Address $billingAddress */
                     $billingAddress = $this->_quoteAddressFactory->create();
                     $billingAddress->importCustomerAddressData($defaultBillingAddress);
-                    if($this->isAddressAllowedForWebsite($billingAddress, (int)$this->getStoreId())) {
+
+                    if ($this->isAddressAllowedForWebsite($billingAddress, (int)$this->getStoreId())) {
                         $this->setBillingAddress($billingAddress);
                     }
                 }

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -22,6 +22,7 @@
 use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */