chore: add more fs util method, add more tests

Author: inhere

src/Directory.php

@@ -87,7 +87,6 @@ public static function getDirs(string $path, bool $loop = false, $parent = null,
         }
 
         $len = strlen($path);
-
         foreach (glob($path . '*') as $v) {
             if (is_dir($v)) {
                 $relatePath = substr($v, $len);
@@ -205,9 +204,8 @@ public static function getFilesInfo(string $path, $ext = null, bool $recursive =
             throw new FileNotFoundException("directory not exists! DIR: $path");
         }
 
-        $ext = is_array($ext) ? implode('|', $ext) : trim($ext);
-
         static $id = 0;
+        $ext = is_array($ext) ? implode('|', $ext) : trim($ext);
 
         // glob()寻找与模式匹配的文件路径
         foreach (glob($path . '*') as $file) {
@@ -235,11 +233,32 @@ public static function getFilesInfo(string $path, $ext = null, bool $recursive =
      *
      * @return bool
      */
-    public static function create(string $path, int $mode = 0775, bool $recursive = true): bool
+    public static function create(string $path, int $mode = 0665, bool $recursive = true): bool
     {
         return (is_dir($path) || !(!@mkdir($path, $mode, $recursive) && !is_dir($path))) && is_writable($path);
     }
 
+    /**
+     * quick make sub-dirs in the given parent dir.
+     *
+     * @param string $parentDir
+     * @param array $subDirs
+     * @param int $mode
+     *
+     * @return bool
+     */
+    public static function mkSubDirs(string $parentDir, array $subDirs, int $mode = 0665): bool
+    {
+        if (!self::create($parentDir)) {
+            return false;
+        }
+
+        foreach ($subDirs as $subPath) {
+
+        }
+        return true;
+    }
+
     /**
      * 复制目录内容
      *
@@ -258,7 +277,6 @@ public static function copy(string $oldDir, string $newDir): bool
         }
 
         self::create($newDir);
-
         foreach (glob($oldDir . '*') as $v) {
             $newFile = $newDir . basename($v);//文件
 

src/FileSystem.php

@@ -16,15 +16,18 @@
 use Toolkit\FsUtil\Exception\FileNotFoundException;
 use Toolkit\FsUtil\Traits\FileSystemFuncTrait;
 use Toolkit\Stdlib\OS;
+use function array_filter;
 use function count;
 use function file_exists;
+use function implode;
 use function is_array;
 use function is_string;
 use function preg_match;
 use function str_ireplace;
 use function strlen;
 use function strpos;
 use function substr;
+use const DIRECTORY_SEPARATOR;
 
 /**
  * Class FileSystem
@@ -46,7 +49,7 @@ public static function isAbsPath(string $path): bool
             return false;
         }
 
-        if (strpos($path, '/') === 0 ||  // linux/mac
+        if (str_starts_with($path, '/') ||  // linux/mac
             1 === preg_match('#^[a-z]:[\/|\\\].+#i', $path) // windows
         ) {
             return true;
@@ -71,6 +74,16 @@ public static function isAbsolutePath(string $file): bool
             null !== parse_url($file, PHP_URL_SCHEME);
     }
 
+    /**
+     * @param string $path
+     *
+     * @return string
+     */
+    public static function getAbsPath(string $path): string
+    {
+        return self::realpath($path);
+    }
+
     /**
      * 转换为标准的路径结构
      *
@@ -82,7 +95,34 @@ public static function pathFormat(string $dirName): string
     {
         $dirName = (string)str_ireplace('\\', '/', trim($dirName));
 
-        return substr($dirName, -1) === '/' ? $dirName : $dirName . '/';
+        return str_ends_with($dirName, '/') ? $dirName : $dirName . '/';
+    }
+
+    /**
+     * @param string $path
+     * @param string ...$subPaths
+     *
+     * @return string
+     */
+    public static function join(string $path, string ...$subPaths): string
+    {
+        return self::joinPath($path, ...$subPaths);
+    }
+
+    /**
+     * @param string $path
+     * @param string ...$subPaths
+     *
+     * @return string
+     */
+    public static function joinPath(string $path, string ...$subPaths): string
+    {
+        $subPaths = array_filter($subPaths, 'strlen');
+        if (!$subPaths) {
+            return $path;
+        }
+
+        return $path . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $subPaths);
     }
 
     /**
@@ -102,8 +142,8 @@ public static function clearPharPath(string $path): string
      */
     public static function clearPharMark(string $path): string
     {
-        if (strpos($path, 'phar://') === 0) {
-            $path = (string)substr($path, 7);
+        if (str_starts_with($path, 'phar://')) {
+            $path = substr($path, 7);
 
             if (strpos($path, '.phar') > 0) {
                 return preg_replace('/\/[\w\.-]+\.phar/', '', $path);

src/Traits/FileSystemFuncTrait.php

@@ -245,7 +245,7 @@ public static function realpath(string $path): string
             return '';
         }
 
-        // ~: is user home dir in *nix OS
+        // ~: is user home dir in OS
         if ($parts[0] === '~') {
             $parts[0] = OS::getUserHomeDir();
         }

test/FsTest.php

@@ -4,6 +4,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Toolkit\FsUtil\FS;
+use function strlen;
+use function vdump;
 
 /**
  * class FsTest
@@ -26,6 +28,30 @@ public function testIsAbsPath(): void
         }
     }
 
+    public function testBasicFsMethods(): void
+    {
+        $this->assertEquals('/ab', FS::join('/ab'));
+        $this->assertEquals('/ab/d', FS::join('/ab', '', 'd'));
+        $this->assertEquals('/ab/d/e', FS::join('/ab', 'd', 'e'));
+    }
+
+    public function testRealpath(): void
+    {
+        $rPaths = [];
+        $tests = [
+            '~',
+            '~/.kite',
+        ];
+        foreach ($tests as $path) {
+            $rPaths[$path] = $rPath = FS::realpath($path);
+            $this->assertTrue(strlen($rPath) > strlen($path));
+            $rPath = FS::getAbsPath($path);
+            $this->assertTrue(strlen($rPath) > strlen($path));
+        }
+
+        vdump($rPaths);
+    }
+
     public function testClearPharPath(): void
     {
         $tests = [