Merge branch 'MAGETWO-90496' into mpi-PR-0207

Author: Mariana Lashch

app/code/Magento/Customer/Model/Address/AbstractAddress.php

@@ -13,8 +13,6 @@
 use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Customer\Model\Data\Address as AddressData;
 use Magento\Framework\Model\AbstractExtensibleModel;
-use Magento\Framework\App\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * Address abstract model
@@ -121,16 +119,6 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
      */
     protected $dataObjectHelper;
 
-    /**
-     * @var \Magento\Directory\Model\AllowedCountries
-     */
-    private $allowedCountriesReader;
-
-    /**
-     * @var \Magento\Customer\Model\Config\Share
-     */
-    private $shareConfig;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -166,9 +154,7 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = [],
-        \Magento\Directory\Model\AllowedCountries $allowedCountriesReader = null,
-        \Magento\Customer\Model\Config\Share $shareConfig = null
+        array $data = []
     ) {
         $this->_directoryData = $directoryData;
         $data = $this->_implodeArrayField($data);
@@ -180,10 +166,6 @@ public function __construct(
         $this->addressDataFactory = $addressDataFactory;
         $this->regionDataFactory = $regionDataFactory;
         $this->dataObjectHelper = $dataObjectHelper;
-        $this->allowedCountriesReader = $allowedCountriesReader
-            ?: ObjectManager::getInstance()->get(\Magento\Directory\Model\AllowedCountries::class);
-        $this->shareConfig = $shareConfig
-            ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\Config\Share::class);
         parent::__construct(
             $context,
             $registry,
@@ -641,7 +623,8 @@ public function validate()
             $errors[] = __('%fieldName is a required field.', ['fieldName' => 'countryId']);
         } else {
             //Checking if such country exists.
-            if (!in_array($countryId, $this->getWebsiteAllowedCountries(), true)) {
+            $countryCollection = $this->_directoryData->getCountryCollection($this->getStoreId());
+            if (!in_array($countryId, $countryCollection->getAllIds(), true)) {
                 $errors[] = __(
                     'Invalid value of "%value" provided for the %fieldName field.',
                     [
@@ -685,22 +668,6 @@ public function validate()
         return $errors;
     }
 
-    /**
-     * Return allowed counties per website.
-     *
-     * @return array
-     */
-    private function getWebsiteAllowedCountries(): array
-    {
-        $websiteId = null;
-
-        if (!$this->shareConfig->isGlobalScope()) {
-            $websiteId = $this->getCustomer() ? $this->getCustomer()->getWebsiteId() : null;
-        }
-
-        return $this->allowedCountriesReader->getAllowedCountries(ScopeInterface::SCOPE_WEBSITE, $websiteId);
-    }
-
     /**
      * @return \Magento\Directory\Model\Region
      */

app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php

@@ -7,6 +7,7 @@
  */
 namespace Magento\Customer\Model\ResourceModel;
 
+use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Model\Address as CustomerAddressModel;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\ResourceModel\Address\Collection;
@@ -123,6 +124,7 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)
         } else {
             $addressModel->updateData($address);
         }
+        $addressModel->setStoreId($customerModel->getStoreId());
 
         $errors = $addressModel->validate();
         if ($errors !== true) {

app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php

@@ -40,16 +40,6 @@ class AbstractAddressTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Data\Collection\AbstractDb|\PHPUnit_Framework_MockObject_MockObject  */
     protected $resourceCollectionMock;
 
-    /**
-     * @var \Magento\Directory\Model\AllowedCountries|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $allowedCountriesReaderMock;
-
-    /**
-     * @var \Magento\Customer\Model\Config\Share|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $shareConfigMock;
-
     /** @var \Magento\Customer\Model\Address\AbstractAddress  */
     protected $model;
 
@@ -105,9 +95,7 @@ protected function setUp()
                 'regionFactory' => $this->regionFactoryMock,
                 'countryFactory' => $this->countryFactoryMock,
                 'resource' => $this->resourceMock,
-                'resourceCollection' => $this->resourceCollectionMock,
-                'allowedCountriesReader' => $this->allowedCountriesReaderMock,
-                'shareConfig' => $this->shareConfigMock,
+                'resourceCollection' => $this->resourceCollectionMock
             ]
         );
     }
@@ -325,10 +313,15 @@ public function testValidate(array $data, $expected)
         $this->directoryDataMock->expects($this->any())
             ->method('isRegionRequired');
 
-        $this->shareConfigMock->method('isGlobalScope')->willReturn(false);
-        $this->allowedCountriesReaderMock
-            ->method('getAllowedCountries')
-            ->with(ScopeInterface::SCOPE_WEBSITE, null)
+        $countryCollectionMock = $this->getMockBuilder(\Magento\Directory\Model\ResourceModel\Country\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllIds'])
+            ->getMock();
+
+        $this->directoryDataMock->method('getCountryCollection')
+            ->willReturn($countryCollectionMock);
+
+        $countryCollectionMock->method('getAllIds')
             ->willReturn([$countryId]);
 
         $regionModelMock = $this->getMockBuilder(\Magento\Directory\Model\Region::class)

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

@@ -11,6 +11,7 @@
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\ObjectManager;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
+use \Magento\Store\Model\ScopeInterface;
 
 /**
  * @api
@@ -75,32 +76,36 @@ public function validateQuoteAmount(QuoteEntity $quote, $amount)
     public function validateBeforeSubmit(QuoteEntity $quote)
     {
         if (!$quote->isVirtual()) {
-            if ($quote->getShippingAddress()->validate() !== true) {
+            $address = $quote->getShippingAddress();
+            $address->setStoreId($quote->getStoreId());
+            if ($address->validate() !== true) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __(
                         'Please check the shipping address information. %1',
-                        implode(' ', $quote->getShippingAddress()->validate())
+                        implode(' ', $address->validate())
                     )
                 );
             }
 
             // Checks if country id present in the allowed countries list.
             if (!in_array(
-                $quote->getShippingAddress()->getCountryId(),
-                $this->allowedCountryReader->getAllowedCountries()
+                $address->getCountryId(),
+                $this->allowedCountryReader->getAllowedCountries(ScopeInterface::SCOPE_STORE, $quote->getStoreId())
             )) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Some addresses cannot be used due to country-specific configurations.')
                 );
             }
 
-            $method = $quote->getShippingAddress()->getShippingMethod();
-            $rate = $quote->getShippingAddress()->getShippingRateByCode($method);
+            $method = $address->getShippingMethod();
+            $rate = $address->getShippingRateByCode($method);
             if (!$method || !$rate) {
                 throw new \Magento\Framework\Exception\LocalizedException(__('Please specify a shipping method.'));
             }
         }
-        if ($quote->getBillingAddress()->validate() !== true) {
+        $billingAddress = $quote->getBillingAddress();
+        $billingAddress->setStoreId($quote->getStoreId());
+        if ($billingAddress->validate() !== true) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __(
                     'Please check the billing address information. %1',