Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 131f4e8f252e · 2024-06-28T11:26:58.000+02:00
* 6.4: 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 >= 6.4 [String] Fix *String::snake methods
diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -58,6 +58,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);
                 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd b/src/Symfony/Bundle/SecurityBundle/Resources/config/schema/security-1.0.xsd
@@ -112,6 +112,7 @@
 
     <xsd:complexType name="user">
         <xsd:attribute name="identifier" type="xsd:string" />
+        <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="password" type="xsd:string" />
         <xsd:attribute name="roles" type="xsd:string" />
     </xsd:complexType>
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/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 {
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -521,10 +521,17 @@ protected function initializeContainer(): void
             touch($oldContainerDir.'.legacy');
         }
 
-        $preload = $this instanceof WarmableInterface ? (array) $this->warmUp($this->container->getParameter('kernel.cache_dir'), $buildDir) : [];
+        $cacheDir = $this->container->getParameter('kernel.cache_dir');
+        $preload = $this instanceof WarmableInterface ? (array) $this->warmUp($cacheDir, $buildDir) : [];
 
         if ($this->container->has('cache_warmer')) {
-            $preload = array_merge($preload, (array) $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'), $buildDir));
+            $cacheWarmer = $this->container->get('cache_warmer');
+
+            if ($cacheDir !== $buildDir) {
+                $cacheWarmer->enableOptionalWarmers();
+            }
+
+            $preload = array_merge($preload, (array) $cacheWarmer->warmUp($cacheDir, $buildDir));
         }
 
         if ($preload && file_exists($preloadFile = $buildDir.'/'.$class.'.preload.php')) {
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/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;
     }
diff --git a/src/Symfony/Component/String/ByteString.php b/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;
     }
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/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'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) {`
`58`	`58`	`}`
`59`	`59`	`if (isset($this->fileMap[$name])) {`
`60`	`60`	`$wrappedInstance = $this->load($this->fileMap[$name], false);`
	`61`	`+ } elseif ((new \ReflectionMethod($this, $this->methodMap[$name]))->isStatic()) {`
	`62`	`+ $wrappedInstance = $this->{$this->methodMap[$name]}($this, false);`
`61`	`63`	`} else {`
`62`	`64`	`$wrappedInstance = $this->{$this->methodMap[$name]}(false);`
`63`	`65`	`}`
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 {`
Original file line number	Diff line number	Diff line change
`@@ -346,8 +346,8 @@ public function reverse(): static`
`346`	`346`
`347`	`347`	`public function snake(): static`
`348`	`348`	`{`
`349`		`- $str = $this->camel();`
`350`		`- $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');`
	`349`	`+ $str = clone $this;`
	`350`	`+ $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'));`
`351`	`351`
`352`	`352`	`return $str;`
`353`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,8 @@ public function slice(int $start = 0, ?int $length = null): static`
`342`	`342`
`343`	`343`	`public function snake(): static`
`344`	`344`	`{`
`345`		`- $str = $this->camel();`
`346`		`- $str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));`
	`345`	`+ $str = clone $this;`
	`346`	`+ $str->string = str_replace(' ', '_', strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1 \2', $str->string)));`
`347`	`347`
`348`	`348`	`return $str;`
`349`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1075,6 +1075,8 @@ public static function provideSnake()`
`1075`	`1075`	`['symfony_is_great', 'symfonyIsGREAT'],`
`1076`	`1076`	`['symfony_is_really_great', 'symfonyIsREALLYGreat'],`
`1077`	`1077`	`['symfony', 'SYMFONY'],`
	`1078`	`+ ['symfony_is_great', 'SYMFONY IS GREAT'],`
	`1079`	`+ ['symfony_is_great', 'SYMFONY_IS_GREAT'],`
`1078`	`1080`	`];`
`1079`	`1081`	`}`
`1080`	`1082`