majiameng / OAuth2

src/Connector/Gateway.php

Spacing +21 added lines, -21 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,7 +243,7 @@ 
             $params = $this->accessTokenParams();
 
             /** 获取access_token */
-            $token =  $this->POST($this->AccessTokenURL, $params);
+            $token = $this->POST($this->AccessTokenURL, $params);
             /** 解析token值(子类实现此方法) */
             $this->token = $this->parseToken($token);
         }
@@ -260,7 +260,7 @@ 
      */
     protected function get($url, $params = [], $headers = [])
     {
-        return \tinymeng\tools\HttpRequest::httpGet($url, $params,$headers);
+        return \tinymeng\tools\HttpRequest::httpGet($url, $params, $headers);
     }
 
     /**
@@ -274,8 +274,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);
     }
 
     /**
@@ -283,7 +283,7 @@ 
      * 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;
     }
 }