MAGETWO-63657: [Backport] - category_ids attribute scope dropdown - for 2.0

Author: StasKozar

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

@@ -39,7 +39,9 @@ class Advanced extends Generic
     protected $disableScopeChangeList;
 
     /**
-     * @var PropertyLocker
+     * Disable form fields.
+     *
+     * @var \Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker PropertyLocker
      */
     private $propertyLocker;
 
@@ -275,7 +277,7 @@ private function getAttributeObject()
     }
 
     /**
-     * Get property locker
+     * Get property locker.
      *
      * @return PropertyLocker
      */
@@ -284,6 +286,7 @@ 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

@@ -61,7 +61,7 @@ protected function setUp()
         $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,