diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #21902 [Filesystem] respect the umask argument in dumpFile() (xabbuh)

Browse Source 
This PR was merged into the 2.7 branch.

Discussion
----------

[Filesystem] respect the umask argument in dumpFile()

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #21823
| License       | MIT
| Doc PR        |

In #21823 we introduced a small BC break: The `dumpFile()` method of the `Filesystem` class allowed to pass the desired file permissions (support for this feature was dropped in Symfony 3.0).

Commits
-------

3a7cd08fe7 respect the umask argument in dumpFile()
This commit is contained in:
Fabien Potencier 2017-03-06 11:24:50 -08:00
commit fda2472b02
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -516,8 +516,8 @@ class Filesystem
}
$this->chmod($tmpFile, $mode);
} else {
@chmod($tmpFile, file_exists($filename) ? fileperms($filename) : 0666 & ~umask());
} elseif (file_exists($filename)) {
@chmod($tmpFile, fileperms($filename));
}
$this->rename($tmpFile, $filename, true);

13
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
View File

@ -1050,6 +1050,19 @@ class FilesystemTest extends FilesystemTestCase
$this->assertSame('bar', file_get_contents($filename));
}
public function testDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()
{
$this->markAsSkippedIfChmodIsMissing();
$filename = $this->workspace.DIRECTORY_SEPARATOR.'foo.txt';
file_put_contents($filename, 'FOO BAR');
chmod($filename, 0745);
$this->filesystem->dumpFile($filename, 'bar', null);
$this->assertFilePermissions(745, $filename);
}
public function testCopyShouldKeepExecutionPermission()
{
$this->markAsSkippedIfChmodIsMissing();