* 1.2:
  fixed locale when changing it on the translator itself
  fixed switfmailer spool where the event dispatcher as different from the other ones

Conflicts:
	src/Silex/Provider/SwiftmailerServiceProvider.php

This PR was merged into the 1.2 branch.

Discussion
----------

fixed locale when changing it on the translator itself

should fix #887 and #905

Commits
-------

46b0535c fixed locale when changing it on the translator itself

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

Discussion
----------

Allow overriding formatter used by default monolog.handler service.

This PR adds a new service, `monolog.formatter`, which is read by the default `monolog.handler` in order to allow easy override of the default formatter to use.

Commits
-------

d77204c7 Allow overriding formatter used by default monolog.handler service.

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

Discussion
----------

Allow to override the access denied handler

Allow to override the access denied handler

Commits
-------

8a2f79e6 Allow to override the access denied handler

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

Discussion
----------

simplified some calls

Commits
-------

21d6ff45 simplified some calls

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

Discussion
----------

made the logger more configurable

Made the logger listener more configurable (see #924.)

Commits
-------

10535580 made the logger more configurable

feature #968 made it easier to replace the translator service with an implementation of TranslatorInterface (fabpot)

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

Discussion
----------

made it easier to replace the translator service with an implementation of TranslatorInterface

fixes #961

Commits
-------

d7500dbd made it easier to replace the translator service with an implementation of TranslatorInterface

bug #970 fixed switfmailer spool where the event dispatcher as different from the other ones (fabpot)

This PR was merged into the 1.2 branch.

Discussion
----------

fixed switfmailer spool where the event dispatcher as different from the other ones

see #959

Commits
-------

32a27ca5 fixed switfmailer spool where the event dispatcher as different from the other ones

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

Discussion
----------

Allowed shared ContextListener for firewalls

In response to #963.

Checks for a `context` key in the firewall configuration, if it's not there use `name`.

Commits
-------

a56d0fa4 Allowed shared ContextListener for firewalls

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

Discussion
----------

remove not needed logger tests

The `isset` checks on `$app['logger']` make no sense since `Application` always sets the logger (to `null`). Checks for `!empty` would be more safe/complete (altough `!empty && instance_of('LoggerInterface')` would be more ideal in some cases).
Updating the unit tests is more complicated because some code under test depends on classes outside of Silex.
Hacking the `class_exists` function or use `mocking` of classes that do not exists (@see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/12) would effect the whole test suit (as @stof pointed out).

Commits
-------

784a2466 remove not needed logger tests

* 1.2:
  Update form.rst

This PR was merged into the 1.2 branch.

Discussion
----------

Update form.rst

Before - http://i.imgur.com/Eu2JUvq.png
After - http://i.imgur.com/1d0CIAs.png

Must be the tiniest pull request ever :)

Commits
-------

cdc9ad6a Update form.rst

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

Discussion
----------

Change the visibility of WebTestCase::setUp to keep the same as in PHPUnit

see https://github.com/sebastianbergmann/phpunit/blob/ea293f782b3e001c9b7eeb5bdc2d545e4c091fdb/src/Framework/TestCase.php#L1834

Commits
-------

7cddf2d0 Change the visibility of WebTestCase::setUp to keep the same as in PHPUnit

* 1.2:
  Update serializer.rst

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

Discussion
----------

Update serializer.rst

Before - http://i.imgur.com/hTYzHGR.png
After - http://i.imgur.com/SAPhNN7.png

Commits
-------

a8ab1f8b Update serializer.rst

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

Discussion
----------

Update README.rst

Commits
-------

35044564 Update README.rst

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

Discussion
----------

Make clear to use Session BEFORE app->boot

It wasn't clear to me the session needs to be there before you boot.
I 'wasted' a great amount of time finding that out.
Please clarify for upcoming geniuses like me.

Commits
-------

5ddcc8b3 Make clear to use Session BEFORE app->boot

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

Discussion
----------

Improve exception messages for mount()

Improve the exception message if the `connect` method of a `ControllerProviderInterface` returns an invalid type.

Previously a misleading message about the arguments to `mount()` was emitted if your `connect` method did not return a `ControllerCollection`.

Commits
-------

7d6298d8 Improve exception messages for mount()

* 1.2:
  Update service_controller.rst

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

Discussion
----------

Update service_controller.rst

The word "it's" is a contraction for "it is".  "Its" is a possessive pronoun.

Commits
-------

09a5fe34 Update service_controller.rst

The word "it's" is a contraction for "it is".  "Its" is a possessive pronoun.

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

Discussion
----------

Fixed the requirements in the subtree splits

They should use Pimple 2.1, not 1.0

Commits
-------

6d1ad87d Fixed the requirements in the subtree splits

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

Discussion
----------

Update PHPUnit to its new major version

4.0 and 4.1 would not be allowed by the ``~3.7`` constraint

Commits
-------

639f2132 Update PHPUnit to its enw major version