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/async/AsyncHook.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace tinymeng\tools\async;
 
-class AsyncHook{
+class AsyncHook {
 
     /**
      * @var array
@@ -20,7 +20,7 @@ 
      */
     public static function hook(callable $callback, $params) {
         self::$hook_list[] = array('callback' => $callback, 'params' => $params);
-        if(self::$hooked == false) {
+        if (self::$hooked == false) {
             self::$hooked = true;
             //注册一个callback当前在脚本执行完后执行
             register_shutdown_function(array(__CLASS__, '__run'));
@@ -33,10 +33,10 @@ 
      */
     private static function __run() {
         fastcgi_finish_request();
-        if(empty(self::$hook_list)) {
+        if (empty(self::$hook_list)) {
             return;
         }
-        foreach(self::$hook_list as $hook) {
+        foreach (self::$hook_list as $hook) {
             $callback = $hook['callback'];
             $params = $hook['params'];
             call_user_func_array($callback, $params);

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/core/Singleton.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
      */
     private static $instance = null;
 
-    public function __construct($config=null){
+    public function __construct($config = null) {
         $this->config = $config;
     }
 
-    private function __clone(){}
+    private function __clone() {}
 
     public function __sleep(): array
     {
@@ -25,7 +25,7 @@ 
         return [];
     }
 
-    protected static function init($gateway, $config=null)
+    protected static function init($gateway, $config = null)
     {
         if (!self::$instance instanceof static) {
             self::$instance = new static($config);
@@ -41,7 +41,7 @@ 
      * @param $config
      * @return mixed
      */
-    public static function __callStatic($gateway, $config=null)
+    public static function __callStatic($gateway, $config = null)
     {
         return self::init($gateway, ...$config);
     }

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 +22 added lines, -22 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);
@@ -45,13 +45,13 @@ 
      * @param int $parent_id 父id值
      * @return array
      */
-    public static function getTreeStructure($list,$filed='id',$parent_filed='pid',$parent_id=0){
+    public static function getTreeStructure($list, $filed = 'id', $parent_filed = 'pid', $parent_id = 0) {
         $result = array();
-        if(!empty($list)){
-            foreach($list as $key=>$val){
-                if($val[$parent_filed] == $parent_id){
-                    $val['child'] = self::getTreeStructure($list,$filed,$parent_filed,$val[$filed]);
-                    if(empty($val['child'])){
+        if (!empty($list)) {
+            foreach ($list as $key=>$val) {
+                if ($val[$parent_filed] == $parent_id) {
+                    $val['child'] = self::getTreeStructure($list, $filed, $parent_filed, $val[$filed]);
+                    if (empty($val['child'])) {
                         unset($val['child']);
                     }
                     $result[] = $val;
@@ -68,12 +68,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;
@@ -85,12 +85,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);