Skip to content

Commit 938b562

Browse files
committed
Revert bad merge
1 parent 56c211e commit 938b562

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/Symfony/Component/Serializer/CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ CHANGELOG
99
7.2
1010
---
1111

12-
* Deprecate the `csv_escape_char` context option of `CsvEncoder`, the `CsvEncoder::ESCAPE_CHAR_KEY` constant
13-
and the `CsvEncoderContextBuilder::withEscapeChar()` method, following its deprecation in PHP 8.4
12+
* Deprecate the `csv_escape_char` context option of `CsvEncoder` and the `CsvEncoder::ESCAPE_CHAR_KEY` constant
13+
* Deprecate `CsvEncoderContextBuilder::withEscapeChar()` method
1414
* Add `SnakeCaseToCamelCaseNameConverter`
1515
* Support subclasses of `\DateTime` and `\DateTimeImmutable` for denormalization
1616
* Add the `UidNormalizer::NORMALIZATION_FORMAT_RFC9562` constant
@@ -24,6 +24,7 @@ CHANGELOG
2424

2525
* Add arguments `$class`, `$format` and `$context` to `NameConverterInterface::normalize()` and `NameConverterInterface::denormalize()`
2626
* Add `DateTimeNormalizer::CAST_KEY` context option
27+
* Add `Default` and "class name" default groups
2728
* Add `AbstractNormalizer::FILTER_BOOL` context option
2829
* Add `CamelCaseToSnakeCaseNameConverter::REQUIRE_SNAKE_CASE_PROPERTIES` context option
2930
* Deprecate `AbstractNormalizerContextBuilder::withDefaultContructorArguments(?array $defaultContructorArguments)`, use `withDefaultConstructorArguments(?array $defaultConstructorArguments)` instead (note the missing `s` character in Contructor word in deprecated method)

0 commit comments

Comments
 (0)