MAGETWO-32371: Move jsonEncode and jsonDecode from core helper to framework

- Removed optional parameters from jsonEncode and jsonDecode methods

Author: Joan He

app/code/Magento/Catalog/Pricing/Render/PriceBox.php

@@ -59,13 +59,11 @@ public function __construct(
      * Encode the mixed $valueToEncode into the JSON format
      *
      * @param mixed $valueToEncode
-     * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-     * @param array $options Additional options used during encoding
      * @return string
      */
-    public function jsonEncode($valueToEncode, $cycleCheck = false, $options = [])
+    public function jsonEncode($valueToEncode)
     {
-        return $this->jsonHelper->jsonEncode($valueToEncode, $cycleCheck, $options);
+        return $this->jsonHelper->jsonEncode($valueToEncode);
     }
 
     /**

lib/internal/Magento/Framework/Json/Decoder.php

@@ -13,10 +13,9 @@ class Decoder implements DecoderInterface
      * Decodes the given $data string which is encoded in the JSON format.
      *
      * @param string $data
-     * @param int $objectDecodeType Optional; flag indicating how to decode
      * @return mixed
      */
-    public function decode($data, $objectDecodeType = \Zend_Json::TYPE_ARRAY)
+    public function decode($data)
     {
         return \Zend_Json::decode($data);
     }

lib/internal/Magento/Framework/Json/DecoderInterface.php

@@ -15,8 +15,7 @@ interface DecoderInterface
      * Decodes the given $data string which is encoded in the JSON format.
      *
      * @param string $data
-     * @param int $objectDecodeType Optional; flag indicating how to decode
      * @return mixed
      */
-    public function decode($data, $objectDecodeType = \Zend_Json::TYPE_ARRAY);
+    public function decode($data);
 }

lib/internal/Magento/Framework/Json/Encoder.php

@@ -26,13 +26,11 @@ public function __construct(\Magento\Framework\Translate\InlineInterface $transl
      * Encode the mixed $data into the JSON format.
      *
      * @param mixed $data
-     * @param  boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-     * @param  array $options Additional options used during encoding
      * @return string
      */
-    public function encode($data, $cycleCheck = false, $options = [])
+    public function encode($data)
     {
-        $json = \Zend_Json::encode($data, $cycleCheck, $options);
+        $json = \Zend_Json::encode($data);
         $this->translateInline->processResponseBody($json, true);
         return $json;
     }

lib/internal/Magento/Framework/Json/EncoderInterface.php

@@ -15,9 +15,7 @@ interface EncoderInterface
      * Encode the mixed $data into the JSON format.
      *
      * @param mixed $data
-     * @param  boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-     * @param  array $options Additional options used during encoding
      * @return string
      */
-    public function encode($data, $cycleCheck = false, $options = []);
+    public function encode($data);
 }

lib/internal/Magento/Framework/Json/Helper/Data.php

@@ -39,25 +39,22 @@ public function __construct(
      * Encode the mixed $valueToEncode into the JSON format
      *
      * @param mixed $valueToEncode
-     * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
-     * @param array $options Additional options used during encoding
      * @return string
      */
-    public function jsonEncode($valueToEncode, $cycleCheck = false, $options = [])
+    public function jsonEncode($valueToEncode)
     {
-        return $this->jsonEncoder->encode($valueToEncode, $cycleCheck, $options);
+        return $this->jsonEncoder->encode($valueToEncode);
     }
 
     /**
      * Decodes the given $encodedValue string which is
      * encoded in the JSON format
      *
      * @param string $encodedValue
-     * @param int $objectDecodeType
      * @return mixed
      */
-    public function jsonDecode($encodedValue, $objectDecodeType = \Zend_Json::TYPE_ARRAY)
+    public function jsonDecode($encodedValue)
     {
-        return $this->jsonDecoder->decode($encodedValue, $objectDecodeType);
+        return $this->jsonDecoder->decode($encodedValue);
     }
 }