merged branch clemens-tolboom/2.0 (PR #3725)

Commits
-------

e4f3fd9 Fixed example code.

Discussion
----------

[Translation] example code did not work.

The example code for Translation did not compile. And the trans() result was void.
[DependencyInjection] Support Yaml calls without arguments
merged branch igorw/dic-yaml-without-args (PR #3747)

Commits
-------

24a0d0a [DependencyInjection] Support Yaml calls without arguments

Discussion
----------

[DependencyInjection] Support Yaml calls without arguments
[Security] [HttpDigest] Fixes a configuration error caused by an invalid key child node configuration
merged branch ruimarinho/http_digest (PR #3778)

Commits
-------

fd1ea69 [Security] [HttpDigest] Fixes a configuration error caused by an invalid key child node configuration

Discussion
----------

[Security] [HttpDigest] Fixes a configuration error caused by an invalid "key" child node configuration

```
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
```
Revert "merged branch ruimarinho/http_digest (PR #3778)"

This reverts commit eb6a26f57269d844cf9ef90150e3e0925d5e5bf3, reversing
changes made to a10fee16c193d93080c22528e58b1fd018341229.
[Security] [HttpDigest] Fixes a configuration error caused by an invalid 'key' child node configuration
Fix for using route name as check_path.
[Routing] improved exception message when giving an invalid route name.
[Routing] fixed exception message.
[Console] Avoid outputing \r's in exception messages
[Console] Wrap exception messages to the terminal width to avoid ugly output
merged branch ruimarinho/http_digest (PR #3781)

Commits
-------

fc41d4f [Security] [HttpDigest] Fixes a configuration error caused by an invalid 'key' child node configuration

Discussion
----------

[Security] [HttpDigest] Fixes a configuration error caused by an invalid "key" child node configuration

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: ![Build status](https://secure.travis-ci.org/ruimarinho/symfony.png?branch=http_digest)
merged branch Seldaek/console_ex_20 (PR #3802)

Commits
-------

595cc11 [Console] Wrap exception messages to the terminal width to avoid ugly output
97f7b29 [Console] Avoid outputing \r's in exception messages

Discussion
----------

[Console] Exception rendering fixes

This fixes two things:

- `\r`'s in exception messages were output (in case of `\r\n` newlines), creating really weird results on windows.
- long exception messages were wrapping and then the "red" block was completely messed up, with half black/half red lines, now it's wrapped before output if the terminal width can be detected.

If you don't care about merging this for 2.0, you can also merge the `console_ex` branch which applies on master. Due to moving tests and renaming of some normalize stuff in the tests, the two test patches are kind of different.

RFC: I am really not sure where to put those getTerminalWidth/Height methods. I guess this is not the best place.
merged branch hhamon/route_collection_better_exception_message (PR #3801)

Commits
-------

04ae7cc [Routing] fixed exception message.
f7647f9 [Routing] improved exception message when giving an invalid route name.

Discussion
----------

Route collection better exception message

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
[Console] Mock terminal size to prevent formatting errors on small terminals
[Console] Add docblocks
merged branch Seldaek/termwidth (PR #3805)

Commits
-------

7ce22f0 [Console] Add docblocks
8a2b115 [Console] Mock terminal size to prevent formatting errors on small terminals

Discussion
----------

[Console] Fixes terminal width in tests

This fixes the [tests that broke on travis-ci](http://travis-ci.org/#!/symfony/symfony/jobs/1031109) (which seems to advertise a terminal width of ~34, not sure why).
[DomCrawler] Added some docbocks into DomCrawler classes. Closes #3832
merged branch stloyd/crawler_phpdoc (PR #3834)

Commits
-------

292364a [DomCrawler] Added some docbocks into DomCrawler classes. Closes #3832

Discussion
----------

[DomCrawler] Added some docbocks into DomCrawler classes, reordered func...

...tions to follow Symfony 2 CS. Closes #3832

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

by fabpot at 2012-04-08T10:38:39Z

Can you revert the code move as it makes merges between 2.0 and master much more complex. Thanks.

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

by stloyd at 2012-04-08T11:36:53Z

Reverted and changed commit message.

@fabpot Should I make PR for `master` according to CS ?

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

by stof at 2012-04-08T11:40:58Z

@stloyd this can be considered as a bugfix as you are fixing the phpdoc. So 2.0 is fine