majiameng / tools

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

Spacing +57 added lines, -57 removed lines

@@ -40,16 +40,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;
     }
@@ -62,7 +62,7 @@ 
      * @return string
      */
     static public function md5Bit16($str):string {
-        return strtoupper(substr(md5($str),8,16));
+        return strtoupper(substr(md5($str), 8, 16));
     }
 
     /**
@@ -72,15 +72,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;
     }
 
     /**
@@ -89,7 +89,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;
     }
@@ -100,7 +100,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;
     }
@@ -112,7 +112,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;
         }
@@ -127,9 +127,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;
@@ -143,7 +143,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))) {
@@ -179,7 +179,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);
     }
 
@@ -190,7 +190,7 @@ 
      * @param $html
      * @return string
      */
-    public static function deleteATag($html=''):string {
+    public static function deleteATag($html = ''):string {
         return preg_replace("#<a[^>]*>(.*?)</a>#is", "", $html);
     }
 
@@ -202,36 +202,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);
     }
 
     /**
@@ -245,11 +245,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') {
@@ -297,14 +297,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;
     }
 
@@ -316,8 +316,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;
     }
 
@@ -328,10 +328,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;
     }
 
@@ -343,9 +343,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;
     }
 

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);//时间转换为时间戳
         }
 

src/Tool.php

Spacing +7 added lines, -7 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);
@@ -88,7 +88,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;
             }
         }

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);

src/ZipTool.php

Spacing +30 added lines, -30 removed lines

@@ -19,10 +19,10 @@ 
      */
     public $client;
 
