MC-16455: Admin user with permission for 1 store can manage categories

- Fix unit and static tests failures.

Author: Yauhen_Lyskavets

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -162,9 +162,9 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
     private $auth;
 
     /**
-     * @param string $name
-     * @param string $primaryFieldName
-     * @param string $requestFieldName
+     * @param $name
+     * @param $primaryFieldName
+     * @param $requestFieldName
      * @param EavValidationRules $eavValidationRules
      * @param CategoryCollectionFactory $categoryCollectionFactory
      * @param StoreManagerInterface $storeManager
@@ -176,7 +176,8 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
      * @param array $data
      * @param PoolInterface|null $pool
      * @param AuthorizationInterface|null $auth
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param ArrayUtils|null $arrayUtils
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
         $name,
@@ -321,7 +322,7 @@ private function prepareFieldsMeta(array $fieldsMap, array $fieldsMeta): array
      * @inheritDoc
      * @since 101.0.0
      */
-    public function getData(): array
+    public function getData()
     {
         if (isset($this->loadedData)) {
             return $this->loadedData;
@@ -382,7 +383,7 @@ public function getAttributesMeta(Type $entityType)
             // disable fields
             $attributeIsLocked = $this->getCurrentCategory()->isLockedAttribute($code);
             $meta[$code]['disabled'] = $attributeIsLocked;
-            if (array_search('use_config.' . $code, $fields, true) && $meta[$code]['disabled']) {
+            if (array_search('use_config.' . $code, $fields) && $meta[$code]['disabled']) {
                 $meta['use_config.' . $code]['disabled'] = true;
             }
         }

app/code/Magento/Catalog/Test/Unit/Model/Category/DataProviderTest.php

@@ -17,6 +17,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Ui\DataProvider\Modifier\PoolInterface;
+use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -78,6 +79,14 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $modifierPool;
 
+    /**
+     * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $arrayUtils;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->eavValidationRules = $this->getMockBuilder(EavValidationRules::class)
@@ -128,6 +137,10 @@ protected function setUp()
             ->getMock();
 
         $this->modifierPool = $this->getMockBuilder(PoolInterface::class)->getMockForAbstractClass();
+
+        $this->arrayUtils = $this->getMockBuilder(ArrayUtils::class)
+            ->setMethods(['flatten'])
+            ->disableOriginalConstructor()->getMock();
     }
 
     /**
@@ -157,7 +170,8 @@ private function getModel()
                 'eavConfig' => $this->eavConfig,
                 'request' => $this->request,
                 'categoryFactory' => $this->categoryFactory,
-                'pool' => $this->modifierPool
+                'pool' => $this->modifierPool,
+                'arrayUtils' => $this->arrayUtils
             ]
         );
 
@@ -331,6 +345,8 @@ public function testGetData()
 
     public function testGetMetaWithoutParentInheritanceResolving()
     {
+        $this->arrayUtils->expects($this->atLeastOnce())->method('flatten')->willReturn([1,3,3]);
+
         $categoryMock = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()
             ->getMock();

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

@@ -149,7 +149,7 @@ public function modifyMeta(array $meta)
      */
     private function isAllowed(): bool
     {
-        return $this->authorization->isAllowed('Magento_Catalog::categories');
+        return (bool) $this->authorization->isAllowed('Magento_Catalog::categories');
     }
 
     /**
@@ -291,6 +291,7 @@ protected function customizeCategoriesField(array $meta)
                             'formElement' => 'container',
                             'additionalClasses' => 'admin__field-small',
                             'componentType' => 'container',
+                            'disabled' => $fieldIsDisabled,
                             'component' => 'Magento_Ui/js/form/components/button',
                             'template' => 'ui/form/components/button/container',
                             'actions' => [
@@ -315,7 +316,6 @@ protected function customizeCategoriesField(array $meta)
                             'displayArea' => 'insideGroup',
                             'sortOrder' => 20,
                             'dataScope'  => $fieldCode,
-                            'disabled' => $fieldIsDisabled,
                         ],
                     ],
                 ]

app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php

@@ -52,7 +52,7 @@ public function __construct(
         array $config = []
     ) {
         $wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
-        if ($config['disabled'] === true) {
+        if (isset($config['disabled']) && $config['disabled'] === true) {
             $config['wysiwygConfigData']['settings']['readonly'] = 1;
         }