Skip to content

[Forwardport] magento/magento2#13551 Fix json encoded attribute backend type to not encode attribute value multiple times #13640

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
merged 1 commit into from
Mar 6, 2018
Merged

[Forwardport] magento/magento2#13551 Fix json encoded attribute backend type to not encode attribute value multiple times #13640

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
22 changes: 21 additions & 1 deletion app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function beforeSave($object)
{
// parent::beforeSave() is not called intentionally
$attrCode = $this->getAttribute()->getAttributeCode();
if ($object->hasData($attrCode)) {
if ($object->hasData($attrCode) && !$this->isJsonEncoded($object->getData($attrCode))) {
$object->setData($attrCode, $this->jsonSerializer->serialize($object->getData($attrCode)));
}
return $this;
Expand All @@ -61,4 +61,24 @@ public function afterLoad($object)
$object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
return $this;
}

/**
* Returns true if given value is a valid json value, and false otherwise.
*
* @param string|int|float|bool|array|null $value
* @return bool
*/
private function isJsonEncoded($value): bool
{
$result = is_string($value);
if ($result) {
try {
$this->jsonSerializer->unserialize($value);
} catch (\InvalidArgumentException $e) {
$result = false;
}
}

return $result;
}
}
19 changes: 19 additions & 0 deletions app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,25 @@ public function testBeforeSave()
$this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
}

/**
* Test before save handler with already encoded attribute value
*/
public function testBeforeSaveWithAlreadyEncodedValue()
{
$product = new \Magento\Framework\DataObject(
[
'json_encoded' => [1, 2, 3]
]
);

// save twice
$this->model->beforeSave($product);
$this->model->beforeSave($product);

// check it is encoded only once
$this->assertEquals(json_encode([1, 2, 3]), $product->getData('json_encoded'));
}

/**
* Test after load handler
*/
Expand Down