majiameng / OAuth2

src/Gateways/Qq.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
             'scope'         => $this->config['scope'],
             'display'       => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -63,7 +63,7 @@ 
             'nickname'=> $result['nickname'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['figureurl_qq_2'] ? $result['figureurl_qq_2'] : $result['figureurl_qq_1'],
-            'birthday'=> date('Y-m-d',strtotime($result['year'])),
+            'birthday'=> date('Y-m-d', strtotime($result['year'])),
         ];
         return $userInfo;
     }
@@ -84,7 +84,7 @@ 
             'access_token'=>$this->token['access_token'],
             'format'=>'json',
         ];
-        $data = $this->get(self::API_BASE . 'user/get_user_info', $params);
+        $data = $this->get(self::API_BASE.'user/get_user_info', $params);
         return json_decode($data, true);
     }
 
@@ -97,12 +97,12 @@ 
      */
     public function openid()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token'])){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else {
             /** 获取token */
             $this->getToken();
         }
@@ -128,7 +128,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         } else {
-            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：" . $token);
+            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：".$token);
         }
     }
 
@@ -139,7 +139,7 @@ 
      * @return mixed|string
      * @throws \Exception
      */
-    private function getOpenID(){
+    private function getOpenID() {
         $query = [
             'access_token' => $this->token['access_token']
         ];
@@ -148,12 +148,12 @@ 
             $query['unionid'] = 1;
         }
 
-        $data = $this->get(self::API_BASE . 'oauth2.0/me',$query);
-        $data     = json_decode(trim(substr($data, 9), " );\n"), true);
+        $data = $this->get(self::API_BASE.'oauth2.0/me', $query);
+        $data = json_decode(trim(substr($data, 9), " );\n"), true);
         if (isset($data['openid'])) {
             return $data;
         } else {
-            throw new \Exception("获取用户openid出错：" . $data['error_description']);
+            throw new \Exception("获取用户openid出错：".$data['error_description']);
         }
     }
 
@@ -162,7 +162,7 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
+    public function getGender($gender) {
         return $gender == '男' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 

src/Gateways/Alipay.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
             $this->AuthorizeURL = str_replace("alipay", "alipaydev", $this->AuthorizeURL);
         }
 
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -112,7 +112,7 @@ 
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['avatar'],
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -125,12 +125,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 \Exception("AliPay APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -148,7 +148,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'];
     }
 
@@ -225,7 +225,7 @@ 
             throw new \Exception('支付宝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;
     }
 

Braces +1 added lines, -1 removed lines

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

src/Connector/Gateway.php

Spacing +22 added lines, -22 removed lines

@@ -91,7 +91,7 @@ 
         if (!$config) {
             throw new \Exception('传入的配置不能为空');
         }
-        if(isset($_GET['referer']) && $config['callback']){
+        if (isset($_GET['referer']) && $config['callback']) {
             $config['callback'] .= ((strpos($config['callback'], '?') !== false) ? '&' : '?').'referer='.$_GET['referer'];
         }
         //默认参数
@@ -104,11 +104,11 @@ 
             'proxy'         => '',
             'state'         => '',
             'type'          => '',
-            'is_sandbox'    => false,//是否是沙箱环境
+            'is_sandbox'    => false, //是否是沙箱环境
         ];
-        $this->config    = array_merge($_config, $config);
-        foreach($this->config as $key=>$val){
-            if(property_exists($this,$key)) $this->$key=$val;
+        $this->config = array_merge($_config, $config);
+        foreach ($this->config as $key=>$val) {
+            if (property_exists($this, $key)) $this->$key = $val;
         }
         $this->timestamp = time();
     }
@@ -144,7 +144,7 @@ 
      * Updater:
      * @return $this
      */
-    public function mustCheckState(){
+    public function mustCheckState() {
         $this->checkState = true;
         return $this;
     }
@@ -154,7 +154,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return array
      */
-    public function getConfig(){
+    public function getConfig() {
         return $this->config;
     }
 
@@ -163,7 +163,7 @@ 
      * @param $token
      * @return $this
      */
-    public function setToken($token){
+    public function setToken($token) {
         $this->token = $token;
         return $this;
     }
@@ -172,14 +172,14 @@ 
      * 存储state
      * @Author: TinyMeng <666@majiameng.com>
      */
-    public function saveState(){
+    public function saveState() {
         if ($this->checkState === true) {
             //是否开启session
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
             }
-            if(empty($this->config['state'])){
-                $this->config['state'] = Str::random();//生成随机state
+            if (empty($this->config['state'])) {
+                $this->config['state'] = Str::random(); //生成随机state
             }
             //存储到session
             $_SESSION['tinymeng_oauth_state'] = $this->config['state'];
@@ -191,7 +191,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @throws \Exception
      */
-    public function checkState(){
+    public function checkState() {
         if ($this->checkState === true) {
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
@@ -208,7 +208,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * @return string
      */
-    public function getCode(){
+    public function getCode() {
         return isset($_REQUEST['code']) ? $_REQUEST['code'] : '';
     }
 
@@ -218,7 +218,7 @@ 
      * Updater:
      * @return array
      */
-    protected function accessTokenParams(){
+    protected function accessTokenParams() {
         $params = [
             'client_id'     => $this->config['app_id'],
             'client_secret' => $this->config['app_secret'],
@@ -234,7 +234,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->checkState();
@@ -243,10 +243,10 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $token =  $this->POST($this->AccessTokenURL, $params);
+            $token = $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else {
             return $this->token;
         }
     }
@@ -262,7 +262,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -276,8 +276,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);
     }
 
     /**
@@ -285,8 +285,8 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
-        return strtolower(substr($gender , 0 , 1)) == 'm' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
+    public function getGender($gender) {
+        return strtolower(substr($gender, 0, 1)) == 'm' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 
 

Braces +4 added lines, -2 removed lines

@@ -108,7 +108,9 @@ 
         ];
         $this->config    = array_merge($_config, $config);
         foreach($this->config as $key=>$val){
-            if(property_exists($this,$key)) $this->$key=$val;
+            if(property_exists($this,$key)) {
+                $this->$key=$val;
+            }
         }
         $this->timestamp = time();
     }
@@ -246,7 +248,7 @@ 
             $token =  $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else{
             return $this->token;
         }
     }