do not duplicate directory separators

xabbuh · xabbuh · commit 72d62d209c13 · 2024-08-05T11:37:16.000+02:00
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`