Skip to content

Commit 5a24a69

Browse files
committed
MC-22829: Revert ticket MAGETWO-96975 which introduce BIC on 2.3.4
1 parent d3da0bb commit 5a24a69

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

dev/tests/integration/testsuite/Magento/Backend/Model/Locale/ResolverTest.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,38 @@ public function testSetLocaleWithRequestLocale()
7676
$this->_checkSetLocale('de_DE');
7777
}
7878

79+
/**
80+
* Tests setLocale() with parameter
81+
*
82+
* @param string|null $localeParam
83+
* @param string|null $localeRequestParam
84+
* @param string $localeExpected
85+
* @dataProvider setLocaleWithParameterDataProvider
86+
*/
87+
public function testSetLocaleWithParameter(
88+
?string $localeParam,
89+
?string $localeRequestParam,
90+
string $localeExpected
91+
) {
92+
$request = Bootstrap::getObjectManager()
93+
->get(\Magento\Framework\App\RequestInterface::class);
94+
$request->setPostValue(['locale' => $localeRequestParam]);
95+
$this->_model->setLocale($localeParam);
96+
$this->assertEquals($localeExpected, $this->_model->getLocale());
97+
}
98+
99+
/**
100+
* @return array
101+
*/
102+
public function setLocaleWithParameterDataProvider(): array
103+
{
104+
return [
105+
['ko_KR', 'ja_JP', 'ja_JP'],
106+
['ko_KR', null, 'ko_KR'],
107+
[null, 'ja_JP', 'ja_JP'],
108+
];
109+
}
110+
79111
/**
80112
* Check set locale
81113
*

dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<rule ref="rulesets/unusedcode.xml" />
3030

3131
<!-- Code design rules -->
32-
<rule ref="rulesets/design.xml/ExitExpression" />
33-
<rule ref="rulesets/design.xml/EvalExpression" />
34-
<rule ref="rulesets/design.xml/GotoStatement" />
3532
<rule ref="rulesets/design.xml/NumberOfChildren" />
3633
<rule ref="rulesets/design.xml/DepthOfInheritance">
3734
<properties>

0 commit comments

Comments
 (0)