Merge branch '5.4' into 6.4

derrabus · derrabus · commit 9989c22aff00 · 2024-07-04T13:16:22.000+02:00
* 5.4:
  [Router] Discard in-memory cache of routes when writing the file-based cache
  [Security] Verify Hungarian translation
  force HTTP 1.1 for Mailgun API requests
  [String] Revert "Fixed u()-&gt;snake(), b()-&gt;snake() and s()-&gt;snake() methods"
  normalize underscores in snake()
  [Security][Validator] Added missing Portuguese(pt) translations
  Fixes #54550 some pt_BR translations
  Fix MockArraySessionStorage to generate more conform ids
  Bump Symfony version to 5.4.42
  Update VERSION for 5.4.41
  Update CONTRIBUTORS for 5.4.41
  Update CHANGELOG for 5.4.41
diff --git a/AbstractUnicodeString.php b/AbstractUnicodeString.php
@@ -155,7 +155,7 @@ public function ascii(array $rules = []): self
     public function camel(): static
     {
         $str = clone $this;
-        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) {
+        $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?!\p{Lu})/u', static function ($m) {
             static $i = 0;
 
             return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');
@@ -346,8 +346,8 @@ public function reverse(): static
 
     public function snake(): static
     {
-        $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'));
+        $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');
 
         return $str;
     }
diff --git a/ByteString.php b/ByteString.php
@@ -342,8 +342,8 @@ public function slice(int $start = 0, ?int $length = null): static
 
     public function snake(): static
     {
-        $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)));
+        $str = $this->camel();
+        $str->string = strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], '\1_\2', $str->string));
 
         return $str;
     }
diff --git a/Tests/AbstractAsciiTestCase.php b/Tests/AbstractAsciiTestCase.php
@@ -1044,6 +1044,7 @@ public static function provideCamel()
             ['symfonyIsGreat', 'symfony_is_great'],
             ['symfony5IsGreat', 'symfony_5_is_great'],
             ['symfonyIsGreat', 'Symfony is great'],
+            ['SYMFONYISGREAT', 'SYMFONY_IS_GREAT'],
             ['symfonyIsAGreatFramework', 'Symfony is a great framework'],
             ['symfonyIsGREAT', '*Symfony* is GREAT!!'],
             ['SYMFONY', 'SYMFONY'],
@@ -1075,8 +1076,12 @@ 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'],
+            ['symfonyisgreat', 'SYMFONY IS GREAT'],
+            ['symfonyisgreat', 'SYMFONY_IS_GREAT'],
+            ['symfony_is_great', 'symfony    is     great'],
+            ['symfonyisgreat', 'SYMFONY    IS     GREAT'],
+            ['symfonyisgreat', 'SYMFONY _ IS _ GREAT'],
+            ['symfony_isgreat', 'Symfony IS GREAT!'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public function ascii(array $rules = []): self`
`155`	`155`	`public function camel(): static`
`156`	`156`	`{`
`157`	`157`	`$str = clone $this;`
`158`		`- $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?![A-Z]{2,})/u', static function ($m) {`
	`158`	`+ $str->string = str_replace(' ', '', preg_replace_callback('/\b.(?!\p{Lu})/u', static function ($m) {`
`159`	`159`	`static $i = 0;`
`160`	`160`
`161`	`161`	`return 1 === ++$i ? ('İ' === $m[0] ? 'i̇' : mb_strtolower($m[0], 'UTF-8')) : mb_convert_case($m[0], \MB_CASE_TITLE, 'UTF-8');`
`@@ -346,8 +346,8 @@ public function reverse(): static`
`346`	`346`
`347`	`347`	`public function snake(): static`
`348`	`348`	`{`
`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'));`
	`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');`
`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 = 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)));`
	`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));`
`347`	`347`
`348`	`348`	`return $str;`
`349`	`349`	`}`