do not duplicate directory separators

symfony · Jul 31, 2024 · 4f3b0f7 · 4f3b0f7
1 parent 0724c51
commit 4f3b0f7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/Iterator/RecursiveDirectoryIterator.php b/Iterator/RecursiveDirectoryIterator.php
@@ -70,8 +70,9 @@ public function current()
             $subPathname .= $this->directorySeparator;
         }
         $subPathname .= $this->getFilename();
+        $basePath = $this->rootPath;
 
-        if ('/' !== $basePath = $this->rootPath) {
+        if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator)) {
             $basePath .= $this->directorySeparator;
         }
 

diff --git a/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/Tests/Iterator/RecursiveDirectoryIteratorTest.php
@@ -55,4 +55,31 @@ public function testSeekOnFtp()
 
         $this->assertEquals($contains, $actual);
     }
+
+    public function testTrailingDirectorySeparatorIsStripped()
+    {
+        $fixturesDirectory = __DIR__ . '/../Fixtures/';
+        $actual = [];
+
+        foreach (new RecursiveDirectoryIterator($fixturesDirectory, RecursiveDirectoryIterator::SKIP_DOTS) as $file) {
+            $actual[] = $file->getPathname();
+        }
+
+        sort($actual);
+
+        $expected = [
+            $fixturesDirectory.'.dot',
+            $fixturesDirectory.'A',
+            $fixturesDirectory.'copy',
+            $fixturesDirectory.'dolor.txt',
+            $fixturesDirectory.'gitignore',
+            $fixturesDirectory.'ipsum.txt',
+            $fixturesDirectory.'lorem.txt',
+            $fixturesDirectory.'one',
+            $fixturesDirectory.'r+e.gex[c]a(r)s',
+            $fixturesDirectory.'with space',
+        ];
+
+        $this->assertEquals($expected, $actual);
+    }
 }