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

Author: Sergey Kovalenko

app/code/Magento/Customer/Model/CountryHandler.php

@@ -65,7 +65,7 @@ public function getAllowedCountries(
 
         if ($this->customerConfigShare->isGlobalScope() && !$ignoreGlobalScope) {
             //Check if we have shared accounts - than merge all website allowed countries
-            $filter = array_map(function(WebsiteInterface $website) {
+            $filter = array_map(function (WebsiteInterface $website) {
                 return $website->getId();
             }, $this->storeManager->getWebsites());
             $scope = ScopeInterface::SCOPE_WEBSITES;

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

@@ -55,8 +55,7 @@ public function __construct(
         \Magento\Directory\Model\ResourceModel\Country\CollectionFactory $countriesFactory,
         \Magento\Directory\Model\CountryHandlerInterface $countryHandler,
         \Magento\Store\Model\StoreManagerInterface $storeManager
-    )
-    {
+    ) {
         $this->countriesFactory = $countriesFactory;
         $this->countryHandler = $countryHandler;
         $this->storeManager = $storeManager;

app/code/Magento/Customer/Test/Unit/Model/CountryHandlerTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Directory\Test\Unit\Model;
+namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\CountryHandler;
@@ -141,7 +141,9 @@ public function testLoadByScope()
             ->method('addFieldToFilter')
             ->with('country_id', ['in' => ['AM' => 'AM']]);
 
-        $this->assertEquals($collectionMock,
-            $this->countryHandler->loadByScope($collectionMock, 1, ScopeInterface::SCOPE_WEBSITE));
+        $this->assertEquals(
+            $collectionMock,
+            $this->countryHandler->loadByScope($collectionMock, 1, ScopeInterface::SCOPE_WEBSITE)
+        );
     }
 }

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

@@ -19,7 +19,7 @@ interface CountryHandlerInterface
 
     /**
      * Retrieve allowed countries list by filter and scope.
-     * @param null $filter
+     * @param int | null $filter
      * @param string $scope
      * @param bool $ignoreGlobalScope
      * @return array
@@ -33,7 +33,7 @@ public function getAllowedCountries(
     /**
      * Filter directory collection by allowed in website countries.
      * @param \Magento\Framework\Data\Collection\AbstractDb $collection
-     * @param $filter
+     * @param int $filter
      * @param string $scope
      * @return AbstractDb
      */

app/code/Magento/Ui/view/base/web/js/form/element/country.js

@@ -33,7 +33,7 @@ define([
 
             this._super(value, field);
 
-             result = _.filter(this.initialOptions, function (item) {
+                result = _.filter(this.initialOptions, function (item) {
 
                 if (item[field]) {
                     return ~item[field].indexOf(value);

app/code/Magento/Ui/view/base/web/js/form/element/website.js

@@ -23,7 +23,7 @@ define([
         initialize: function () {
             this._super();
 
-            if (this.customerId || this.isGlobalScope) { //disable element if customer exists
+            if (this.customerId || this.isGlobalScope) {//disable element if customer exists
                 this.disable(true);
             }
 

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php

@@ -20,6 +20,7 @@
 
 /**
  * Customer addresses edit block.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Addresses extends Tab
 {

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangingWebsiteChangeCountries.php

@@ -22,8 +22,11 @@ class AssertChangingWebsiteChangeCountries extends AbstractConstraint
      * @param array $expectedRequiredFields
      * @return void
      */
-    public function processAssert(CustomerIndexNew $customerIndexNew, Customer $customer, \Magento\Customer\Test\Fixture\Address $address, $expectedList)
-    {
+    public function processAssert(
+        CustomerIndexNew $customerIndexNew,
+        Customer $customer,
+        $expectedList
+    ) {
         $customerIndexNew->getCustomerForm()
             ->openTab('account_information');
         $customerIndexNew->getCustomerForm()->fillCustomer($customer);

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php

@@ -48,7 +48,6 @@ class CreateCustomerBackendEntityTest extends Injectable
      */
     private $address;
 
-
     /** @var array  */
     private $allowedCountriesData = [];
 
@@ -100,7 +99,7 @@ public function test(
         Address $address = null,
         array $steps = [],
         array $beforeActionCallback = []
-        ) {
+    ) {
         ///Process initialize steps
         foreach ($steps as $methodName => $stepData) {
             if (method_exists($this, $methodName)) {
@@ -127,7 +126,7 @@ public function test(
      * Assert that allowed countries renders in correct way.
      * @return void
      */
-    private function assertAllowedCountries()
+    protected function assertAllowedCountries()
     {
         /** @var \Magento\Customer\Test\Constraint\AssertChangingWebsiteChangeCountries $assert */
         $assert = $this->objectManager->get(
@@ -146,7 +145,6 @@ private function assertAllowedCountries()
             $assert->processAssert(
                 $this->pageCustomerIndexNew,
                 $customerWithWebsite,
-                $this->address,
                 $dataPerWebsite['countries']
             );
         }
@@ -200,11 +198,10 @@ private function createWebsiteFixture()
         return $websiteFixture;
     }
 
-
     /**
      * @param array $countryList
      */
-    private function configureAllowedCountries(array $countryList = [])
+    protected function configureAllowedCountries(array $countryList = [])
     {
         foreach ($countryList as $countries) {
             $websiteFixture = $this->createWebsiteFixture();