Merge remote-tracking branch 'origin/MAGETWO-63657' into 2.0.15-develop-pr14

Author: zakdma

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

@@ -16,6 +16,8 @@
 use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Eav\Helper\Data;
+use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
+use Magento\Framework\App\ObjectManager;
 
 class Advanced extends Generic
 {
@@ -36,6 +38,13 @@ class Advanced extends Generic
      */
     protected $disableScopeChangeList;
 
+    /**
+     * Disable form fields.
+     *
+     * @var \Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker PropertyLocker
+     */
+    private $propertyLocker;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -241,6 +250,8 @@ protected function _prepareForm()
             $form->getElement('is_global')->setDisabled(1);
         }
         $this->setForm($form);
+        $this->getPropertyLocker()->lock($form);
+
         return $this;
     }
 
@@ -264,4 +275,18 @@ private function getAttributeObject()
     {
         return $this->_coreRegistry->registry('entity_attribute');
     }
+
+    /**
+     * Get property locker.
+     *
+     * @return PropertyLocker
+     */
+    private function getPropertyLocker()
+    {
+        if (null === $this->propertyLocker) {
+            $this->propertyLocker = ObjectManager::getInstance()->get(PropertyLocker::class);
+        }
+        
+        return $this->propertyLocker;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/Tab/AdvancedTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Attribute\Edit\Tab;
 
+use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
+
 class AdvancedTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -41,38 +43,46 @@ class AdvancedTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $filesystem;
+    
+    /**
+     * @var PropertyLocker|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $propertyLocker;
 
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->registry = $this->getMock('\Magento\Framework\Registry');
-        $this->formFactory = $this->getMock('Magento\Framework\Data\FormFactory', [], [], '', false);
-        $this->yesNo = $this->getMock('Magento\Config\Model\Config\Source\Yesno');
-        $this->localeDate = $this->getMock('Magento\Framework\Stdlib\DateTime\TimezoneInterface');
-        $this->eavData = $this->getMock('Magento\Eav\Helper\Data', [], [], '', false);
-        $this->filesystem = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $this->registry = $this->getMock(\Magento\Framework\Registry::class);
+        $this->formFactory = $this->getMock(\Magento\Framework\Data\FormFactory::class, [], [], '', false);
+        $this->yesNo = $this->getMock(\Magento\Config\Model\Config\Source\Yesno::class);
+        $this->localeDate = $this->getMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
+        $this->eavData = $this->getMock(\Magento\Eav\Helper\Data::class, [], [], '', false);
+        $this->filesystem = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
+        $this->propertyLocker = $this->getMock(PropertyLocker::class, [], [], '', false);
 
         $this->block = $objectManager->getObject(
-            'Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced',
+            \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced::class,
             [
                 'registry' => $this->registry,
                 'formFactory' => $this->formFactory,
                 'localeDate' => $this->localeDate,
                 'yesNo' => $this->yesNo,
                 'eavData' => $this->eavData,
-                'filesystem' => $this->filesystem
+                'filesystem' => $this->filesystem,
+                'propertyLocker' => $this->propertyLocker
             ]
         );
+        $objectManager->setBackwardCompatibleProperty($this->block, 'propertyLocker', $this->propertyLocker);
     }
 
     public function testToHtml()
     {
-        $fieldSet = $this->getMock('Magento\Framework\Data\Form\Element\Fieldset', [], [], '', false);
-        $form = $this->getMock('Magento\Framework\Data\Form', [], [], '', false);
-        $attributeModel = $this->getMock('\Magento\Catalog\Model\ResourceModel\Eav\Attribute', [], [], '', false);
-        $entityType = $this->getMock('Magento\Eav\Model\Entity\Type', [], [], '', false);
-        $formElement = $this->getMock('Magento\Framework\Data\Form\Element\Text', ['setDisabled'], [], '', false);
-        $directoryReadInterface = $this->getMock('\Magento\Framework\Filesystem\Directory\ReadInterface');
+        $fieldSet = $this->getMock(\Magento\Framework\Data\Form\Element\Fieldset::class, [], [], '', false);
+        $form = $this->getMock(\Magento\Framework\Data\Form::class, [], [], '', false);
+        $attributeModel = $this->getMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], [], '', false);
+        $entityType = $this->getMock(\Magento\Eav\Model\Entity\Type::class, [], [], '', false);
+        $formElement = $this->getMock(\Magento\Framework\Data\Form\Element\Text::class, ['setDisabled'], [], '', false);
+        $directoryReadInterface = $this->getMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
 
         $this->registry->expects($this->any())->method('registry')->with('entity_attribute')
             ->willReturn($attributeModel);
@@ -93,6 +103,7 @@ public function testToHtml()
         $this->yesNo->expects($this->any())->method('toOptionArray')->willReturn(['yes', 'no']);
         $this->filesystem->expects($this->any())->method('getDirectoryRead')->willReturn($directoryReadInterface);
         $directoryReadInterface->expects($this->any())->method('getRelativePath')->willReturn('relative_path');
+        $this->propertyLocker->expects($this->once())->method('lock')->with($form);
 
         $this->block->setData(['action' => 'save']);
         $this->block->toHtml();

app/code/Magento/Catalog/etc/eav_attributes.xml

@@ -30,6 +30,7 @@
             <field code="is_searchable" locked="true" />
         </attribute>
         <attribute code="category_ids">
+            <field code="is_global" locked="true" />
             <field code="is_searchable" locked="true" />
         </attribute>
         <attribute code="media_gallery">