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

@@ -27,6 +27,11 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
      */
     protected $_countriesFactory;
 
+    /**
+     * @var StoreResolverInterface
+     */
+    private $storeResolver;
+
     /**
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\OptionFactory $attrOptionFactory
@@ -65,11 +70,16 @@ protected function _createCountriesCollection()
     }
 
     /**
+     * Retrieve Store Resolver
      * @deprecated
      * @return StoreResolverInterface
      */
     private function getStoreResolver()
     {
-        return ObjectManager::getInstance()->get(StoreResolverInterface::class);
+        if (!$this->storeResolver) {
+            $this->storeResolver = ObjectManager::getInstance()->get(StoreResolverInterface::class);
+        }
+
+        return $this->storeResolver;
     }
 }