Sort the values to normalize between filesystems

hydephp · Dec 14, 2024 · be1d051 · be1d051
1 parent a4d4701
commit be1d051
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -218,6 +218,7 @@ public function findFiles(string $directory, string|false $matchExtension = fals
             $files->push(str_replace($directory.DIRECTORY_SEPARATOR, '', $file->getRealPath()));
         }
 
-        return $files;
+        // Sort files for consistent output
+        return $files->sort()->values();
     }
 }
diff --git a/packages/framework/tests/Unit/FilesystemFindFilesTest.php b/packages/framework/tests/Unit/FilesystemFindFilesTest.php
@@ -179,7 +179,7 @@ protected function assertSameArray(array $expected, string $directory, string|fa
         $files = (new Filesystem(Hyde::getInstance()))->findFiles($directory, $matchExtension, $recursive);
 
         // Compare sorted arrays because some filesystems may return files in a different order.
-        $this->assertSame(collect($expected)->sort()->values()->all(), $files->sort()->values()->all());
+        $this->assertSame(collect($expected)->sort()->values()->all(), $files->all());
     }
 
     protected function tearDown(): void