Merge branch '5.4' into 6.4

* 5.4:
  [Filesystem] Fix Filesystem::remove() on Windows
  [DoctrineBridge] Fix compat with DI >= 6.4
  [String] Fix *String::snake methods

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/ManagerRegistry.php

@@ -61,6 +61,8 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {
                 }
                 if (isset($this->fileMap[$name])) {
                     $wrappedInstance = $this->load($this->fileMap[$name], false);
+                } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {
+                    $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);
                 } else {
                     $wrappedInstance = $this->{$this->methodMap[$name]}(false);
                 }

src/Symfony/Component/Filesystem/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 {

src/Symfony/Component/String/AbstractUnicodeString.php

@@ -346,8 +346,8 @@ public function reverse(): static
 
     public function snake(): static
     {
-        $str = $this->camel();
-        $str->string = mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1_\2', $str->string), 'UTF-8');
+        $str = clone $this;
+        $str->string = str_replace(' ', '_', mb_strtolower(preg_replace(['/(\p{Lu}+)(\p{Lu}\p{Ll})/u', '/([\p{Ll}0-9])(\p{Lu})/u'], '\1 \2', $str->string), 'UTF-8'));
 
         return $str;
     }

src/Symfony/Component/String/ByteString.php

@@ -342,8 +342,8 @@ public function slice(int $start = 0, ?int $length = null): static
 
     public function snake(): static
     {
-        $str = $this->camel();
-        $str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));
+        $str = clone $this;
+        $str->string = str_replace(' ', '_', strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1 \2', $str->string)));
 
         return $str;
     }

src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php

@@ -1075,6 +1075,8 @@ public static function provideSnake()
             ['symfony_is_great', 'symfonyIsGREAT'],
             ['symfony_is_really_great', 'symfonyIsREALLYGreat'],
             ['symfony', 'SYMFONY'],
+            ['symfony_is_great', 'SYMFONY IS GREAT'],
+            ['symfony_is_great', 'SYMFONY_IS_GREAT'],
         ];
     }