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/TinymengException.php

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
 
     public function __construct(int $statusCode, string $message = '', Exception $previous = null, array $headers = [], $code = 0)
     {
-        $this->headers    = $headers;
+        $this->headers = $headers;
 
         /** message */
-        if(empty($message)) $message = isset(StatusCode::$status_code[$statusCode]) ? StatusCode::$status_code[$statusCode] :StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        if (empty($message)) $message = isset(StatusCode::$status_code[$statusCode]) ? StatusCode::$status_code[$statusCode] : StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
         parent::__construct('ERROR_TINYMENG_TOOL: '.$message, $code, $previous);
     }
 

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
         $this->headers    = $headers;
 
         /** message */
-        if(empty($message)) $message = isset(StatusCode::$status_code[$statusCode]) ? StatusCode::$status_code[$statusCode] :StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        if(empty($message)) {
+            $message = isset(StatusCode::$status_code[$statusCode]) ? StatusCode::$status_code[$statusCode] :StatusCode::$status_code[StatusCode::COMMON_UNKNOWN];
+        }
         parent::__construct('ERROR_TINYMENG_TOOL: '.$message, $code, $previous);
     }
 

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/HttpRequest.php

Spacing +27 added lines, -27 removed lines

@@ -33,19 +33,19 @@ 
      * @return mixed
      * @throws \Exception
      */
-    static public function httpPost($url, $param = array(), $httpHeaders = array(),$proxy='', $http_code = null)
+    static public function httpPost($url, $param = array(), $httpHeaders = array(), $proxy = '', $http_code = null)
     {
         /** 参数检测,object或者array进行http_build_query */
-        if(!empty($param) && is_array($param)){
+        if (!empty($param) && is_array($param)) {
             $flag = false;
-            foreach ($param as $value){
+            foreach ($param as $value) {
                 //判断参数是否是一个对象 或者 是一个数组
-                if(is_array($value) || (is_string($value) && is_object($value))){
+                if (is_array($value) || (is_string($value) && is_object($value))) {
                     $flag = true;
                     break;
                 }
             }
-            if($flag == true){
+            if ($flag == true) {
                 $param = http_build_query($param);
             }
         }
@@ -62,12 +62,12 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)){
+        if (empty($httpHeaders)) {
             $httpHeaders = array(
                 "user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36"
             );
         }
-        if (is_array($httpHeaders)){
+        if (is_array($httpHeaders)) {
             curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
         }
         /** gzip压缩 */
@@ -81,11 +81,11 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 请求 */
@@ -95,20 +95,20 @@ 
         /** 关闭请求资源 */
         curl_close($curl);
 
-        if($http_code != null){
+        if ($http_code != null) {
             /** 验证网络请求状态 */
             if (intval($info["http_code"]) === 0) {
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true)
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true)
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true).' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpPost]: POST request was aborted ! Request url :'.$url.' , post request data : '.var_export($param, true).' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }
@@ -125,13 +125,13 @@ 
      * @return mixed
      * @throws \Exception
      */
-    static public function httpGet($url, $param = array(), $httpHeaders = array(),$proxy= '',  $http_code = 200)
+    static public function httpGet($url, $param = array(), $httpHeaders = array(), $proxy = '', $http_code = 200)
     {
         $curl = curl_init();
 
         /** 设置请求参数 */
         if (!empty($param)) {
-            $url = $url . '?' . http_build_query($param);
+            $url = $url.'?'.http_build_query($param);
         }
 
         /** 设置请求链接 */
@@ -147,20 +147,20 @@ 
         }
 
         /** http代理 */
-        if(!empty($proxy)){
-            $proxy = explode(':',$proxy);
+        if (!empty($proxy)) {
+            $proxy = explode(':', $proxy);
             curl_setopt($curl, CURLOPT_PROXYAUTH, CURLAUTH_BASIC); //代理认证模式
             curl_setopt($curl, CURLOPT_PROXY, "$proxy[0]"); //代理服务器地址
-            curl_setopt($curl, CURLOPT_PROXYPORT,$proxy[1]); //代理服务器端口
+            curl_setopt($curl, CURLOPT_PROXYPORT, $proxy[1]); //代理服务器端口
         }
 
         /** 设置请求headers */
-        if(empty($httpHeaders)){
+        if (empty($httpHeaders)) {
             $httpHeaders = array(
                 "user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.66 Safari/537.36"
             );
         }
-        if (is_array($httpHeaders)){
+        if (is_array($httpHeaders)) {
             curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
         }
         /** gzip压缩 */
@@ -174,19 +174,19 @@ 
         curl_close($curl);
 
         /** 验证网络请求状态 */
-        if($http_code != null){
+        if ($http_code != null) {
             if (intval($info["http_code"]) === 0) {
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url
+                    '[httpGet]: GET request was aborted ! Request url :'.$url
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            }elseif (intval($info["http_code"]) != $http_code) {
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
-                    '[httpGet]: GET request was aborted ! Request url :' . $url .' ,return code : '.$info["http_code"] .' ,return content : '.$content
+                    '[httpGet]: GET request was aborted ! Request url :'.$url.' ,return code : '.$info["http_code"].' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else {
             return $content;
         }
     }

Braces +4 added lines, -4 removed lines

@@ -101,14 +101,14 @@ 
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true)
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            } elseif(intval($info["http_code"]) != $http_code){
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpPost]: POST request was aborted ! Request url :' . $url . ' , post request data : ' . var_export($param,true).' ,return code : '.$info["http_code"] .' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else{
             return $content;
         }
     }
@@ -179,14 +179,14 @@ 
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpGet]: GET request was aborted ! Request url :' . $url
                 );
-            }elseif(intval($info["http_code"]) != $http_code){
+            } elseif(intval($info["http_code"]) != $http_code){
                 throw new TinymengException(StatusCode::COMMON_TINYMENG_REQUEST_METHOD,
                     '[httpGet]: GET request was aborted ! Request url :' . $url .' ,return code : '.$info["http_code"] .' ,return content : '.$content
                 );
             } else {
                 return $content;
             }
-        }else{
+        } else{
             return $content;
         }
     }

src/Zip.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/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);
     }