Merge pull request #23 from TheNorthMemory/master

fix #4 for PHP5.3
w7corp · May 18, 2015 · 514f713 · 514f713
2 parents 5bad9be + 970352e
commit 514f713
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/src/Wechat/AccessToken.php b/src/Wechat/AccessToken.php
@@ -80,21 +80,22 @@ public function getToken()
         }
 
         // for php 5.3
-        $appId     = $this->appId;
-        $appSecret = $this->appSecret;
-        $cache     = $this->cache;
-        $cacheKey  = $this->cacheKey;
+        $appId       = $this->appId;
+        $appSecret   = $this->appSecret;
+        $cache       = $this->cache;
+        $cacheKey    = $this->cacheKey;
+        $apiTokenGet = self::API_TOKEN_GET;
 
         return $this->token = $this->cache->get(
-            $cacheKey, function ($cacheKey) use ($appId, $appSecret, $cache) {
+            $cacheKey, function ($cacheKey) use ($appId, $appSecret, $cache, $apiTokenGet) {
                 $params = array(
                        'appid'      => $appId,
                        'secret'     => $appSecret,
                        'grant_type' => 'client_credential',
                       );
                 $http = new Http();
 
-                $token = $http->get(self::API_TOKEN_GET, $params);
+                $token = $http->get($apiTokenGet, $params);
 
                 $cache->set($cacheKey, $token['access_token'], $token['expires_in']);
 

diff --git a/src/Wechat/Alias.php b/src/Wechat/Alias.php
@@ -7,7 +7,7 @@
  */
 class Alias
 {
-    protected static $aliases = [
+    protected static $aliases = array(
                'WechatAuth'            => 'Overtrue\\Wechat\\Auth',
                'WechatCard'            => 'Overtrue\\Wechat\\Card',
                'WechatException'       => 'Overtrue\\Wechat\\Exception',
@@ -39,7 +39,7 @@ class Alias
                'WechatStats'           => 'Overtrue\\Wechat\\Stats',
                'WechatSemantic'        => 'Overtrue\\Wechat\\Semantic',
                'WechatColor'           => 'Overtrue\\Wechat\\Color',
-    ];
+    );
 
     /**
      * 是否已经注册过

diff --git a/src/Wechat/Card.php b/src/Wechat/Card.php
@@ -88,13 +88,14 @@ public function getTicket()
         $key = 'overtrue.wechat.card.api_ticket';
 
         // for php 5.3
-        $http  = $this->http;
-        $cache = $this->cache;
+        $http      = $this->http;
+        $cache     = $this->cache;
+        $apiTicket = self::API_TICKET;
 
         return $this->ticket = $this->cache->get(
-            $key, function ($key) use ($http, $cache) {
+            $key, function ($key) use ($http, $cache, $apiTicket) {
 
-                $result = $http->get(self::API_TICKET);
+                $result = $http->get($apiTicket);
 
                 $cache->set($key, $result['ticket'], $result['expires_in']);
 

diff --git a/src/Wechat/Color.php b/src/Wechat/Color.php
@@ -45,13 +45,14 @@ public function lists()
         $key = 'overtrue.wechat.colors';
 
         // for php 5.3
-        $http  = $this->http;
-        $cache = $this->cache;
+        $http    = $this->http;
+        $cache   = $this->cache;
+        $apiList = self::API_LIST;
 
         return $this->cache->get(
-            $key, function ($key) use ($http, $cache) {
+            $key, function ($key) use ($http, $cache, $apiList) {
 
-                $result = $http->get(self::API_LIST);
+                $result = $http->get($apiList);
 
                 $cache->set($key, $result['colors'], 86400);// 1 day
 

diff --git a/src/Wechat/Js.php b/src/Wechat/Js.php
@@ -81,12 +81,13 @@ public function getTicket()
         $appId     = $this->appId;
         $appSecret = $this->appSecret;
         $cache     = $this->cache;
+        $apiTicket = self::API_TICKET;
 
         return $this->cache->get(
-            $key, function ($key) use ($appId, $appSecret, $cache) {
+            $key, function ($key) use ($appId, $appSecret, $cache, $apiTicket) {
                 $http  = new Http(new AccessToken($appId, $appSecret));
 
-                $result = $http->get(self::API_TICKET);
+                $result = $http->get($apiTicket);
 
                 $cache->set($key, $result['ticket'], $result['expires_in']);
 

diff --git a/src/Wechat/Media.php b/src/Wechat/Media.php
@@ -282,7 +282,7 @@ public function __call($method, $args)
      *
      * @return string
      */
-    protected function getUrl($type, $queries = [])
+    protected function getUrl($type, $queries = array())
     {
         if ($type === 'news') {
             $api = self::API_FOREVER_NEWS_UPLOAD;