Merge remote-tracking branch 'origin/MAGETWO-90838' into 2.3-develop-pr25

Author: OlgaVasyltsun

app/code/Magento/Customer/Model/Address/Validator/Country.php

@@ -7,6 +7,8 @@
 
 use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Customer\Model\Address\ValidatorInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Address country and region validator.
@@ -18,13 +20,31 @@ class Country implements ValidatorInterface
      */
     private $directoryData;
 
+    /**
+     * @var \Magento\Directory\Model\AllowedCountries
+     */
+    private $allowedCountriesReader;
+
+    /**
+     * @var \Magento\Customer\Model\Config\Share
+     */
+    private $shareConfig;
+
     /**
      * @param \Magento\Directory\Helper\Data $directoryData
+     * @param \Magento\Directory\Model\AllowedCountries|null $allowedCountriesReader
+     * @param \Magento\Customer\Model\Config\Share|null $shareConfig
      */
     public function __construct(
-        \Magento\Directory\Helper\Data $directoryData
+        \Magento\Directory\Helper\Data $directoryData,
+        \Magento\Directory\Model\AllowedCountries $allowedCountriesReader = null,
+        \Magento\Customer\Model\Config\Share $shareConfig = null
     ) {
         $this->directoryData = $directoryData;
+        $this->allowedCountriesReader = $allowedCountriesReader
+            ?: ObjectManager::getInstance()->get(\Magento\Directory\Model\AllowedCountries::class);
+        $this->shareConfig = $shareConfig
+            ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\Config\Share::class);
     }
 
     /**
@@ -52,7 +72,7 @@ private function validateCountry(AbstractAddress $address)
         $errors = [];
         if (!\Zend_Validate::is($countryId, 'NotEmpty')) {
             $errors[] = __('"%fieldName" is required. Enter and try again.', ['fieldName' => 'countryId']);
-        } elseif (!in_array($countryId, $this->directoryData->getCountryCollection()->getAllIds(), true)) {
+        } elseif (!in_array($countryId, $this->getWebsiteAllowedCountries($address), true)) {
             //Checking if such country exists.
             $errors[] = __(
                 'Invalid value of "%value" provided for the %fieldName field.',
@@ -97,4 +117,21 @@ private function validateRegion(AbstractAddress $address)
 
         return $errors;
     }
+
+    /**
+     * Return allowed counties per website.
+     *
+     * @param AbstractAddress $address
+     * @return array
+     */
+    private function getWebsiteAllowedCountries(AbstractAddress $address): array
+    {
+        $websiteId = null;
+
+        if (!$this->shareConfig->isGlobalScope()) {
+            $websiteId = $address->getCustomer() ? $address->getCustomer()->getWebsiteId() : null;
+        }
+
+        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $websiteId);
+    }
 }

app/code/Magento/Customer/Test/Unit/Model/Address/Validator/CountryTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Customer\Test\Unit\Model\Address\Validator;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Magento\Customer\Model\Address\Validator\Country tests.
  */
@@ -20,14 +22,34 @@ class CountryTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
     private $objectManager;
 
+    /**
+     * @var \Magento\Directory\Model\AllowedCountries|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $allowedCountriesReaderMock;
+
+    /**
+     * @var \Magento\Customer\Model\Config\Share|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $shareConfigMock;
+
     protected function setUp()
     {
         $this->directoryDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->allowedCountriesReaderMock = $this->createPartialMock(
+            \Magento\Directory\Model\AllowedCountries::class,
+            ['getAllowedCountries']
+        );
+        $this->shareConfigMock = $this->createPartialMock(
+            \Magento\Customer\Model\Config\Share::class,
+            ['isGlobalScope']
+        );
         $this->model = $this->objectManager->getObject(
             \Magento\Customer\Model\Address\Validator\Country::class,
             [
                 'directoryData' => $this->directoryDataMock,
+                'allowedCountriesReader' => $this->allowedCountriesReaderMock,
+                'shareConfig' => $this->shareConfigMock,
             ]
         );
     }
@@ -59,16 +81,11 @@ public function testValidate(array $data, array $countryIds, array $allowedRegio
             ->method('isRegionRequired')
             ->willReturn($data['regionRequired']);
 
-        $countryCollectionMock = $this->getMockBuilder(\Magento\Directory\Model\ResourceModel\Country\Collection::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getAllIds'])
-            ->getMock();
-
-        $this->directoryDataMock->expects($this->any())
-            ->method('getCountryCollection')
-            ->willReturn($countryCollectionMock);
-
-        $countryCollectionMock->expects($this->any())->method('getAllIds')->willReturn($countryIds);
+        $this->shareConfigMock->method('isGlobalScope')->willReturn(false);
+        $this->allowedCountriesReaderMock
+            ->method('getAllowedCountries')
+            ->with(ScopeInterface::SCOPE_WEBSITE, null)
+            ->willReturn($countryIds);
 
         $addressMock->method('getCountryId')->willReturn($data['country_id']);