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

Update ToolsExtend.php

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

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

@ -101,20 +101,20 @@ class ToolsExtend
* @param string $path 要扫描的目录路径 * @param string $path 要扫描的目录路径
* @param ?Closure $filterFile 用于过滤文件的闭包 * @param ?Closure $filterFile 用于过滤文件的闭包
* @param ?Closure $filterPath 用于过滤目录的闭包 * @param ?Closure $filterPath 用于过滤目录的闭包
* @param boolean $shortPath 是否返回相对于给定路径的短路径 * @param boolean $short 是否返回相对于给定路径的短路径
* @param ?integer $depth 当前递归深度，null 表示无限制深度 * @param ?integer $depth 当前递归深度，null 表示无限制深度
* @return array 包含文件路径的数组 * @return array 包含文件路径的数组
*/ */
public static function findFilesArray(string $path, ?Closure $filterFile = null, ?Closure $filterPath = null, bool $shortPath = 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 = []; $files = [];
if (is_file($path)) { if (is_file($path)) {
if (($file = new SplFileInfo($path)) && ($filterFile === null || $filterFile($file))) { if (($file = new SplFileInfo($path)) && ($filterFile === null || $filterFile($file))) {
$files[] = $shortPath ? $file->getBasename() : $file->getPathname(); $files[] = $short ? $file->getBasename() : $file->getPathname();
} }
} elseif (is_dir($path)) { } elseif (is_dir($path)) {
foreach (static::findFilesYield($path, $filterFile, $filterPath, $depth) as $file) { foreach (static::findFilesYield($path, $filterFile, $filterPath, $depth) as $file) {
$files[] = $shortPath ? substr($file->getRealPath(), strlen($path) + 1) : $file->getRealPath(); $files[] = $short ? substr($file->getRealPath(), strlen($path) + 1) : $file->getRealPath();
} }
} }
return $files; return $files;