Merge pull request #7361 from kenjis/fix-Cache-FileHandler-error

kenjis · web-flow · commit 3bbe1daed6e1 · 2023-03-22T17:38:28.000+09:00
fix: Cache FileHandler error when there is a folder in cache dir
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
@@ -346,7 +346,7 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true,
             while (false !== ($file = readdir($fp))) {
                 if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
                     $this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
-                } elseif ($file[0] !== '.') {
+                } elseif (! is_dir($sourceDir . $file) && $file[0] !== '.') {
                     $_filedata[$file]                  = $this->getFileInfo($sourceDir . $file);
                     $_filedata[$file]['relative_path'] = $relativePath;
                 }

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true,`
`346`	`346`	`while (false !== ($file = readdir($fp))) {`
`347`	`347`	`if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {`
`348`	`348`	`$this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);`
`349`		`- } elseif ($file[0] !== '.') {`
	`349`	`+ } elseif (! is_dir($sourceDir . $file) && $file[0] !== '.') {`
`350`	`350`	`$_filedata[$file] = $this->getFileInfo($sourceDir . $file);`
`351`	`351`	`$_filedata[$file]['relative_path'] = $relativePath;`
`352`	`352`	`}`