Merge pull request #6031 from kenjis/refactor-get_filenames-4th-param

kenjis · web-flow · commit f63e6e55edd7 · 2022-05-26T17:55:16.000+09:00
refactor: use get_filenames() 4th param
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -343,7 +343,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
                 continue;
             }
 
-            $tempFiles = get_filenames($fullPath, true);
+            $tempFiles = get_filenames($fullPath, true, false, false);
 
             if (! empty($tempFiles)) {
                 $files = array_merge($files, $tempFiles);
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -424,7 +424,7 @@ public function findNamespaceMigrations(string $namespace): array
         if (! empty($this->path)) {
             helper('filesystem');
             $dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
-            $files = get_filenames($dir, true);
+            $files = get_filenames($dir, true, false, false);
         } else {
             $files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
         }

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ public function listNamespaceFiles(string $prefix, string $path): array`
`343`	`343`	`continue;`
`344`	`344`	`}`
`345`	`345`
`346`		`- $tempFiles = get_filenames($fullPath, true);`
	`346`	`+ $tempFiles = get_filenames($fullPath, true, false, false);`
`347`	`347`
`348`	`348`	`if (! empty($tempFiles)) {`
`349`	`349`	`$files = array_merge($files, $tempFiles);`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ public function findNamespaceMigrations(string $namespace): array`
`424`	`424`	`if (! empty($this->path)) {`
`425`	`425`	`helper('filesystem');`
`426`	`426`	`$dir = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';`
`427`		`- $files = get_filenames($dir, true);`
	`427`	`+ $files = get_filenames($dir, true, false, false);`
`428`	`428`	`} else {`
`429`	`429`	`$files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');`
`430`	`430`	`}`