Fixing config normalisation example in docblock
merged branch richardmiller/fixing_config_docblock (PR #5542)

Commits
-------

1402b42 Fixing config normalisation example in docblock

Discussion
----------

Fixing config normalisation example in docblock

Against 2.0 this time

as per @stof's comments in symfony/symfony-docs#1721

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: -
Fixes the following tickets: -
Todo: -
License of the code: MIT
[Console] fixed default argument display (closes #5563)
[HttpFoundation] removed the username and password from generated URL as generated by the Request class (closes #5555)

Quoted from the ticket it solves for future reference:

"I've been having issues with using htdigest auth (requirement for me to
work with) after upgrading to 2.1. Each time a resource is loaded, a
prompt is given for the HTTP Auth username and password, and Chrome does
not automatically respond to these 401 responses with the credentials it
already has. I've traced the issue to being caused by the HttpFoundation
Component, specifically Request.php.

The request class adds the PHP_AUTH_USER/PHP_AUTH_PW parameters to the
request URI (changes http://www.mysite.com requests to
http://user:pw@www.mysite.com) in getSchemeAndHttpHost(). This behaviour
is not specified in the HTTP RFC, and is incompatible with Chrome as of
Chrome 19, IE (as of IE 9) and has special behaviour in Firefox (prompts
the user to confirm they know they're logging into the site, which is an
ambiguous behaviour at best, but at least it's something if they're
going to support it for now).

This functionality was added about to HttpFoundation about a year ago,
but it really should be removed and standard protocol practices should
be followed. This practice makes it possible for cross-site tracking and
other malicious behaviours to be performed by hiding information in the
authorization headers, which explains why most browsers no longer
support or take exception with it.

The offending line is specifically this. Replacing it with return
$this->getScheme().'://'.$this->getHttpHost(); seems to solve the
problem."
fixed stringification of array objects in RequestDataCollector (closes #5295)
Merge branch '2.0' into 2.1

* 2.0:
  fixed stringification of array objects in RequestDataCollector (closes #5295)
  Fixing config normalisation example in docblock

Conflicts:
	src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
	src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
[Config] Fixed tests on Windows
[Filesystem] Fixed tests on Windows
[Console] Fix some input tests
merged branch Nanocom/console_fix_input_tests (PR #5579)

Commits
-------

cc46780 [Console] Fix some input tests

Discussion
----------

[Console] Fix some input tests

New PR for console input tests, was previously on the master branch : https://github.com/symfony/symfony/pull/5567
[Locale] Fixed tests
[Console] Fixed return value for Command::run
merged branch hason/command (PR #5585)

Commits
-------

c869a65 [Console] Fixed return value for Command::run

Discussion
----------

[2.1][Console] Fixed return value for Command::run

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

API says that Command::run returns integer. This is also necessary if I want to run nested commands.
[Config] Fixed preserving keys in associative arrays
[HttpFoundation] Fixed the tests

b8a2f8c646d1db06dd8745a9cd0d4698e363c22f reverted the use of the username
and password in the getSchemeAndHost method but forgot to revert the
corresponding tests.
added dirs generated by build-data.php in locale component to .gitignore
[Form] Fixed the testsuite for PHPUnit 3.6 as travis still uses it
fixed issue #5596 (Broken DOM with the profiler's toolbar set in position top)
Update src/Symfony/Component/Validator/Resources/translations/validators.pl.xlf

polish translation patch
I think translator should choose first translation if other (seccond/third form) does not exist.
merged branch stof/phpunit_3_6 (PR #5598)

Commits
-------

ef288a2 [Form] Fixed the testsuite for PHPUnit 3.6 as travis still uses it

Discussion
----------

[Form] Fixed the testsuite for PHPUnit 3.6

Travis is still using it so this avoids making all build fail just because of it.