majiameng / OAuth2

src/Gateways/Alipay.php

Spacing +10 added lines, -10 removed lines

@@ -81,7 +81,7 @@ 
             $this->AuthorizeURL = str_replace("alipay", "alipaydev", $this->AuthorizeURL);
         }
 
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -114,17 +114,17 @@ 
 
         $userInfo = [
             'open_id'  => $this->openid(),
-            'union_id'  => $this->token['union_id']??'',
+            'union_id'  => $this->token['union_id'] ?? '',
             'channel' => ConstCode::TYPE_ALIPAY,
             'nickname'    => $result['nick_name'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['avatar'],
             // 拓展字段
-            'access_token'  => $this->token['access_token']??'',
+            'access_token'  => $this->token['access_token'] ?? '',
             'user_id'  => $this->token['user_id'],
             'native'   => $result,
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -137,12 +137,12 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -160,7 +160,7 @@ 
 
         $data = $this->post(self::API_BASE, $params);
         $data = mb_convert_encoding($data, 'utf-8', 'gbk');
-        $result =  json_decode($data, true);
+        $result = json_decode($data, true);
         return $result['alipay_user_info_share_response'];
     }
 
@@ -237,7 +237,7 @@ 
             throw new OAuthException('支付宝RSA密钥未配置');
         }
         $rsa    = str_replace([PHP_EOL, $header, $footer], '', $rsa);
-        $rsaVal = $header . PHP_EOL . chunk_split($rsa, 64, PHP_EOL) . $footer;
+        $rsaVal = $header.PHP_EOL.chunk_split($rsa, 64, PHP_EOL).$footer;
         return $rsaVal;
     }
 
@@ -256,7 +256,7 @@ 
 
         if (isset($data['alipay_system_oauth_token_response'])) {
             $data           = $data['alipay_system_oauth_token_response'];
-            $data['openid'] = $data['open_id']??$data['user_id'];
+            $data['openid'] = $data['open_id'] ?? $data['user_id'];
             return $data;
         } else {
             throw new OAuthException("获取支付宝 ACCESS_TOKEN 出错：{$token}");

Braces +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
                 throw new OAuthException("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }

src/Gateways/Coding.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -59,7 +59,7 @@ 
             'access_token' => $this->token['access_token'] ?? '',
             'channel' => ConstCode::TYPE_CODING,
             'nickname' => $response['name'] ?? '',
-            'gender'   => ConstCode::GENDER,  // Coding 不返回性别信息
+            'gender'   => ConstCode::GENDER, // Coding 不返回性别信息
             'avatar'   => $response['avatar'] ?? '',
             // 额外信息
             'email'    => $response['email'] ?? '',
@@ -80,8 +80,8 @@ 
         ]);
         $data = json_decode($data, true);
         
-        if(!isset($data['id'])) {
-            throw new OAuthException("获取Coding用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['id'])) {
+            throw new OAuthException("获取Coding用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -129,7 +129,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取Coding ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取Coding ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Oschina.php

Spacing +4 added lines, -4 removed lines

@@ -48,8 +48,8 @@ 
         ]);
         $data = json_decode($data, true);
         
-        if(!isset($data['id'])) {
-            throw new OAuthException("获取OSChina用户信息失败：" . ($data['error_description'] ?? '未知错误'));
+        if (!isset($data['id'])) {
+            throw new OAuthException("获取OSChina用户信息失败：".($data['error_description'] ?? '未知错误'));
         }
         return $data;
     }
@@ -68,7 +68,7 @@ 
             'state'         => $this->config['state'],
             'scope'         => $this->config['scope'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -115,7 +115,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         }
-        throw new OAuthException("获取OSChina ACCESS_TOKEN出错：" . ($data['error_description'] ?? '未知错误'));
+        throw new OAuthException("获取OSChina ACCESS_TOKEN出错：".($data['error_description'] ?? '未知错误'));
     }
 
     /**

src/Gateways/Wechat.php

Spacing +15 added lines, -15 removed lines

@@ -42,7 +42,7 @@ 
         $this->saveState();
 
         //获取代理链接
-        if(isset($this->config['proxy_url'])){
+        if (isset($this->config['proxy_url'])) {
             return $this->getProxyURL();
         }
 
@@ -55,7 +55,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params) . '#wechat_redirect';
+        return $this->AuthorizeURL.'?'.http_build_query($params).'#wechat_redirect';
     }
 
     /**
@@ -73,7 +73,7 @@ 
             'state'         => $this->config['state'],
             'redirect_uri'    => $this->config['callback'],
         ];
-        return $this->config['proxy_url'] . '?' . http_build_query($params);
+        return $this->config['proxy_url'].'?'.http_build_query($params);
     }
 
     /**
@@ -110,12 +110,12 @@ 
             'union_id'=> $this->token['unionid'] ?? '',
             'access_token'=> $this->token['access_token'] ?? '',
             'channel' => ConstCode::TYPE_WECHAT,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => $result['sex'] ?? ConstCode::GENDER,
-            'avatar'  => $result['headimgurl']??'',
+            'avatar'  => $result['headimgurl'] ?? '',
             'type'    => ConstCode::getTypeConst(ConstCode::TYPE_WECHAT, $this->type),
             // 额外信息
-            'session_key'  => $result['session_key']??'',
+            'session_key'  => $result['session_key'] ?? '',
             'native'   => $result,
         ];
         return $userInfo;
@@ -130,15 +130,15 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        }elseif ($this->type == 'applets') {
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -149,7 +149,7 @@ 
             'openid'=>$this->openid(),
             'lang'=>'zh_CN',
         ];
-        $data = $this->get(self::API_BASE . 'userinfo', $params);
+        $data = $this->get(self::API_BASE.'userinfo', $params);
         return json_decode($data, true);
     }
 
@@ -157,13 +157,13 @@ 
      * @return array|mixed|null
      * @throws OAuthException
      */
