Skip to content

[12.x] add allDirectories() method to Filesytem #57565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 29, 2025
Merged

[12.x] add allDirectories() method to Filesytem #57565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddf3cdf
add `allDirectories()` method to `Filesytem`
browner12 Oct 28, 2025
377fad9
minor formatting
browner12 Oct 28, 2025
b231609
return string path names instead of `SplFileInfo`s
browner12 Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/Illuminate/Filesystem/Filesystem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,14 +625,17 @@ public function directories($directory)
/**
* Get all the directories within a given directory (recursive).
*
* @return \Symfony\Component\Finder\SplFileInfo[]
* @return array
*/
public function allDirectories(string $directory): array
{
return iterator_to_array(
Finder::create()->in($directory)->directories()->sortByName(),
false,
);
$directories = [];

foreach (Finder::create()->in($directory)->directories()->sortByName() as $dir) {
$directories[] = $dir->getPathname();
}

return $directories;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/Facades/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @method static \Symfony\Component\Finder\SplFileInfo[] files(string $directory, bool $hidden = false)
* @method static \Symfony\Component\Finder\SplFileInfo[] allFiles(string $directory, bool $hidden = false)
* @method static array directories(string $directory)
* @method static \Symfony\Component\Finder\SplFileInfo[] allDirectories(string $directory)
* @method static array allDirectories(string $directory)
* @method static void ensureDirectoryExists(string $path, int $mode = 0755, bool $recursive = true)
* @method static bool makeDirectory(string $path, int $mode = 0755, bool $recursive = false, bool $force = false)
* @method static bool moveDirectory(string $from, string $to, bool $overwrite = false)
Expand Down
12 changes: 4 additions & 8 deletions tests/Filesystem/FilesystemTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,14 +534,10 @@ public function testAllDirectoriesFindsDirectories()

$directories = (new Filesystem)->allDirectories(self::$tempDir);

$this->assertContainsOnlyInstancesOf(SplFileInfo::class, $directories);

$mappedDirectories = array_map(fn ($item) => $item->getPathname(), $directories);

$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'film', $mappedDirectories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music', $mappedDirectories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music'.DIRECTORY_SEPARATOR.'rock', $mappedDirectories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music'.DIRECTORY_SEPARATOR.'blues', $mappedDirectories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'film', $directories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music', $directories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music'.DIRECTORY_SEPARATOR.'rock', $directories);
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music'.DIRECTORY_SEPARATOR.'blues', $directories);
}

public function testMakeDirectory()
Expand Down