Skip to content

Commit 2007f45

Browse files
committed
ACPT-1709: Clean up skip-list for GraphQlState Test
-- fix test failures
1 parent 9a444e6 commit 2007f45

File tree

10 files changed

+27
-11
lines changed

10 files changed

+27
-11
lines changed

app/code/Magento/ConfigurableProductGraphQl/Test/Unit/Model/Cart/BuyRequest/SuperAttributeDataProviderTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
/**
2626
* Test for SuperAttributeDataProvider
27+
*
28+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2729
*/
2830
class SuperAttributeDataProviderTest extends TestCase
2931
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ protected function getCustomAttributesCodes()
388388
*
389389
* @return \Magento\Customer\Model\Address\CustomAttributeListInterface
390390
* @deprecated 100.0.6
391+
* @see not recommended way
391392
*/
392393
private function getAttributeList()
393394
{

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
* @method bool getShouldIgnoreValidation()
3636
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3737
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
38+
* @SuppressWarnings(PHPMD.TooManyFields)
3839
*
3940
* @api
4041
* @since 100.0.2
@@ -71,7 +72,10 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
7172
*/
7273
protected static $_countryModels = [];
7374

74-
/** @var CountryModelsCache */
75+
/**
76+
* @var CountryModelsCache
77+
* phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
78+
*/
7579
private readonly CountryModelsCache $countryModelsCache;
7680

7781
/**
@@ -83,7 +87,10 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
8387
*/
8488
protected static $_regionModels = [];
8589

86-
/** @var RegionModelsCache */
90+
/**
91+
* @var RegionModelsCache
92+
* phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
93+
*/
8794
private readonly RegionModelsCache $regionModelsCache;
8895

8996
/**
@@ -156,7 +163,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
156163
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
157164
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
158165
* @param array $data
159-
* @param CompositeValidator|null $compositeValidator
166+
* @param CompositeValidator $compositeValidator
160167
* @param CountryModelsCache|null $countryModelsCache
161168
* @param RegionModelsCache|null $regionModelsCache
162169
*
@@ -179,7 +186,7 @@ public function __construct(
179186
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
180187
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
181188
array $data = [],
182-
?CompositeValidator $compositeValidator = null,
189+
CompositeValidator $compositeValidator = null,
183190
?CountryModelsCache $countryModelsCache = null,
184191
?RegionModelsCache $regionModelsCache = null,
185192
) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Customer\Model\Address\AbstractAddress;
89

@@ -29,7 +30,7 @@ public function _resetState(): void
2930
* Adds model to cache using key
3031
*
3132
* @param string $key
32-
* @param Country $value
33+
* @param Country $model
3334
* @return void
3435
*/
3536
public function add(string $key, Country $model) : void

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
67

78
namespace Magento\Customer\Model\Address\AbstractAddress;
89

@@ -29,7 +30,7 @@ public function _resetState(): void
2930
* Adds model to cache using key
3031
*
3132
* @param string $key
32-
* @param Region $value
33+
* @param Region $model
3334
* @return void
3435
*/
3536
public function add(string $key, Region $model) : void

lib/internal/Magento/Framework/Logger/LoggerProxy.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ class LoggerProxy implements LoggerInterface, NoninterceptableInterface, ResetAf
2121
{
2222
/**
2323
* @var ObjectManagerInterface
24+
* phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
2425
*/
2526
private readonly ObjectManagerInterface $objectManager;
2627

lib/internal/Magento/Framework/MessageQueue/Topology/Config/Xml/Converter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function __construct(
6565
/**
6666
* @inheritdoc
6767
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
68-
* phpcs:ignore Magento2.Performance.ForeachArrayMerge
68+
* phpcs:disable Magento2.Performance.ForeachArrayMerge
6969
*/
7070
public function convert($source)
7171
{

lib/internal/Magento/Framework/ObjectManager/Resetter/Resetter.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
1414
use Magento\Framework\ObjectManagerInterface;
1515
use WeakMap;
16-
use WeakReference;
1716

1817
/**
1918
* Class that keeps track of the instances that need to be reset, and resets them
@@ -32,7 +31,6 @@ class Resetter implements ResetterInterface
3231
/** @var WeakMapSorter|null Note: We use temporal coupling here because of chicken/egg during bootstrapping */
3332
private ?WeakMapSorter $weakMapSorter = null;
3433

35-
3634
/**
3735
* @var array
3836
*/
@@ -41,6 +39,8 @@ class Resetter implements ResetterInterface
4139
/**
4240
* Constructor
4341
*
42+
* @param ComponentRegistrarInterface $componentRegistrar
43+
* @param array $classList
4444
* @return void
4545
* @phpcs:disable Magento2.Functions.DiscouragedFunction
4646
*/
@@ -71,7 +71,6 @@ private function getPaths(): \Generator
7171
}
7272
}
7373

74-
7574
/**
7675
* Add instance to be reset later
7776
*

lib/internal/Magento/Framework/ObjectManager/Resetter/ResetterFactory.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ class ResetterFactory
1919
*/
2020
private static string $resetterClassName = Resetter::class;
2121

22+
/**
23+
* @param ObjectManagerInterface $objectManager
24+
*/
2225
public function __construct(private ObjectManagerInterface $objectManager)
2326
{
2427
}

lib/internal/Magento/Framework/TestFramework/ApplicationStateComparator/Resetter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use Magento\Framework\Component\ComponentRegistrarInterface;
1111
use Magento\Framework\ObjectManager\Resetter\Resetter as OriginalResetter;
12-
use Magento\Framework\ObjectManager\Resetter\WeakMapSorter;
1312
use Magento\Framework\ObjectManagerInterface;
1413
use WeakMap;
1514

@@ -35,6 +34,8 @@ class Resetter extends OriginalResetter
3534
/**
3635
* Constructor
3736
*
37+
* @param ComponentRegistrarInterface $componentRegistrar
38+
* @param array $classList
3839
* @return void
3940
*/
4041
public function __construct(ComponentRegistrarInterface $componentRegistrar, array $classList = [])

0 commit comments

Comments
 (0)