MAGETWO-71062: Remove zend json from json controller #10342

 - Reverted Pull Request #10342 from dmanners/magento2:remove-zend-json-from-json-controller
 - Merged commits:
   1. baeb58c
   2. db6f353
   3. 4f78388
   4. 7e46cea
   5. ff0581b
   6. 41e118b

Author: Oleksii Korshenko

app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php

@@ -14,8 +14,7 @@ class AjaxLoad extends \Magento\Tax\Controller\Adminhtml\Rate
     /**
      * Json needed for the Ajax Edit Form
      *
-     * @return \Magento\Framework\Controller\Result\Json
-     * @throws \InvalidArgumentException
+     * @return void
      */
     public function execute()
     {

app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxSave.php

@@ -14,7 +14,6 @@ class AjaxSave extends \Magento\Tax\Controller\Adminhtml\Rate
      * Save Tax Rate via AJAX
      *
      * @return \Magento\Framework\Controller\Result\Json
-     * @throws \InvalidArgumentException
      */
     public function execute()
     {

lib/internal/Magento/Framework/Controller/Result/Json.php

@@ -29,65 +29,24 @@ class Json extends AbstractResult
     protected $json;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
      */
-    private $serializer;
-
-    /**
-     * @param InlineInterface $translateInline
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @throws \RuntimeException
-     */
-    public function __construct(
-        InlineInterface $translateInline,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
-    ) {
+    public function __construct(InlineInterface $translateInline)
+    {
         $this->translateInline = $translateInline;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
      * Set json data
      *
-     * @param array|string|\Magento\Framework\DataObject $data
-     * @param bool $cycleCheck
-     * @param array $options
-     * @return Json
-     * @throws \InvalidArgumentException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated
-     * @see Json::setArrayData
-     * @see Json::setJsonData
-     */
-    public function setData($data, $cycleCheck = false, $options = [])
-    {
-        if ($data instanceof \Magento\Framework\DataObject) {
-            return $this->setArrayData($data->toArray());
-        }
-
-        if (is_array($data)) {
-            return $this->setArrayData($data);
-        }
-
-        if (is_string($data)) {
-            return $this->setJsonData($data);
-        }
-
-        throw new \Magento\Framework\Exception\LocalizedException(
-            new \Magento\Framework\Phrase('Invalid argument type')
-        );
-    }
-
-    /**
-     * @param array $data
+     * @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 $this
-     * @throws \InvalidArgumentException
      */
-    public function setArrayData(array $data)
+    public function setData($data, $cycleCheck = false, $options = [])
     {
-        $this->setJsonData($this->serializer->serialize($data));
+        $this->json = \Zend_Json::encode($data, $cycleCheck, $options);
         return $this;
     }