-    static public function init(){
+    static public function init() {
         $gateway = new self();
 
-        $gateway->client =  new ZipArchive();
+        $gateway->client = new ZipArchive();
         return $gateway;
     }
 
@@ -33,29 +33,29 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:26
      */
-    public function open($filename,$Fromfilename=null){
-        if (!empty($filename)){
+    public function open($filename, $Fromfilename = null) {
+        if (!empty($filename)) {
             $this->setFileName($filename);
-            if(!$this->client->open($this->fileName, ZipArchive::CREATE))
+            if (!$this->client->open($this->fileName, ZipArchive::CREATE))
                 return 'File open failed';
         }
-        if(!empty($Fromfilename)){
-            if(is_dir($Fromfilename)){
+        if (!empty($Fromfilename)) {
+            if (is_dir($Fromfilename)) {
                 $list_dir = scandir($Fromfilename);
-                for($i=2;$i<count($list_dir);$i++){
-                    if(is_dir($Fromfilename.'/'.$list_dir[$i])){
+                for ($i = 2; $i < count($list_dir); $i++) {
+                    if (is_dir($Fromfilename.'/'.$list_dir[$i])) {
                         $this->client->addGlob($Fromfilename.'/'.$list_dir[$i].'/*.*', 0, array('add_path' => $Fromfilename.'/'.$list_dir[$i].'/', 'remove_path' => $Fromfilename.'/'.$list_dir[$i]));
                         $list_chr = scandir($Fromfilename.'/'.$list_dir[$i]);
-                        for($j=2;$j<count($list_chr);$j++){
-                            if(is_dir($Fromfilename.'/'.$list_dir[$i].'/'.$list_chr[$j])){
+                        for ($j = 2; $j < count($list_chr); $j++) {
+                            if (is_dir($Fromfilename.'/'.$list_dir[$i].'/'.$list_chr[$j])) {
                                 echo $list_chr[$j];
-                                $this->open('',$Fromfilename.'/'.$list_dir[$i].'/'.$list_chr[$j]);
+                                $this->open('', $Fromfilename.'/'.$list_dir[$i].'/'.$list_chr[$j]);
                             }
                         }
                     }
                 }
-            }else{
-                $this->client->addFile ($Fromfilename);
+            } else {
+                $this->client->addFile($Fromfilename);
             }
         }
         return $this;
@@ -68,9 +68,9 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:26
      */
-    private function setFileName($filename){
-        if(!preg_match('/zip/m', $filename)){
-            $filename = $filename.'-'.date('Ymd').rand(111,999).'.zip';
+    private function setFileName($filename) {
+        if (!preg_match('/zip/m', $filename)) {
+            $filename = $filename.'-'.date('Ymd').rand(111, 999).'.zip';
         }
         $this->fileName = $filename;
         return $filename;
@@ -82,7 +82,7 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:50
      */
-    public function getFileName(){
+    public function getFileName() {
         return $this->fileName;
     }
 
@@ -94,8 +94,8 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:31
      */
-    public function addFileContent($file_name,$content){
-        $this->client->addFromString($file_name,$content);
+    public function addFileContent($file_name, $content) {
+        $this->client->addFromString($file_name, $content);
         return $this;
     }
 
@@ -107,8 +107,8 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:31
      */
-    public function addFile($file_name,$content){
-        $this->client->addFromString($file_name,$content);
+    public function addFile($file_name, $content) {
+        $this->client->addFromString($file_name, $content);
         return $this;
     }
 
@@ -116,7 +116,7 @@ 
      * 文件下载
      * @return void
      */
-    public function download(){
+    public function download() {
         $this->client->finish();
     }
 
@@ -128,17 +128,17 @@ 
      * @author: Tinymeng <666@majiameng.com>
      * @time: 2022/4/27 9:38
      */
-    public function unzip($filename,$dir){
-        if(!file_exists($filename))
+    public function unzip($filename, $dir) {
+        if (!file_exists($filename))
             return 'File does not exist';
-        if(!$this->client->open($filename))
+        if (!$this->client->open($filename))
             return 'File open failed';
-        if(!is_dir($dir)){
-            mkdir($dir,775);
-        }else{
+        if (!is_dir($dir)) {
+            mkdir($dir, 775);
+        } else {
             return 'Dir mk failed';
         }
-        if(!$this->client->extractTo($dir))
+        if (!$this->client->extractTo($dir))
             return 'File unzip failed';
         return $this;
     }

Braces +14 added lines, -10 removed lines

@@ -36,8 +36,9 @@ 
     public function open($filename,$Fromfilename=null){
         if (!empty($filename)){
             $this->setFileName($filename);
-            if(!$this->client->open($this->fileName, ZipArchive::CREATE))
-                return 'File open failed';
+            if(!$this->client->open($this->fileName, ZipArchive::CREATE)) {
+                            return 'File open failed';
+            }
         }
         if(!empty($Fromfilename)){
             if(is_dir($Fromfilename)){
@@ -54,7 +55,7 @@ 
                         }
                     }
                 }
-            }else{
+            } else{
                 $this->client->addFile ($Fromfilename);
             }
         }
@@ -129,17 +130,20 @@ 
      * @time: 2022/4/27 9:38
      */
     public function unzip($filename,$dir){
-        if(!file_exists($filename))
-            return 'File does not exist';
-        if(!$this->client->open($filename))
-            return 'File open failed';
+        if(!file_exists($filename)) {
+                    return 'File does not exist';
+        }
+        if(!$this->client->open($filename)) {
+                    return 'File open failed';
+        }
         if(!is_dir($dir)){
             mkdir($dir,775);
-        }else{
+        } else{
             return 'Dir mk failed';
         }
-        if(!$this->client->extractTo($dir))
-            return 'File unzip failed';
+        if(!$this->client->extractTo($dir)) {
+                    return 'File unzip failed';
+        }
         return $this;
     }
 

src/UrlTool.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * Url
  */
-class UrlTool{
+class UrlTool {
 
     /**
      * 获取url中主域名
@@ -15,7 +15,7 @@ 
         if (!$host) {
             return '';
         }
-        if (in_array($host,['127.0.0.1','localhost'])) {
+        if (in_array($host, ['127.0.0.1', 'localhost'])) {
             return '';
         }