Skip to content

Commit

Permalink
fixed markup
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Jan 19, 2013
1 parent 62a4cc9 commit 6923a48
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
9 changes: 5 additions & 4 deletions UPGRADE-2.2.md
Expand Up @@ -563,8 +563,9 @@
trusted_proxies: ['127.0.0.1', '10.0.0.1'] # a list of proxy IPs you trust
```

#### Serializer
### Serializer

* All serializer interfaces (Serializer, Normalizer, Encoder) have been extended with an optional ``$context`` array.
This was necessary to allow for more complex use-cases that require context information during the (de)normalization
and en-/decoding steps.
* All serializer interfaces (Serializer, Normalizer, Encoder) have been
extended with an optional `$context` array. This was necessary to allow for
more complex use-cases that require context information during the
(de)normalization and en-/decoding steps.
12 changes: 6 additions & 6 deletions src/Symfony/Component/Serializer/CHANGELOG.md
Expand Up @@ -4,12 +4,12 @@ CHANGELOG
2.2.0
-----

* All Serializer, Normalizer and Encoder interfaces have been
modified to include an optional ``$context`` array parameter.
* The XML Root name can now be configured with the ``xml_root_name``
parameter in the context option to the ``XmlEncoder``.
* Options to ``json_encode`` and ``json_decode`` can be passed through
the context options of ``JsonEncode`` and ``JsonDecode`` encoder/decoders.
* [BC BREAK] All Serializer, Normalizer and Encoder interfaces have been
modified to include an optional `$context` array parameter.
* The XML Root name can now be configured with the `xml_root_name`
parameter in the context option to the `XmlEncoder`.
* Options to `json_encode` and `json_decode` can be passed through
the context options of `JsonEncode` and `JsonDecode` encoder/decoders.

2.1.0
-----
Expand Down

0 comments on commit 6923a48

Please sign in to comment.