majiameng / tools

src/ChineseChar.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
         if ($len <= $split_len) {
             return array($str);
         }
-        preg_match_all('/.{' . $split_len . '}|[^\x00]{1,' . $split_len . '}$/us', $str, $ar);
+        preg_match_all('/.{'.$split_len.'}|[^\x00]{1,'.$split_len.'}$/us', $str, $ar);
 
         return $ar[0];
     }

src/exception/StatusCode.php

Spacing +21 added lines, -21 removed lines

@@ -12,43 +12,43 @@
     /**
      * 公共状态码
      */
-    const COMMON_SUCCESS = 200;//成功
-    const COMMON_UNKNOWN = 400;//未知错误
-    const COMMON_REQUEST_METHOD = 401;//错误请求(请求方式错误)
-    const COMMON_HEADER_MISS_PARAM = 402;//缺失头信息
-    const COMMON_ACCESS_BARRED = 403;//禁止访问
-    const COMMON_NOT_REQUEST = 404;//请求不存在
-    const COMMON_TINYMENG_REQUEST_METHOD = 405;//站外链接请求错误
+    const COMMON_SUCCESS = 200; //成功
+    const COMMON_UNKNOWN = 400; //未知错误
+    const COMMON_REQUEST_METHOD = 401; //错误请求(请求方式错误)
+    const COMMON_HEADER_MISS_PARAM = 402; //缺失头信息
+    const COMMON_ACCESS_BARRED = 403; //禁止访问
+    const COMMON_NOT_REQUEST = 404; //请求不存在
+    const COMMON_TINYMENG_REQUEST_METHOD = 405; //站外链接请求错误
 
     /**
      * 未授权 420
      */
-    const COMMON_TOKEN_INVALID = 421;//token无效
-    const COMMON_SIGN_ERROR = 422;//签名错误
-    const COMMON_NO_ACCESS = 423;//没有权限
+    const COMMON_TOKEN_INVALID = 421; //token无效
+    const COMMON_SIGN_ERROR = 422; //签名错误
+    const COMMON_NO_ACCESS = 423; //没有权限
 
     /**
      * 数据错误 430
      */
-    const COMMON_PARAM_INVALID = 431;//参数无效
-    const COMMON_PARAM_MISS = 432;//参数缺失
-    const COMMON_PARAMS_VERIFY_ERROR = 433;//字段验证失败
-    const COMMON_CAPTCHA_INVALID = 434;//验证码错误
-    const COMMON_NO_DATA_EXIST = 435;//数据不存在
-    const COMMON_DATA_EXIST = 436;//数据已存在
-    const COMMON_SAVE_FAILURE = 437;//存储失败
+    const COMMON_PARAM_INVALID = 431; //参数无效
+    const COMMON_PARAM_MISS = 432; //参数缺失
+    const COMMON_PARAMS_VERIFY_ERROR = 433; //字段验证失败
+    const COMMON_CAPTCHA_INVALID = 434; //验证码错误
+    const COMMON_NO_DATA_EXIST = 435; //数据不存在
+    const COMMON_DATA_EXIST = 436; //数据已存在
+    const COMMON_SAVE_FAILURE = 437; //存储失败
 
     /**
      * 用户错误码 440
      */
-    const COMMON_NOT_ENTERED_PASSWORD = 440;//未输入密码
-    const COMMON_PASSWORD_INVALID = 441;//密码错误
+    const COMMON_NOT_ENTERED_PASSWORD = 440; //未输入密码
+    const COMMON_PASSWORD_INVALID = 441; //密码错误
 
     /**
      * 系统状态码 300000
      */