-    public function applets(){
+    public function applets() {
         /** 获取参数 */
         $params = $this->accessTokenParams();
         $params['js_code'] = $params['code'];
 
         /** 获取access_token */
-        $token =  $this->get($this->jsCode2Session, $params);
+        $token = $this->get($this->jsCode2Session, $params);
         /** 解析token值(子类实现此方法) */
         $this->token = $this->parseToken($token);
         return $this->token;
@@ -219,7 +219,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        }elseif (isset($data['session_key'])) {
             //小程序登录
             return $data;
         } else {
@@ -298,7 +298,7 @@ 
                 'access_token' => $accessToken,
                 'openid'      => $this->openid(),
             ];
-            $result = $this->get(self::API_BASE . 'auth', $params);
+            $result = $this->get(self::API_BASE.'auth', $params);
             $result = json_decode($result, true);
             return isset($result['errcode']) && $result['errcode'] == 0;
         } catch (\Exception $e) {

Braces +3 added lines, -3 removed lines

@@ -135,10 +135,10 @@ 
                 throw new OAuthException("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        } elseif ($this->type == 'applets'){
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -219,7 +219,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        } elseif (isset($data['session_key'])){
             //小程序登录
             return $data;
         } else {

src/Gateways/Facebook.php

Spacing +5 added lines, -5 removed lines

@@ -54,7 +54,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'] ?: Str::random(),
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -91,12 +91,12 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new OAuthException("Facebook APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $fields = isset($this->config['fields']) ? $this->config['fields'] : 'id,name,gender,picture.width(400)';
@@ -116,7 +116,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
         $data = $this->$method($request['uri'], $params);

Braces +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 throw new OAuthException("Facebook APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $fields = isset($this->config['fields']) ? $this->config['fields'] : 'id,name,gender,picture.width(400)';

src/Connector/GatewayTrait.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -33,8 +33,8 @@ 
      */
     protected function post($url, $params = [], $headers = [])
     {
-        $headers[] = 'Accept: application/json';//GitHub需要的header
-        return \tinymeng\tools\HttpRequest::httpPost($url, $params,$headers);
+        $headers[] = 'Accept: application/json'; //GitHub需要的header
+        return \tinymeng\tools\HttpRequest::httpPost($url, $params, $headers);
     }
 
 

src/Helper/Encryptor.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 use tinymeng\OAuth2\Exception\OAuthException;
 
-class Encryptor{
+class Encryptor {
 
     /**
      * 解密数据（微信小程序手机号）

src/OAuth.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
      */
     protected static function init($gateway, $config)
     {
-        if(empty($config)){
+        if (empty($config)) {
             throw new OAuthException("第三方登录 [$gateway] config配置不能为空");
         }
         $baseConfig = [
@@ -45,14 +45,14 @@ 
             'scope'     => '',
             'type'      => '',
         ];
-        if($gateway == 'weixin'){
+        if ($gateway == 'weixin') {
             /** 兼容 tinymeng/oauth v1.0.0完美升级 */
             $gateway = 'wechat';
         }
         $gateway = Str::uFirst($gateway);
-        $class = __NAMESPACE__ . '\\Gateways\\' . $gateway;
+        $class = __NAMESPACE__.'\\Gateways\\'.$gateway;
         if (class_exists($class)) {
-            $app = new $class(array_replace_recursive($baseConfig,$config));
+            $app = new $class(array_replace_recursive($baseConfig, $config));
             if ($app instanceof GatewayInterface) {
                 return $app;
             }