bug #57895 [Finder] do not duplicate directory separators (xabbuh)

fabpot · fabpot · commit 92a4b72eb695 · 2024-08-03T12:01:43.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Finder] do not duplicate directory separators | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #54352 | License | MIT Commits ------- a449a85 do not duplicate directory separators
diff --git 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
@@ -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);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,8 +70,9 @@ public function current()`
`70`	`70`	`$subPathname .= $this->directorySeparator;`
`71`	`71`	`}`
`72`	`72`	`$subPathname .= $this->getFilename();`
	`73`	`+ $basePath = $this->rootPath;`
`73`	`74`
`74`		`- if ('/' !== $basePath = $this->rootPath) {`
	`75`	`+ if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator)) {`
`75`	`76`	`$basePath .= $this->directorySeparator;`
`76`	`77`	`}`
`77`	`78`