兼容php8

.gitignore

@@ -0,0 +1,2 @@
+vendor
+composer.lock

composer.json

@@ -23,8 +23,8 @@
         }
     },
     "require": {
-        "php": "^7.0",
-        "hanson/foundation-sdk": "4.0.2",
+        "php": "^7.0||^8.0",
+        "hanson/foundation-sdk": "^5.0",
         "ext-json": "*"
     }
 }

src/AccessToken.php

@@ -9,6 +9,7 @@
 namespace Justmd5\PinDuoDuo;
 
 use Hanson\Foundation\AbstractAccessToken;
+use Hanson\Foundation\Foundation;
 
 class AccessToken extends AbstractAccessToken
 {
@@ -30,11 +31,13 @@ class AccessToken extends AbstractAccessToken
     protected $expiresJsonKey = 'expires_in';
 
     /**
-     * @param string $clientId
-     * @param string $secret
+     * @param  string  $clientId
+     * @param  string  $secret
+     * @param  Foundation  $app
      */
-    public function __construct(string $clientId, string $secret)
+    public function __construct(string $clientId, string $secret, Foundation $app)
     {
+        parent::__construct($app);
         $this->appId = $clientId;
         $this->secret = $secret;
     }

src/Api.php

@@ -22,7 +22,6 @@ class Api extends AbstractAPI
 
     public function __construct(PinDuoDuo $pinduoduo, $needToken = false)
     {
-        parent::__construct($pinduoduo);
         $this->pinduoduo = $pinduoduo;
         $this->needToken = $needToken;
     }

src/Oauth/ServiceProvider.php

@@ -26,7 +26,8 @@ public function register(Container $pimple)
         $pimple['oauth.access_token'] = function (Foundation $pimple) {
             $accessToken = new AccessToken(
                 $pimple->getConfig('client_id'),
-                $pimple->getConfig('client_secret')
+                $pimple->getConfig('client_secret'),
+                $pimple
             );
             $accessToken->setHttp($pimple->http);
             $accessToken->setRequest($pimple['request']);

src/ServiceProvider.php

@@ -26,7 +26,8 @@ public function register(Container $pimple)
         $pimple['access_token'] = function (Foundation $pimple) {
             return new AccessToken(
                 $pimple->getConfig('client_id'),
-                $pimple->getConfig('client_secret')
+                $pimple->getConfig('client_secret'),
+                $pimple
             );
         };