[TwigBundle] Fixed tests
merged branch hason/twigbundle_test (PR #6187)

This PR was merged into the 2.0 branch.

Commits
-------

acf1f86 [TwigBundle] Fixed tests

Discussion
----------

[2.0][2.1][TwigBundle] Fixed tests
[Config] Fixed tests on Windows
[Locale] fixed tests
merged branch hason/tests_2_0 (PR #6197)

This PR was merged into the 2.0 branch.

Commits
-------

5fe58bf [Locale] fixed tests
500cc3c [Config] Fixed tests on Windows

Discussion
----------

[2.0] Fixed tests

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

by fabpot at 2012-12-05T15:25:23Z

Is it a backport of some commits that were merged in 2.1/master?

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

by hason at 2012-12-05T22:17:15Z

I backported 65281fb56c57c24352ff6cad18015871bce30c37 and modified 90d6dc379149e1a8d924f97be8c236b9e3bd2de5
[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.
[HttpFoundation] fixed a small regression
[Config] Loader::import must return imported data
removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
merged branch hason/config_import (PR #6226)

This PR was merged into the 2.0 branch.

Commits
-------

8bb3208 [Config] Loader::import must return imported data

Discussion
----------

[2.0][2.1][2.2] [Config] Loader::import must return imported data

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

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

by fabpot at 2012-12-07T13:40:58Z

why?

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

by hason at 2012-12-07T20:57:06Z

We should support both approaches to importing. The first case assumes shared object accross all the loaders (loading DI configuration) and the second case requires returning of imported object (merging route collections).

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

by stof at 2012-12-07T21:38:42Z

@fabpot As ``load`` can have a return value, this PR makes sense IMO

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

by fabpot at 2012-12-10T12:44:09Z

This change should be done in master then.

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

by stof at 2012-12-10T14:43:18Z

@fabpot I would consider it as a bugfix. The routing loaders are simply broken (as of 2.0) if the loader does not extend from FileLoader (which overwrites the ``import`` method and takes care to return the value). the routing loaders expect to receive the loaded data when importing instead of loosing the imported data entirely: https://github.com/symfony/Routing/blob/2.0/Loader/XmlFileLoader.php#L80
remove realpath call

I'm trying to create an executable phar archive from a Symfony application, but when I run the phar, it fails to find any commands because of this php bug/feature:

https://bugs.php.net/bug.php?id=52769

After this change, my archive works just like a normal app/console call
fixed CS
merged branch Burgov/patch-2 (PR #6263)

This PR was merged into the 2.0 branch.

Commits
-------

e6bb156 remove realpath call

Discussion
----------

[HttpKernel] remove realpath call

I'm trying to create an executable phar archive from a Symfony application, but when I run the phar, it fails to find any commands because of this php bug/feature:

https://bugs.php.net/bug.php?id=52769

After this change, my archive works just like a normal app/console call
[FrameworkBundle] used the new method for trusted proxies
checked for a potentially missing key

The 'function' key isn't always available in the trace. This was
causing me a notice.
merged branch bamarni/patch-14 (PR #6273)

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

Commits
-------

9273b62 [HttpKernel] checked for a potentially missing key

Discussion
----------

[HttpKernel] checked for a potentially missing key
[FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt()