* 2.3:
[2.3] [HttpFoundation] [MimeTypeGuesser]
Removed dead code and various cleaning
[Console] Make it clear that the second argument is not about command options.
Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
[Yaml] fixed parse shortcut Key after unindented collection.
[Console] fixed#10531
Make the container considered non-fresh if the environment parameters are changed
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
src/Symfony/Component/Console/Tests/ApplicationTest.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
This PR was squashed before being merged into the 2.1 branch (closes#7344).
Commits
-------
c423f16 [2.1][TwigBridge] Fixes Issue #7342 in TwigBridge
Discussion
----------
[2.1][TwigBridge] Fixes Issue #7342 in TwigBridge
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7342
| License | MIT
| Doc PR | --
---------------------------------------------------------------------------
by stof at 2013-03-12T13:28:15Z
Can you add a test to avoid regressions ?
---------------------------------------------------------------------------
by benbender at 2013-03-12T13:54:02Z
Done
---------------------------------------------------------------------------
by stevelacey at 2013-03-12T14:40:59Z
Looks good to me?
---------------------------------------------------------------------------
by pborreli at 2013-03-12T16:04:27Z
👍