fix 修改DirectoryHelper::getFileTree,弃用glob

kakuilan · Oct 15, 2020 · 157e816 · 157e816
1 parent 8a8a65b
commit 157e816
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/src/Helpers/DirectoryHelper.php b/src/Helpers/DirectoryHelper.php
@@ -46,26 +46,30 @@ public static function mkdirDeep(string $dir, int $mode = 0766): bool {
      * @return array
      */
     public static function getFileTree(string $path, string $type = 'all', bool $recursive = true): array {
-        $path = rtrim($path, DIRECTORY_SEPARATOR);
-        $tree = [];
-        // '{.,*}*' 相当于 '.*'(搜索.开头的隐藏文件)和'*'(搜索正常文件)
-        foreach (glob($path . '/{.,*}*', (defined(GLOB_BRACE) ? GLOB_BRACE : 1024)) as $single) {
-            if (is_dir($single)) {
-                $file = str_replace($path . '/', '', $single);
-                if ($file == '.' || $file == '..') {
-                    continue;
-                }
+        $typeArr = ['all', 'dir', 'file'];
+        $path    = rtrim($path, DIRECTORY_SEPARATOR);
+        $tree    = [];
 
-                if ($type != 'file') {
-                    array_push($tree, $single);
-                }
+        if (!in_array($type, $typeArr)) {
+            $type = 'all';
+        }
 
-                if ($recursive) {
-                    $tree = array_merge($tree, self::getFileTree($single, $type, $recursive));
+        if (is_dir($path)) {
+            $dir      = new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS);
+            $iterator = new RecursiveIteratorIterator($dir, RecursiveIteratorIterator::SELF_FIRST);
+
+            foreach ($iterator as $single => $file) {
+                $fpath = $file->getRealPath();
+                if ($file->isDir()) {
+                    if ($type != 'file') {
+                        array_push($tree, $fpath);
+                    }
+                } elseif ($type != 'dir') {
+                    array_push($tree, $fpath);
                 }
-            } elseif ($type != 'dir') {
-                array_push($tree, $single);
             }
+        } elseif (is_file($path) && $type != 'dir') {
+            array_push($tree, $path);
         }
 
         return $tree;
@@ -215,7 +219,7 @@ public static function clearDir(string $path): bool {
             @rmdir($dir);
         }
 
-        unset($objects, $object, $dirs);
+        unset($dir, $iterator, $dirs);
         return true;
     }