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

Sergii Kovalenko · Sergii Kovalenko · commit 83e34c897b1d · 2016-09-16T00:58:22.000-07:00
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -242,7 +242,7 @@ private function getCountryByWebsiteSource()
     }
 
     /**
-     * Retrive Customer Share Config
+     * Retrieve Customer Share Config
      * @deprecated
      * @return \Magento\Customer\Model\Config\Share
      */
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -90,7 +90,6 @@ public function getAllOptions()
                 $allowedCountries = $this->allowedCountriesReader->getAllowedCountries();
             }
 
-
             $this->options = $this->createCountriesCollection()
                 ->addFieldToFilter('country_id', ['in' => $allowedCountries])
                 ->toOptionArray();
diff --git a/app/code/Magento/Directory/Model/AllowedCountries.php b/app/code/Magento/Directory/Model/AllowedCountries.php
@@ -78,7 +78,7 @@ public function getAllowedCountries(
      * Resolve scope code by scope
      *
      * @throws \InvalidArgumentException
-     * @param $scope
+     * @param string $scope
      * @return array|int
      */
     private function getDefaultScopeCode($scope)

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ private function getCountryByWebsiteSource()`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/**`
`245`		`- * Retrive Customer Share Config`
	`245`	`+ * Retrieve Customer Share Config`
`246`	`246`	`* @deprecated`
`247`	`247`	`* @return \Magento\Customer\Model\Config\Share`
`248`	`248`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ public function getAllOptions()`
`90`	`90`	`$allowedCountries = $this->allowedCountriesReader->getAllowedCountries();`
`91`	`91`	`}`
`92`	`92`
`93`		`-`
`94`	`93`	`$this->options = $this->createCountriesCollection()`
`95`	`94`	`->addFieldToFilter('country_id', ['in' => $allowedCountries])`
`96`	`95`	`->toOptionArray();`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function getAllowedCountries(`
`78`	`78`	`* Resolve scope code by scope`
`79`	`79`	`*`
`80`	`80`	`* @throws \InvalidArgumentException`
`81`		`- * @param $scope`
	`81`	`+ * @param string $scope`
`82`	`82`	`* @return array\|int`
`83`	`83`	`*/`
`84`	`84`	`private function getDefaultScopeCode($scope)`