Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 748ccd87f5e6 · 2024-06-28T11:25:38.000+02:00
* 5.4:
  [Filesystem] Fix Filesystem::remove() on Windows
  [DoctrineBridge] Fix compat with DI &gt;= 6.4
  [String] Fix *String::snake methods
diff --git a/Filesystem.php b/Filesystem.php
@@ -172,7 +172,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
`@@ -172,7 +172,7 @@ private static function doRemove(array $files, bool $isRecursive): void`
`172`	`172`	`}`
`173`	`173`	`} elseif (is_dir($file)) {`
`174`	`174`	`if (!$isRecursive) {`
`175`		`- $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-_'));`
	`175`	`+ $tmpName = \dirname(realpath($file)).'/.!'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-!'));`
`176`	`176`
`177`	`177`	`if (file_exists($tmpName)) {`
`178`	`178`	`try {`