* 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

* 1.2:
  bumped version to 1.2.3-DEV
  prepared the 1.2.2 release
  updated CHANGELOG
  fixed translator
  fixed translator
  Update testing.rst

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php

This PR was merged into the 1.2 branch.

Discussion
----------

fixed translator

Fixes #1028, #988, #983, #1023

That makes the tests pass again.

Commits
-------

712375b9 fixed translator

As of Symfony 2.5.2, Translator::__construct() calls setLocale.
As the Silex Translator calls it with null and because we synchronize
the translator language with the app one, the locale was always
set to null when calling the translator for the first time, overriding
the current app locale.

As of Symfony 2.5.2, Translator::__construct() calls setLocale.
As the Silex Translator calls it with null and because we synchronize
the translator language with the app one, the locale was always
set to null when calling the translator for the first time, overriding
the current app locale.

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

Discussion
----------

Add missing @param tags

Commits
-------

6a54320e Add missing @param tags

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

Discussion
----------

Add imports for type hints

Commits
-------

926bbc03 Add imports for type hints

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

Discussion
----------

Update testing.rst

Fix dead link, @see:
https://github.com/silexphp/Silex/issues/1020

Commits
-------

8c8b6a67 Update testing.rst

Fix dead link, @see:
https://github.com/silexphp/Silex/issues/1020

* 1.2:
  fixed CS
  Update session.rst
  updated docs and changelog
  Add  parameter for application middlewares (before, after, finish)
  updated docs and changelog
  allow to register form types without extensions

Conflicts:
	src/Silex/Provider/FormServiceProvider.php
	tests/Silex/Tests/Provider/FormServiceProviderTest.php

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

Discussion
----------

Update session.rst

May be a bug, but Sessions expire after 30 minutes (or less ?)
To have the default behavior describe in documentation, you must set cookie_lifetime to 0

$app->register(new Silex\Provider\UrlGeneratorServiceProvider(), array(
    'session.storage.options' => array(
        'cookie_lifetime' => 0
        )
    )
);

Commits
-------

0e553e36 Update session.rst

May be a bug, but Sessions expire after 30 minutes (or less ?)
To have the default behavior describe in documentation, you must set cookie_lifetime to 0

$app->register(new Silex\Provider\UrlGeneratorServiceProvider(), array(
    'session.storage.options' => array(
        'cookie_lifetime' => 0
        )
    )
);

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

Discussion
----------

Add $app parameter for application middlewares (before, after, finish)

There is small inconsistence between route and application middlewares.

Route middlewares (http://silex.sensiolabs.org/doc/middlewares.html#route-middlewares) can have $app parameter, but application middlewares (http://silex.sensiolabs.org/doc/middlewares.html#application-middlewares) has this parameter missing.

Commits
-------

38a3c465 Add  parameter for application middlewares (before, after, finish)

This PR was squashed before being merged into the 1.2 branch (closes #1018).

Discussion
----------

allow to register form types without extensions

Commits
-------

0e5f4899 allow to register form types without extensions

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

Discussion
----------

Fixed DoctrineServiceProvider when no logger

When the provider is used with `Pimple` alone, it throws an exception if the `logger` is not defined.

It was previously working, but it seems to be introduced in https://github.com/silexphp/Silex/commit/784a24665de285cb8c31db2c12c4785eb5605773.

Commits
-------

d89029c6 Fixed DoctrineServiceProvider when no logger