Minor changes

This commit is contained in:
Visman 2023-10-14 22:31:33 +07:00
parent 0cf80df852
commit 3891d8fced
2 changed files with 8 additions and 4 deletions

View file

@ -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;

View file

@ -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 = [];