Merge remote-tracking branch 'origin/MC-33152' into 2.3-develop-pr44

Author: serhii-balko

app/code/Magento/Directory/Helper/Data.php

@@ -6,11 +6,13 @@
 
 namespace Magento\Directory\Helper;
 
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Directory\Model\Currency;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Directory\Model\ResourceModel\Country\Collection;
 use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\App\Cache\Type\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Json\Helper\Data as JsonData;
 use Magento\Store\Model\ScopeInterface;
@@ -21,6 +23,7 @@
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -156,6 +159,7 @@ public function getRegionCollection()
     {
         if (!$this->_regionCollection) {
             $this->_regionCollection = $this->_regCollectionFactory->create();
+            // phpstan:ignore
             $this->_regionCollection->addCountryFilter($this->getAddress()->getCountryId())->load();
         }
         return $this->_regionCollection;
@@ -185,7 +189,9 @@ public function getRegionJson()
     {
         \Magento\Framework\Profiler::start('TEST: ' . __METHOD__, ['group' => 'TEST', 'method' => __METHOD__]);
         if (!$this->_regionJson) {
-            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . $this->_storeManager->getStore()->getId();
+            $scope = $this->getCurrentScope();
+            $scopeKey = $scope['value'] ? '_' . implode('_', $scope) : null;
+            $cacheKey = 'DIRECTORY_REGIONS_JSON_STORE' . $scopeKey;
             $json = $this->_configCacheType->load($cacheKey);
             if (empty($json)) {
                 $regions = $this->getRegionData();
@@ -344,10 +350,13 @@ public function getDefaultCountry($store = null)
      */
     public function getRegionData()
     {
-        $countryIds = [];
-        foreach ($this->getCountryCollection() as $country) {
-            $countryIds[] = $country->getCountryId();
-        }
+        $scope = $this->getCurrentScope();
+        $allowedCountries = $this->scopeConfig->getValue(
+            AllowedCountries::ALLOWED_COUNTRIES_PATH,
+            $scope['type'],
+            $scope['value']
+        );
+        $countryIds = explode(',', $allowedCountries);
         $collection = $this->_regCollectionFactory->create();
         $collection->addCountryFilter($countryIds)->load();
         $regions = [
@@ -392,4 +401,31 @@ public function getWeightUnit()
     {
         return $this->scopeConfig->getValue(self::XML_PATH_WEIGHT_UNIT, ScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * Get current scope from request
+     *
+     * @return array
+     */
+    private function getCurrentScope(): array
+    {
+        $scope = [
+            'type' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            'value' => null,
+        ];
+        $request = $this->_getRequest();
+        if ($request->getParam(ScopeInterface::SCOPE_WEBSITE)) {
+            $scope = [
+                'type' => ScopeInterface::SCOPE_WEBSITE,
+                'value' => $request->getParam(ScopeInterface::SCOPE_WEBSITE),
+            ];
+        } elseif ($request->getParam(ScopeInterface::SCOPE_STORE)) {
+            $scope = [
+                'type' => ScopeInterface::SCOPE_STORE,
+                'value' => $request->getParam(ScopeInterface::SCOPE_STORE),
+            ];
+        }
+
+        return $scope;
+    }
 }

app/code/Magento/Directory/Test/Unit/Helper/DataTest.php

@@ -6,6 +6,10 @@
 namespace Magento\Directory\Test\Unit\Helper;
 
 use Magento\Directory\Helper\Data;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -47,11 +51,13 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->scopeConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->scopeConfigMock->expects($this->any())->method('isSetFlag')->willReturn(false);
+        $requestMock = $this->createMock(RequestInterface::class);
         $context = $this->createMock(\Magento\Framework\App\Helper\Context::class);
+        $context->method('getRequest')
+            ->willReturn($requestMock);
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
-
         $configCacheType = $this->createMock(\Magento\Framework\App\Cache\Type\Config::class);
 
         $this->_countryCollection = $this->createMock(\Magento\Directory\Model\ResourceModel\Country\Collection::class);
@@ -91,19 +97,18 @@ protected function setUp()
 
     public function testGetRegionJson()
     {
-        $countries = [
-            new \Magento\Framework\DataObject(['country_id' => 'Country1']),
-            new \Magento\Framework\DataObject(['country_id' => 'Country2'])
-        ];
-        $countryIterator = new \ArrayIterator($countries);
-        $this->_countryCollection->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getIterator'
-        )->will(
-            $this->returnValue($countryIterator)
-        );
-
+        $this->scopeConfigMock->method('getValue')
+            ->willReturnMap(
+                [
+                    [
+                        AllowedCountries::ALLOWED_COUNTRIES_PATH,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                        null,
+                        'Country1,Country2'
+                    ],
+                    [Data::XML_PATH_STATES_REQUIRED, ScopeInterface::SCOPE_STORE, null, '']
+                ]
+            );
         $regions = [
             new \Magento\Framework\DataObject(
                 ['country_id' => 'Country1', 'region_id' => 'r1', 'code' => 'r1-code', 'name' => 'r1-name']