diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix unix root dir issue

This commit is contained in:
Christopher Hertel 2020-02-12 22:21:47 +01:00 committed by Fabien Potencier
parent f20b36e3de
commit 9e431038b2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Finder/Finder.php
View File

@ -744,6 +744,10 @@ class Finder implements \IteratorAggregate, \Countable
*/
private function normalizeDir($dir)
{
if ('/' === $dir) {
return $dir;
}
$dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
if (preg_match('#^(ssh2\.)?s?ftp://#', $dir)) {

6
src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
View File

@ -74,7 +74,11 @@ class RecursiveDirectoryIterator extends \RecursiveDirectoryIterator
}
$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);
}
/**