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

Author: Sergii Kovalenko

app/code/Magento/Customer/Model/Plugin/AllowedCountries.php

@@ -44,6 +44,8 @@ public function __construct(
      * @param \Magento\Directory\Model\AllowedCountries $subject
      * @param string | null $filter
      * @param string $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeGetAllowedCountries(
         \Magento\Directory\Model\AllowedCountries $subject,

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

@@ -48,6 +48,7 @@ class CountryWithWebsites extends \Magento\Eav\Model\Entity\Attribute\Source\Tab
      * @param \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countriesFactory
      * @param AllowedCountries $allowedCountries
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param Share $shareConfig
      */
     public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,

app/code/Magento/Customer/Setup/UpgradeData.php

@@ -191,7 +191,7 @@ private function mergeAllowedCountries(array $countries, array $newCountries, $i
     private function getAllowedCountries($scope, $scopeCode)
     {
         $allowedCountriesReader = $this->getAllowedCountriesReader();
-        return $allowedCountriesReader->getUniqueCountries(
+        return $allowedCountriesReader->makeCountriesUnique(
             $allowedCountriesReader->getCountriesFromConfig($scope, $scopeCode)
         );
     }

app/code/Magento/Customer/Test/Unit/Model/Plugin/AllowedCountriesTest.php

@@ -56,8 +56,8 @@ public function testGetAllowedCountriesWithGlobalScope()
             ->willReturn([$websiteMock]);
 
         $this->assertEquals(
-            [[$expectedFilter], $expectedScope],
+            [$expectedScope, [$expectedFilter]],
             $this->plugin->beforeGetAllowedCountries($originalAllowedCountriesMock)
         );
     }
-}
+}

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsitesTest.php

@@ -93,12 +93,12 @@ public function testGetAllOptions()
         $this->allowedCountriesMock->expects($this->exactly(2))
             ->method('getAllowedCountries')
             ->withConsecutive(
-                [1, 'website'],
-                [2, 'website']
+                ['website', 1],
+                ['website', 2]
             )
             ->willReturnMap([
-                [1, 'website', ['AM' => 'AM']],
-                [2, 'website', ['AM' => 'AM', 'DZ' => 'DZ']]
+                ['website', 1, ['AM' => 'AM']],
+                ['website', 2, ['AM' => 'AM', 'DZ' => 'DZ']]
             ]);
         $this->countriesFactoryMock->expects($this->once())
             ->method('create')

app/code/Magento/Directory/Model/AllowedCountries.php

@@ -105,7 +105,7 @@ private function getDefaultScopeCode($scope)
      * @param array $allowedCountries
      * @return array
      */
-    public function getUniqueCountries(array $allowedCountries)
+    public function makeCountriesUnique(array $allowedCountries)
     {
         return array_combine($allowedCountries, $allowedCountries);
     }