Skip to content

fix deep list contents not returning directories #16

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 2 commits into from
Aug 12, 2025
Merged

fix deep list contents not returning directories #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dd7e65
fix deep list contents not returning directories
Aug 8, 2025
092a280
fix phpstan on php 8.1
Aug 8, 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
15 changes: 9 additions & 6 deletions src/AzureBlobStorageAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,20 @@ public function listContents(string $path, bool $deep): iterable
{
try {
$prefix = $this->prefixer->prefixDirectoryPath($path);
$directories = [$prefix];

if ($deep) {
foreach ($this->containerClient->getBlobs($prefix) as $item) {
yield $this->normalizeBlob($this->prefixer->stripPrefix($item->name), $item->properties);
}
} else {
foreach ($this->containerClient->getBlobsByHierarchy($prefix) as $item) {
while (!empty($directories)) {
$currentPrefix = array_shift($directories);

foreach ($this->containerClient->getBlobsByHierarchy($currentPrefix) as $item) {
if ($item instanceof Blob) {
yield $this->normalizeBlob($this->prefixer->stripPrefix($item->name), $item->properties);
} else {
yield new DirectoryAttributes($this->prefixer->stripPrefix($item->name));

if ($deep) {
$directories[] = $item->name;
}
}
}
}
Expand Down
24 changes: 24 additions & 0 deletions tests/AzureBlobStorageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,28 @@ public function setting_visibility_causes_errors(): void

$adapter->setVisibility('some-file.md', 'public');
}

#[Test]
public function listing_contents_deep(): void
{
$this->runScenario(function () {
$adapter = $this->adapter();

$adapter->write('dir1/file1.txt', 'content1', new Config());
$adapter->write('dir1/dir2/file2.txt', 'content2', new Config());
$adapter->write('dir1/dir2/dir3/file3.txt', 'content3', new Config());
/** @phpstan-ignore-next-line */
$contents = iterator_to_array($adapter->listContents('', true));

$this->assertCount(6, $contents); // 3 files + 3 directories

$paths = array_map(fn($item) => $item->path(), $contents);
$this->assertContains('dir1', $paths);
$this->assertContains('dir1/file1.txt', $paths);
$this->assertContains('dir1/dir2', $paths);
$this->assertContains('dir1/dir2/file2.txt', $paths);
$this->assertContains('dir1/dir2/dir3', $paths);
$this->assertContains('dir1/dir2/dir3/file3.txt', $paths);
});
}
}