diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php index 547a23ed979d1..a6ebc50fe98bc 100644 --- a/lib/internal/Magento/Framework/DataObject.php +++ b/lib/internal/Magento/Framework/DataObject.php @@ -325,19 +325,21 @@ public function convertToXml( * Convert object data to JSON * * @param array $keys array of required keys - * @return string + * @return bool|string + * @throws \InvalidArgumentException */ public function toJson(array $keys = []) { $data = $this->toArray($keys); - return \Zend_Json::encode($data); + return \Magento\Framework\Serialize\JsonConverter::convert($data); } /** * The "__" style wrapper for toJson * - * @param array $keys - * @return string + * @param array $keys + * @return bool|string + * @throws \InvalidArgumentException */ public function convertToJson(array $keys = []) { diff --git a/lib/internal/Magento/Framework/Serialize/JsonConverter.php b/lib/internal/Magento/Framework/Serialize/JsonConverter.php new file mode 100644 index 0000000000000..6f6fdfb249408 --- /dev/null +++ b/lib/internal/Magento/Framework/Serialize/JsonConverter.php @@ -0,0 +1,28 @@ +serialize($data); + } +}