Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit ae8a119a7eae · 2024-06-28T11:27:18.000+02:00
* 7.0:
  Revert "bug #57520 [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD (MatTheCat)"
  [HttpKernel] Enable optional cache-warmers when cache-dir != build-dir
  [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
@@ -164,7 +164,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
`@@ -164,7 +164,7 @@ private static function doRemove(array $files, bool $isRecursive): void`
`164`	`164`	`}`
`165`	`165`	`} elseif (is_dir($file)) {`
`166`	`166`	`if (!$isRecursive) {`
`167`		`- $tmpName = \dirname(realpath($file)).'/.'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-_'));`
	`167`	`+ $tmpName = \dirname(realpath($file)).'/.!'.strrev(strtr(base64_encode(random_bytes(2)), '/=', '-!'));`
`168`	`168`
`169`	`169`	`if (file_exists($tmpName)) {`
`170`	`170`	`try {`