bug #57574 [Filesystem] Fix Filesystem::remove() on Windows (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 572ce41047e1 · 2024-06-28T11:19:04.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Filesystem] Fix Filesystem::remove() on Windows | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | #57375, #57346 | License | MIT Let's experiment with `@smnandre`'s theory. Commits ------- 2b50dea [Filesystem] Fix Filesystem::remove() on Windows
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -173,7 +173,7 @@ private static function doRemove(array $files, bool $isRecursive): void
                 }
             } elseif (is_dir($file)) {
                 if (!$isRecursive) {
-                    $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-_'));
+                    $tmpName = \dirname(realpath($file)).'/.!'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-!'));
 
                     if (file_exists($tmpName)) {
                         try {

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ private static function doRemove(array $files, bool $isRecursive): void`
`173`	`173`	`}`
`174`	`174`	`} elseif (is_dir($file)) {`
`175`	`175`	`if (!$isRecursive) {`
`176`		`- $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-_'));`
	`176`	`+ $tmpName = \dirname(realpath($file)).'/.!'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-!'));`
`177`	`177`
`178`	`178`	`if (file_exists($tmpName)) {`
`179`	`179`	`try {`