[Filesystem] Follow symlinks when dumping files #50437
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41df08a to
6805bb8
Compare
There was a problem hiding this comment.
LGTM. Can you please consider this minor patch and figure out the failures on appveyor?
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -667,14 +667,12 @@ class Filesystem
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)) {
- $this->dumpFile(Path::makeAbsolute($linkTarget, \dirname($filename)), $content);
+ $dir = \dirname($filename);
- return;
+ if (null !== $linkTarget = $this->readlink($filename)) {
+ $filename = Path::makeAbsolute($linkTarget, $dir);
}
- $dir = \dirname($filename);
-
if (!is_dir($dir)) {
$this->mkdir($dir);
Done in d729da4 |
nicolas-grekas
approved these changes
May 30, 2023
d729da4 to
4aa8b46
Compare
|
Thank you @ausi. |
Merged
nicolas-grekas
added a commit
that referenced
this pull request
May 31, 2023
…ausi) This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] Fix broken symlink tests Windows PHP 7.4+ | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Followup to #50437 | License | MIT | Doc PR | - The test currently fail on windows with PHP >= 7.4 ``` 1) Symfony\Component\Filesystem\Tests\FilesystemTest::testReadBrokenLink Failed asserting that two strings are equal. --- Expected +++ Actual @@ @@ -'C:\…\Temp\1685536465.4767.1091468882/file' +'C:\…\Temp\1685536465.4767.1091468882\file' C:\…\src\Symfony\Component\Filesystem\Tests\FilesystemTest.php:1105 ``` Commits ------- d98a011 Fix broken symlink tests Windows PHP 7.4+
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, if
Filesystem::dumpFile()is called on a symlink, the link gets replaced with a new file.This is unexpected I think because both
Filesystem::appendToFile()as well asfile_put_contents()follow the symlink instead.This PR changes
dumpFile()to behave the same way.