bug #54878 [Filesystem] Fix dumpFile stat failed error hitting custom handler (acoulton)

nicolas-grekas · nicolas-grekas · commit f68a8dfacec1 · 2024-05-16T16:40:21.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] Fix dumpFile `stat failed` error hitting custom handler | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | See below | License | MIT Since #54471, dumpFile will trigger a `fileperms(): stat failed` error when writing to a filename that does not yet exist. This was silenced from PHP's default handler with the `@` operator. However, the error is still passed to any custom handler that the application has registered, and can therefore cause exceptions or spurious logging depending on the implementation of the handler. The better solution, which is consistent with all other calls to native functions in this class, would be to use `self::box` to catch and ignore the potential error so that it never leaks outside this class. Commits ------- 247182a [Filesystem] Fix dumpFile `stat failed` error hitting custom handler
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -691,7 +691,7 @@ public function dumpFile(string $filename, $content)
                 throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);
             }
 
-            self::box('chmod', $tmpFile, @fileperms($filename) ?: 0666 & ~umask());
+            self::box('chmod', $tmpFile, self::box('fileperms', $filename) ?: 0666 & ~umask());
 
             $this->rename($tmpFile, $filename, true);
         } finally {

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,7 @@ public function dumpFile(string $filename, $content)`
`691`	`691`	`throw new IOException(sprintf('Failed to write file "%s": ', $filename).self::$lastError, 0, null, $filename);`
`692`	`692`	`}`
`693`	`693`
`694`		`- self::box('chmod', $tmpFile, @fileperms($filename) ?: 0666 & ~umask());`
	`694`	`+ self::box('chmod', $tmpFile, self::box('fileperms', $filename) ?: 0666 & ~umask());`
`695`	`695`
`696`	`696`	`$this->rename($tmpFile, $filename, true);`
`697`	`697`	`} finally {`