MAGETWO-80178: [2.2.x] - Remove zend json from data object #10306

Author: irenelagno

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 = [])
     {

lib/internal/Magento/Framework/Serialize/JsonConverter.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Serialize;
+
+/**
+ * This class was introduced only for usage in the \Magento\Framework\DataObject::toJson method.
+ * It should not be used in other cases and instead \Magento\Framework\Serialize\Serializer\Json::serialize
+ * should be used.
+ */
+class JsonConverter
+{
+    /**
+     * This method should only be used by \Magento\Framework\DataObject::toJson
+     * All other cases should use \Magento\Framework\Serialize\Serializer\Json::serialize directly
+     *
+     * @param string|int|float|bool|array|null $data
+     * @return bool|string
+     * @throws \InvalidArgumentException
+     */
+    public static function convert($data)
+    {
+        $serializer = new \Magento\Framework\Serialize\Serializer\Json();
+        return $serializer->serialize($data);
+    }
+}

lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonConverterTest.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+class JsonConverterTest extends \PHPUnit\Framework\TestCase
+{
+    public function testConvert()
+    {
+        $data = [
+            'key' => 'value'
+        ];
+
+        $this->assertEquals(json_encode($data), \Magento\Framework\Serialize\JsonConverter::convert($data));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to serialize value.
+     */
+    public function testConvertWithException()
+    {
+        //verify that exception will be thrown with invalid UTF8 sequence
+        \Magento\Framework\Serialize\JsonConverter::convert("\xB1\x31");
+    }
+}