[更新]调整数据处理函数，兼容PHP7.2

zoujingli · Jan 16, 2018 · 390beea · 390beea
1 parent 7551bad
commit 390beea
Showing 1 changed file with 21 additions and 16 deletions.
diff --git a/Wechat/WechatCard.php b/Wechat/WechatCard.php
@@ -79,7 +79,7 @@ public function getJsCardTicket($appid = '', $jsapi_ticket = '')
         if (($jsapi_ticket = Tools::getCache($authname))) {
             return $jsapi_ticket;
         }
-        $result = Tools::httpGet(self::API_URL_PREFIX . self::GET_TICKET_URL . "access_token={$this->access_token}" . '&type=wx_card');
+        $result = Tools::httpGet(self::API_URL_PREFIX . self::GET_TICKET_URL . "access_token={$this->access_token}&type=wx_card");
         if ($result) {
             $json = json_decode($result, true);
             if (empty($json) || !empty($json['errcode'])) {
@@ -125,30 +125,35 @@ public function createChooseCardJsPackage($cardid = null, $cardtype = null, $sho
      */
     public function createAddCardJsPackage($cardid = null, $data = array())
     {
-
-        function _sign($cardid = null, $attr = array(), $self)
-        {
-            unset($attr['outer_id']);
-            $attr['cardId'] = $cardid;
-            $attr['timestamp'] = time();
-            $attr['api_ticket'] = $self->getJsCardTicket();
-            $attr['nonce_str'] = Tools::createNoncestr();
-            $attr['signature'] = $self->getTicketSignature($attr);
-            unset($attr['api_ticket']);
-            return $attr;
-        }
-
         $cardList = array();
         if (is_array($cardid)) {
             foreach ($cardid as $id) {
-                $cardList[] = array('cardId' => $id, 'cardExt' => json_encode(_sign($id, $data, $this)));
+                $cardList[] = array('cardId' => $id, 'cardExt' => json_encode($this->_cardSign($id, $data)));
             }
         } else {
-            $cardList[] = array('cardId' => $cardid, 'cardExt' => json_encode(_sign($cardid, $data, $this)));
+            $cardList[] = array('cardId' => $cardid, 'cardExt' => json_encode($this->_cardSign($cardid, $data)));
         }
         return array('cardList' => $cardList);
     }
 
+    /**
+     * 卡券数据签名
+     * @param null|string $cardid
+     * @param array $attr
+     * @return array
+     */
+    private function _cardSign($cardid = null, $attr = array())
+    {
+        unset($attr['outer_id']);
+        $attr['cardId'] = $cardid;
+        $attr['timestamp'] = time();
+        $attr['api_ticket'] = $this->getJsCardTicket();
+        $attr['nonce_str'] = Tools::createNoncestr();
+        $attr['signature'] = $this->getTicketSignature($attr);
+        unset($attr['api_ticket']);
+        return $attr;
+    }
+
     /**
      * 获取微信卡券签名
      * @param array $arrdata 签名数组