Merge remote-tracking branch 'origin/MAGETWO-81153' into MPI-PR-2.2.1

Author: viktym

app/code/Magento/Customer/Block/Address/Edit.php

@@ -5,7 +5,9 @@
  */
 namespace Magento\Customer\Block\Address;
 
+use Magento\Customer\Model\AttributeChecker;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Customer address edit block
@@ -46,6 +48,11 @@ class Edit extends \Magento\Directory\Block\Data
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var AttributeChecker
+     */
+    private $attributeChecker;
+
     /**
      * Constructor
      *
@@ -61,7 +68,7 @@ class Edit extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array $data
-     *
+     * @param AttributeChecker $attributeChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -76,13 +83,16 @@ public function __construct(
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        array $data = []
+        array $data = [],
+        AttributeChecker $attributeChecker = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressRepository = $addressRepository;
         $this->addressDataFactory = $addressDataFactory;
         $this->currentCustomer = $currentCustomer;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->attributeChecker = $attributeChecker ?: ObjectManager::getInstance()->get(AttributeChecker::class);
+
         parent::__construct(
             $context,
             $directoryHelper,
@@ -352,4 +362,16 @@ public function getConfig($path)
     {
         return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
+
+    /**
+     * Checks whether it is allowed to show an attribute on the form.
+     *
+     * @param string $attributeCode
+     * @param string $formName
+     * @return bool
+     */
+    public function isAttributeAllowedOnForm($attributeCode, $formName)
+    {
+        return $this->attributeChecker->isAttributeAllowedOnForm($attributeCode, $formName);
+    }
 }

app/code/Magento/Customer/Helper/AttributeChecker.php renamed to app/code/Magento/Customer/Model/AttributeChecker.php

@@ -3,19 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Customer\Helper;
+namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
-use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Metadata\AttributeResolver;
-use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 
 /**
  * Customer attribute checker.
  */
-class AttributeChecker extends AbstractHelper
+class AttributeChecker
 {
     /**
      * @var AddressMetadataInterface
@@ -28,18 +26,15 @@ class AttributeChecker extends AbstractHelper
     private $attributeResolver;
 
     /**
-     * @param Context $context
      * @param AddressMetadataInterface $addressMetadata
      * @param AttributeResolver $attributeResolver
      */
     public function __construct(
-        Context $context,
         AddressMetadataInterface $addressMetadata,
         AttributeResolver $attributeResolver
     ) {
         $this->addressMetadata = $addressMetadata;
         $this->attributeResolver = $attributeResolver;
-        parent::__construct($context);
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Helper/AttributeCheckerTest.php renamed to app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php

@@ -4,24 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Customer\Test\Unit\Helper;
+namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
-use Magento\Customer\Helper\AttributeChecker;
+use Magento\Customer\Model\AttributeChecker;
 use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Metadata\AttributeResolver;
-use Magento\Framework\App\Helper\Context;
 
 class AttributeCheckerTest extends \PHPUnit\Framework\TestCase
 {
     /** @var AttributeChecker|\PHPUnit_Framework_MockObject_MockObject */
     private $model;
 
-    /** @var Context */
-    private $context;
-
     /** @var  AttributeResolver|\PHPUnit_Framework_MockObject_MockObject */
     private $attributeResolver;
 
@@ -30,16 +26,12 @@ class AttributeCheckerTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->addressMetadataService = $this->getMockForAbstractClass(AddressMetadataInterface::class);
         $this->attributeResolver = $this->getMockBuilder(AttributeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->model = new AttributeChecker(
-            $this->context,
             $this->addressMetadataService,
             $this->attributeResolver
         );