* 1.2:
  Fixed Form Provider documentation
  Fix: Add missing method visibility in interface excerpts
  Adding a default port for the connection to the database
  Simplify installation instructions
  simplified Composer instructions

Conflicts:
	README.rst
	doc/providers.rst
	doc/usage.rst

This PR was merged into the 1.2 branch.

Discussion
----------

simplified Composer instructions

Commits
-------

29076993 simplified Composer instructions

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

Discussion
----------

Typo in fn name

Commits
-------

5c383b24 Typo in fn name

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

Discussion
----------

Fixed Form Provider documentation

The Locale component is replaced by the Intl and Icu components, which are taken care of by Composer.

The twig bridge also does not work without translation, as far as I tested.

Commits
-------

dddd0aab Fixed Form Provider documentation

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

Discussion
----------

Fix: Add missing method visibility in interface excerpts

PSR-2, that's why.

Commits
-------

fc9c1b7d Fix: Add missing method visibility in interface excerpts

PSR-2, that's why.

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

Discussion
----------

Add option to disable memory spool

Thought this might do for #1054

Commits
-------

0501be91 Add option to disable memory spool

This PR was merged into the 1.2 branch.

Discussion
----------

Adding a default port for the connection to the database

On HHVM an exception is thrown like what it is not a number.

Commits
-------

4a1d3480 Adding a default port for the connection to the database

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

Discussion
----------

Retrospectively update changelog

Anyone think of anything else? I did diff 1.2..master, but it's hard to see the wood for the trees.

Commits
-------

6d1128f6 Retrospectively update changelog

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

Discussion
----------

Update docs to reflect provider interface changes

Commits
-------

db32f192 Update docs to reflect provider interface changes

This PR was merged into the 1.2 branch.

Discussion
----------

Simplify installation instructions for 1.2

See #1069

Commits
-------

fcb77426 Simplify installation instructions

On HHVM an exception is thrown like what it is not a number.

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

Discussion
----------

Fix Monolog error where newer versions does not allow an empty stream

Fixes an error with Monolog, only problem is that i think i have already done this PR once before, but it have gone missing.

Commits
-------

26c7d59e Fix Monolog error where newer versions does not allow an empty stream

* 1.2:
  fixed tests for PHP 5.3

Conflicts:
	tests/Silex/Tests/CallbackServicesTest.php

* 1.2:
  fixed some tests
  fixed CS
  simplified the build matrix
  fixed tests for Symfony 2.6+
  allowed any Symfony 2.x versions
  Grammar correction

Conflicts:
	composer.json
	tests/Silex/Tests/Application/UrlGeneratorTraitTest.php
	tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

This PR was merged into the 1.2 branch.

Discussion
----------

allowed any Symfony 2.x versions for Silex 1.2

As we know that Symfony 3.0 will be next year, let's allow any Symfony 2.x versions. I've added the 2.6 and 2.7 versions in Travis to check that everything work fine for all supported Symfony 2.x versions.

Commits
-------

a5dd2b55 simplified the build matrix
ec53f07e fixed tests for Symfony 2.6+
288d8911 allowed any Symfony 2.x versions

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

Discussion
----------

Grammar correction

Commits
-------

29004259 Grammar correction

* 1.2:
  Update RememberMeServiceProvider.php

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

Discussion
----------

Update RememberMeServiceProvider.php

Dispatcher is not called in the remember me listener because dispatcher was not given in the constructor of the RememberMe Listener.

Commits
-------

89b1287b Update RememberMeServiceProvider.php

* 1.2:
  Remove PHPUnit as a development dependency

Conflicts:
	composer.json

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

Discussion
----------

Remove PHPUnit as a development dependency

This will make it more inline with how Symfony uses PHPUnit and already
considers this a tool installed when developing.

for reference as PR that rejects having phpunit as dependency in symfony
https://github.com/symfony/symfony/issues/12136

Commits
-------

62b0fa70 Remove PHPUnit as a development dependency

This will make it more inline with how Symfony uses PHPUnit and already
considers this a tool installed when developing.

for reference as PR that rejects having phpunit as dependency in symfony
https://github.com/symfony/symfony/issues/12136