majiameng / tools

src/Encryption.php

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

src/FileTool.php

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

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

src/ZipTool.php

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

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
         {
             //	use crc32 hash value instead of rand
             $nRand	= crc32( $sSource );
-        }
-        else
+        } else
         {
             //	0 ~ 4095
             $nRand	= rand( 0, 0xFFF );

src/exception/TException.php

Braces +3 added lines, -1 removed lines

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

src/HttpRequest.php

Braces +10 added lines, -6 removed lines

@@ -66,7 +66,9 @@ 
         curl_setopt($curl, CURLOPT_POSTFIELDS, $param);
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if(empty($httpHeaders)) {
+            $httpHeaders = self::$httpHeaders;
+        }
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -100,14 +102,14 @@ 
                 throw new TException(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 TException(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;
         }
     }
@@ -154,7 +156,9 @@ 
         }
 
         /** 设置请求headers */
-        if(empty($httpHeaders)) $httpHeaders = self::$httpHeaders;
+        if(empty($httpHeaders)) {
+            $httpHeaders = self::$httpHeaders;
+        }
         curl_setopt($curl, CURLOPT_HTTPHEADER, $httpHeaders);
 
         /** gzip压缩 */
@@ -173,14 +177,14 @@ 
                 throw new TException(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 TException(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;
         }
     }