👔 up: update some helper methods and add more useful method for FTB

Author: inhere

README.md

@@ -22,9 +22,7 @@ Some useful file system util for php
 composer require toolkit/fsutil
 ```
 
-## Usage
-
-### File Finder
+## File Finder
 
 ```php
 use Toolkit\FsUtil\Extra\FileFinder;
@@ -44,10 +42,14 @@ foreach ($finder as $file) {
 }
 ```
 
-### File Tree Builder
+## File Tree Builder
 
 `FileTreeBuilder` - can be quickly create dirs and files, copy dir and files.
 
+- can use path var in `dir()`, `copy()` ... methods. eg: `copy('{baseDir}/to/file', '{workdir}/dst/file')`
+
+Quick start:
+
 ```php
 use Toolkit\FsUtil\Extra\FileTreeBuilder;
 
@@ -78,7 +80,16 @@ Will create file tree like:
  |-- new-file1.md
 ```
 
-### Modify Watcher
+### path vars
+
+- `tplDir` The template dir path
+- `baseDir` base workdir path, only init on first set workdir.
+- `current,workdir` current workdir path.
+- And all simple type var in `tplVars`.
+
+Usage in path string: `{baseDir}/file`
+
+## Modify Watcher
 
 ```php
 use Toolkit\FsUtil\Extra\ModifyWatcher;

composer.json

@@ -18,7 +18,7 @@
     }
   ],
   "require": {
-    "php": ">=8.0.1",
+    "php": ">=8.1.1",
     "toolkit/stdlib": "^2.0"
   },
   "autoload": {

src/Directory.php

@@ -286,11 +286,11 @@ public static function mkSubDirs(string $parentDir, array $subDirs, int $mode =
     public static function copy(string $oldDir, string $newDir, array $options = []): bool
     {
         if (!is_dir($oldDir)) {
-            throw new FileNotFoundException("copy error：source dir does not exist！path: $oldDir");
+            throw new FileNotFoundException("Copy error: source dir does not exist！path: $oldDir");
         }
 
         self::doCopy($oldDir, $newDir, array_merge([
-            'skipExist' => true,
+            'skipExist' => true, // skip exist file
             'filterFn'  => null,
             'beforeFn'  => null,
             'afterFn'   => null,
@@ -310,7 +310,7 @@ private static function doCopy(string $oldDir, string $newDir, array $options):
     {
         self::create($newDir);
         $beforeFn = $options['beforeFn'];
-        $filterFn = $options['filterFn'];
+        $filterFn = $options['filterFn']; // filter file or dir.
 
         // use '{,.}*' match hidden files
         foreach (glob($oldDir . '/{,.}*', GLOB_BRACE) as $old) {
@@ -319,15 +319,14 @@ private static function doCopy(string $oldDir, string $newDir, array $options):
                 continue;
             }
 
-            $new = self::joinPath($newDir, $name);
-
-            if (is_dir($old)) {
-                self::doCopy($old, $new, $options);
+            // return false to skip copy
+            if ($filterFn && !$filterFn($old)) {
                 continue;
             }
 
-            // return false to skip copy
-            if ($filterFn && !$filterFn($old)) {
+            $new = self::joinPath($newDir, $name);
+            if (is_dir($old)) {
+                self::doCopy($old, $new, $options);
                 continue;
             }
 
@@ -361,7 +360,6 @@ private static function doCopy(string $oldDir, string $newDir, array $options):
     public static function delete(string $path, bool $delSelf = true): bool
     {
         $dirPath = self::pathFormat($path);
-
         if (is_file($dirPath)) {
             return unlink($dirPath);
         }