瀏覽代碼

Minor changes

Visman 1 年之前
父節點
當前提交
3891d8fced
共有 2 個文件被更改,包括 8 次插入4 次删除
  1. 4 2
      app/Core/Cache/FileCache.php
  2. 4 2
      app/Core/LogViewer.php

+ 4 - 2
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;
 

+ 4 - 2
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   = [];