fix: resolve race condition in get_dir_file_info

This adds a null check for get_file_info() to gracefully ignore files deleted mid-scan, fixing random test failures in the Commands component. Also includes a unit test for this behavior.

Author: gr8man

system/Helpers/filesystem_helper.php

@@ -85,10 +85,12 @@ function directory_mirror(string $originDir, string $targetDir, bool $overwrite
         $dirLen = strlen($originDir);
 
         /** @var SplFileInfo $file */
-        foreach (new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
-            RecursiveIteratorIterator::SELF_FIRST,
-        ) as $file) {
+        foreach (
+            new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::SELF_FIRST,
+            ) as $file
+        ) {
             $origin = $file->getPathname();
             $target = $targetDir . substr($origin, $dirLen);
 
@@ -159,10 +161,12 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false,
         $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         try {
-            foreach (new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
-                RecursiveIteratorIterator::CHILD_FIRST,
-            ) as $object) {
+            foreach (
+                new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
+                    RecursiveIteratorIterator::CHILD_FIRST,
+                ) as $object
+            ) {
                 $filename = $object->getFilename();
                 if (! $hidden && $filename[0] === '.') {
                     continue;
@@ -212,10 +216,12 @@ function get_filenames(
         $sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         try {
-            foreach (new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS),
-                RecursiveIteratorIterator::SELF_FIRST,
-            ) as $name => $object) {
+            foreach (
+                new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS | FilesystemIterator::FOLLOW_SYMLINKS),
+                    RecursiveIteratorIterator::SELF_FIRST,
+                ) as $name => $object
+            ) {
                 $basename = pathinfo($name, PATHINFO_BASENAME);
                 if (! $hidden && $basename[0] === '.') {
                     continue;
@@ -281,8 +287,10 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
                 if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
                     get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
                 } elseif ($file[0] !== '.') {
-                    $fileData[$file]                  = get_file_info($sourceDir . $file);
-                    $fileData[$file]['relative_path'] = $relativePath;
+                    if (($info = get_file_info($sourceDir . $file)) !== null) {
+                        $fileData[$file]                  = $info;
+                        $fileData[$file]['relative_path'] = $relativePath;
+                    }
                 }
             }
 
@@ -401,18 +409,18 @@ function symbolic_permissions(int $perms): string
 
         // Owner
         $symbolic .= ((($perms & 0x0100) !== 0) ? 'r' : '-')
-                . ((($perms & 0x0080) !== 0) ? 'w' : '-')
-                . ((($perms & 0x0040) !== 0) ? ((($perms & 0x0800) !== 0) ? 's' : 'x') : ((($perms & 0x0800) !== 0) ? 'S' : '-'));
+            . ((($perms & 0x0080) !== 0) ? 'w' : '-')
+            . ((($perms & 0x0040) !== 0) ? ((($perms & 0x0800) !== 0) ? 's' : 'x') : ((($perms & 0x0800) !== 0) ? 'S' : '-'));
 
         // Group
         $symbolic .= ((($perms & 0x0020) !== 0) ? 'r' : '-')
-                . ((($perms & 0x0010) !== 0) ? 'w' : '-')
-                . ((($perms & 0x0008) !== 0) ? ((($perms & 0x0400) !== 0) ? 's' : 'x') : ((($perms & 0x0400) !== 0) ? 'S' : '-'));
+            . ((($perms & 0x0010) !== 0) ? 'w' : '-')
+            . ((($perms & 0x0008) !== 0) ? ((($perms & 0x0400) !== 0) ? 's' : 'x') : ((($perms & 0x0400) !== 0) ? 'S' : '-'));
 
         // World
         $symbolic .= ((($perms & 0x0004) !== 0) ? 'r' : '-')
-                . ((($perms & 0x0002) !== 0) ? 'w' : '-')
-                . ((($perms & 0x0001) !== 0) ? ((($perms & 0x0200) !== 0) ? 't' : 'x') : ((($perms & 0x0200) !== 0) ? 'T' : '-'));
+            . ((($perms & 0x0002) !== 0) ? 'w' : '-')
+            . ((($perms & 0x0001) !== 0) ? ((($perms & 0x0200) !== 0) ? 't' : 'x') : ((($perms & 0x0200) !== 0) ? 'T' : '-'));
 
         return $symbolic;
     }

tests/system/Helpers/FilesystemHelperTest.php

@@ -477,6 +477,25 @@ public function testGetDirFileInfoFailure(): void
         $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
     }
 
+    public function testGetDirFileInfoIgnoresDirectoriesWhenTopLevelOnlyIsTrue(): void
+    {
+        $dir = WRITEPATH . 'test_get_dir_file_info';
+        mkdir($dir . '/subdir', 0777, true);
+        file_put_contents($dir . '/file.txt', 'test');
+
+        $result = get_dir_file_info($dir, true);
+
+        // Clean up
+        unlink($dir . '/file.txt');
+        rmdir($dir . '/subdir');
+        rmdir($dir);
+
+        // 'subdir' is a directory. When $topLevelOnly is true, get_dir_file_info passes it to get_file_info,
+        // which returns null because is_file() is false. The function should ignore it completely.
+        $this->assertArrayHasKey('file.txt', $result);
+        $this->assertArrayNotHasKey('subdir', $result);
+    }
+
     public function testGetFileInfo(): void
     {
         $file = SUPPORTPATH . 'Files/baker/banana.php';