Follow symlinks when dumping files

ausi · ausi · commit 41df08ab3883 · 2023-05-25T23:26:31.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -667,6 +667,10 @@ public function dumpFile(string $filename, $content)
             throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));
         }
 
+        if (is_link($filename) && $linkTarget = $this->readlink($filename, true)) {
+            $filename = $linkTarget;
+        }
+
         $dir = \dirname($filename);
 
         if (!is_dir($dir)) {
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1605,6 +1605,21 @@ public function testDumpFileOverwritesAnExistingFile()
         $this->assertStringEqualsFile($filename, 'bar');
     }
 
+    public function testDumpFileFollowsSymlink()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo.txt';
+        file_put_contents($filename, 'FOO BAR');
+        $linkname = $this->workspace.\DIRECTORY_SEPARATOR.'bar.txt';
+        $this->filesystem->symlink($filename, $linkname);
+
+        $this->filesystem->dumpFile($linkname, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertFileExists($linkname);
+        $this->assertStringEqualsFile($filename, 'bar');
+        $this->assertStringEqualsFile($linkname, 'bar');
+    }
+
     public function testDumpFileWithFileScheme()
     {
         $scheme = 'file://';
@@ -1678,6 +1693,21 @@ public function testAppendToFileWithResource()
         }
     }
 
+    public function testAppendToFileFollowsSymlink()
+    {
+        $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo.txt';
+        file_put_contents($filename, 'foo');
+        $linkname = $this->workspace.\DIRECTORY_SEPARATOR.'bar.txt';
+        $this->filesystem->symlink($filename, $linkname);
+
+        $this->filesystem->appendToFile($linkname, 'bar');
+
+        $this->assertFileExists($filename);
+        $this->assertFileExists($linkname);
+        $this->assertStringEqualsFile($filename, 'foobar');
+        $this->assertStringEqualsFile($linkname, 'foobar');
+    }
+
     public function testAppendToFileWithScheme()
     {
         $scheme = 'file://';

Original file line number	Diff line number	Diff line change
`@@ -667,6 +667,10 @@ public function dumpFile(string $filename, $content)`
`667`	`667`	`throw new \TypeError(sprintf('Argument 2 passed to "%s()" must be string or resource, array given.', __METHOD__));`
`668`	`668`	`}`
`669`	`669`
	`670`	`+ if (is_link($filename) && $linkTarget = $this->readlink($filename, true)) {`
	`671`	`+ $filename = $linkTarget;`
	`672`	`+ }`
	`673`	`+`
`670`	`674`	`$dir = \dirname($filename);`
`671`	`675`
`672`	`676`	`if (!is_dir($dir)) {`