Removed useless branch alias for dev-master in composer.json
merged branch hason/composer_2_1 (PR #6201)

This PR was merged into the 2.1 branch.

Commits
-------

10e5f3b Removed useless branch alias for dev-master in composer.json

Discussion
----------

[2.1] Fixed composer.json

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

by fabpot at 2012-12-06T08:23:35Z

Why is is useless?

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

by hason at 2012-12-06T08:30:58Z

Because the ``dev-master`` branch is alias for ``2.2-dev`` as mentioned @stof in https://github.com/symfony/symfony/pull/6196#discussion_r2320254.

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

by fabpot at 2012-12-06T08:33:42Z

got it now. Can you fix your PR as there are some unrelated commits? Thanks.

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

by hason at 2012-12-06T09:02:50Z

I backported some "unrelated" commits for better usage with composer. Should I remove these?

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

by fabpot at 2012-12-06T09:05:45Z

We do not backport things. So, please, remove them.

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

by hason at 2012-12-06T10:02:08Z

done
merged branch bschussek/issue6141 (PR #6206)

This PR was merged into the 2.1 branch.

Commits
-------

b604eb7 [DoctrineBridge] Improved performance of the EntityType when used with the "query_builder" option
db2ee54 [DoctrineBridge] Improved exception message
99321cb [DoctrineBridge] Fixed: Exception is thrown if the entity class is not known to Doctrine

Discussion
----------

[DoctrineBridge] fixed caching when EntityType is used with the "query_builder" option

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
[HttpFoundation] added a check for the host header value
merged branch fabpot/host-check (PR #6209)

This PR was merged into the 2.0 branch.

Commits
-------

0489799 [HttpFoundation] added a check for the host header value

Discussion
----------

[HttpFoundation] added a check for the host header value

alternative for #3865
[HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)
merged branch fabpot/move-uploaded-file-2_0 (PR #6221)

This PR was merged into the 2.0 branch.

Commits
-------

447ff91 [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)

Discussion
----------

[HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)

An alternative for #5878 and it fixes #6185.
Merge branch '2.0' into 2.1

* 2.0:
  [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible (closes #5878, closes #6185)
  [HttpFoundation] added a check for the host header value

Conflicts:
	src/Symfony/Component/HttpFoundation/File/File.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
[DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed