[Filesystem] symlink use RealPath instead LinkTarget

aitboudad · fabpot · commit a8b8d33e9425 · 2014-12-12T08:08:37.000+01:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -405,7 +405,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
                 }
             } else {
                 if (is_link($file)) {
-                    $this->symlink($file->getLinkTarget(), $target);
+                    $this->symlink($file->getRealPath(), $target);
                 } elseif (is_dir($file)) {
                     $this->mkdir($target);
                 } elseif (is_file($file)) {
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -899,6 +899,31 @@ public function testMirrorCopiesLinkedDirectoryContents()
         $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
     }
 
+    public function testMirrorCopiesRelativeLinkedContents()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+
+        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
+        $oldPath = getcwd();
+
+        mkdir($sourcePath.'nested/', 0777, true);
+        file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
+        // Note: Create relative symlink
+        chdir($sourcePath);
+        symlink('nested', 'link1');
+
+        chdir($oldPath);
+
+        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertTrue(is_dir($targetPath));
+        $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.DIRECTORY_SEPARATOR.'link1/file1.txt');
+        $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
+        $this->assertEquals($sourcePath.'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
+    }
+
     /**
      * @dataProvider providePathsForIsAbsolutePath
      */

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`405`	`405`	`}`
`406`	`406`	`} else {`
`407`	`407`	`if (is_link($file)) {`
`408`		`- $this->symlink($file->getLinkTarget(), $target);`
	`408`	`+ $this->symlink($file->getRealPath(), $target);`
`409`	`409`	`} elseif (is_dir($file)) {`
`410`	`410`	`$this->mkdir($target);`
`411`	`411`	`} elseif (is_file($file)) {`