[Security] Regenerated the ACL SQL schema with the latest Doctrine version
[HttpFoundation] Restore compliance with RFC2324
Add missing backtick to CHANGELOG-2.1
merged branch xanido/master (PR #3558)

Commits
-------

afd708e Add missing backtick to CHANGELOG-2.1

Discussion
----------

Fix a typo in CHANGELOG-2.1

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: -
Fixes the following tickets: -
Todo: -
merged branch drak/patch-2 (PR #3556)

Commits
-------

0761b8a [HttpFoundation] Restore compliance with RFC2324

Discussion
----------

[HttpFoundation] Restore compliance with RFC2324

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
merged branch stof/acl_schemas (PR #3554)

Commits
-------

919eee4 [Security] Regenerated the ACL SQL schema with the latest Doctrine version

Discussion
----------

[Security] Regenerated the ACL SQL schema with the latest Doctrine version

This regenerates the SQL schemas for all platforms supported by Doctrine as some changes were made in the DBAL code since the previous run of the script and a new platform has been added.
merged branch Engerim/patch-1 (PR #3538)

Commits
-------

3fd9003 Update src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php

Discussion
----------

Changed return Tags from PermissionBuilder to MaskBuilder
merged branch johnnypeck/patch-2 (PR #3536)

Commits
-------

99079ba Very small semantic changes improving understanding and readability.

Discussion
----------

Very small semantic changes improving understanding and readability.

The "may or may not" change may seem pedantic but it quantifies the use of the field; obviously a boolean is true or not but "may not be empty" made me wonder about it's intent so clarification seemed appropriate.

Change "return" to "returns" as the rest of the code in the class uses this syntax.

Change "contains" to "contain" in an exception message.
merged branch hason/classloader (PR #3529)

Commits
-------

1ec075d [ClassLoader] Fixed version compare
8fb529c [ClassLoader] Fixed ClassMapGenerator and added suport for traits

Discussion
----------

[ClassLoader] Fixed ClassMapGenerator and added suport for traits

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

by hason at 2012-03-08T10:49:53Z

@fabpot, @Seldaek ``PHP_VERSION_ID`` or ``version_compare``?

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

by Seldaek at 2012-03-08T11:42:20Z

Ultimately @fabpot can call it, but I'm pro version_compare because it's just typically used for those checks, which may not make it more readable but makes it less WTF since it's a common pattern.

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

by drak at 2012-03-08T13:43:18Z

I prefer `version_compare()` with `phpversion()` as it's way more readable and obvious what it is.

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

by fabpot at 2012-03-08T17:06:25Z

+1 for `version_compare()`

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

by hason at 2012-03-09T07:19:10Z

@fabpot done
[Console] Added style helper.

Nested styles don't work. For instance if within a command you try:
`$output->write('<fg=blue>Hello <fg=red>world</fg=red>!</fg=blue>');`
then final `!` wont be blue because the `</fg=red>` tag clears all styles.

Style helper provides a `flatten` method which flatten nested styles by
turning `<fg=blue>Hello <fg=red>world</fg=red>!</fg=blue>`
into `<fg=blue>Hello </fg=blue><fg=red>world</fg=red><fg=blue>!</fg=blue>`.
[console] Added style helper tests.
[Console] Added validation capability to style helper.

When removing style or flatten it, style helper will remove every tags.
When enabling validation, the helper will keep safe every non-style tags safe.
[Console] Added style helper validation tests.
[Console] Added docblock comments to style helper.
[Console] Added highlight methods to style helper.
[Console] Added style helper highlight methods tests.
[Console] Added style helper to default application helper set.