Merge pull request #15 from qbhy/master

修复抽象AccessToken类获取http实例问题
Hanson · Jun 11, 2020 · 46990dc · 46990dc
2 parents 1ade721 + bee283e
commit 46990dc
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/src/AbstractAccessToken.php b/src/AbstractAccessToken.php
@@ -61,6 +61,11 @@ abstract class AbstractAccessToken
      */
     protected $http;
 
+    /**
+     * @var Foundation
+     */
+    protected $app;
+
     /**
      * Token string.
      *
@@ -69,8 +74,17 @@ abstract class AbstractAccessToken
     protected $token;
 
     /**
-     * @param mixed $token
-     * @param int $expires
+     * AbstractAccessToken constructor.
+     * @param  Foundation  $app
+     */
+    public function __construct(Foundation $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * @param  mixed  $token
+     * @param  int  $expires
      * @return $this
      */
     public function setToken($token, $expires = 86400)
@@ -87,7 +101,7 @@ public function setToken($token, $expires = 86400)
     /**
      * Get token from cache.
      *
-     * @param bool $forceRefresh
+     * @param  bool  $forceRefresh
      *
      * @return string
      */
@@ -128,7 +142,7 @@ abstract public function getTokenFromServer();
     abstract public function checkTokenResponse($result);
 
     /**
-     * @param mixed $appId
+     * @param  mixed  $appId
      */
     public function setAppId($appId)
     {
@@ -144,7 +158,7 @@ public function getAppId()
     }
 
     /**
-     * @param string $secret
+     * @param  string  $secret
      */
     public function setSecret($secret)
     {
@@ -162,7 +176,7 @@ public function getSecret()
     /**
      * Set cache instance.
      *
-     * @param \Doctrine\Common\Cache\Cache $cache
+     * @param  \Doctrine\Common\Cache\Cache  $cache
      *
      * @return AbstractAccessToken
      */
@@ -204,13 +218,13 @@ public function getCacheKey()
      */
     public function getHttp()
     {
-        return $this->http ?: $this->http = new Http();
+        return $this->http ?? $this->app->http;
     }
 
     /**
      * Set the http instance.
      *
-     * @param Http $http
+     * @param  Http  $http
      *
      * @return $this
      */