[String] Fix folded in compat mode

smnandre · nicolas-grekas · commit 37e98c70d283 · 2024-05-15T13:14:28.000+02:00
diff --git a/src/Symfony/Component/String/AbstractUnicodeString.php b/src/Symfony/Component/String/AbstractUnicodeString.php
@@ -195,7 +195,7 @@ public function folded(bool $compat = true): parent
 
         if (!$compat || \PHP_VERSION_ID < 70300 || !\defined('Normalizer::NFKC_CF')) {
             $str->string = normalizer_normalize($str->string, $compat ? \Normalizer::NFKC : \Normalizer::NFC);
-            $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $this->string), 'UTF-8');
+            $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $str->string), 'UTF-8');
         } else {
             $str->string = normalizer_normalize($str->string, \Normalizer::NFKC_CF);
         }
diff --git a/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php b/src/Symfony/Component/String/Tests/AbstractUnicodeTestCase.php
@@ -470,10 +470,10 @@ public static function provideBeforeAfterLastIgnoreCase(): array
         );
     }
 
-    public static function provideToFoldedCase(): array
+    public static function provideFolded(): array
     {
         return array_merge(
-            parent::provideToFoldedCase(),
+            parent::provideFolded(),
             [
                 ['déjà', 'DéjÀ'],
                 ['σσσ', 'Σσς'],

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function folded(bool $compat = true): parent`
`195`	`195`
`196`	`196`	`if (!$compat \|\| \PHP_VERSION_ID < 70300 \|\| !\defined('Normalizer::NFKC_CF')) {`
`197`	`197`	`$str->string = normalizer_normalize($str->string, $compat ? \Normalizer::NFKC : \Normalizer::NFC);`
`198`		`- $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $this->string), 'UTF-8');`
	`198`	`+ $str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $str->string), 'UTF-8');`
`199`	`199`	`} else {`
`200`	`200`	`$str->string = normalizer_normalize($str->string, \Normalizer::NFKC_CF);`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -470,10 +470,10 @@ public static function provideBeforeAfterLastIgnoreCase(): array`
`470`	`470`	`);`
`471`	`471`	`}`
`472`	`472`
`473`		`- public static function provideToFoldedCase(): array`
	`473`	`+ public static function provideFolded(): array`
`474`	`474`	`{`
`475`	`475`	`return array_merge(`
`476`		`- parent::provideToFoldedCase(),`
	`476`	`+ parent::provideFolded(),`
`477`	`477`	`[`
`478`	`478`	`['déjà', 'DéjÀ'],`
`479`	`479`	`['σσσ', 'Σσς'],`