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

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

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

Discussion
----------

Allow strings for levels in the monolog service provider

The monolog service provider requires a constant on Monolog\Logger to be
referenced, which has an integer value. This is not very practical when
working with external configuration files.

This patch accepts strings like debug, info, error, etc. that are
translated to the corresponding logger constant values.

This is an alternative to #882.

Commits
-------

6c97e670 Fix JSON syntax error in monolog provider docs
a7cba302 Reword the documentation on string logger levels
2ef826ce Backport static:: to classname:: for PHP 5.3 compatibility
121f3f2b Allow strings for levels in the monolog service provider

The monolog service provider requires a constant on Monolog\Logger to be
referenced, which has an integer value. This is not very practical when
working with external configuration files.

This patch accepts strings like debug, info, error, etc. that are
translated to the corresponding logger constant values.

This is an alternative to #882.

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

Discussion
----------

removal of redundant line of code

Commits
-------

539e97eb removal of redundant line of code

This PR was merged into the master branch.

Discussion
----------

Allow changing of ResolvedFormTypeFactory

Added a new service for the ResolvedTypeFactory. The service name is based on the symfony service name.

This is needed to get the debug form panel working in silex. (PR for this follows soon in web-profiler-provider)

Commits
-------

6309b930 Allow changing of ResolvedFormTypeFactory

Added a new service for the ResolvedTypeFactory. The service name is based on the symfony service name.

* 1.1:
  Remove gendered pronouns

* 1.0:
  Remove gendered pronouns

This PR was merged into the 1.0 branch.

Discussion
----------

Remove gendered pronouns

When referencing hypothetical users, it's more inclusive to use
gender-neutral prnouns. Instances of he/she/his/her/him have been
replaced with they/them/their and verb tenses changed to match.

Commits
-------

c48da4ca Remove gendered pronouns

When referencing hypothetical users, it's more inclusive to use
gender-neutral prnouns. Instances of he/she/his/her/him have been
replaced with they/them/their and verb tenses changed to match.

This PR was merged into the master branch.

Discussion
----------

Array types defined

Commits
-------

04f0efb3 array types defined

This PR was merged into the master branch.

Discussion
----------

moved README to rst

Commits
-------

cb303871 moved README to rst

This PR was merged into the master branch.

Discussion
----------

allowed any callback to be a method call on a service (a:b notation)

#800 added the possibility to use a service method (with the `a:b` notation) for converters. This PR goes one step further by allowing almost all methods accepting a callback to use a service method.

The following is now possible:

```php
$app->before('service:beforeApp');
$app->after('service:afterApp');
$app->finish('service:finishApp');
$app->error('service:error');
$app->on('kernel.request', 'service:onRequest');

$app
    ->match('/', 'service:controller')
    ->convert('foo', 'service:convert')
    ->before('service:before')
    ->after('service:after')
;
```

Commits
-------

87f5e203 allowed any callback to be a method call on a service (a:b notation)