Skip to content

Commit 23f9442

Browse files
author
Oleksandr Gorkun
committed
MC-13958: Additional Permissions for Design settings
1 parent 1988de3 commit 23f9442

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ protected function getCustomAttributesCodes()
330330
return $this->customAttributesCodes;
331331
}
332332

333+
// phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
333334
/**
334335
* Returns model resource
335336
*
@@ -339,9 +340,9 @@ protected function getCustomAttributesCodes()
339340
*/
340341
protected function _getResource()
341342
{
342-
//phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
343343
return parent::_getResource();
344344
}
345+
// phpcs:enable
345346

346347
/**
347348
* Get flat resource model flag

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ private function convertValues($category, $categoryData)
519519
$stat = $fileInfo->getStat($fileName);
520520
$mime = $fileInfo->getMimeType($fileName);
521521

522-
//phpcs:ignore Generic.PHP.ForbiddenFunctions
522+
// phpcs:ignore Magento2.Functions.DiscouragedFunction
523523
$categoryData[$attributeCode][0]['name'] = basename($fileName);
524524

525525
if ($fileInfo->isBeginsWithMediaDirectoryPath($fileName)) {

app/code/Magento/Catalog/Model/Product.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ protected function _construct()
503503
$this->_init(\Magento\Catalog\Model\ResourceModel\Product::class);
504504
}
505505

506+
// phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
506507
/**
507508
* Get resource instance
508509
*
@@ -512,9 +513,9 @@ protected function _construct()
512513
*/
513514
protected function _getResource()
514515
{
515-
//phpcs:ignore Generic.CodeAnalysis.UselessOverridingMethod
516516
return parent::_getResource();
517517
}
518+
// phpcs:enable
518519

519520
/**
520521
* Get a list of custom attribute codes that belongs to product attribute set.

0 commit comments

Comments
 (0)