From 4598856a9e19c81f76f7f7076c80acff8dc67644 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 10 May 2018 18:34:26 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E7=B4=A0=E6=9D=90=E4=BA=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=88=B6=E6=96=87=E4=BB=B6=E5=85=81=E8=AE=B8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=BE=93=E5=87=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Media.php  |  8 ++++----
 WeMini/Qrcode.php | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WeChat/Media.php b/WeChat/Media.php
index 684b568..33f9a69 100644
--- a/WeChat/Media.php
+++ b/WeChat/Media.php
@@ -56,8 +56,8 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::get($url);
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -139,8 +139,8 @@ class Media extends BasicWeChat
         $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, ['media_id' => $media_id]);
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
diff --git a/WeMini/Qrcode.php b/WeMini/Qrcode.php
index aa70129..a271712 100644
--- a/WeMini/Qrcode.php
+++ b/WeMini/Qrcode.php
@@ -43,8 +43,8 @@ class Qrcode extends BasicWeChat
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color];
         $result = Tools::post($url, Tools::arr2json($data));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -68,8 +68,8 @@ class Qrcode extends BasicWeChat
         $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color];
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json($data));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }
@@ -89,8 +89,8 @@ class Qrcode extends BasicWeChat
         $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
         $this->registerApi($url, __FUNCTION__, func_get_args());
         $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
-        if (($json = Tools::json2arr($result))) {
-            return $json;
+        if (json_decode($result)) {
+            return Tools::json2arr($result);
         }
         return is_null($outType) ? $result : $outType($result);
     }