[Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.
Fix CS issues, removed global options
Rename $options to $context, as it makes the intent much more clear.
Added context to JsonEncoder
Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)
merged branch fabpot/recursion-fix (PR #6800)

This PR was merged into the master branch.

Commits
-------

94cb13d [FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)

Discussion
----------

[FrameworkBundle] fixed circular reference for service templating (closes #6730, closes #6762)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6730, #6762
| License       | MIT
| Doc PR        | n/a

---------------------------------------------------------------------------

by tristanbes at 2013-01-18T14:55:39Z

@fabpot Do you have an idea when you'll merge it please ?
Fixed some tests on Windows
[HttpKernel] Fixed the Redis profiler storage return value
[SecurityBundle] changed includes to use the new Twig notation
Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md
merged branch stof/fix_tests (PR #6804)

This PR was merged into the master branch.

Commits
-------

3d762dd [HttpKernel] Fixed the Redis profiler storage return value
44fe249 Fixed some tests on Windows

Discussion
----------

Fix tests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | n/a

This fixes the testsuite in master.
For the Redis storage, the test failure seems to come from a bad resolution when merging 2.1 into master.

---------------------------------------------------------------------------

by stof at 2013-01-18T20:58:59Z

I still have some failing tests in master locally:

- some tests with the incremental output tests in the Process component
- a timing test for the Stopwatch component (but passing when running only the Stopwatch tests)
- some mock expectations in the Form component.

However, all these tests are passing on Travis so it looks weird.
merged branch davedevelopment/new-twig-notation (PR #6805)

This PR was merged into the master branch.

Commits
-------

d5e73e5 [SecurityBundle] changed includes to use the new Twig notation

Discussion
----------

[SecurityBundle] changed includes to use the new Twig notation

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no - couple of unrelated failures
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A
merged branch beberlei/SerializerOptions (PR #6797)

This PR was merged into the master branch.

Commits
-------

fcabadf Fix JsonDecode to work on PHP 5.3, update the CHANGELOG.md
b6bdb45 Completly refactor the Serializer Options Pull Request to push context information directly and avoid state and dependencies between SerializerInterface and encoders/normalizers.
ef652e2 Added context to JsonEncoder
eacb7e2 Rename $options to $context, as it makes the intent much more clear.
8854b85 Fix CS issues, removed global options
9c54a4b [Serializer] Allow options to be passed to SerialiizerInterface#serialize and #unserialize. Thsee options are available to all encoders/decoders/normalizers that implement SerializerAwareInterface.

Discussion
----------

[2.2] [Serializer] Configurable Serializer

Bug fix: no
Feature addition: yes
Backwards compatibility break: yes
Symfony2 tests pass: yes
Fixes the following tickets: #4907, #4938
License of the code: MIT
Todo:

This is an extension of GH-6574 that removes the context state in favor of passing this information around.

---------------------------------------------------------------------------

by beberlei at 2013-01-18T13:12:39Z

@fabpot @lsmith I think this is how it should work from an OOP/OOD perpesctive, avoiding the context state. This makes for a much cleaner code and dependency graph.

---------------------------------------------------------------------------

by lsmith77 at 2013-01-18T14:14:37Z

makes sense. anything fancier would lose this components simplicity which IMHO is the main benefit versus JMS serializer.

---------------------------------------------------------------------------

by fabpot at 2013-01-18T14:26:25Z

Looks very good. :+1:

---------------------------------------------------------------------------

by beberlei at 2013-01-18T14:37:32Z

I need to fix the failures with the JsonEncoder and then this is good to merge

---------------------------------------------------------------------------

by stof at 2013-01-18T14:40:21Z

you also need to update the CHANGELOG of the component

---------------------------------------------------------------------------

by beberlei at 2013-01-18T23:17:57Z

Fixed, only the Redis Profiler problem still failing the Travis builds. Also I updated the CHANGELOG.md.

@fabpot  Good to merge from my POV

---------------------------------------------------------------------------

by stof at 2013-01-18T23:27:59Z

@beberlei see #6804 for the Redis profiler issue
fixed markup
[TwigBridge] fixed format_file to include the line number even if the link text is passed

That fixes the logs in the profiler where lines were not displayed for
deprecated calls.
tweaked the deprecated error handler to actually display the deprecation message

I've also removed uninterested information (like the trigger_error stack
frame).
merged branch fabpot/deprecated_message (PR #6812)

This PR was merged into the master branch.

Commits
-------

1ab48db tweaked the deprecated error handler to actually display the deprecation message

Discussion
----------

tweaked the deprecated error handler to actually display the deprecation message

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

I've also removed uninterested information (like the trigger_error stack
frame).
merged branch fabpot/format_file (PR #6811)

This PR was merged into the master branch.

Commits
-------

32322a1 [TwigBridge] fixed format_file to include the line number even if the link text is passed

Discussion
----------

[TwigBridge] fixed format_file to include the line number even if the link text is passed

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

That fixes the logs in the profiler where lines were not displayed for deprecated calls.

---------------------------------------------------------------------------

by stof at 2013-01-20T10:58:58Z

shouldn't this be merged in older branches as it is a bugfix ?

---------------------------------------------------------------------------

by fabpot at 2013-01-20T15:14:50Z

It is a bug fix but people might rely on the current behavior. But then, nobody ever reported it. So, I prefer to keep it on 2.2 only.
[HttpKernel] refactored the HTTP content renderer to make it easier to extend