This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Various fixes

Some merged PRs from fabpot/Silex repo.

Commits
-------

72aae9e1 fixed CS
e4e0fef3 fixed wrong merge
33903336 minor #4 Changed fetchAssoc to fetchAll (gelbander)
c119f90e Merge remote-tracking branch 'WouterJ/doc_fixes'
19265c0c feature #7 Provides support for the PATCH method for HTTP (ramsey)
0f6956d1 Provides support for the PATCH method for HTTP
919c32c7 Some doc fixes
03839264 Changed fetchAssoc to fetchAll

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Changed fetchAssoc to fetchAll

fetchAssoc only returns one row. Thats what the sql query implicates.

Commits
-------

03839264 Changed fetchAssoc to fetchAll

* WouterJ/doc_fixes:
  Some doc fixes

Conflicts:
	doc/intro.rst
	doc/usage.rst

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Provides support for the PATCH method for HTTP

This pull request allows Silex routes to be specified to handle the `PATCH` method for HTTP. Without this, when trying to specify that a route accepts `PATCH` requests, Silex throws a `BadMethodCallException` with the message `Method "Silex\Route::patch" does not exist.`

#### References:

* [PATCH Method for HTTP](http://tools.ietf.org/html/rfc5789)

Commits
-------

0f6956d1 Provides support for the PATCH method for HTTP

feature #920 allow to add object initializers, for complex valdations as unique entity (dominikzogg)

This PR was squashed before being merged into the 1.2.x-dev branch (closes #920).

Discussion
----------

allow to add object initializers, for complex valdations as unique entity

Commits
-------

3a0eac09 allow to add object initializers, for complex valdations as unique entity

This PR was squashed before being merged into the 1.2.x-dev branch (closes #917).

Discussion
----------

Added a note about how to send emails with console commands

Commits
-------

09e21e66 Added a note about how to send emails with console commands

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Added contribution instructions

Instructions to install symfony/serializer dependency was missing.

Commits
-------

e552300f Added contribution instructions

Instructions to install symfony/serializer dependency was missing.

* 1.1:
  Update twig.rst SymfonyBridgesServiceProvider

This PR was submitted for the 1.1.x-dev branch but it was merged into the 1.1 branch instead (closes #903).

Discussion
----------

Update twig.rst SymfonyBridgesServiceProvider

Changelog:
2012-05-26: Removed SymfonyBridgesServiceProvider. It is now implicit by checking the existence of the bridge.

Commits
-------

b8d68e7 Update twig.rst SymfonyBridgesServiceProvider

Changelog:
2012-05-26: Removed SymfonyBridgesServiceProvider. It is now implicit by checking the existence of the bridge.

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Typo in comment, LATE_EVENT is -512 not 512

Commits
-------

46d20b82 Typo in comment, LATE_EVENT is -512 not 512

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

The form csrf extension should use the translator if available

Fixes #896

Commits
-------

c0745457 The form csrf extension should use the translator if available

Fixes #896

http://tools.ietf.org/html/rfc5789

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Replaceable event listener callable

Made event callables injectable with pimple. refs #870

Commits
-------

6690ff5c Made event callables injectable with pimple. refs #870

This PR was squashed before being merged into the 1.2.x-dev branch (closes #890).

Discussion
----------

Update phpDoc for ControllerCollection

__call() forwards method-calls to Route, but returns instance of ControllerCollection.
 Added the listing Route's methods, so that IDEs know they are valid.

Commits
-------

53b3a357 Update phpDoc for ControllerCollection

This PR was merged into the 1.2.x-dev branch.

Discussion
----------

Made Silex compatible with Symfony 2.5

Commits
-------

2c12d84c Enabled testing on Symfony 2.5 on Travis
2a7f3db2 Made Silex comaptible with Symfony 2.5

* 1.1:
  TranslationServiceProvider replaced translator.messages by translator.domains.

* 1.0:
  TranslationServiceProvider replaced translator.messages by translator.domains.

This PR was submitted for the 1.0.x-dev branch but it was merged into the 1.0 branch instead (closes #892).

Discussion
----------

TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D

Commits
-------

72b1ad9 TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D

* 1.1:
  Updated year in License

* 1.0:
  Updated year in License

This PR was merged into the 1.0 branch.

Discussion
----------

Updated year in License

Commits
-------

1e543d2a Updated year in License

minor #874 Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution (alcohol)

This PR was squashed before being merged into the 1.2.x-dev branch (closes #874).

Discussion
----------

Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution

Took me quite a while to realise this; this simple tip might help others save that time :-)

Commits
-------

4b1ae82b Update http_cache.rst - hint at whitelisting 127.0.0.1 if using HTTP Cache solution