up: update some fs util methods

Author: inhere

src/Directory.php

@@ -233,7 +233,7 @@ public static function getFilesInfo(string $path, $ext = null, bool $recursive =
      *
      * @return bool
      */
-    public static function create(string $path, int $mode = 0666, bool $recursive = true): bool
+    public static function create(string $path, int $mode = 0765, bool $recursive = true): bool
     {
         return (is_dir($path) || !(!@mkdir($path, $mode, $recursive) && !is_dir($path))) && is_writable($path);
     }

src/File.php

@@ -235,14 +235,15 @@ public static function getContents(
     }
 
     /**
-     * save content use file_put_contents()
+     * save contents to file use file_put_contents()
      *
      * @param string $filename
-     * @param mixed  $data string, array(仅一维数组) 或者是 stream  资源
+     * @param string|array|resource  $data string, array(仅一维数组) 或者是 stream  资源
      * @param int    $flags
      * @param null   $context
      *
      * @return int
+     * @see file_put_contents()
      */
     public static function putContents(string $filename, $data, int $flags = 0, $context = null): int
     {
@@ -255,31 +256,47 @@ public static function putContents(string $filename, $data, int $flags = 0, $con
     }
 
     /**
-     * save content
+     * save contents to file.
      *
      * @param string $filename
-     * @param mixed  $data string, array(仅一维数组) 或者是 stream  资源
+     * @param string|array|resource  $data string, array(仅一维数组) 或者是 stream  资源
      * @param int    $flags
-     * @param mixed  $context
+     * @param null|resource $context
      *
      * @return int
      */
-    public static function save(string $filename, string $data, int $flags = 0, $context = null): int
+    public static function save(string $filename, $data, int $flags = 0, $context = null): int
+    {
+        return self::putContents($filename, $data, $flags, $context);
+    }
+
+    /**
+     * save contents to file. if dir is not exists, will create it.
+     *
+     * @param string $filename
+     * @param string|array|resource  $data
+     * @param int $flags
+     * @param null|mixed $context
+     *
+     * @return int
+     */
+    public static function mkdirSave(string $filename, $data, int $flags = 0, $context = null): int
     {
         return self::putContents($filename, $data, $flags, $context);
     }
 
     /**
      * @param string $content
      * @param string $path
+     *
+     * @return bool
      */
-    public static function write(string $content, string $path): void
+    public static function write(string $content, string $path): bool
     {
         $stream = static::streamOpen($path);
-
         static::streamWrite($stream, $content);
 
-        fclose($stream);
+        return fclose($stream);
     }
 
     /**

src/FileSystem.php

@@ -17,16 +17,20 @@
 use Toolkit\FsUtil\Traits\FileSystemFuncTrait;
 use Toolkit\Stdlib\OS;
 use function array_filter;
+use function array_map;
 use function count;
 use function file_exists;
 use function implode;
 use function is_array;
+use function is_dir;
+use function is_file;
 use function is_string;
 use function preg_match;
 use function str_ireplace;
 use function strlen;
 use function strpos;
 use function substr;
+use function trim;
 use const DIRECTORY_SEPARATOR;
 
 /**
@@ -99,30 +103,33 @@ public static function pathFormat(string $dirName): string
     }
 
     /**
-     * @param string $path
+     * @param string $basePath
      * @param string ...$subPaths
      *
      * @return string
      */
-    public static function join(string $path, string ...$subPaths): string
+    public static function join(string $basePath, string ...$subPaths): string
     {
-        return self::joinPath($path, ...$subPaths);
+        return self::joinPath($basePath, ...$subPaths);
     }
 
     /**
-     * @param string $path
+     * @param string $basePath
      * @param string ...$subPaths
      *
      * @return string
      */
-    public static function joinPath(string $path, string ...$subPaths): string
+    public static function joinPath(string $basePath, string ...$subPaths): string
     {
-        $subPaths = array_filter($subPaths, 'strlen');
+        $subPaths = array_filter(array_map(static function ($path) {
+            return trim($path, '/\\ ');
+        }, $subPaths), 'strlen');
+
         if (!$subPaths) {
-            return $path;
+            return $basePath;
         }
 
-        return $path . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $subPaths);
+        return $basePath . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $subPaths);
     }
 
     /**
@@ -153,6 +160,26 @@ public static function clearPharMark(string $path): string
         return $path;
     }
 
+    /**
+     * @param string $filepath
+     */
+    public static function assertIsFile(string $filepath): void
+    {
+        if (is_file($filepath)) {
+            throw new InvalidArgumentException("No such file: $filepath");
+        }
+    }
+
+    /**
+     * @param string $dirPath
+     */
+    public static function assertIsDir(string $dirPath): void
+    {
+        if (is_dir($dirPath)) {
+            throw new InvalidArgumentException("No such directory: $dirPath");
+        }
+    }
+
     /**
      * 检查文件/夹/链接是否存在
      *