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

[FrameworkBundle] fixed Filesystem when used within a phar archive

Browse Source
This commit is contained in:
Fabien Potencier 2010-09-23 18:52:18 +02:00
parent a01a74ef79
commit d62befd67b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Bundle/FrameworkBundle/Util/Filesystem.php
View File

@ -37,10 +37,7 @@ class Filesystem
$options['override'] = false;
}
// we create target_dir if needed
if (!is_dir(dirname($targetFile))) {
$this->mkdirs(dirname($targetFile));
}
$this->mkdirs(dirname($targetFile));
$mostRecent = false;
if (file_exists($targetFile)) {
@ -206,8 +203,16 @@ class Filesystem
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST);
}
if ('/' === substr($targetDir, -1) || '\\' === substr($targetDir, -1)) {
$targetDir = substr($targetDir, 0, -1);
}
if ('/' === substr($originDir, -1) || '\\' === substr($originDir, -1)) {
$originDir = substr($originDir, 0, -1);
}
foreach ($iterator as $file) {
$target = $targetDir.DIRECTORY_SEPARATOR.str_replace(realpath($originDir), '', $file->getRealPath());
$target = $targetDir.'/'.str_replace($originDir.'/', '', $file->getPathname());
if (is_dir($file)) {
$this->mkdirs($target);