zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-23 08:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix FileSystemTest no perm

Browse Source
This commit is contained in:
sunxyw
2023-01-03 23:35:38 +08:00
parent 8f8002608e
commit 2d6896adde
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ZM/Store/FileSystem.php
View File

@@ -25,6 +25,11 @@ class FileSystem
logger()->warning(zm_internal_errcode('E00080') . '扫描目录失败，目录不存在'); logger()->warning(zm_internal_errcode('E00080') . '扫描目录失败，目录不存在');
return false; return false;
} }
// 检查目录是否可读
if (!is_readable($dir)) {
logger()->warning(zm_internal_errcode('E00080') . '扫描目录失败，目录不可读');
return false;
}
logger()->debug('扫描' . $dir); logger()->debug('扫描' . $dir);
// 套上 zm_dir // 套上 zm_dir
$scan_list = scandir($dir); $scan_list = scandir($dir);

2
tests/ZM/Store/FileSystemTest.php
View File

@@ -127,7 +127,7 @@ class FileSystemTest extends TestCase
$old_perm = $this->vfs->getPermissions(); $old_perm = $this->vfs->getPermissions();
$this->vfs->chmod(0000); $this->vfs->chmod(0000);
FileSystem::scanDirFiles($this->vfs->url()); FileSystem::scanDirFiles($this->vfs->url());
$this->assertLogged('warning', zm_internal_errcode('E00080') . '扫描目录失败，目录无法读取: ' . $this->vfs->url()); $this->assertLogged('warning', zm_internal_errcode('E00080') . '扫描目录失败，目录不可读');
$this->vfs->chmod($old_perm); $this->vfs->chmod($old_perm);
} }
} }