Skip to content

Commit a99f790

Browse files
committed
ACPT-1709: Clean up skip-list for GraphQlState Test
-- fix test failures
1 parent 6581823 commit a99f790

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Magento\Customer\Api\Data\RegionInterfaceFactory;
1212
use Magento\Customer\Model\Address\AbstractAddress\CountryModelsCache;
1313
use Magento\Customer\Model\Address\AbstractAddress\RegionModelsCache;
14+
use Magento\Customer\Model\Address\CompositeValidator;
1415
use Magento\Framework\Indexer\StateInterface;
1516

1617
/**
@@ -76,6 +77,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress
7677
* @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
7778
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
7879
* @param array $data
80+
* @param CompositeValidator|null $compositeValidator
7981
* @param CountryModelsCache|null $countryModelsCache
8082
* @param RegionModelsCache|null $regionModelsCache
8183
*
@@ -101,6 +103,7 @@ public function __construct(
101103
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
102104
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
103105
array $data = [],
106+
?CompositeValidator $compositeValidator = null,
104107
?CountryModelsCache $countryModelsCache = null,
105108
?RegionModelsCache $regionModelsCache = null,
106109
) {
@@ -124,6 +127,7 @@ public function __construct(
124127
$resource,
125128
$resourceCollection,
126129
$data,
130+
$compositeValidator,
127131
$countryModelsCache,
128132
$regionModelsCache,
129133
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class AbstractAddress extends AbstractExtensibleModel implements AddressModelInt
163163
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
164164
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
165165
* @param array $data
166-
* @param CompositeValidator $compositeValidator
166+
* @param CompositeValidator|null $compositeValidator
167167
* @param CountryModelsCache|null $countryModelsCache
168168
* @param RegionModelsCache|null $regionModelsCache
169169
*
@@ -186,7 +186,7 @@ public function __construct(
186186
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
187187
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
188188
array $data = [],
189-
CompositeValidator $compositeValidator = null,
189+
?CompositeValidator $compositeValidator = null,
190190
?CountryModelsCache $countryModelsCache = null,
191191
?RegionModelsCache $regionModelsCache = null,
192192
) {

0 commit comments

Comments
 (0)