StringInput resets the given options.
[Validator] gracefully handle transChoice errors
[Translator] coding style
[Translator] fix MessageCatalogueInterface::getFallbackCatalogue that can return null

also use inheritdoc for the implementation
[Translator] mention that the message id may also be an object that can be cast to string in TranslatorInterface and fix the IdentityTranslator that did not respect this
[Translator] fix phpdoc of MessageCatalogueInterface::add and ::replace
[Translator] optimized adding of resources and saving a call to array_unique
[Translator] fix typecast in transChoice
[Translator] fix metadata

- fix '0' problem
- only access metadata when implementing interface
- refactor code
- clarify phpdoc
[HttpKernel] hinclude fragment renderer must escape URIs properly to return valid html
Removed some leaking deprecation warning in the Form component

Fixes #7101
merged branch stof/hide_deprecation (PR #7114)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7114).

Commits
-------

4680d87 Removed some leaking deprecation warning in the Form component

Discussion
----------

Removed some leaking deprecation warning in the Form component

| Q             | A
| ------------- | ---
| Fixed tickets | #7101
| License       | MIT

I have removed the error handler in the integration test case so that the testsuite can show any leaked deprecation message from the core and replaced deprecated methods in the type testcases.
This keeps only 2 cases where the handlign was needed: the test ensuring the BC for ``property_path``, and the code triggering #7101 because of its BC call

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

by stof at 2013-02-18T22:41:56Z

hmm, wrong target. My branch is actually based on the 2.2 branch. @fabpot is it good for you or should I reopen it to the appropriate branch ?
fixed HInclude renderer (closes #7113)
[HttpKernel] fixed locale management when exiting sub-requests

This fix is temporary as #7007 will fix it properly in Symfony 2.3.
merged branch fabpot/locale-fix (PR #7099)

This PR was merged into the 2.1 branch.

Commits
-------

3e40c17 [HttpKernel] fixed locale management when exiting sub-requests

Discussion
----------

[HttpKernel] fixed locale management when exiting sub-requests

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

This fix is temporary as #7007 will fix it properly in Symfony 2.3.

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

by vicb at 2013-02-17T20:17:44Z

changelog ?

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

by fabpot at 2013-02-17T20:27:22Z

The changelogs are updated when we release a new version only.

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

by stof at 2013-02-17T20:41:00Z

@fabpot the intl locale should be reset to the right value too

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

by stof at 2013-02-17T20:42:31Z

hmm sorry, I missed the fact that you are changing the locale in the Request again, which will set the intl one
Merge branch '2.1' into 2.2

* 2.1:
  [HttpKernel] fixed locale management when exiting sub-requests
[FrameworkBundle] Fix a BC for Hinclude global template
[DomCrawler] lowered parsed protocol string (fixes #6986)
merged branch cloppy/Dom-Crawler-fix (PR #7127)

This PR was merged into the 2.0 branch.

Commits
-------

cb03074 [DomCrawler] lowered parsed protocol string (fixes #6986)

Discussion
----------

[DomCrawler] lowered parsed protocol string (fixes #6986)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6986
| License       | MIT
| Doc PR        | symfony/symfony-docs#123

Are UTs needed for this?
added a note about a BC break for the path info of sub-request (closes #7138)