Skip to content

[Backport] Fixed #22396 config:set fails with JSON values #23277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 1 commit into from
Jun 22, 2019
Merged

[Backport] Fixed #22396 config:set fails with JSON values #23277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected function serializeValue($value)
}
return $this->serializer->serialize($data);
} else {
return '';
return $value;
}
}

Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/CatalogInventory/Test/Unit/Helper/MinsaleqtyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public function testMakeStorableArrayFieldValue($value, $result, $serializeCallC
public function makeStorableArrayFieldValueDataProvider()
{
return [
'invalid bool' => [false, ''],
'invalid bool' => [false, false],
'invalid empty string' => ['', ''],
'valid numeric' => ['22', '22'],
'valid empty array' => [[], '[]', 1],
Expand All @@ -240,7 +240,8 @@ public function makeStorableArrayFieldValueDataProvider()
'[1]',
1,
[0 => 1.0]
]
],
'json value' => ['{"32000":2,"0":1}', '{"32000":2,"0":1}'],
];
}
}