Skip to content

Commit 3d42703

Browse files
author
Yevhen Miroshnychenko
committed
MAGETWO-92154: [Backport to 2.2] Unlock Locales Editing when SCD on Demand Mode is Enabled
1 parent 0d90929 commit 3d42703

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ protected function setUp()
5555
* @param bool $isDisabled
5656
* @param bool $isHidden
5757
* @dataProvider disabledDataProvider
58+
* @return void
5859
*/
59-
public function testCheckVisibility(string $path, string $mageMode, bool $isHidden, bool $isDisabled): void
60+
public function testCheckVisibility(string $path, string $mageMode, bool $isHidden, bool $isDisabled)
6061
{
6162
$this->stateMock->expects($this->any())
6263
->method('getMode')

app/code/Magento/Config/Test/Unit/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemandTest.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ protected function setUp()
6969
);
7070
}
7171

72-
public function testIsHiddenScdOnDemandEnabled(): void
72+
/**
73+
* @return void
74+
*/
75+
public function testIsHiddenScdOnDemandEnabled()
7376
{
7477
$path = 'section1/group1/field1';
7578
$this->deploymentConfigMock->expects($this->once())
@@ -82,7 +85,10 @@ public function testIsHiddenScdOnDemandEnabled(): void
8285
$this->assertFalse($this->model->isHidden($path));
8386
}
8487

85-
public function testIsDisabledScdOnDemandEnabled(): void
88+
/**
89+
* @return void
90+
*/
91+
public function testIsDisabledScdOnDemandEnabled()
8692
{
8793
$path = 'section1/group1/field1';
8894
$this->deploymentConfigMock->expects($this->once())
@@ -99,8 +105,9 @@ public function testIsDisabledScdOnDemandEnabled(): void
99105
* @param bool $isHidden
100106
*
101107
* @dataProvider visibilityDataProvider
108+
* @return void
102109
*/
103-
public function testIsHiddenScdOnDemandDisabled(bool $isHidden): void
110+
public function testIsHiddenScdOnDemandDisabled(bool $isHidden)
104111
{
105112
$path = 'section1/group1/field1';
106113
$this->deploymentConfigMock->expects($this->once())
@@ -119,8 +126,9 @@ public function testIsHiddenScdOnDemandDisabled(bool $isHidden): void
119126
* @param bool $isDisabled
120127
*
121128
* @dataProvider visibilityDataProvider
129+
* @return void
122130
*/
123-
public function testIsDisabledScdOnDemandDisabled(bool $isDisabled): void
131+
public function testIsDisabledScdOnDemandDisabled(bool $isDisabled)
124132
{
125133
$path = 'section1/group1/field1';
126134
$this->deploymentConfigMock->expects($this->once())

lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected function setUp()
8787
*
8888
* @dataProvider getFullLocalesDataProvider
8989
*/
90-
public function testGetOptionLocalesFull(string $mode, int $scdOnDemand, array $locales): void
90+
public function testGetOptionLocalesFull(string $mode, int $scdOnDemand, array $locales)
9191
{
9292
$this->localeListsMock->expects($this->once())
9393
->method('getOptionLocales')
@@ -106,7 +106,7 @@ public function testGetOptionLocalesFull(string $mode, int $scdOnDemand, array $
106106
*
107107
* @dataProvider getFullLocalesDataProvider
108108
*/
109-
public function testGetTranslatedOptionLocalesFull(string $mode, int $scdOnDemand, array $locales): void
109+
public function testGetTranslatedOptionLocalesFull(string $mode, int $scdOnDemand, array $locales)
110110
{
111111
$this->localeListsMock->expects($this->once())
112112
->method('getTranslatedOptionLocales')
@@ -133,7 +133,7 @@ public function testGetOptionLocalesLimited(
133133
array $locales,
134134
array $expectedLocales,
135135
array $deployedCodes
136-
): void {
136+
) {
137137
$this->localeListsMock->expects($this->once())
138138
->method('getOptionLocales')
139139
->willReturn($locales);
@@ -159,7 +159,7 @@ public function testGetTranslatedOptionLocalesLimited(
159159
array $locales,
160160
array $expectedLocales,
161161
array $deployedCodes
162-
): void {
162+
) {
163163
$this->localeListsMock->expects($this->once())
164164
->method('getTranslatedOptionLocales')
165165
->willReturn($locales);
@@ -175,7 +175,7 @@ public function testGetTranslatedOptionLocalesLimited(
175175
* @param array $deployedCodes
176176
* @return void
177177
*/
178-
private function prepareGetLocalesLimited(string $mode, int $scdOnDemand, $deployedCodes): void
178+
private function prepareGetLocalesLimited(string $mode, int $scdOnDemand, $deployedCodes)
179179
{
180180
$this->stateMock->expects($this->once())
181181
->method('getMode')
@@ -209,7 +209,7 @@ private function prepareGetLocalesLimited(string $mode, int $scdOnDemand, $deplo
209209
* @param int $scdOnDemand
210210
* @return void
211211
*/
212-
private function prepareGetLocalesFull(string $mode, int $scdOnDemand): void
212+
private function prepareGetLocalesFull(string $mode, int $scdOnDemand)
213213
{
214214
$this->stateMock->expects($this->once())
215215
->method('getMode')

0 commit comments

Comments
 (0)