Skip to content

Commit 6f41b18

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [Serializer] Improve exception message in UnwrappingDenormalizer [PropertyInfo] Update DoctrineExtractor for new DBAL 4 BIGINT type Update security.nl.xlf [Validator] IBAN Check digits should always between 2 and 98 [Security] Populate translations for trans-unit 20 add missing plural translation messages filter out empty HTTP header parts [String] Fix folded in compat mode Remove calls to `getMockForAbstractClass()` [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode [Serializer] Fix type for missing property add test for JSON response with null as content [Filesystem] Fix dumpFile `stat failed` error hitting custom handler Return false in isTtySupported() when open_basedir restrictions prevent access to /dev/tty. Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
2 parents ffe3085 + 4ed8062 commit 6f41b18

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

AbstractUnicodeString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public function folded(bool $compat = true): static
190190

191191
if (!$compat || !\defined('Normalizer::NFKC_CF')) {
192192
$str->string = normalizer_normalize($str->string, $compat ? \Normalizer::NFKC : \Normalizer::NFC);
193-
$str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $this->string), 'UTF-8');
193+
$str->string = mb_strtolower(str_replace(self::FOLD_FROM, self::FOLD_TO, $str->string), 'UTF-8');
194194
} else {
195195
$str->string = normalizer_normalize($str->string, \Normalizer::NFKC_CF);
196196
}

Tests/AbstractUnicodeTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,10 @@ public static function provideBeforeAfterLastIgnoreCase(): array
582582
);
583583
}
584584

585-
public static function provideToFoldedCase(): array
585+
public static function provideFolded(): array
586586
{
587587
return array_merge(
588-
parent::provideToFoldedCase(),
588+
parent::provideFolded(),
589589
[
590590
['déjà', 'DéjÀ'],
591591
['σσσ', 'Σσς'],

0 commit comments

Comments
 (0)