Skip to content

Commit c81469e

Browse files
authored
Merge pull request #559 from magento-performance/ACPT-1523
ACPT-1523: Fix Static test failures on application-server
2 parents 22d7364 + aba3d92 commit c81469e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

Lines changed: 1 addition & 0 deletions
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\BundleImportExport\Model\Import\Product\Type;
89

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/ResetAfterRequestTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
/**
1616
* Test that verifies that resetState method for classes cause the state to be the same as it was initially constructed
1717
* @magentoDbIsolation disabled
18+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
19+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
20+
* @SuppressWarnings(PHPMD.NPathComplexity)
1821
*/
1922
class ResetAfterRequestTest extends \PHPUnit\Framework\TestCase
2023
{
@@ -169,8 +172,7 @@ public function testResetAfterRequestClasses(string $className)
169172
continue; // We can skip _select because we load a fresh new Select after reset
170173
}
171174
if ('_regionModels' == $propertyName
172-
&& is_a($className, \Magento\Customer\Model\Address\AbstractAddress::class, true))
173-
{
175+
&& is_a($className, \Magento\Customer\Model\Address\AbstractAddress::class, true)) {
174176
continue; // AbstractAddress has static property _regionModels, so it would fail this test.
175177
// TODO: Can we convert _regionModels to member variable,
176178
// or move to a dependency injected service class instead?

0 commit comments

Comments
 (0)