Fixed metadata serialization
Merge branch '2.0' into 2.1

* 2.0:
  Fixed metadata serialization
[Validator] fixed metadata serialization
Merge branch '2.1' into 2.2

* 2.1:
  [Validator] fixed metadata serialization
  Fixed metadata serialization
added trusted hosts check
replaced deprecated Twig features
Merge branch '2.0' into 2.1

* 2.0:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
Merge branch '2.1' into 2.2

* 2.1:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Request.php
updated CHANGELOG for 2.2.5
update CONTRIBUTORS for 2.2.5
updated VERSION for 2.2.5
bumped Symfony version to 2.2.6
merged branch fabpot/twig-deprecated-features (PR #8675)

This PR was merged into the 2.2 branch.

Discussion
----------

replaced deprecated Twig features

| 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

As Symfony depends on Twig 1.11+, removing the usage of deprecated features will allow Symfony 2.2+ to work with Twig 2.0.

Commits
-------

322f880 replaced deprecated Twig features
made the filesystem loader compatible with Twig 2.0

Without adding the exists() method, the code happens to work by chance,
just because the current implementation of Twig exits() method calls
findTemplate().

But we know that it won't be the case anymore as of Twig 2.0.
merged branch fabpot/twig-filesystem-exists (PR #8677)

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

Discussion
----------

[TwigBundle] made the filesystem loader compatible with Twig 2.0

| Q             | A
| ------------- | ---
| Bug fix?      | yes (for Twig 2.x)
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Without adding the exists() method, the code happens to work by chance,
just because the current implementation of Twig exits() method calls
findTemplate().

But we know that it won't be the case anymore as of Twig 2.0.

Commits
-------

d00548b [TwigBundle] made the filesystem loader compatible with Twig 2.0
Fixed bug introduced in #8675
merged branch WouterJ/fix_bug (PR #8696)

This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][TwigBridge] Fix form_enctype bug

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

After a copy/past error in #8675, `{{ form_enctype() }}` was not working because it results in a `Class "Symfony\Bridge\Twig\Node\FormEnctypeNode" not found` error.

This should only be merged in 2.2, as of 2.3 this is moved to the `Symfony\Bridge\Twig\Node\FormEnctypeNode` class

Commits
-------

e0c7d3d Fixed bug introduced in #8675
added missing support for the new output API in PHP 5.4+
Use strstr instead of strpos
merged branch larowlan/master (PR #8081)

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

Discussion
----------

Use strstr instead of strpos in ClassLoader (4% perf improvement)

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

Using ClassLoader in Drupal 8, using strstr instead of strpos nets 4% perf improvement.
XHPROF diff https://dl.dropboxusercontent.com/u/10201421/diff.html

Commits
-------

25d7b90 [ClassLoader] Use strstr instead of strpos