Commitcece029

committed

[Filesystem] fix cleaning up tmp files when dumpFile() fails

1 parentcdfa9c2 commitcece029Copy full SHA for cece029

File tree

+24

-5

lines changed

src/Symfony/Component/Filesystem
- Filesystem.php
- Tests
  - FilesystemTest.php

+24

-5

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -686,13 +686,17 @@ public function dumpFile($filename, $content)`
`686`	`686`	`// when the filesystem supports chmod.`
`687`	`687`	`$tmpFile =$this->tempnam($dir,basename($filename));`
`688`	`688`
`689`		`-if (false === @file_put_contents($tmpFile,$content)) {`
`690`		`-thrownewIOException(sprintf('Failed to write file "%s".',$filename),0,null,$filename);`
`691`		`- }`
	`689`	`+try {`
	`690`	`+if (false === @file_put_contents($tmpFile,$content)) {`
	`691`	`+thrownewIOException(sprintf('Failed to write file "%s".',$filename),0,null,$filename);`
	`692`	`+ }`
`692`	`693`
`693`		`- @chmod($tmpFile,file_exists($filename) ?fileperms($filename) :0666 & ~umask());`
	`694`	`+@chmod($tmpFile,file_exists($filename) ?fileperms($filename) :0666 & ~umask());`
`694`	`695`
`695`		`-$this->rename($tmpFile,$filename,true);`
	`696`	`+$this->rename($tmpFile,$filename,true);`
	`697`	`+ }finally {`
	`698`	`+ @unlink($tmpFile);`
	`699`	`+ }`
`696`	`700`	`}`
`697`	`701`
`698`	`702`	`/**`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1710,6 +1710,21 @@ public function testAppendToFileCreateTheFileIfNotExists()`
`1710`	`1710`	`$this->assertStringEqualsFile($filename,'bar');`
`1711`	`1711`	`}`
`1712`	`1712`
	`1713`	`+publicfunctiontestDumpRemovesTmpFilesOnFailure()`
	`1714`	`+ {`
	`1715`	`+$expected =scandir(__DIR__,SCANDIR_SORT_ASCENDING);`
	`1716`	`+$filename =$this->workspace.\DIRECTORY_SEPARATOR.'foo.txt';`
	`1717`	`+file_put_contents($filename,'FOO BAR');`
	`1718`	`+chmod($filename,0745);`
	`1719`	`+`
	`1720`	`+try {`
	`1721`	`+$this->filesystem->dumpFile(__DIR__.'/Fixtures','bar',null);`
	`1722`	`+$this->fail('IOException expected.');`
	`1723`	`+ }catch (IOException$e) {`
	`1724`	`+$this->assertSame($expected,scandir(__DIR__,SCANDIR_SORT_ASCENDING));`
	`1725`	`+ }`
	`1726`	`+ }`
	`1727`	`+`
`1713`	`1728`	`publicfunctiontestDumpKeepsExistingPermissionsWhenOverwritingAnExistingFile()`
`1714`	`1729`	`{`
`1715`	`1730`	`$this->markAsSkippedIfChmodIsMissing();`

Comments

(0)