[FrameworkBundle] recursively resolve container parameter placeholders
for arrays in router _defaults
Updated HttpFoundation and Locale for proper Composer autoloading
[Routing] fixed 4 bugs in the UrlGenerator
[Routing] context params should have higher priority than defaults

fixes #5437
[Routing] fixed RouteCompiler for adjacent and nested placeholders
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
[DomCrawler] Added ability to set file as raw path to file field
moved some code to the component
Fix PSR-0 incompatibilty

Having 2 classes in the same file breaks PSR-0 compability
added a comment
[Console] fixed default argument display (closes #5563)
merged branch schmittjoh/refDumper (PR #5559)

Commits
-------

6bafe5a moved some code to the component

Discussion
----------

moved some code to the component

This simply moves some code from a command to a dedicated class to make it more reusable.

I wasn't able to run tests because composer failed to install dependencies. Let's see if travis can do better.
fixed CS
[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
Merge branch '2.1'

* 2.1:
  fixed stringification of array objects in RequestDataCollector (closes #5295)
  [HttpFoundation] removed the username and password from generated URL as generated by the Request class (closes #5555)
  [Console] fixed default argument display (closes #5563)
  Fixing config normalisation example in docblock
Improve FilterResponseEvent docblocks Response ref

The type hinting wasn't working in PHPStorm.
merged branch adrienbrault/patch-3 (PR #5572)

Commits
-------

34ca3de Improve FilterResponseEvent docblocks Response ref

Discussion
----------

Improve FilterResponseEvent docblocks Response ref

The type hinting wasn't working in PHPStorm.