[Filesystem] fixed a test broken after merging the 2.3 branch
[DomCrawler] fixed wrong merge
Merge branch '2.4'

* 2.4:
  [DomCrawler] fixed wrong merge
  [Filesystem] fixed a test broken after merging the 2.3 branch
Fixed tests after merging pattern deprecation
bug #10535 [Form] Fixed tests after merging pattern deprecation (stefanosala)

This PR was merged into the 2.5-dev branch.

Discussion
----------

[Form] Fixed tests after merging pattern deprecation

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

Tests were not run on #10001.
Here are some fixes.

Commits
-------

e2d8944 Fixed tests after merging pattern deprecation
Model choice accept custom unique column

Use now ->add('my_field', 'model', array('class' => 'MyClassWithSlug', 'index_property' => 'slug'));
To make choice list keys as slug
feature #10513 [Bridge][Propel1][Form] Model choice accept custom unique column (cedriclombardot)

This PR was merged into the 2.5-dev branch.

Discussion
----------

[Bridge][Propel1][Form] Model choice accept custom unique column

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

This PR permit to do :

```` php
<?php
public function buildForm(FormBuilderInterface $builder, array $options)
{
    $builder->add('my_field', 'model', array(
                        'class' => 'MyClassWithSlug',
                        'index_property' => 'slug'
    ));
}
````

With this option you can hide internal ids to expose an unique column eg slug and render

```` html
<select name="my_field">
      <option value="{THE_SLUG}">{THE_VALUE}</option>
</select>
````

Commits
-------

81e94d0 Model choice accept custom unique column
added explicit swiftmailer flush after ConsoleEvents::TERMINATE
feature #10534 [SwiftMailer] [MonologBundle] send error log mails from CLI (arodiss)

This PR was merged into the 2.5-dev branch.

Discussion
----------

[SwiftMailer] [MonologBundle] send error log mails from CLI

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

Given I have symfony2 application with Monolog configured to send mail on error logs.
When I have exception thrown from CLI task
Then I should receive error mail

However this is not true because `Monolog/SwiftMailerHandler` is doing force flush only on `kernel.terminate`, but not on `console.terminate`

This PR fixes issue together with https://github.com/symfony/MonologBundle/pull/73

Commits
-------

9bb602f added explicit swiftmailer flush after ConsoleEvents::TERMINATE
handle array root element

An array to string conversion notice was thrown when the root element of
the thing being validated is an array.
bug #10123 handle array root element (greg0ire)

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

Discussion
----------

handle array root element

An array to string conversion notice was thrown when the root element of the thing being validated is an array.

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

Commits
-------

17ed8bf handle array root element
Fixed ACE domain checks on UrlValidator (#10031)
bug #10275 [Validator] Fixed ACE domain checks on UrlValidator (#10031) (aeoris)

This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Fixed ACE domain checks on UrlValidator (#10031)

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

I added some checks to allow internationalised domain names as per reported on #10031 and some extra testcases to cover ACE domain names.

Commits
-------

7a2f154 Fixed ACE domain checks on UrlValidator (#10031)
Added new validator for UUIDs
feature #10291 [Validator] New validator for UUIDs (colinodell)

This PR was submitted for the 2.3 branch but it was merged into the 2.5-dev branch instead (closes #10291).

Discussion
----------

[Validator] New validator for UUIDs

This PR adds a new validator for [RFC 4122](http://tools.ietf.org/html/rfc4122)-compliant [universally unique identifiers (UUIDs)](https://en.wikipedia.org/wiki/Universally_unique_identifier).  This implementation validates both the format and (optionally) the UUID version.

The RFC is very specific on how UUIDs should be formatted.  However, some systems/platforms like PostgreSQL produce or allow similar but non-compliant UUIDs which some developers may need to allow.  (Their dashes are in different spots, or they might be wrapped in curly braces, but still contain the same number of hexadecimal characters). To accommodate both parties, I've added a `strict` option to the constraint.  When enabled (default), the validator only allows UUIDs conforming to the exact RFC specs.

Comments and feedback would be greatly appreciated :)

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

**TODOs:**

 - [x] Gather feedback; make changes
 - [x] Ensure all tests pass
 - [ ] Get approval; have this added to the 2.5 milestone
 - [x] Submit PR for the documentation

Commits
-------

19931c9 Added new validator for UUIDs
Fix issue symfony/symfony#10345 '[FrameworkBundle][Console] container:debug --parameter="" not working anymore'
bug #10363 [FrameworkBundle][Console] Fix issue #10345 container:debug --parameter="" not working anymore (FineWolf)

This PR was merged into the 2.4 branch.

Discussion
----------

[FrameworkBundle][Console] Fix issue #10345 container:debug --parameter="" not working anymore

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

## TODO
- [x] Fix issue #10345
- [ ] Create unit test for `describeContainerParameter`

Commits
-------

b278aa4 Fix issue symfony/symfony#10345 '[FrameworkBundle][Console] container:debug --parameter="" not working anymore'
Add UnprocessableEntityHttpException to HttpKernel Exceptions
minor #10527 [HttpKernel] [Exception] Add UnprocessableEntityHttpException to HttpKernel Exceptions (steveYeah)

This PR was merged into the 2.5-dev branch.

Discussion
----------

[HttpKernel] [Exception] Add UnprocessableEntityHttpException to HttpKernel Exceptions

Add UnprocessableEntityHttpException, as this would have been useful as few times now.

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

Commits
-------

304cbe9 Add UnprocessableEntityHttpException to HttpKernel Exceptions
Check headers sent before sending PHP response

If the response contents has been sent before an error occurs, PHP
triggers the warning "Cannot modify header information - headers already sent"

This change ensure that the error message is echoed, while it's impossible
to change the HTTP status code and headers.