Skip to content

Commit 411464e

Browse files
committed
MAGETWO-62168: Improve field data converter logging and error reporting
1 parent 76fbff2 commit 411464e

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

lib/internal/Magento/Framework/DB/DataConverter/SerializedToJson.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,11 @@ protected function isValidJsonValue($value)
8080
protected function unserializeValue($value)
8181
{
8282
try {
83-
if (PHP_MAJOR_VERSION >= 7) {
84-
$value = $this->serialize->unserialize($value);
85-
} else {
86-
set_error_handler(function ($errorNumber, $errorString) {
87-
throw new DataConversionException($errorString, $errorNumber);
88-
});
89-
$value = $this->serialize->unserialize($value);
90-
restore_error_handler();
91-
}
83+
set_error_handler(function ($errorNumber, $errorString) {
84+
throw new DataConversionException($errorString, $errorNumber);
85+
});
86+
$value = $this->serialize->unserialize($value);
87+
restore_error_handler();
9288
} catch (\Throwable $throwable) {
9389
throw new DataConversionException($throwable->getMessage());
9490
}

0 commit comments

Comments
 (0)