tweak code. (#640)

* tweak code. * Fix styles. * Remove unused method.
w7corp · Apr 7, 2017 · 69a222e · 69a222e
1 parent 9bb76a0
commit 69a222e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 23 deletions.
diff --git a/src/Server/Guard.php b/src/Server/Guard.php
@@ -30,7 +30,6 @@
 use EasyWeChat\Message\Text;
 use EasyWeChat\Support\Collection;
 use EasyWeChat\Support\Log;
-use EasyWeChat\Support\Str;
 use EasyWeChat\Support\XML;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -347,16 +346,6 @@ public function getMessage()
         return $message;
     }
 
-    /**
-     * Get the collected request message.
-     *
-     * @return Collection
-     */
-    public function getCollectedMessage()
-    {
-        return new Collection($this->getMessage());
-    }
-
     /**
      * Handle request.
      *
@@ -460,8 +449,9 @@ protected function parseMessageFromRequest($content)
     {
         $content = strval($content);
 
-        if (Str::isJson($content)) {
-            return Str::json2Array($content);
+        $arrayable = json_decode($content, true);
+        if (json_last_error() === JSON_ERROR_NONE) {
+            return $arrayable;
         }
 
         if ($this->isSafeMode()) {

diff --git a/src/Support/Str.php b/src/Support/Str.php
@@ -193,14 +193,4 @@ public static function studly($value)
 
         return static::$studlyCache[$key] = str_replace(' ', '', $value);
     }
-
-    public static function isJson($value)
-    {
-        return json_decode($value) !== null;
-    }
-
-    public static function json2Array($value)
-    {
-        return json_decode($value, true);
-    }
 }