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

fabpot · fabpot · commit fababe11af14 · 2024-08-06T22:03:02.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 Looking at the [test failures on AppVeyor](https://ci.appveyor.com/project/fabpot/symfony/builds/50345724#L975) it seems that #57895 didn't (at least not fully) fix #54352. Commits ------- 72d62d2 do not duplicate directory separators
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -72,7 +72,7 @@ public function current()
         $subPathname .= $this->getFilename();
         $basePath = $this->rootPath;
 
-        if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator)) {
+        if ('/' !== $basePath && !str_ends_with($basePath, $this->directorySeparator) && !str_ends_with($basePath, '/')) {
             $basePath .= $this->directorySeparator;
         }
 

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