Skip to content

Commit 7482615

Browse files
author
Yauhen_Lyskavets
committed
MC-16455: Admin user with permission for 1 store can manage categories
- Fix static tests failures.
1 parent 8a627e0 commit 7482615

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
162162
private $auth;
163163

164164
/**
165-
* @param $name
166-
* @param $primaryFieldName
167-
* @param $requestFieldName
165+
* @param string $name
166+
* @param string $primaryFieldName
167+
* @param string $requestFieldName
168168
* @param EavValidationRules $eavValidationRules
169169
* @param CategoryCollectionFactory $categoryCollectionFactory
170170
* @param StoreManagerInterface $storeManager
@@ -178,6 +178,7 @@ class DataProvider extends \Magento\Ui\DataProvider\ModifierPoolDataProvider
178178
* @param AuthorizationInterface|null $auth
179179
* @param ArrayUtils|null $arrayUtils
180180
* @throws \Magento\Framework\Exception\LocalizedException
181+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
181182
*/
182183
public function __construct(
183184
$name,
@@ -383,7 +384,8 @@ public function getAttributesMeta(Type $entityType)
383384
// disable fields
384385
$attributeIsLocked = $this->getCurrentCategory()->isLockedAttribute($code);
385386
$meta[$code]['disabled'] = $attributeIsLocked;
386-
if (array_search('use_config.' . $code, $fields) && $meta[$code]['disabled']) {
387+
$hasUseConfigField = (bool) array_search('use_config.' . $code, $fields, true);
388+
if ($hasUseConfigField && $meta[$code]['disabled']) {
387389
$meta['use_config.' . $code]['disabled'] = true;
388390
}
389391
}

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,12 @@ public function testGetDataNoFileExists()
220220
->getMock();
221221
$categoryMock->expects($this->exactly(2))
222222
->method('getData')
223-
->willReturnMap([
224-
['', null, $categoryData],
225-
['image', null, $categoryData['image']],
226-
]);
223+
->willReturnMap(
224+
[
225+
['', null, $categoryData],
226+
['image', null, $categoryData['image']],
227+
]
228+
);
227229
$categoryMock->expects($this->any())
228230
->method('getExistsStoreValueFlag')
229231
->with('url_key')
@@ -294,10 +296,12 @@ public function testGetData()
294296
->getMock();
295297
$categoryMock->expects($this->exactly(2))
296298
->method('getData')
297-
->willReturnMap([
298-
['', null, $categoryData],
299-
['image', null, $categoryData['image']],
300-
]);
299+
->willReturnMap(
300+
[
301+
['', null, $categoryData],
302+
['image', null, $categoryData['image']],
303+
]
304+
);
301305
$categoryMock->expects($this->any())
302306
->method('getExistsStoreValueFlag')
303307
->with('url_key')

0 commit comments

Comments
 (0)