blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2026-06-12 14:28:09 +08:00
Code Issues Projects Releases Wiki Activity

Update ToolsExtend.php

Browse Source
This commit is contained in:
邹景立 2024-09-10 09:47:48 +08:00
parent 1b78f1bd28
commit 752680a7cc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/think-library/src/extend/ToolsExtend.php
View File

@ -107,14 +107,14 @@ class ToolsExtend
*/ */
public static function findFilesArray(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $short = true, ?int $depth = null): array public static function findFilesArray(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $short = true, ?int $depth = null): array
{ {
$files = []; [$info, $files] = [new SplFileInfo($path), []];
if (is_file($path)) { if ($info->isFile()) {
if (($file = new SplFileInfo($path)) && ($filterFile === null || $filterFile($file))) { if ($filterFile === null || $filterFile($info)) {
$files[] = $short ? $file->getBasename() : $file->getPathname(); $files[] = $short ? $info->getBasename() : $info->getPathname();
} }
} elseif (is_dir($path)) { } elseif ($info->isDir()) {
foreach (static::findFilesYield($path, $filterFile, $filterPath, $depth) as $file) { foreach (static::findFilesYield($info->getPathname(), $filterFile, $filterPath, $depth) as $file) {
$files[] = $short ? substr($file->getRealPath(), strlen($path) + 1) : $file->getRealPath(); $files[] = $short ? substr($file->getRealPath(), strlen($info->getPathname()) + 1) : $file->getRealPath();
} }
} }
return $files; return $files;