[Security] Add an option to disable the hasPreviousSession() check in AbstractAuthenticationListener
[TwigBundle] Use display instead of visibility for exception page icons
StringInput resets the given options.
[Security] Add PHPDoc to AuthenticationEvents
[FrameworkBundle] [Templating] added Stopwatch support to the PHP engine
Fixed the NullLogger to implement the HttpKernel interface again
Correct comment in NativeSessionStorage regarding session.save_handler

It's save_handler, not save_handlers.
[Finder] Fixed test
merged branch jfsimon/finder-iterator-keys-fix (PR #6924)

This PR was merged into the master branch.

Commits
-------

ed3a875 [Finder] Fixed test

Discussion
----------

[Finder] Fixed test

Fixed tests broken by PR #6911.
Iterator keys were considered as incremented index in `FilePathsIteratorTest`.
merged branch stof/fix_null_logger (PR #6920)

This PR was merged into the master branch.

Commits
-------

b1d1168 Fixed the NullLogger to implement the HttpKernel interface again

Discussion
----------

Fixed the NullLogger to implement the HttpKernel interface again

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no (reverting one introduced by mistake)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | n/a

This BC breaking mistake has been reported in https://github.com/schmittjoh/JMSSecurityExtraBundle/pull/105#issuecomment-12908659
merged branch igorw/session-save-handler-comment (PR #6922)

This PR was merged into the 2.1 branch.

Commits
-------

d6c0455 Correct comment in NativeSessionStorage regarding session.save_handler

Discussion
----------

Correct comment in NativeSessionStorage regarding session.save_handler

It's save_handler, not save_handlers.
Fugbix typo
Replaced call that triggers deprecated error
merged branch dlsniper/validator-deprecation (PR #6929)

This PR was merged into the master branch.

Commits
-------

d0341e8 Replaced call that triggers deprecated error

Discussion
----------

[Validator][ChoiceValidator] Replaced call that triggers deprecated error

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

This removes the deprecation warnings from the ChoiceValidator.
Remove executable bit from all PHP files
merged branch TravisCarden/master (PR #6933)

This PR was merged into the master branch.

Commits
-------

924c256 Remove executable bit from all PHP files

Discussion
----------

Remove executable bit from all PHP files

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

Apologies if I haven't got the protocol quite right here. This is my first interaction with this project.

By the way, I've noticed a non-trivial number of pull requests to remove executable bits. Could there be an automated test to prevent files getting into the repo with them on in the first place?
updated the branch alias in composer files
Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version
merged branch stloyd/feature/doctrine_versions (PR #6632)

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

Commits
-------

a1c0ff5 Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version

Discussion
----------

Update `composer.json` files

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

by fabpot at 2013-01-09T17:55:54Z

When will Doctrine 2.4 be released? If not in the next couple of weeks, this PR cannot be merged as we need to ship Symfony 2.2 with a stable version of Doctrine.

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

by stof at 2013-01-09T18:13:59Z

@fabpot This allows to use Doctrine 2.4. It does not require to use 2.4. Actually, as Doctrine releases are BC, I would even vote for using ``~2.2`` as requirement

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

by fabpot at 2013-01-10T08:18:52Z

If the Doctrine is fine with `~2.2`, let's do that. @beberlei Can you confirm?

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

by stloyd at 2013-01-10T08:30:19Z

As Doctrine latest release is `2.3.2` maybe for Symfony `2.2` we should increase to `~2.3` not `~2.2` ?

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

by stof at 2013-01-10T09:15:00Z

@stloyd Why should we force using 2.3 when we don't require any of the 2.3 features ? Composer will use the most recent package matching the constraint anyway, so 2.2 will not be used unless someone forbids 2.3 in another package.

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

by stloyd at 2013-01-29T19:24:09Z

@fabpot ping
Fix a deprecated method call in the tests