added a proper setter for the templating servicein HInclude
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.
Fix REMOTE_ADDR for cached subrequests

Fixes #7091
merged branch mweimerskirch/patch-12 (PR #7092)

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

Commits
-------

187645f Fix REMOTE_ADDR for cached subrequests

Discussion
----------

[HttpKernel/HttpCache] Fix "REMOTE_ADDR" for cached subrequests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | none that I know of
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | 7091
| License       | MIT

I moved the code that modifies the REMOTE_ADDR variable further up the chain so that cached subrequests also receive the local IP address. Before, only new subrequests received the local IP address and cached ones received the original IP, which made "validateRequest" in FragmentListener fail.

Please review. I'm not sure about side-effects of this patch, including possible security issues.

Fixes #7091

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

by bamarni at 2013-02-16T11:49:27Z

@fabpot rejected setting this on the master request, so you should do it on the ```forward()``` method instead.

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

by mweimerskirch at 2013-02-16T12:13:46Z

@bamarni @fabpot done
[HttpKernel] added some tests for previous merge
[Config] tweaked dumper to indent multi-line info
merged branch 1ed/ref-dumper-tweak (PR #7093)

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

Commits
-------

609636e [Config] tweaked dumper to indent multi-line info

Discussion
----------

[Config] tweaked dumper to indent multi-line info

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

Little cosmetic tweak.

before:
```yaml
    # router configuration
    router:
        resource:             ~ # Required
        type:                 ~
        http_port:            80
        https_port:           443

        # set to true to throw an exception when a parameter does not match the requirements
set to false to disable exceptions when a parameter does not match the requirements (and return null instead)
set to null to disable parameter checks against requirements
'true' is the preferred configuration in development mode, while 'false' or 'null' might be preferred in production
        strict_requirements:  true

    # session configuration
    session:
```
after:
```yaml
    # router configuration
    router:
        resource:             ~ # Required
        type:                 ~
        http_port:            80
        https_port:           443

        # set to true to throw an exception when a parameter does not match the requirements
        # set to false to disable exceptions when a parameter does not match the requirements (and return null instead)
        # set to null to disable parameter checks against requirements
        # 'true' is the preferred configuration in development mode, while 'false' or 'null' might be preferred in production
        strict_requirements:  true

    # session configuration
```

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

by stof at 2013-02-17T01:49:27Z

could you add a testcase ?

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

by 1ed at 2013-02-17T05:15:10Z

This class had no tests at all, so I thought it's not important... I added one but I have not much experience in writing tests. Is it adequate?

I realized that the new numeric node type not supperted by the dumper at all.

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

by stof at 2013-02-17T11:27:43Z

looks good to me. However, you should edit the PR description: this is a bugfix

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

by 1ed at 2013-02-17T11:32:07Z

@stof done. Thanks!

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

by stof at 2013-02-17T11:41:44Z

@fabpot this should even go into 2.1 as it is a bugfix

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

by 1ed at 2013-02-17T11:44:08Z

@stof there is no ReferenceDumper class in 2.1

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

by stof at 2013-02-17T12:23:44Z

ah, it was directly in the command in 2.1. But the bug should still be fixed IMO