-    const USER_STOP_USE = 300105;//用户停止使用
-    const USER_SYSTEM_UPDATE = 300109;//系统升级
+    const USER_STOP_USE = 300105; //用户停止使用
+    const USER_SYSTEM_UPDATE = 300109; //系统升级
 
     public static $status_code = [
         //公共错误码

src/Encryption.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class Encryption{
+class Encryption {
 
 
     /**
@@ -22,7 +22,7 @@ 
      * @return bool|string
      */
     static public function authcode($string, $operation = 'decode', $key = 'tinymeng', $expiry = 0) {
-        $ckey_length = 4;	// 随机密钥长度 取值 0-32;
+        $ckey_length = 4; // 随机密钥长度 取值 0-32;
         // 加入随机密钥，可以令密文无任何规律，即便是原文和密钥完全相同，加密结果也会每次不同，增大破解难度。
         // 取值越大，密文变动规律越大，密文变化 = 16 的 $ckey_length 次方
         // 当此值为 0 时，则不产生随机密钥
@@ -30,14 +30,14 @@ 
         $key = md5($key);
         $keya = md5(substr($key, 0, 16));
         $keyb = md5(substr($key, 16, 16));
-        $keyc = $ckey_length ? ($operation == 'decode' ? substr($string, 0, $ckey_length): substr(md5(microtime()), -$ckey_length)) : '';
+        $keyc = $ckey_length ? ($operation == 'decode' ? substr($string, 0, $ckey_length) : substr(md5(microtime()), -$ckey_length)) : '';
 
         $cryptkey = $keya.md5($keya.$keyc);
         $key_length = strlen($cryptkey);
 
-        if($operation == 'decode'){
+        if ($operation == 'decode') {
             $string = base64_decode(substr($string, $ckey_length));
-        }else{
+        } else {
             $a = $expiry ? $expiry + time() : 0;
             $string = sprintf('%010d', $a).substr(md5($string.$keyb), 0, 16).$string;
         }
@@ -47,27 +47,27 @@ 
         $box = range(0, 255);
 
         $rndkey = array();
-        for($i = 0; $i <= 255; $i++) {
+        for ($i = 0; $i <= 255; $i++) {
             $rndkey[$i] = ord($cryptkey[$i % $key_length]);
         }
-        for($j = $i = 0; $i < 256; $i++) {
+        for ($j = $i = 0; $i < 256; $i++) {
             $j = ($j + $box[$i] + $rndkey[$i]) % 256;
             $tmp = $box[$i];
             $box[$i] = $box[$j];
             $box[$j] = $tmp;
         }
 
-        for($a = $j = $i = 0; $i < $string_length; $i++) {
+        for ($a = $j = $i = 0; $i < $string_length; $i++) {
             $a = ($a + 1) % 256;
             $j = ($j + $box[$a]) % 256;
             $tmp = $box[$a];
             $box[$a] = $box[$j];
             $box[$j] = $tmp;
-            $result .= chr( ord($string[$i])  ^ ( $box[($box[$a] + $box[$j]) % 256]));
+            $result .= chr(ord($string[$i]) ^ ($box[($box[$a] + $box[$j]) % 256]));
         }
 
-        if($operation == 'decode') {
-            if((substr($result, 0, 10) == 0 || substr($result, 0, 10) - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26).$keyb), 0, 16)) {
+        if ($operation == 'decode') {
+            if ((substr($result, 0, 10) == 0 || substr($result, 0, 10) - time() > 0) && substr($result, 10, 16) == substr(md5(substr($result, 26).$keyb), 0, 16)) {
                 return substr($result, 26);
             } else {
                 return '';

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
         if($operation == 'decode'){
             $string = base64_decode(substr($string, $ckey_length));
-        }else{
+        } else{
             $a = $expiry ? $expiry + time() : 0;
             $string = sprintf('%010d', $a).substr(md5($string.$keyb), 0, 16).$string;
         }

src/Calendar.php

Spacing +4 added lines, -4 removed lines

@@ -218,7 +218,7 @@ 
     {
         $date = $this->makeDate("{$year}-{$month}-{$day}");
         $lunar = $this->solar2lunar($year, $month, $day, $hour);
-        $week = abs((int)$date->format('w')); // 0 ~ 6 修正 星期七 为 星期日
+        $week = abs((int) $date->format('w')); // 0 ~ 6 修正 星期七 为 星期日
 
         return array_merge(
             $lunar,
@@ -434,7 +434,7 @@ 
         if ($no < 1 || $no > 24) {
             return -1;
         }
-        $solarTermsOfYear = array_map('hexdec', (array)str_split($this->solarTerms[$year - 1900], 5));
+        $solarTermsOfYear = array_map('hexdec', (array) str_split($this->solarTerms[$year - 1900], 5));
         $positions = [
             0 => [0, 1],
             1 => [1, 2],
@@ -598,7 +598,7 @@ 
             throw new InvalidArgumentException("不支持的日期:{$year}-{$month}-{$day}");
         }
 
-        $offset = (int)$this->dateDiff($date, '1900-01-31')->days;
+        $offset = (int) $this->dateDiff($date, '1900-01-31')->days;
 
         for ($i = 1900; $i < 2101 && $offset > 0; ++$i) {
             $daysOfYear = $this->daysOfYear($i);
@@ -1117,7 +1117,7 @@ 
         $date = $this->makeDate("{$solar['solar_year']}-{$solar['solar_month']}-{$solar['solar_day']}");
         $date->modify($value.' day');
 
-        return $this->solar2lunar((int)$date->format('Y'), (int)$date->format('m'), (int)$date->format('d'));
+        return $this->solar2lunar((int) $date->format('Y'), (int) $date->format('m'), (int) $date->format('d'));
     }
 
     /**

src/RsaTool.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
 class RsaTool
 {
 
-    private $rsaPath = './';//公钥证书路径
+    private $rsaPath = './'; //公钥证书路径
 
     /**
      * Author: JiaMeng <666@majiameng.com>
@@ -62,11 +62,11 @@ 
         // 生成私钥
         $rsa = openssl_pkey_new($config);
         openssl_pkey_export($rsa, $privKey, $this->privkeypass, $config);
-        file_put_contents($this->rsaPath . DIRECTORY_SEPARATOR . 'priv.key', $privKey);
+        file_put_contents($this->rsaPath.DIRECTORY_SEPARATOR.'priv.key', $privKey);
         // 生成公钥
         $rsaPri = openssl_pkey_get_details($rsa);
         $pubKey = $rsaPri['key'];
-        file_put_contents($this->rsaPath . DIRECTORY_SEPARATOR . 'pub.key', $pubKey);
+        file_put_contents($this->rsaPath.DIRECTORY_SEPARATOR.'pub.key', $pubKey);
     }
 
     /**
@@ -75,7 +75,7 @@ 
      */
     public function setupPrivKey()
     {
-        $file = $this->rsaPath . DIRECTORY_SEPARATOR . 'priv.key';
+        $file = $this->rsaPath.DIRECTORY_SEPARATOR.'priv.key';
         $privKey = file_get_contents($file);
         $this->_privKey = openssl_pkey_get_private($privKey, $this->privkeypass);
         return true;
@@ -87,7 +87,7 @@ 
      */
     public function setupPubKey()
     {
-        $file = $this->rsaPath . DIRECTORY_SEPARATOR . 'pub.key';
+        $file = $this->rsaPath.DIRECTORY_SEPARATOR.'pub.key';
         $pubKey = file_get_contents($file);
         $this->_pubKey = openssl_pkey_get_public($pubKey);
         return true;

src/ArrayTool.php

Braces +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
         }
         if($type == 'asc'){
             asort($keysValue);
-        }else{
+        } else{
             arsort($keysValue);
         }
         reset($keysValue);
@@ -88,7 +88,7 @@ 
             if(is_array($val)){
                 if(empty($val)){
                     settype($val,'object');
-                }else{
+                } else{
                     self::nullArrayToObject($val);
                 }
             }

Spacing +23 added lines, -23 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class ArrayTool{
+class ArrayTool {
 
     /**
      * @param $arr
@@ -16,20 +16,20 @@ 
      * @param $type
      * @return array
      */
-    static public function arraySort($arr,$keys,$type='asc'){
+    static public function arraySort($arr, $keys, $type = 'asc') {
         $keysValue = $newArray = array();
-        foreach ($arr as $k=>$v){
-            if(isset($v[$keys])){
+        foreach ($arr as $k=>$v) {
+            if (isset($v[$keys])) {
                 $keysValue[$k] = $v[$keys];
             }
         }
-        if($type == 'asc'){
+        if ($type == 'asc') {
             asort($keysValue);
-        }else{
+        } else {
             arsort($keysValue);
         }
         reset($keysValue);
-        foreach ($keysValue as $k=>$v){
+        foreach ($keysValue as $k=>$v) {
             $newArray[$k] = $arr[$k];
         }
         return array_values($newArray);
@@ -46,14 +46,14 @@ 
      * @param string $childrenName child
      * @return array
      */
-    public static function getTreeStructureRecursion(array $list,string $filed='id',string $parentFiled='pid',int $parentId=0,string $childrenName = 'child')
+    public static function getTreeStructureRecursion(array $list, string $filed = 'id', string $parentFiled = 'pid', int $parentId = 0, string $childrenName = 'child')
     {
         $result = array();
-        if(!empty($list)){
-            foreach($list as $val){
-                if($val[$parentFiled] == $parentId){
-                    $val[$childrenName] = self::getTreeStructureRecursion($list,$filed,$parentFiled,$val[$filed]);
-                    if(empty($val[$childrenName])){
+        if (!empty($list)) {
+            foreach ($list as $val) {
+                if ($val[$parentFiled] == $parentId) {
+                    $val[$childrenName] = self::getTreeStructureRecursion($list, $filed, $parentFiled, $val[$filed]);
+                    if (empty($val[$childrenName])) {
                         unset($val[$childrenName]);
                     }
                     $result[] = $val;
@@ -73,7 +73,7 @@ 
      * @param string $childrenName child
      * @return array
      */
-    public static function getTreeStructure(array $list,string $filed = 'id', string $parentFiled = 'pid', string $childrenName = 'child')
+    public static function getTreeStructure(array $list, string $filed = 'id', string $parentFiled = 'pid', string $childrenName = 'child')
     {
         $result = array();
         foreach ($list as $value) {
@@ -97,12 +97,12 @@ 
      * @param $obj
      * @return array
      */
-    public static function objectToArray($obj){
-        if(!is_object($obj) && !is_array($obj)) {
+    public static function objectToArray($obj) {
+        if (!is_object($obj) && !is_array($obj)) {
             return $obj;
         }
         $arr = array();
-        foreach($obj as $k => $v){
+        foreach ($obj as $k => $v) {
             $arr[$k] = self::objectToArray($v);
         }
         return $arr;
@@ -114,12 +114,12 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @param $data
      */
-    public static function nullArrayToObject(&$data){
-        foreach ($data as $key=>&$val){
-            if(is_array($val)){
-                if(empty($val)){
-                    settype($val,'object');
-                }else{
+    public static function nullArrayToObject(&$data) {
+        foreach ($data as $key=>&$val) {
+            if (is_array($val)) {
+                if (empty($val)) {
+                    settype($val, 'object');
+                } else {
                     self::nullArrayToObject($val);
                 }
             }

src/FileTool.php

Spacing +36 added lines, -36 removed lines

@@ -4,8 +4,8 @@ 
  * 文件操作类
  *  logFilePath: /storage/tinymeng/log/
  */
-define('logFilePath',dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'storage'.DIRECTORY_SEPARATOR.'tinymeng'.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR);
-class FileTool{
+define('logFilePath', dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'storage'.DIRECTORY_SEPARATOR.'tinymeng'.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR);
+class FileTool {
 
     /**
      * Name: writeLog
@@ -16,26 +16,26 @@ 
      * @param \Exception|null $exception
      * @return bool
      */
-    static public function writeLog($message, $file_name='error',bool $echo = false,\Exception $exception = null){
-        if(!is_string($message)){
+    static public function writeLog($message, $file_name = 'error', bool $echo = false, \Exception $exception = null) {
+        if (!is_string($message)) {
             $message = json_encode($message);
         }
         $message = date('Y-m-d H:i:s').' : '.$message.PHP_EOL;
-        if($exception && $exception instanceof \Exception){
+        if ($exception && $exception instanceof \Exception) {
             $message .= ' File: '.$exception->getFile().' ,Line: '.$exception->getLine().' ,Message: '.$exception->getMessage();
         }
-        if($echo){
+        if ($echo) {
             echo $message;
         }
         $path = logFilePath;
         if (!is_dir($path)) {
-            if(!mkdir($path, 0755, true)){
+            if (!mkdir($path, 0755, true)) {
                 die('创建缓存文件夹"'.$path.'"失败!');
             }
         }
 
         $file_name = $path.$file_name;
-        self::filePutContents($file_name."-".date('Ymd',time()).".log",$message,true);
+        self::filePutContents($file_name."-".date('Ymd', time()).".log", $message, true);
         return true;
     }
 
@@ -48,10 +48,10 @@ 
      * file_put_contents和fopen，fwrite,fclose三个组合的区别
      * http://blog.majiameng.com/article/2724.html
      */
-    static public function filePutContents(string $file_name,string $content,bool $file_append = false){
-        if(strrpos($file_name,DIRECTORY_SEPARATOR)){
+    static public function filePutContents(string $file_name, string $content, bool $file_append = false) {
+        if (strrpos($file_name, DIRECTORY_SEPARATOR)) {
             //获取文件夹路径
-            $dir_name = substr($file_name,0,strrpos($file_name,DIRECTORY_SEPARATOR));
+            $dir_name = substr($file_name, 0, strrpos($file_name, DIRECTORY_SEPARATOR));
             //创建文件夹
             self::mkdir($dir_name);
         }
@@ -60,10 +60,10 @@ 
         self::chmod($file_name);
 
         //内容写入文件
-        if($file_append === false){
-            file_put_contents($file_name,$content);
-        }else{
-            file_put_contents($file_name,$content,FILE_APPEND);
+        if ($file_append === false) {
+            file_put_contents($file_name, $content);
+        } else {
+            file_put_contents($file_name, $content, FILE_APPEND);
         }
     }
 
@@ -76,10 +76,10 @@ 
      * file_put_contents和fopen，fwrite,fclose三个组合的区别
      * http://blog.majiameng.com/article/2724.html
      */
-    static public function fWrite(string $file_name,string $content,bool $file_append = false){
-        if(strrpos($file_name,DIRECTORY_SEPARATOR)){
+    static public function fWrite(string $file_name, string $content, bool $file_append = false) {
+        if (strrpos($file_name, DIRECTORY_SEPARATOR)) {
             //获取文件夹路径
-            $dir_name = substr($file_name,0,strrpos($file_name,DIRECTORY_SEPARATOR));
+            $dir_name = substr($file_name, 0, strrpos($file_name, DIRECTORY_SEPARATOR));
             //创建文件夹
             self::mkdir($dir_name);
         }
@@ -88,11 +88,11 @@ 
         self::chmod($file_name);
 
         //内容写入文件
-        if($file_append === false){
+        if ($file_append === false) {
             $handle = fopen($file_name, 'w');
             fwrite($handle, $content);
             fclose($handle);
-        }else{
+        } else {
             $handle = fopen($file_name, 'a');
             fwrite($handle, $content);
             fclose($handle);
@@ -105,9 +105,9 @@ 
      * @param $dir_name
      * @return bool
      */
-    static public function mkdir(string $dir_name){
+    static public function mkdir(string $dir_name) {
         if (!is_dir($dir_name)) {
-            if(!mkdir($dir_name, 0755, true)){
+            if (!mkdir($dir_name, 0755, true)) {
                 die('创建缓存文件夹"'.$dir_name.'"失败!');
             }
             //添加文件权限
@@ -123,7 +123,7 @@ 
      * @return bool
      */
     static public function delDir(string $dir) {
-        if(!file_exists($dir)){//文件不存在
+        if (!file_exists($dir)) {//文件不存在
             return true;
         }
         if (!is_dir($dir)) {
@@ -134,9 +134,9 @@ 
         //先删除目录下的文件
         $dh = opendir($dir);
         while ($file = readdir($dh)) {
-            if($file != "." && $file!="..") {
+            if ($file != "." && $file != "..") {
                 $full_path = $dir."/".$file;
-                if(!is_dir($full_path)) {
+                if (!is_dir($full_path)) {
                     unlink($full_path);
                 } else {
                     self::delDir($full_path);
@@ -146,7 +146,7 @@ 
         closedir($dh);
 
         //删除当前文件夹：
-        if(rmdir($dir)) {
+        if (rmdir($dir)) {
             return true;
         } else {
             return false;
@@ -159,9 +159,9 @@ 
      * @param $file_name
      * @param int $mode
      */
-    static public function chmod($file_name,$mode = 0755){
-        if (file_exists($file_name)){
-            @chmod($file_name,$mode);
+    static public function chmod($file_name, $mode = 0755) {
+        if (file_exists($file_name)) {
+            @chmod($file_name, $mode);
         }
     }
 
@@ -172,12 +172,12 @@ 
      * dirname()可以的当前文件目录
      * @return array
      */
-    static public function scanDir($path){
+    static public function scanDir($path) {
         $filename = scandir($path);
         $result = array();
-        foreach($filename as $k=>$v){
+        foreach ($filename as $k=>$v) {
             // 跳过两个特殊目录   continue跳出循环
-            if($v=="." || $v==".."){continue;}
+            if ($v == "." || $v == "..") {continue; }
             $result[] = $v;
         }
         return $result;
@@ -193,21 +193,21 @@ 
     static public function move(string $file, string $new_file): bool
     {
         //文件是否存在
-        if(!file_exists($file)){
+        if (!file_exists($file)) {
             return false;
         }
 
         //新文件目录
-        if(strrpos($new_file,DIRECTORY_SEPARATOR)){
+        if (strrpos($new_file, DIRECTORY_SEPARATOR)) {
             //获取文件夹路径
-            $dir_name = substr($new_file,0,strrpos($new_file,DIRECTORY_SEPARATOR));
+            $dir_name = substr($new_file, 0, strrpos($new_file, DIRECTORY_SEPARATOR));
             //创建文件夹
             self::mkdir($dir_name);
             //添加文件权限
             self::chmod($dir_name);
         }
 
-        copy($file,$new_file); //拷贝到新目录
+        copy($file, $new_file); //拷贝到新目录
         unlink($file); //删除旧目录下的文件
 
         return true;

Braces +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
         //内容写入文件
         if($file_append === false){
             file_put_contents($file_name,$content);
-        }else{
+        } else{
             file_put_contents($file_name,$content,FILE_APPEND);
         }
     }
@@ -92,7 +92,7 @@ 
             $handle = fopen($file_name, 'w');
             fwrite($handle, $content);
             fclose($handle);
-        }else{
+        } else{
             $handle = fopen($file_name, 'a');
             fwrite($handle, $content);
             fclose($handle);

src/StringTool.php

Braces +7 added lines, -7 removed lines

@@ -75,9 +75,9 @@ 
         if(empty($time)){
             list($msec, $sec) = explode(' ', microtime());
             $millisecond = (int)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
-        }elseif(is_numeric($time) && strlen((string)$time)==10){
+        } elseif(is_numeric($time) && strlen((string)$time)==10){
             $millisecond = (string)$time."000";
-        }else{
+        } else{
             $millisecond = strtotime($time)."000";
         }
         return (int)$millisecond;
@@ -162,12 +162,12 @@ 
             foreach ($string as $key => $val) {
                 $_key = self::autoCharset($key, $from, $to);
                 $string[$_key] = self::autoCharset($val, $from, $to);
-                if ($key != $_key)
-                    unset($string[$key]);
+                if ($key != $_key) {
+                                    unset($string[$key]);
+                }
             }
             return $string;
-        }
-        else {
+        } else {
             return $string;
         }
     }
@@ -205,7 +205,7 @@ 
     public static function getTime($date,$is_timestamp=false):string {
         if($is_timestamp === true){
             $time = $date;
-        }else{
+        } else{
             $time = strtotime($date);//时间转换为时间戳
         }
 

Spacing +63 added lines, -63 removed lines

@@ -80,22 +80,22 @@ 
         $str = '';
         switch ($type) {
             case 0:
-                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' . $addChars;
+                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.$addChars;
                 break;
             case 1:
                 $chars = str_repeat('0123456789', 3);
                 break;
             case 2:
-                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . $addChars;
+                $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.$addChars;
                 break;
             case 3:
-                $chars = 'abcdefghijklmnopqrstuvwxyz' . $addChars;
+                $chars = 'abcdefghijklmnopqrstuvwxyz'.$addChars;
                 break;
             case 4:
-                $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书" . $addChars;
+                $chars = "们以我到他会作时要动国产的一是工就年阶义发成部民可出能方进在了不和有大这主中人上为来分生对于学下级地个用同行面说种过命度革而多子后自社加小机也经力线本电高量长党得实家定深法表着水理化争现所二起政三好十战无农使性前等反体合斗路图把结第里正新开论之物从当两些还天资事队批点育重其思与间内去因件日利相由压员气业代全组数果期导平各基或月毛然如应形想制心样干都向变关问比展那它最及外没看治提五解系林者米群头意只明四道马认次文通但条较克又公孔领军流入接席位情运器并飞原油放立题质指建区验活众很教决特此常石强极土少已根共直团统式转别造切九你取西持总料连任志观调七么山程百报更见必真保热委手改管处己将修支识病象几先老光专什六型具示复安带每东增则完风回南广劳轮科北打积车计给节做务被整联步类集号列温装即毫知轴研单色坚据速防史拉世设达尔场织历花受求传口断况采精金界品判参层止边清至万确究书".$addChars;
                 break;
             default:
-                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789' . $addChars;
+                $chars = 'ABCDEFGHIJKMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789'.$addChars;
                 break;
         }
         if ($length > 10) {
@@ -176,7 +176,7 @@ 
         if (!ctype_lower($value)) {
             $value = preg_replace('/\s+/u', '', ucwords($value));
 
-            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1' . $delimiter, $value));
+            $value = static::lower(preg_replace('/(.)(?=[A-Z])/u', '$1'.$delimiter, $value));
         }
 
         return static::$snakeCache[$key][$delimiter] = $value;
@@ -259,16 +259,16 @@ 
     static public function createChannelId($namespace = ''):string {
         static $guid = '';
         $uid = uniqid("", true);
-        $data = $namespace. md5(time() . mt_rand(1,1000000)).uniqid();
-        $hash = strtoupper(hash('ripemd128', $uid . $guid . md5($data)));
-        $guid = substr($hash, 0, 8) .
-            '-' .
-            substr($hash, 8, 4) .
-            '-' .
-            substr($hash, 12, 4) .
-            '-' .
-            substr($hash, 16, 4) .
-            '-' .
+        $data = $namespace.md5(time().mt_rand(1, 1000000)).uniqid();
+        $hash = strtoupper(hash('ripemd128', $uid.$guid.md5($data)));
+        $guid = substr($hash, 0, 8).
+            '-'.
+            substr($hash, 8, 4).
+            '-'.
+            substr($hash, 12, 4).
+            '-'.
+            substr($hash, 16, 4).
+            '-'.
             substr($hash, 20, 12);
         return $guid;
     }
@@ -281,7 +281,7 @@ 
      * @return string
      */
     static public function md5Bit16($str):string {
-        return strtoupper(substr(md5($str),8,16));
+        return strtoupper(substr(md5($str), 8, 16));
     }
 
     /**
@@ -291,15 +291,15 @@ 
      * @return int
      */
     static public function millisecond($time = null) :int{
-        if(empty($time)){
+        if (empty($time)) {
             list($msec, $sec) = explode(' ', microtime());
-            $millisecond = (int)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
-        }elseif(is_numeric($time) && strlen((string)$time)==10){
-            $millisecond = (string)$time."000";
-        }else{
+            $millisecond = (int) sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
+        }elseif (is_numeric($time) && strlen((string) $time) == 10) {
+            $millisecond = (string) $time."000";
+        } else {
             $millisecond = strtotime($time)."000";
         }
-        return (int)$millisecond;
+        return (int) $millisecond;
     }
 
     /**
@@ -308,7 +308,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isContainChinese($string=''):bool {
+    public static function isContainChinese($string = ''):bool {
         $result = preg_match('/[\x{4e00}-\x{9fa5}]/u', $string);
         return $result == 0 ? false : true;
     }
@@ -319,7 +319,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isAllChinese($string=''):bool {
+    public static function isAllChinese($string = ''):bool {
         $result = preg_match('/^[\x{4e00}-\x{9fa5}]+$/u', $string);
         return $result == 0 ? false : true;
     }
@@ -331,7 +331,7 @@ 
      * @param string $string
      * @return bool
      */
-    public static function isMobile($string=''):bool {
+    public static function isMobile($string = ''):bool {
         if (!preg_match("/(^1[3|4|5|7|8][0-9]{9}$)/", $string)) {
             return false;
         }
@@ -346,9 +346,9 @@ 
      * @param int $double   小数点保留位数 默认3位
      * @return string
      */
-    public static function sctonum($num, $double = 3){
-        if(false !== stripos($num, "e")){
-            $a = explode("e",strtolower($num));
+    public static function sctonum($num, $double = 3) {
+        if (false !== stripos($num, "e")) {
+            $a = explode("e", strtolower($num));
             return bcmul($a[0], bcpow(10, $a[1], $double), $double);
         }
         return $num;
@@ -362,7 +362,7 @@ 
      * @param string $to
      * @return array|false|string|string[]|null
      */
-    public static function autoCharset($string, $from='gbk', $to='utf-8') {
+    public static function autoCharset($string, $from = 'gbk', $to = 'utf-8') {
         $from = strtoupper($from) == 'UTF8' ? 'utf-8' : $from;
         $to = strtoupper($to) == 'UTF8' ? 'utf-8' : $to;
         if (strtoupper($from) === strtoupper($to) || empty($string) || (is_scalar($string) && !is_string($string))) {
@@ -398,7 +398,7 @@ 
      * @param $html
      * @return string
      */
-    public static function filterATag($html=''):string {
+    public static function filterATag($html = ''):string {
         return preg_replace("#<a[^>]*>(.*?)</a>#is", "$1", $html);
     }
 
@@ -409,7 +409,7 @@ 
      * @param $html
      * @return string
      */
-    public static function deleteATag($html=''):string {
+    public static function deleteATag($html = ''):string {
         return preg_replace("#<a[^>]*>(.*?)</a>#is", "", $html);
     }
 
@@ -421,36 +421,36 @@ 
      * @param bool $is_timestamp   是否是时间戳
      * @return string
      */
-    public static function getTime($date,$is_timestamp=false):string {
-        if($is_timestamp === true){
+    public static function getTime($date, $is_timestamp = false):string {
+        if ($is_timestamp === true) {
             $time = $date;
-        }else{
-            $time = strtotime($date);//时间转换为时间戳
+        } else {
+            $time = strtotime($date); //时间转换为时间戳
         }
 
-        if($time >= time()){
+        if ($time >= time()) {
             return '刚刚';
         }
         $seconds = time() - $time;
-        if($seconds <= 60){
+        if ($seconds <= 60) {
             return '刚刚';
         }
         $minutes = intval($seconds / 60);
-        if($minutes <= 60){
+        if ($minutes <= 60) {
             return $minutes.'分钟前';
         }
         $hours = intval($minutes / 60);
-        if($hours <= 24){
+        if ($hours <= 24) {
             return $hours.'小时前';
         }
         $days = intval($hours / 24);
-        if($days <= 3){
+        if ($days <= 3) {
             return $days.'天前';
         }
-        if($days <= 365){
-            return date('m-d',/** @scrutinizer ignore-type */ $time);
+        if ($days <= 365) {
+            return date('m-d', /** @scrutinizer ignore-type */ $time);
         }
-        return date('Y-m-d',$time);
+        return date('Y-m-d', $time);
     }
 
     /**
@@ -464,11 +464,11 @@ 
         $compress = '';
         foreach ($chunks as $c) {
             if (strtolower(substr($c, 0, 19)) == '<!--<nocompress>-->') {
-                $c        = substr($c, 19, strlen($c) - 19 - 20);
+                $c = substr($c, 19, strlen($c) - 19 - 20);
                 $compress .= $c;
                 continue;
             } elseif (strtolower(substr($c, 0, 12)) == '<nocompress>') {
-                $c        = substr($c, 12, strlen($c) - 12 - 13);
+                $c = substr($c, 12, strlen($c) - 12 - 13);
                 $compress .= $c;
                 continue;
             } elseif (strtolower(substr($c, 0, 4)) == '<pre' || strtolower(substr($c, 0, 9)) == '<textarea') {
@@ -516,14 +516,14 @@ 
      * @return mixed
      */
     static public function htmlReplaceXcx(string $content):string {
-        $content = str_replace("\r\n","",$content);//出除回车和换行符
-        $content = preg_replace("/style=\".*?\"/si",'',$content);//style样式
-        $content = preg_replace(["/<strong.*?>/si", "/<\/strong>/si"],['<text class="wx-strong">','</text>'],$content);//strong
-        $content = preg_replace(["/<p.*?>/si", "/<\/p>/si"],['<view class="wx-p">','</view>'],$content);//p
-        $content = preg_replace(["/<a.*?>/si", "/<\/a>/si"],['<text class="wx-a">','</text>'],$content);//a
-        $content = preg_replace(["/<span.*?>/si", "/<\/span>/si"],['<text class="wx-span">','</text>'],$content);//span
-        $content = preg_replace(["/<h[1-6].*?>/si", "/<\/h[1-6]>/si"],['<view class="wx-h">','</view>'],$content);//h
-        $content = preg_replace("/<img.*?/si",'<image class="wx-img"',$content);//img
+        $content = str_replace("\r\n", "", $content); //出除回车和换行符
+        $content = preg_replace("/style=\".*?\"/si", '', $content); //style样式
+        $content = preg_replace(["/<strong.*?>/si", "/<\/strong>/si"], ['<text class="wx-strong">', '</text>'], $content); //strong
+        $content = preg_replace(["/<p.*?>/si", "/<\/p>/si"], ['<view class="wx-p">', '</view>'], $content); //p
+        $content = preg_replace(["/<a.*?>/si", "/<\/a>/si"], ['<text class="wx-a">', '</text>'], $content); //a
+        $content = preg_replace(["/<span.*?>/si", "/<\/span>/si"], ['<text class="wx-span">', '</text>'], $content); //span
+        $content = preg_replace(["/<h[1-6].*?>/si", "/<\/h[1-6]>/si"], ['<view class="wx-h">', '</view>'], $content); //h
+        $content = preg_replace("/<img.*?/si", '<image class="wx-img"', $content); //img
         return $content;
     }
 
@@ -535,8 +535,8 @@ 
      * @return string
      */
     static public function pReplaceSpan(string $content):string {
-        $content = str_replace(["\r","\n","\t"],'',$content);
-        $content = preg_replace(["/<p/si", "/<\/p>/si"],['<span','</span><br>'],$content);//p
+        $content = str_replace(["\r", "\n", "\t"], '', $content);
+        $content = preg_replace(["/<p/si", "/<\/p>/si"], ['<span', '</span><br>'], $content); //p
         return $content;
     }
 
@@ -547,10 +547,10 @@ 
      * @param  string $keyword
      * @return string
      */
-    static public function filterPunctuation($keyword){
-        $keyword = str_replace(["\r\n", "\r", "\n"," ","　"], "", trim($keyword));//删除空格
-        $keyword = preg_replace('# #','',$keyword);
-        $keyword = preg_replace("/[ '.,:;*?~`!@#$%^&+=)(<>{}]|\]|\[|\/|\\\|\"|\|/",'',$keyword);
+    static public function filterPunctuation($keyword) {
+        $keyword = str_replace(["\r\n", "\r", "\n", " ", "　"], "", trim($keyword)); //删除空格
+        $keyword = preg_replace('# #', '', $keyword);
+        $keyword = preg_replace("/[ '.,:;*?~`!@#$%^&+=)(<>{}]|\]|\[|\/|\\\|\"|\|/", '', $keyword);
         return $keyword;
     }
 
@@ -562,9 +562,9 @@ 
      * @param string $allowable_tags
      * @return string
      */
-    static public function stripTags($content,$allowable_tags = '<font>'){
-        $content = strip_tags($content,$allowable_tags);//替换标签
-        $content = str_replace(["\r\n", "\r", "\n","　"], "", trim($content));//删除空格
+    static public function stripTags($content, $allowable_tags = '<font>') {
+        $content = strip_tags($content, $allowable_tags); //替换标签
+        $content = str_replace(["\r\n", "\r", "\n", "　"], "", trim($content)); //删除空格
         return $content;
     }
 

src/Tool.php

Braces +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
     public static function getIp(){
         if(!empty($_SERVER["HTTP_CLIENT_IP"])){
             $cip = $_SERVER["HTTP_CLIENT_IP"];
-        }else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
+        } else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
             $cip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-        }else if(!empty($_SERVER["REMOTE_ADDR"])){
+        } else if(!empty($_SERVER["REMOTE_ADDR"])){
             $cip = $_SERVER["REMOTE_ADDR"];
-        }else{
+        } else{
             $cip = '';
         }
         preg_match("/[\d\.]{7,15}/", $cip, $cips);

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
  * Description: Tool.php.
  */
 
-class Tool{
+class Tool {
 
     /**
      * Description:  获取ip
@@ -16,14 +16,14 @@ 
      * Updater:
      * @return string
      */
-    public static function getIp(){
-        if(!empty($_SERVER["HTTP_CLIENT_IP"])){
+    public static function getIp() {
+        if (!empty($_SERVER["HTTP_CLIENT_IP"])) {
             $cip = $_SERVER["HTTP_CLIENT_IP"];
-        }else if(!empty($_SERVER["HTTP_X_FORWARDED_FOR"])){
+        } else if (!empty($_SERVER["HTTP_X_FORWARDED_FOR"])) {
             $cip = $_SERVER["HTTP_X_FORWARDED_FOR"];
-        }else if(!empty($_SERVER["REMOTE_ADDR"])){
+        } else if (!empty($_SERVER["REMOTE_ADDR"])) {
             $cip = $_SERVER["REMOTE_ADDR"];
-        }else{
+        } else {
             $cip = '';
         }
         preg_match("/[\d\.]{7,15}/", $cip, $cips);
@@ -39,7 +39,7 @@ 
      * Updater:
      * @return string
      */
-    public static function getOrigin(){
+    public static function getOrigin() {
         $origin = '';
         if (isset($_SERVER['HTTP_X_ORIGINAL_FOR'])) {
             $origin = $_SERVER['HTTP_X_ORIGINAL_FOR'];
@@ -104,7 +104,7 @@ 
                 'mobile'
             );
             // 从HTTP_USER_AGENT中查找手机浏览器的关键字
-            if (preg_match("/(" . implode('|', $clientKeyWords) . ")/i", strtolower($_SERVER['HTTP_USER_AGENT']))) {
+            if (preg_match("/(".implode('|', $clientKeyWords).")/i", strtolower($_SERVER['HTTP_USER_AGENT']))) {
                 return true;
             }
         }