Unify file iteration code

Usbac · Jan 2, 2025 · 40b0fed · 40b0fed
1 parent 2a79a2a
commit 40b0fed
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/app/bootstrap/routes.php b/app/bootstrap/routes.php
@@ -175,7 +175,7 @@
         $absolute_theme_dir = Helper::getPath(Kernel::config('views') . "/$theme_dir");
         $view_files = [];
 
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($absolute_theme_dir)) as $file) {
+        foreach (Helper::getFileIterator($absolute_theme_dir) as $file) {
             if ($file->isFile()) {
                 $view_files[] = mb_substr($file->getPathname(), mb_strlen($absolute_theme_dir) + 1);
             }
@@ -950,7 +950,7 @@
         $zip = new ZipArchive();
         $zip->open($file_path, ZipArchive::CREATE | ZipArchive::OVERWRITE);
 
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($absolute_path)) as $file) {
+        foreach (\Aurora\Core\Helper::getFileIterator($absolute_path) as $file) {
             $real_path = $file->getRealPath();
             $relative_path = mb_substr($real_path, mb_strlen($absolute_path) + 1);
 

diff --git a/bin/BaseCommand.php b/bin/BaseCommand.php
@@ -22,7 +22,7 @@ protected function getThemeFiles()
         $absolute_theme_dir = \Aurora\Core\Helper::getPath($this->config['views'] . '/themes/' . $this->settings['theme']);
         $view_files = [ '' ];
 
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($absolute_theme_dir)) as $file) {
+        foreach (\Aurora\Core\Helper::getFileIterator($absolute_theme_dir) as $file) {
             if ($file->isFile()) {
                 $view_files[] = mb_substr($file->getPathname(), mb_strlen($absolute_theme_dir) + 1);
             }

diff --git a/core/Helper.php b/core/Helper.php
@@ -86,8 +86,7 @@ public static function copy(string $source, string $destination, int $permission
             mkdir($destination, $permission);
         }
 
-        $dir_iterator = new \RecursiveDirectoryIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS);
-        $iterator = new \RecursiveIteratorIterator($dir_iterator, \RecursiveIteratorIterator::SELF_FIRST);
+        $iterator = self::getFileIterator($source, \RecursiveDirectoryIterator::SKIP_DOTS, \RecursiveIteratorIterator::SELF_FIRST);
         foreach ($iterator as $item) {
             $new_path = "$destination/" . call_user_func([ $iterator, 'getSubPathname' ]);
             $res = $item->isDir()
@@ -102,6 +101,21 @@ public static function copy(string $source, string $destination, int $permission
         return true;
     }
 
+    /**
+     * Returns a recursive file iterator
+     * @param string $path the path
+     * @param [int] $flags the flags
+     * @param [int] $mode the mode
+     * @return \RecursiveIteratorIterator a recursive file iterator
+     */
+    public static function getFileIterator(string $path,
+        int $flags = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO,
+        int $mode = \RecursiveIteratorIterator::LEAVES_ONLY,
+    ): \RecursiveIteratorIterator
+    {
+        return new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path, $flags), $mode);
+    }
+
     /**
      * Returns the given byte size in a human readable format
      * @param float $bytes the size in bytes