Skip to content

Commit ac7af37

Browse files
committed
Fix static tests.
1 parent c1d0128 commit ac7af37

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public function prepareProductAttributes(Product $product, array $productData, a
4646
}
4747

4848
/**
49+
* Reset "Use Config Settings" to false in product data.
50+
*
4951
* @param Product $product
5052
* @param string $attributeCode
5153
* @param array $productData
@@ -62,6 +64,8 @@ private function prepareConfigData(Product $product, string $attributeCode, arra
6264
}
6365

6466
/**
67+
* Prepare default attribute data for product.
68+
*
6569
* @param array $attributeList
6670
* @param string $attributeCode
6771
* @param array $productData
@@ -86,6 +90,8 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
8690
}
8791

8892
/**
93+
* Check, whether attribute should not be updated.
94+
*
8995
* @param Product $product
9096
* @param array $useDefaults
9197
* @param string $attribute

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Catalog super product attribute resource model
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -11,6 +9,9 @@
119
use Magento\Framework\DB\Adapter\AdapterInterface;
1210
use Magento\Store\Model\Store;
1311

12+
/**
13+
* Catalog super product attribute resource model.
14+
*/
1415
class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1516
{
1617
/**
@@ -189,8 +190,7 @@ public function deleteAttributesByProductId($productId)
189190
}
190191

191192
/**
192-
* @param \Magento\Framework\Model\AbstractModel $object
193-
* @return $this
193+
* @inheritDoc
194194
*/
195195
protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
196196
{

app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77

88
/**
99
* Reports Product Index Abstract Model
10+
*
1011
* @api
1112
* @since 100.0.2
13+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1214
*/
1315
abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
1416
{

app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
?>
77

8-
<div class="admin__page-section-title <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
9-
<span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
8+
<div class="admin__page-section-title <?= /* @noEscape */ $block->getHeaderCssClass() ?>">
9+
<span class="title"><?= /* @noEscape */ $block->getHeaderText() ?></span>
1010
<div class="actions"></div>
1111
</div>
1212
<div id="customer_account_fields" class="admin__page-section-content">

0 commit comments

Comments
 (0)