Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[Filesystem] Prevented infiite loop on windows while calling mirror o…
…n symlink. Added test for mirroring symlinks.
  • Loading branch information
jakzal committed Apr 9, 2012
1 parent 127cff0 commit efad5d5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Symfony/Component/Filesystem/Filesystem.php
Expand Up @@ -229,12 +229,12 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
}

foreach ($iterator as $file) {
$target = $targetDir.'/'.str_replace($originDir.DIRECTORY_SEPARATOR, '', $file->getPathname());
$target = str_replace($originDir, $targetDir, $file->getPathname());

if (is_link($file)) {
$this->symlink($file, $target);
} elseif (is_dir($file)) {
if (is_dir($file)) {
$this->mkdir($target);
} elseif (!$copyOnWindows && is_link($file)) {
$this->symlink($file, $target);
} elseif (is_file($file) || ($copyOnWindows && is_link($file))) {
$this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
} else {
Expand Down
19 changes: 19 additions & 0 deletions src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
Expand Up @@ -483,6 +483,25 @@ public function testMirrorCopiesFilesAndDirectoriesRecursively()
$this->assertFileEquals($file2, $targetPath.'file2');
}

public function testMirrorCopiesLinks()
{
$this->markAsSkippeIfSymlinkIsMissing();

$sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;

mkdir($sourcePath);
file_put_contents($sourcePath.'file1', 'FILE1');
symlink($sourcePath.'file1', $sourcePath.'link1');

$targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;

$this->filesystem->mirror($sourcePath, $targetPath);

$this->assertTrue(is_dir($targetPath));
$this->assertFileEquals($sourcePath.'file1', $targetPath.DIRECTORY_SEPARATOR.'link1');
$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
}

/**
* @dataProvider providePathsForIsAbsolutePath
*/
Expand Down

0 comments on commit efad5d5

Please sign in to comment.