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

merged branch jonathaningram/patch-1 (PR #2466)

Browse Source 
Commits
-------

6343bef [HttpKernel] Updated mirror method to check for symlinks before dirs and files

Discussion
----------

[HttpKernel] Updated mirror method to check for symlinks before dirs and files

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #2436
This commit is contained in:
Fabien Potencier 2011-10-25 11:05:13 +02:00
commit 68eb068fd8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/HttpKernel/Util/Filesystem.php
View File

@ -204,12 +204,12 @@ class Filesystem
foreach ($iterator as $file) {
$target = $targetDir.'/'.str_replace($originDir.DIRECTORY_SEPARATOR, '', $file->getPathname());
if (is_dir($file)) {
if (is_link($file)) {
$this->symlink($file, $target);
} else if (is_dir($file)) {
$this->mkdir($target);
} else if (is_file($file) || ($copyOnWindows && is_link($file))) {
$this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
} else if (is_link($file)) {
$this->symlink($file, $target);
} else {
throw new \RuntimeException(sprintf('Unable to guess "%s" file type.', $file));
}