diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
index 886dae588530b..a1225fceeb120 100644
--- a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
+++ b/src/Symfony/Component/Finder/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/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
index 49144505f7883..353a919b13414 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
+++ b/src/Symfony/Component/Finder/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);
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy