Skip to content

Commit 921450e

Browse files
committed
ACPT-1052: Some Luma Storefront Scenarios Are Broken
- fix failed tests
1 parent 99f16b7 commit 921450e

File tree

12 files changed

+29
-17
lines changed

12 files changed

+29
-17
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,8 @@ protected function validateCategory(Category $category)
234234
*
235235
* @return ExtensibleDataObjectConverter
236236
*
237-
* @deprecated 101.0.0 @see we don't recommend this approach anymore
237+
* @deprecated 101.0.0
238+
* @see we don't recommend this approach anymore
238239
*/
239240
private function getExtensibleDataObjectConverter()
240241
{

app/code/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ private function markSynchronized()
186186
* @param string $tableName
187187
* @return void
188188
*/
189-
private function synchronizeTable($tableName)
189+
private function synchronizeTable(string $tableName): void
190190
{
191191
foreach ($this->fetchAttributeValues($tableName) as $attributeValueItems) {
192192
$this->processAttributeValues($attributeValueItems, $tableName);
@@ -359,7 +359,7 @@ private function getAttributeValueKey($entityId, $attributeId, $websiteId)
359359
}
360360

361361
/**
362-
* generate insertions for attribute value
362+
* Generate insertions for attribute value
363363
*
364364
* @param array $attributeValue
365365
* @param string $tableName

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/Websites/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,6 @@ private function fetch() : array
141141
public function _resetState(): void
142142
{
143143
$this->productIds = [];
144-
$this->website = [];
144+
$this->websites = [];
145145
}
146146
}

app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenCategoriesProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public function getChildren(Category $category, $recursive = false)
3232
}
3333

3434
/**
35+
* Retrieve category children ids
36+
*
3537
* @param \Magento\Catalog\Model\Category $category
3638
* @param boolean $recursive
3739
* @return int[]

app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUsedInProductsHashMap.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public function __construct(
4141
}
4242

4343
/**
44-
* Returns an array of product ids for all DataProductHashMap list,
45-
* that occur in other categories not part of DataCategoryHashMap list
44+
* Returns product ids for all DataProductHashMap list from other categories not part of DataCategoryHashMap list
4645
*
4746
* @param int $categoryId
4847
* @return array

app/code/Magento/Customer/Helper/Address.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* Customer address helper
1919
*
2020
* @api
21-
* phpcs:disable Generic.CodeAnalysis.EmptyStatement
2221
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2322
* @since 100.0.2
2423
*/
@@ -27,7 +26,8 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper implements Re
2726
/**
2827
* VAT Validation parameters XML paths
2928
*/
30-
public const XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT = 'customer/create_account/viv_disable_auto_group_assign_default';
29+
public const XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT =
30+
'customer/create_account/viv_disable_auto_group_assign_default';
3131

3232
public const XML_PATH_VIV_ON_EACH_TRANSACTION = 'customer/create_account/viv_on_each_transaction';
3333

@@ -126,6 +126,7 @@ public function __construct(
126126
/**
127127
* Addresses url
128128
*
129+
* phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedFunction
129130
* @return void
130131
*/
131132
public function getBookUrl()
@@ -135,6 +136,7 @@ public function getBookUrl()
135136
/**
136137
* Retrieve edit url.
137138
*
139+
* phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedFunction
138140
* @return void
139141
*/
140142
public function getEditUrl()
@@ -144,6 +146,7 @@ public function getEditUrl()
144146
/**
145147
* Retrieve delete url.
146148
*
149+
* phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedFunction
147150
* @return void
148151
*/
149152
public function getDeleteUrl()
@@ -153,6 +156,7 @@ public function getDeleteUrl()
153156
/**
154157
* Retrieve create url.
155158
*
159+
* phpcs:ignore Generic.CodeAnalysis.EmptyStatement
156160
* @return void
157161
*/
158162
public function getCreateUrl()
@@ -163,7 +167,7 @@ public function getCreateUrl()
163167
* Retrieve block renderer.
164168
*
165169
* @param string $renderer
166-
* @return \Magento\Framework\View\Element\BlockInterface
170+
* @return BlockInterface
167171
*/
168172
public function getRenderer($renderer)
169173
{

app/code/Magento/Customer/Model/Address/AbstractAddress.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* @method string getPostcode()
3333
* @method bool getShouldIgnoreValidation()
3434
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
35+
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
3536
*
3637
* @api
3738
* @since 100.0.2

app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
9797
* Get StoreManager dependency
9898
*
9999
* @return StoreManagerInterface
100-
* @deprecated 100.1.6 @see we don't recommend this approach anymore
100+
* @deprecated 100.1.6
101+
* @see we don't recommend this approach anymore
101102
*/
102103
private function getStoreManager()
103104
{

app/code/Magento/Tax/Model/TaxCalculation.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ protected function processItem(
287287
* @param TaxDetailsItemInterface[] $children
288288
* @param int $quantity
289289
* @return TaxDetailsItemInterface
290+
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
290291
*/
291292
protected function calculateParent($children, $quantity)
292293
{

dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiConfigFixture.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
/**
2121
* @inheritDoc
22+
* @SuppressWarnings(PHPMD.NPathComplexity)
2223
*/
2324
class ApiConfigFixture extends ConfigFixture
2425
{

0 commit comments

Comments
 (0)