do not duplicate directory separators

xabbuh · xabbuh · commit a04eae4fbb27 · 2024-07-31T14:33:50.000+02:00
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;
         }
 

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`