GC0202 / ThinkLibrary

src/helper/Times.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -58,7 +58,7 @@ 
         date_default_timezone_set('Asia/Shanghai');
         $msec = 0;
         list($msec, $sec) = explode(' ', microtime());
-        return (float)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
+        return (float)sprintf('%.0f', (floatval($msec)+floatval($sec))*1000);
     }
 
     /**
@@ -72,7 +72,7 @@ 
         date_default_timezone_set('Asia/Shanghai');
         $end_time = strtotime($end_time);
         $start_time = $start_time == '' ? time() : strtotime($start_time);
-        return $end_time - $start_time;
+        return $end_time-$start_time;
     }
 
     /**
@@ -111,7 +111,7 @@ 
         if (empty($time)) {
             $time = time();
         }
-        return date($format, $time - $mun);
+        return date($format, $time-$mun);
     }
 
     /**
@@ -127,7 +127,7 @@ 
         if (empty($time)) {
             $time = time();
         }
-        return date($format, $time + $mun);
+        return date($format, $time+$mun);
     }
 
 
@@ -141,9 +141,9 @@ 
     {
         date_default_timezone_set('Asia/Shanghai');
         $date = date('H:i');
-        $curTime = strtotime($date);//当前时分
-        $assignTime1 = strtotime($start);//获得指定分钟时间戳，00:00
-        $assignTime2 = strtotime($end);//获得指定分钟时间戳，01:00
+        $curTime = strtotime($date); //当前时分
+        $assignTime1 = strtotime($start); //获得指定分钟时间戳，00:00
+        $assignTime2 = strtotime($end); //获得指定分钟时间戳，01:00
         $result = false;
         if ($curTime > $assignTime1 && $curTime < $assignTime2) {
             $result = true;

src/helper/Strings.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -37,7 +37,7 @@ 
      */
     public function extractBefore(string $str, int $start_num, int $end_num): string
     {
-        if (strlen($str) < $start_num + $end_num) {
+        if (strlen($str) < $start_num+$end_num) {
             return $str;
         }
         return substr($str, $start_num, $end_num);
@@ -151,7 +151,7 @@ 
                 }
             }
             return false;
