majiameng / OAuth2

src/Connector/GatewayTrait.php

Spacing +3 added lines, -3 removed lines

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

src/Connector/Gateway.php

Spacing +19 added lines, -19 removed lines

@@ -112,7 +112,7 @@ 
         if (!$config) {
             throw new OAuthException('传入的配置不能为空');
         }
-        if(isset($_GET['referer']) && $config['callback']){
+        if (isset($_GET['referer']) && $config['callback']) {
             $config['callback'] .= ((strpos($config['callback'], '?') !== false) ? '&' : '?').'referer='.$_GET['referer'];
         }
         //默认参数
@@ -125,11 +125,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();
     }
@@ -165,7 +165,7 @@ 
      * Updater:
      * @return $this
      */
-    public function mustCheckState(){
+    public function mustCheckState() {
         $this->checkState = true;
         return $this;
     }
@@ -175,7 +175,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return array
      */
-    public function getConfig(){
+    public function getConfig() {
         return $this->config;
     }
 
@@ -184,7 +184,7 @@ 
      * @param $token
      * @return $this
      */
-    public function setToken($token){
+    public function setToken($token) {
         $this->token = $token;
         return $this;
     }
@@ -193,14 +193,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'];
@@ -212,7 +212,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @throws OAuthException
      */
-    public function checkState(){
+    public function checkState() {
         if ($this->checkState === true) {
             if (session_status() !== PHP_SESSION_ACTIVE) {
                 session_start();
@@ -229,7 +229,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * @return string
      */
-    public function getCode(){
+    public function getCode() {
         return isset($_REQUEST['code']) ? $_REQUEST['code'] : '';
     }
 
@@ -239,7 +239,7 @@ 
      * Updater:
      * @return array
      */
-    protected function accessTokenParams(){
+    protected function accessTokenParams() {
         $params = [
             'client_id'     => $this->config['app_id'],
             'client_secret' => $this->config['app_secret'],
@@ -255,7 +255,7 @@ 
      * @author: JiaMeng <666@majiameng.com>
      * Updater:
      */
-    protected function getToken(){
+    protected function getToken() {
         if (empty($this->token)) {
             /** 验证state参数 */
             $this->checkState();
@@ -264,10 +264,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;
         }
     }
@@ -277,8 +277,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

@@ -129,7 +129,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();
     }
@@ -267,7 +269,7 @@ 
             $token =  $this->post($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
-        }else{
+        } else{
             return $this->token;
         }
     }

example/demo/connect.php

Indentation +7 added lines, -7 removed lines

@@ -30,11 +30,11 @@
     }
 } else {
     $arr = $oauth->login($type);
-     if (isset($arr['code']) && $arr['code'] == 0) {
-         exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
-     } elseif (isset($arr['code'])) {
-         exit('登录接口返回：' . $arr['msg']);
-     } else {
-         exit('获取登录地址失败');
-     }
+        if (isset($arr['code']) && $arr['code'] == 0) {
+            exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
+        } elseif (isset($arr['code'])) {
+            exit('登录接口返回：' . $arr['msg']);
+        } else {
+            exit('获取登录地址失败');
+        }
 }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
         exit("<script language='javascript'>window.location.href='./';</script>");
 
     } elseif (isset($arr['code'])) {
-        exit('登录失败，返回错误原因：' . $arr['msg']);
+        exit('登录失败，返回错误原因：'.$arr['msg']);
     } else {
         exit('获取登录数据失败');
     }
@@ -33,7 +33,7 @@ 
      if (isset($arr['code']) && $arr['code'] == 0) {
          exit("<script language='javascript'>window.location.href='{$arr['url']}';</script>");
      } elseif (isset($arr['code'])) {
-         exit('登录接口返回：' . $arr['msg']);
+         exit('登录接口返回：'.$arr['msg']);
      } else {
          exit('获取登录地址失败');
      }

example/demo/index.php

Spacing +4 added lines, -4 removed lines

@@ -24,16 +24,16 @@
 		<div class="list-group">
             <?php foreach ($_SESSION['user'] as $key => $value):?>
                 <div class="form-group">
-                    <label><?php echo $key;?>：</label>
-                    <?php if(is_array($value)):?>
+                    <label><?php echo $key; ?>：</label>
+                    <?php if (is_array($value)):?>
                         <textarea  rows="5" class="form-control" readonly="readonly">
                             <?php echo json_encode($value); ?>
                         </textarea>
                     <?php else:?>
                         <input type="text" value="<?php echo $value; ?>" class="form-control" readonly="readonly"/>
-                    <?php endif;?>
+                    <?php endif; ?>
                 </div>
-            <?php endforeach;?>
+            <?php endforeach; ?>
 		</div>
 	</div>
 </div>

Braces +5 added lines, -2 removed lines

@@ -29,8 +29,11 @@
                         <textarea  rows="5" class="form-control" readonly="readonly">
                             <?php echo json_encode($value); ?>
                         </textarea>
-                    <?php else:?>
-                        <input type="text" value="<?php echo $value; ?>" class="form-control" readonly="readonly"/>
+                    <?php else {
+    :?>
+                        <input type="text" value="<?php echo $value;
+}
+?>" class="form-control" readonly="readonly"/>
                     <?php endif;?>
                 </div>
             <?php endforeach;?>