added a proper setter for the templating servicein HInclude
[DependencyInjection] fixed tests (refs #7017)
Merge branch '2.0' into 2.1

* 2.0:
  [DependencyInjection] fixed tests (refs #7017)
Merge branch '2.1' into 2.2

* 2.1:
  [DependencyInjection] fixed tests (refs #7017)
Revert "merged branch povilas/issue_6101 (PR #6708)"

This reverts commit b2bcbbbd19efdb6e4f2133dfbdf162c9bb30a214, reversing
changes made to c5fcf0d0cc6a3353ec13e2141411e082693db2d5.
bumped Symfony version to 2.2.0-DEV
Remove array type hint from GetResponseForControllerResultEvent::setControllerResult()
merged branch igorw/view-event-typehint (PR #7057)

This PR was merged into the 2.2 branch.

Commits
-------

06c26dc Remove array type hint from GetResponseForControllerResultEvent::setControllerResult()

Discussion
----------

Remove array type hint from GetResponseForControllerResultEvent::setControllerResult()

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

I don't see a good reason to limit responses to arrays. The method was introduced in 2.2, so there is no real BC break.

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

by stof at 2013-02-13T03:18:35Z

Indeed. SensioFrameworkExtraBundle handles the case where the result is an array, but in the case of FOSRestBundle, it is an object
[BrowserKit] added a test to make sure HTTP authentication is preserved when submitting a form
[Process] Warn user with a useful message when tmpfile() failed
merged branch Seldaek/proctemp (PR #7066)

This PR was merged into the 2.1 branch.

Commits
-------

5e8d844 [Process] Warn user with a useful message when tmpfile() failed

Discussion
----------

[Process] Warn user with a useful message when tmpfile() failed

Simple warning so users know what's going on instead of getting a proc_open error, see composer/composer#1581.

Can't get the PR template since ~~symfony.com~~ my dns resolver is dead :)
Create validators.lv.xlf

Latvian translation of validators
merged branch Pendrokar/patch-1 (PR #7073)

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

Commits
-------

3bc0567 Create validators.lv.xlf

Discussion
----------

Create validators.lv.xlf, latvian translation

Latvian translation of validators
[HttpFoundation] Added getter for httpMethodParameterOverride state
merged branch dlsniper/small-http-foundation-enhancement (PR #6999)

This PR was squashed before being merged into the 2.2 branch (closes #6999).

Commits
-------

de0f7b7 [HttpFoundation] Added getter for httpMethodParameterOverride state

Discussion
----------

[HttpFoundation] Added getter for httpMethodParameterOverride state

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6984
| License       | MIT
| Doc PR        | ~
[HttpFoundation] tweaked previous merge
[HttpKernel] added error display suppression when using the ErrorHandler (if not, errors are displayed twice, refs #6254)
[WebProfilerBundle] removed dependency on FrameworkBundle (closes #6949)
[FrameworkBundle] CSRF should be on by default
merged branch vicb/csrffix (PR #7060)

This PR was squashed before being merged into the 2.2 branch (closes #7060).

Commits
-------

f842ae6 [FrameworkBundle] CSRF should be on by default

Discussion
----------

[FrameworkBundle] CSRF should be on by default

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

by stof at 2013-02-13T11:27:32Z

:+1:

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

by vicb at 2013-02-15T08:54:39Z

Oops seems like a file is missing... will update

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

by vicb at 2013-02-15T09:04:13Z

@fabpot the fix is fixed, ready to be merged !

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

by stloyd at 2013-02-15T09:05:24Z

Shouldn't this be noted in upgrade/changelog file? It's kinda of BC break...

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

by vicb at 2013-02-15T09:13:18Z

don't fix so, this is something I did break a few weeks ago, just reverting to how it is supposed to work.

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

by fabpot at 2013-02-15T09:49:21Z

If you broke CSRF configuration, I suppose that you also broke form, ESI, framgents, translator, validator, and profiler configuration, no (see fde7585)?

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

by vicb at 2013-02-15T09:51:51Z

Hey @fabpot I am not that BAD :)

"form, ESI, framgents, translator, validator, and profiler" are off by default. Only CSRF should be on by default.