MAGETWO-98832: Multistore Allowed Countries List Problem

Author: ysapiga

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

@@ -905,7 +905,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         }
         try {
             foreach ($customerAddresses as $address) {
-                if (!$this->isAddressAllowedForWebsite($address, (string)$customer->getStoreId())) {
+                if (!$this->isAddressAllowedForWebsite($address, $customer->getStoreId())) {
                     continue;
                 }
                 if ($address->getId()) {
@@ -1619,10 +1619,10 @@ private function setIgnoreValidationFlag($customer)
      * Check is address allowed for store
      *
      * @param AddressInterface $address
-     * @param string $storeId
+     * @param int|null $storeId
      * @return bool
      */
-    private function isAddressAllowedForWebsite(AddressInterface $address, string $storeId): bool
+    private function isAddressAllowedForWebsite(AddressInterface $address, $storeId): bool
     {
         $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
 

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

@@ -2613,10 +2613,10 @@ public function setExtensionAttributes(\Magento\Quote\Api\Data\CartExtensionInte
      * Check is address allowed for store
      *
      * @param Address $address
-     * @param  string $storeId
+     * @param  int|null $storeId
      * @return bool
      */
-    private function isAddressAllowedForWebsite(Address $address, string $storeId): bool
+    private function isAddressAllowedForWebsite(Address $address, $storeId): bool
     {
         $allowedCountries = $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $storeId);
 
@@ -2627,13 +2627,13 @@ private function isAddressAllowedForWebsite(Address $address, string $storeId):
      * Assign address to quote
      *
      * @param Address $address
-     * @param bool $billingAddress
+     * @param bool $isBillingAddress
      * @return void
      */
-    private function assignAddress(Address $address, bool $billingAddress = true): void
+    private function assignAddress(Address $address, bool $isBillingAddress = true): void
     {
-        if ($this->isAddressAllowedForWebsite($address, (string) $this->getStoreId())) {
-            $billingAddress
+        if ($this->isAddressAllowedForWebsite($address, $this->getStoreId())) {
+            $isBillingAddress
                 ? $this->setBillingAddress($address)
                 : $this->setShippingAddress($address);
         }

dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ConfigInterface $config */
+$config = $objectManager->get(ConfigInterface::class);
+$config->saveConfig('general/country/allow', 'FR');
+$objectManager->get(ReinitableConfigInterface::class)->reinit();

dev/tests/integration/testsuite/Magento/Backend/_files/allowed_countries_fr_rollback.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ConfigInterface $config */
+$config = $objectManager->get(ConfigInterface::class);
+$config->deleteConfig('general/country/allow');
+$objectManager->get(ReinitableConfigInterface::class)->reinit();

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php

@@ -862,11 +862,10 @@ public function testCreateNewCustomerWithPasswordHash()
      */
     public function testCreateNewCustomerWithPasswordHashWithNotAllowedCountry()
     {
-        $fixtureCustomerId = 1;
+        $customerId = 1;
         $allowedCountryIdForSecondWebsite = 'UA';
-        /** @var \Magento\Customer\Model\Customer $customer */
         $store = $this->storeManager->getStore('fixture_second_store');
-        $customerData = $this->customerRepository->getById($fixtureCustomerId);
+        $customerData = $this->customerRepository->getById($customerId);
         $customerData->getAddresses()[1]->setRegion(null)->setCountryId($allowedCountryIdForSecondWebsite)
             ->setRegionId(null);
         $customerData->setStoreId($store->getId())->setWebsiteId($store->getWebsiteId())->setId(null);

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

@@ -349,27 +349,19 @@ public function testAssignCustomerWithAddressChange(): void
      *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
      * @return void
      */
     public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
     {
-        $this->config->saveConfig(
-            $this->allowedCountriesConfigPath,
-            'FR'
-        );
-        Bootstrap::getObjectManager()->get(ReinitableConfigInterface::class)->reinit();
         /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
         $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
-
-        /** Execute SUT */
         $quote->assignCustomerWithAddressChange($customerData);
 
         /** Check that addresses are empty */
         $this->assertNull($quote->getBillingAddress()->getCountryId());
         $this->assertNull($quote->getShippingAddress()->getCountryId());
-
-        $this->config->deleteConfig($this->allowedCountriesConfigPath);
     }
 
     /**