Ensure asset container contents folder check finishes with / (#356)

* Ensure folder check finishes with / * Test coverage * Better test name
statamic · Sep 26, 2024 · f0c69a3 · f0c69a3
1 parent c58b1cf
commit f0c69a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Assets/AssetContainerContents.php b/src/Assets/AssetContainerContents.php
@@ -71,7 +71,7 @@ public function filteredDirectoriesIn($folder, $recursive)
 
         return $this->directories()
             ->filter(function ($dir) use ($folder) {
-                if ($folder && ! Str::startsWith($dir['path'], $folder)) {
+                if ($folder && ! Str::startsWith($dir['path'], Str::finish($folder, '/'))) {
                     return false;
                 }
 

diff --git a/tests/Assets/AssetContainerContentsTest.php b/tests/Assets/AssetContainerContentsTest.php
@@ -84,4 +84,18 @@ public function it_creates_parent_folders_where_they_dont_exist()
 
         $this->assertCount(3, $container->contents()->filteredDirectoriesIn('', true));
     }
+
+    #[Test]
+    public function it_doesnt_nest_folders_that_start_with_the_same_name()
+    {
+        $container = tap(AssetContainer::make('test')->disk('test'))->save();
+        $container->makeAsset('one/file.txt')->upload(UploadedFile::fake()->create('one.txt'));
+        $container->makeAsset('one-two/file.txt')->upload(UploadedFile::fake()->create('one.txt'));
+        $container->makeAsset('one/two/file.txt')->upload(UploadedFile::fake()->create('one.txt'));
+
+        $filtered = $container->contents()->filteredDirectoriesIn('one/', true);
+
+        $this->assertCount(1, $filtered);
+        $this->assertSame($filtered->keys()->all(), ['one/two']);
+    }
 }