fixed too greedy replacements
bug #10549 Fixed server values in BrowserKit (fabpot)

This PR was merged into the 2.3 branch.

Discussion
----------

Fixed server values in BrowserKit

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9527, #9762, #9821, #9901
| License       | MIT
| Doc PR        | n/a

Commits
-------

65b9810 fixed too greedy replacements
d9cf28d fixed protocol-relative URLs
289da16 added override power to server parameters provided on request method
Add parameter descriptors
feature #10370 [FrameworkBundle][Console] Add parameter descriptors (inalgnu)

This PR was squashed before being merged into the 2.5-dev branch (closes #10370).

Discussion
----------

[FrameworkBundle][Console] Add parameter descriptors

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

I've added several descriptors for each format, henceforth :
``php app/console container:debug --parameter=database_name --format=txt`` will output:
``symfony``

``php app/console container:debug --parameter=database_name --format=json`` will output:
```json
{
    "database_name": "symfony"
}
```

``php app/console container:debug --parameter=database_name --format=xml`` will output :
```xml
<?xml version="1.0" encoding="UTF-8"?>
<parameter key="database_name">symfony</parameter>
```
and ``php app/console container:debug --parameter=database_name --format=md`` will output :
```md
database_name
=============

symfony
```

what do you think ?

Commits
-------

6aa1050 Add parameter descriptors
framework_bundle -> framework
minor #10554 framework_bundle -> framework (mvrhov)

This PR was merged into the 2.5-dev branch.

Discussion
----------

framework_bundle -> framework

Commits
-------

85cf7a7 framework_bundle -> framework
added missing unit test
minor #10558 [DependencyInjection] added missing unit test (fabpot)

This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] added missing unit test

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

Added a unit test to ensure that #10536 won't break BC.

Commits
-------

47d1592 added missing unit test
Merge branch '2.3' into 2.4

* 2.3:
  added missing unit test
  fixed too greedy replacements
  fixed protocol-relative URLs
  added override power to server parameters provided on request method
  made parsing controllers more robust
  Fixed YamlFileLoader imports path

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
Merge branch '2.4'

* 2.4:
  added missing unit test
  fixed too greedy replacements
  fixed protocol-relative URLs
  added override power to server parameters provided on request method
  made parsing controllers more robust
  Fixed YamlFileLoader imports path
Avoid levenshtein comparison when using ContainerBuilder.
bug #10536 Avoid levenshtein comparison when using ContainerBuilder. (catch56)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10536).

Discussion
----------

Avoid levenshtein comparison when using ContainerBuilder.

[DependencyInjection] ContainerBuilder catches exceptions when a service isn't found by Container::get().

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

In the process of building the exception message, I saw over 13k calls to levenshtein() when profiling a Drupal request where there's no compiled container yet, this adds around 36ms+ to the request for the function calls themselves, more for the overall logic.

Made the levenshtein calls optional based on a property on the class, then ContainerBuilder can set that to false and skip the suggestions.

![lev-before](https://f.cloud.github.com/assets/116285/2525110/d6dd3a90-b4eb-11e3-934a-a3726e0f8f09.png)
![lev-after](https://f.cloud.github.com/assets/116285/2525114/dd2de0fc-b4eb-11e3-8df0-598cadf2286b.png)

Commits
-------

cc9cc37 Avoid levenshtein comparison when using ContainerBuilder.
fixed CS
fixed CS
fixed typos
bug #10565 fixed typos (fabpot)

This PR was merged into the 2.5-dev branch.

Discussion
----------

fixed typos

/cc @nicolas-grekas

Commits
-------

584b5c0 fixed typos
Fixed bug in ChoiceType triggering a warning when not using utf-8

This fixes issue #10409 by not using json_encode anymore, but serialize
instead.
Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
bug #10568 [Form] Fixed hashing of choice lists containing non-UTF-8 characters (webmozart)

This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed hashing of choice lists containing non-UTF-8 characters

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

Commits
-------

18dc9a7 Added test case for 4c6a2d15095c13b2a35751b2b2712b183be489c4
73d56f7 Fixed bug in ChoiceType triggering a warning when not using utf-8
fixed CS