-        } else {
+        }else {
             if ($str == $nee) {
                 return true;
             }

src/helper/Xmls.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\helper;
 
@@ -44,11 +44,11 @@ 
         $xml = "<xml>";
         foreach ($values as $key => $val) {
             if (is_array($val)) {
-                $xml .= "<" . $key . ">" . $this->toXml($val) . "</" . $key . ">";
-            } else if (is_numeric($val)) {
-                $xml .= "<" . $key . ">" . $val . "</" . $key . ">";
-            } else {
-                $xml .= "<" . $key . "><![CDATA[" . $val . "]]></" . $key . ">";
+                $xml .= "<".$key.">".$this->toXml($val)."</".$key.">";
+            }else if (is_numeric($val)) {
+                $xml .= "<".$key.">".$val."</".$key.">";
+            }else {
+                $xml .= "<".$key."><![CDATA[".$val."]]></".$key.">";
             }
         }
         $xml .= "</xml>";

src/facade/Randoms.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 // | Packagist 地址 ：https://packagist.org/packages/liguangchun/think-library
 // +----------------------------------------------------------------------
 
-declare (strict_types=1);
+declare(strict_types=1);
 
 namespace DtApp\ThinkLibrary\facade;
 

src/session/Mysql.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
     public function read(string $sessionId): string
     {
         return (string)Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->whereTime('session_expire', '>=', time())
             ->order('session_expire desc')
             ->value('session_data', '');
@@ -72,7 +72,7 @@ 
     public function delete(string $sessionId): bool
     {
         $result = Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->delete();
         return $result ? true : false;
     }
@@ -89,20 +89,20 @@ 
     public function write(string $sessionId, string $data): bool
     {
         $get = Db::table($this->table_name)
-            ->where('session_id', $this->config['session_prefix'] . $sessionId)
+            ->where('session_id', $this->config['session_prefix'].$sessionId)
             ->whereTime('session_expire', '>=', time())
             ->field('id')
             ->find();
         if (empty($get)) {
             $params = [
-                'session_id' => $this->config['session_prefix'] . $sessionId,
+                'session_id' => $this->config['session_prefix'].$sessionId,
                 'session_expire' => Times::dateRear("Y-m-d H:i:s", $this->config['session_expire']),
                 'session_data' => $data
             ];
             $result = Db::table($this->table_name)
                 ->insert($params);
             return $result ? true : false;
-        } else {
+        }else {
             $params = [
                 'session_expire' => Times::dateRear("Y-m-d H:i:s", $this->config['session_expire']),
                 'session_data' => $data

src/ApiController.php

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         }
         if (isset($this->aes_decrypt_data[$name])) {
             return $this->aes_decrypt_data[$name];
-        } else {
+        }else {
             return $default;
         }
     }
@@ -218,7 +218,7 @@ 
         $rear = strtotime('+2minute');
         if ($timestamp <= $rear && $timestamp >= $before) {
             $this->aes_decrypt_data = $data;
-        } else {
+        }else {
             $this->error('已超时，请重新尝试！');
         }
     }
@@ -240,7 +240,7 @@ 
         if (!empty(is_array($data))) {
             $data = json_encode($data);
         }
-        return urlencode(base64_encode(openssl_encrypt($data, 'AES-128-CBC', $this->aes_md5, 1, $this->aes_md5_iv . $timestamp)));
+        return urlencode(base64_encode(openssl_encrypt($data, 'AES-128-CBC', $this->aes_md5, 1, $this->aes_md5_iv.$timestamp)));
     }
 
     /**
@@ -257,6 +257,6 @@ 
         if (empty($this->aes_md5_iv)) {
             $this->setAesMd5Iv();
         }
-        return openssl_decrypt(base64_decode(urldecode($data)), "AES-128-CBC", $this->aes_md5, true, $this->aes_md5_iv . $timestamp);
+        return openssl_decrypt(base64_decode(urldecode($data)), "AES-128-CBC", $this->aes_md5, true, $this->aes_md5_iv.$timestamp);
     }
 }

src/exception/ThinkException.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
                         'domain' => request()->domain(),
                         'url' => request()->url(),
                         'node' => config('dtapp.exception.wechat.node', ''),
-                        'info' => "ServerIp：" . $ip . "；CdnIp：" . $_SERVER['REMOTE_ADDR'] . "；ClientIp：" . get_ip(),
+                        'info' => "ServerIp：".$ip."；CdnIp：".$_SERVER['REMOTE_ADDR']."；ClientIp：".get_ip(),
                         'ip' => $ipinfo['location_all'],
                         'error' => base64_encode($msg)
                     ])

src/common.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
         if (empty($ip)) {
             if (!isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $ip = $_SERVER['REMOTE_ADDR'];
-            } else {
+            }else {
                 //为了兼容百度的CDN，所以转成数组
                 $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
                 $ip = $arr[0];
@@ -61,7 +61,7 @@ 
             //为了兼容百度的CDN，所以转成数组
             $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
             return $arr[0];
-        } else {
+        }else {
             return $_SERVER['REMOTE_ADDR'];
         }
     }
@@ -99,13 +99,13 @@ 
         if (empty($value)) {
             return $myc->name($name)
                 ->get();
-        } else {
+        }else {
             if (empty($myc->name($name)
                 ->get())) {
                 $myc->name($name)
                     ->expire($expire)
                     ->set($value);
-            } else {
+            }else {
                 $myc->name($name)
                     ->expire($expire)
                     ->update($value);

src/service/Ip/IpIpService.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         if (empty($this->ipPath)) {
             throw new DtaException('请检查配置文件是否配置了IP数据库文件存放位置');
         }
-        $this->reader = new IpIpReader($this->ipPath . 'ipipfree.ipdb');
+        $this->reader = new IpIpReader($this->ipPath.'ipipfree.ipdb');
         parent::__construct($app);
     }