From df5d57e13e81e307f08dc94db3950066a36806eb Mon Sep 17 00:00:00 2001
From: Rhilip <rhilipruan@gmail.com>
Date: Fri, 8 Mar 2019 20:35:57 +0800
Subject: [PATCH] refactor(Helpers): Remove JsonHelper

---
 apps/config/http_base.php        | 12 ------------
 framework/Helpers/JsonHelper.php | 23 -----------------------
 framework/Http/BaseResponse.php  | 20 +++++++-------------
 framework/Http/Json.php          | 21 ---------------------
 framework/Http/Jsonp.php         | 29 -----------------------------
 5 files changed, 7 insertions(+), 98 deletions(-)
 delete mode 100644 framework/Helpers/JsonHelper.php
 delete mode 100644 framework/Http/Json.php
 delete mode 100644 framework/Http/Jsonp.php

diff --git a/apps/config/http_base.php b/apps/config/http_base.php
index b795014..b63e14e 100644
--- a/apps/config/http_base.php
+++ b/apps/config/http_base.php
@@ -52,18 +52,6 @@
             'class'         => Rid\Http\Response::class,
             // 默认输出格式
             'defaultFormat' => Rid\Http\Response::FORMAT_HTML,
-            // json
-            'json'          => [
-                // 类路径
-                'class' => Rid\Http\Json::class,
-            ],
-            // jsonp
-            'jsonp'         => [
-                // 类路径
-                'class' => Rid\Http\Jsonp::class,
-                // callback键名
-                'name'  => 'callback',
-            ],
             // xml
             'xml'           => [
                 // 类路径
diff --git a/framework/Helpers/JsonHelper.php b/framework/Helpers/JsonHelper.php
deleted file mode 100644
index 9660692..0000000
--- a/framework/Helpers/JsonHelper.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Rid\Helpers;
-
-/**
- * JsonHelper
- */
-class JsonHelper
-{
-
-    // 编码
-    public static function encode($value, $options = 0, $depth = 512)
-    {
-        return json_encode($value, $options, $depth);
-    }
-
-    // 解码
-    public static function decode($json, $assoc = false, $depth = 512, $options = 0)
-    {
-        return json_decode($json, $assoc, $depth, $options);
-    }
-
-}
diff --git a/framework/Http/BaseResponse.php b/framework/Http/BaseResponse.php
index adc2f36..c6a3e33 100644
--- a/framework/Http/BaseResponse.php
+++ b/framework/Http/BaseResponse.php
@@ -20,16 +20,6 @@ class BaseResponse extends Component
     // 默认输出格式
     public $defaultFormat = self::FORMAT_HTML;
 
-    /**
-     * @var \Rid\Http\Json
-     */
-    public $json;
-
-    /**
-     * @var \Rid\Http\Jsonp
-     */
-    public $jsonp;
-
     /**
      * @var \Rid\Http\Xml
      */
@@ -92,11 +82,15 @@ protected function prepare()
         if (is_array($content) || is_object($content)) {
             switch ($this->format) {
                 case self::FORMAT_JSON:
-                    $content = $this->json->encode($content);
+                    $content = json_encode($content, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                     break;
                 case self::FORMAT_JSONP:
-                    $content = $this->jsonp->encode($content);
-                    break;
+                    {
+                        $callback_key = app()->request->get('callback', 'callback');
+                        $content = json_encode($content, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
+                        $content = $callback_key . '(' . $content . ')';
+                        break;
+                    }
                 case self::FORMAT_XML:
                     $content = $this->xml->encode($content);
                     break;
diff --git a/framework/Http/Json.php b/framework/Http/Json.php
deleted file mode 100644
index f6f45cc..0000000
--- a/framework/Http/Json.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Rid\Http;
-
-use Rid\Base\BaseObject;
-use Rid\Helpers\JsonHelper;
-
-/**
- * JSON 类
- */
-class Json extends BaseObject
-{
-
-    // 编码
-    public static function encode($data)
-    {
-        // 不转义中文、斜杠
-        return JsonHelper::encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-    }
-
-}
diff --git a/framework/Http/Jsonp.php b/framework/Http/Jsonp.php
deleted file mode 100644
index fde6f0a..0000000
--- a/framework/Http/Jsonp.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Rid\Http;
-
-use Rid\Base\BaseObject;
-use Rid\Helpers\JsonHelper;
-
-/**
- * JSONP 类
- */
-class Jsonp extends BaseObject
-{
-
-    // callback键名
-    public $name = 'callback';
-
-    // 编码
-    public function encode($data)
-    {
-        // 不转义中文、斜杠
-        $jsonString = JsonHelper::encode($data, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
-        $callback   = \Rid::app()->request->get($this->name);
-        if (is_null($callback)) {
-            return $jsonString;
-        }
-        return $callback . '(' . $jsonString . ')';
-    }
-
-}