MAGETWO-56941: [Github] Allowed countries for customer address in admin using storeview configuration #2946

Author: Sergii Kovalenko

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

@@ -13,6 +13,7 @@
 
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -49,7 +50,7 @@ public function getAllOptions()
     {
         if (!$this->_options) {
             $this->_options = $this->_createCountriesCollection()->loadByStore(
-                $this->getStoreManager()->getStore()->getId()
+                $this->getStoreResolver()->getCurrentStoreId()
             )->toOptionArray();
         }
         return $this->_options;
@@ -65,10 +66,10 @@ protected function _createCountriesCollection()
 
     /**
      * @deprecated
-     * @return StoreManagerInterface
+     * @return StoreResolverInterface
      */
-    private function getStoreManager()
+    private function getStoreResolver()
     {
-        return ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        return ObjectManager::getInstance()->get(StoreResolverInterface::class);
     }
 }