majiameng / tools

src/File.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 File{
+define('logFilePath', dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'storage'.DIRECTORY_SEPARATOR.'tinymeng'.DIRECTORY_SEPARATOR.'log'.DIRECTORY_SEPARATOR);
+class File {
 
     /**
      * 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;

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

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