Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions src/Illuminate/Filesystem/Filesystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,22 @@ public function directories($directory)
return $directories;
}

/**
* Get all the directories within a given directory (recursive).
*
* @return array
*/
public function allDirectories(string $directory): array
{
$directories = [];

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

return $directories;
}

/**
* Ensure a directory exists.
*
Expand Down
1 change: 1 addition & 0 deletions src/Illuminate/Support/Facades/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +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 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
15 changes: 15 additions & 0 deletions tests/Filesystem/FilesystemTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,21 @@ public function testDirectoriesFindsDirectories()
$this->assertContains(self::$tempDir.DIRECTORY_SEPARATOR.'music', $directories);
}

public function testAllDirectoriesFindsDirectories()
{
mkdir(self::$tempDir.'/film');
mkdir(self::$tempDir.'/music');
mkdir(self::$tempDir.'/music/rock');
mkdir(self::$tempDir.'/music/blues');

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

$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()
{
$files = new Filesystem;
Expand Down