bug #35693 [Finder] Fix unix root dir issue (chr-hertel)

fabpot · fabpot · commit f6f6a600a883 · 2020-02-14T08:34:28.000+01:00
This PR was submitted for the 4.4 branch but it was merged into the 3.4 branch instead. Discussion ---------- [Finder] Fix unix root dir issue | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35683 | License | MIT not quite sure about this one 🤔 Commits ------- 9e43103 fix unix root dir issue
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
@@ -744,6 +744,10 @@ private function searchInDirectory($dir)
      */
     private function normalizeDir($dir)
     {
+        if ('/' === $dir) {
+            return $dir;
+        }
+
         $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
 
         if (preg_match('#^(ssh2\.)?s?ftp://#', $dir)) {
diff --git a/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php b/src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
@@ -74,7 +74,11 @@ public function current()
         }
         $subPathname .= $this->getFilename();
 
-        return new SplFileInfo($this->rootPath.$this->directorySeparator.$subPathname, $this->subPath, $subPathname);
+        if ('/' !== $basePath = $this->rootPath) {
+            $basePath .= $this->directorySeparator;
+        }
+
+        return new SplFileInfo($basePath.$subPathname, $this->subPath, $subPathname);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,11 @@ public function current()`
`74`	`74`	`}`
`75`	`75`	`$subPathname .= $this->getFilename();`
`76`	`76`
`77`		`- return new SplFileInfo($this->rootPath.$this->directorySeparator.$subPathname, $this->subPath, $subPathname);`
	`77`	`+ if ('/' !== $basePath = $this->rootPath) {`
	`78`	`+ $basePath .= $this->directorySeparator;`
	`79`	`+ }`
	`80`	`+`
	`81`	`+ return new SplFileInfo($basePath.$subPathname, $this->subPath, $subPathname);`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`/**`