diff --git a/app/Core/Cache/FileCache.php b/app/Core/Cache/FileCache.php index 8f103463..7c3893ae 100644 --- a/app/Core/Cache/FileCache.php +++ b/app/Core/Cache/FileCache.php @@ -16,6 +16,7 @@ use Psr\SimpleCache\InvalidArgumentException; use DateInterval; use DateTime; use DateTimeZone; +use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; use RegexIterator; @@ -117,8 +118,9 @@ class FileCache implements CacheInterface */ public function clear(): bool { - $dir = new RecursiveDirectoryIterator($this->cacheDir, RecursiveDirectoryIterator::SKIP_DOTS); - $iterator = new RecursiveIteratorIterator($dir); + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($this->cacheDir, FilesystemIterator::SKIP_DOTS) + ); $files = new RegexIterator($iterator, '%\.(?:php|tmp)$%i', RegexIterator::MATCH); $result = true; diff --git a/app/Core/LogViewer.php b/app/Core/LogViewer.php index cc1f3af7..8ea92ba0 100644 --- a/app/Core/LogViewer.php +++ b/app/Core/LogViewer.php @@ -11,6 +11,7 @@ declare(strict_types=1); namespace ForkBB\Core; use Psr\SimpleCache\CacheInterface; +use FilesystemIterator; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; use RegexIterator; @@ -76,8 +77,9 @@ class LogViewer protected function getFileList(): array { - $dir = new RecursiveDirectoryIterator($this->dir, RecursiveDirectoryIterator::SKIP_DOTS); - $iterator = new RecursiveIteratorIterator($dir); + $iterator = new RecursiveIteratorIterator( + new RecursiveDirectoryIterator($this->dir, FilesystemIterator::SKIP_DOTS) + ); $files = new RegexIterator($iterator, $this->namePattern, RegexIterator::MATCH); $result = [];