MAGETWO-70052: Fix not detecting current store using store code in url #9429

 - Merge Pull Request #9429 from mimarcel/magento2:fix/wrong_allowed_countries_in_checkout
 - Merged commits:
   1. b4e3113
   2. 0fcb792
   3. 5475184

Author: ishakhsuvarov

app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php

@@ -7,6 +7,7 @@
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Directory data processor.
@@ -37,9 +38,9 @@ class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutP
     private $countryCollectionFactory;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @var DirectoryHelper
@@ -51,17 +52,19 @@ class DirectoryDataProcessor implements \Magento\Checkout\Block\Checkout\LayoutP
      * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection
      * @param StoreResolverInterface $storeResolver
      * @param DirectoryHelper $directoryHelper
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countryCollection,
         \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollection,
         StoreResolverInterface $storeResolver,
-        DirectoryHelper $directoryHelper
+        DirectoryHelper $directoryHelper,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->countryCollectionFactory = $countryCollection;
         $this->regionCollectionFactory = $regionCollection;
-        $this->storeResolver = $storeResolver;
         $this->directoryHelper = $directoryHelper;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()->get(StoreManagerInterface::class);
     }
 
     /**
@@ -91,7 +94,7 @@ private function getCountryOptions()
     {
         if (!isset($this->countryOptions)) {
             $this->countryOptions = $this->countryCollectionFactory->create()->loadByStore(
-                $this->storeResolver->getCurrentStoreId()
+                $this->storeManager->getStore()->getId()
             )->toOptionArray();
             $this->countryOptions = $this->orderCountryOptions($this->countryOptions);
         }
@@ -108,7 +111,7 @@ private function getRegionOptions()
     {
         if (!isset($this->regionOptions)) {
             $this->regionOptions = $this->regionCollectionFactory->create()->addAllowedCountriesFilter(
-                $this->storeResolver->getCurrentStoreId()
+                $this->storeManager->getStore()->getId()
             )->toOptionArray();
         }
 

app/code/Magento/Checkout/Test/Unit/Block/Checkout/DirectoryDataProcessorTest.php

@@ -37,6 +37,11 @@ class DirectoryDataProcessorTest extends \PHPUnit_Framework_TestCase
      */
     protected $storeResolverMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -75,6 +80,9 @@ protected function setUp()
         $this->storeResolverMock = $this->getMock(
             \Magento\Store\Api\StoreResolverInterface::class
         );
+        $this->storeManagerMock = $this->getMock(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
         $this->directoryDataHelperMock = $this->getMock(
             \Magento\Directory\Helper\Data::class,
             [],
@@ -87,7 +95,8 @@ protected function setUp()
             $this->countryCollectionFactoryMock,
             $this->regionCollectionFactoryMock,
             $this->storeResolverMock,
-            $this->directoryDataHelperMock
+            $this->directoryDataHelperMock,
+            $this->storeManagerMock
         );
     }
 

app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php

@@ -11,9 +11,7 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Address\Attribute\Source;
 
-use Magento\Checkout\Model\Session;
 use Magento\Framework\App\ObjectManager;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -28,9 +26,9 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
     protected $_countriesFactory;
 
     /**
-     * @var StoreResolverInterface
+     * @var StoreManagerInterface
      */
-    private $storeResolver;
+    private $storeManager;
 
     /**
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
@@ -55,7 +53,7 @@ public function getAllOptions()
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
-                $this->getStoreResolver()->getCurrentStoreId()
+                $this->getStoreManager()->getStore()->getId()
             )->toOptionArray();
         }
         return $this->_options;
@@ -70,16 +68,16 @@ protected function _createCountriesCollection()
     }
 
     /**
-     * Retrieve Store Resolver
+     * Retrieve Store Manager
      * @deprecated
-     * @return StoreResolverInterface
+     * @return StoreManagerInterface
      */
-    private function getStoreResolver()
+    private function getStoreManager()
     {
-        if (!$this->storeResolver) {
-            $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
+        if (!$this->storeManager) {
+            $this->storeManager = ObjectManager::getInstance()->get(StoreManagerInterface::class);
         }
 
-        return $this->storeResolver;
+        return $this->storeManager;
     }
 }