bug symfony#15121 fixed symfony#15118 [Filesystem] mirroring a symlink copies absolute file path (danepowell)

fabpot · fabpot · commit 07e1d25b6bed · 2015-10-06T17:23:29.000+02:00
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes symfony#15121). Discussion ---------- fixed symfony#15118 [Filesystem] mirroring a symlink copies absolute file path | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#15118 | License | MIT | Doc PR | This reverts the code change in a8b8d33 and adjusting the test case accordingly. Commits ------- a83d525 fixed symfony#15118 [Filesystem] mirroring a symlink copies absolute file path
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -402,7 +402,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
                 }
             } else {
                 if (is_link($file)) {
-                    $this->symlink($file->getRealPath(), $target);
+                    $this->symlink($file->getLinkTarget(), $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
@@ -906,7 +906,7 @@ public function testMirrorCopiesRelativeLinkedContents()
         $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'));
+        $this->assertEquals('nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`402`	`402`	`}`
`403`	`403`	`} else {`
`404`	`404`	`if (is_link($file)) {`
`405`		`- $this->symlink($file->getRealPath(), $target);`
	`405`	`+ $this->symlink($file->getLinkTarget(), $target);`
`406`	`406`	`} elseif (is_dir($file)) {`
`407`	`407`	`$this->mkdir($target);`
`408`	`408`	`} elseif (is_file($file)) {`
Original file line number	Diff line number	Diff line change
`@@ -906,7 +906,7 @@ public function testMirrorCopiesRelativeLinkedContents()`
`906`	`906`	`$this->assertTrue(is_dir($targetPath));`
`907`	`907`	`$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.DIRECTORY_SEPARATOR.'link1/file1.txt');`
`908`	`908`	`$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));`
`909`		`- $this->assertEquals($sourcePath.'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));`
	`909`	`+ $this->assertEquals('nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));`
`910`	`910`	`}`
`911`	`911`
`912`	`912`	`/**`