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

Discussion
----------

Clean ups on master

Remove some stuff that doesn't apply anymore for master and a little typo.

Commits
-------

85558b76 Clean ups on master

* 1.3:
  Phpdocs
  Have `Controller::generateRouteName()` always put the method first.

Conflicts:
	src/Silex/ControllerCollection.php
	src/Silex/EventListener/LogListener.php
	src/Silex/ExceptionListenerWrapper.php
	src/Silex/Provider/SerializerServiceProvider.php
	tests/Silex/Tests/LazyUrlMatcherTest.php

* 1.2:
  Phpdocs

This PR was merged into the 1.2 branch.

Discussion
----------

PHPDocs cleans ups

And some tabs versus spaces.

Commits
-------

bd9f72eb Phpdocs

This PR was merged into the 1.3 branch.

Discussion
----------

Have `Controller::generateRouteName()` always put the method first.

(As requested, this is #1154 rebased against 1.3.)

At present, mounted controllers can get weird route names. For instance, let's say you have this controller definition:

    $otherController = $app['controllers_factory'];
    $otherController->get('/{name}', function (Request $request, $name) use ($app) {
      return new Response("Goodbye $name!\n", 200, ['Content-Type' => 'text/plain']);
      });
    $app->mount('/goodbye', $otherController);

The generated route name in this case will be `_goodbyeGET_name`, which technically contains everything, but is ugly.

With this PR, the route name will change to `GET_goodbye_name`, which is considerably easier to parse when debugging.

Commits
-------

f8d6484c Have `Controller::generateRouteName()` always put the method first.

At present, mounted controllers can get weird route names. For instance, let's
say you have this controller definition:

    $otherController = $app['controllers_factory'];
    $otherController->get('/{name}', function (Request $request, $name) use ($app) {
      return new Response("Goodbye $name!\n", 200, ['Content-Type' => 'text/plain']);
      });
    $app->mount('/goodbye', $otherController);

The generated route name in this case will be `_goodbyeGET_name`, which
technically contains everything, but is ugly.

With this PR, the route name will change to `GET_goodbye_name`, which is
considerably easier to parse when debugging.

* 1.3:
  Fix return of renderView to string
  updated docs for 1.3
  Add mention of patch method to usage docs

Conflicts:
	doc/cookbook/multiple_loggers.rst
	doc/intro.rst
	doc/providers.rst
	doc/services.rst
	doc/usage.rst

* 1.2:
  Fix return of renderView to string
  Add mention of patch method to usage docs

Conflicts:
	doc/usage.rst

This PR was merged into the 1.2 branch.

Discussion
----------

Fix return of renderView to string

Commits
-------

988753a4 Fix return of renderView to string

This PR was merged into the 1.3 branch.

Discussion
----------

updated docs for 1.3

Commits
-------

58c91cdd updated docs for 1.3

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

Discussion
----------

fixed compatibility with Symfony 2.6

fixes #1145 and #1146

Commits
-------

c2077877 fixed compatbility with Symfony 2.6

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

Discussion
----------

Add mention of patch method to usage docs

Commits
-------

f8c6113d Add mention of patch method to usage docs

* 1.3:
  Revert "removed obsolete code"

Conflicts:
	src/Silex/Provider/ValidatorServiceProvider.php

This reverts commit aaec9f86.

* 1.3:
  removed obsolete code

Conflicts:
	src/Silex/Provider/ValidatorServiceProvider.php

* 1.3:
  removed obsolete code
  Improve Silex\Route\SecurityTrait coverage
  updated CHANGELOG

* 1.2:
  removed obsolete code
  Improve Silex\Route\SecurityTrait coverage
  updated CHANGELOG

Conflicts:
	doc/changelog.rst

* 1.3:
  fixed CS

Conflicts:
	src/Silex/Application.php
	src/Silex/EventListener/LogListener.php
	src/Silex/LazyUrlMatcher.php

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

Discussion
----------

A solution to resolve #983 (bad comportment of Translator)

Implementation of @henrikbjorn solution :

Use the Translator directly from Symfony and create a EventListener that sets the Locale on the translator based on the request (like LocaleListener does).

Commits
-------

36cfde2b A solution to resolve #983 (bad comportment of Translator)

* 1.3: (44 commits)
  Add a isGranted() function to Silex\Application\SecurityTrait + unit tests
  Type hint against EventDispatcherInterface
  Update usage.rst
  Use PSR-4 for autoloading, works same as the PSR-0 configuration. Use autoload-dev for autoloading tests
  updated CHANGELOG
  Patch debug and caching translator (Symfony 2.6+ with caching enabled).
  Updated year in License
  Update testing.rst
  Add docblock for the $app field
  fixed CS
  Update intro.rst
  Correct exception message when mounting
  fixed compatibility with 2.7
  updated .travis.yml with only maintained Symfony versions
  Link to Monolog provider chapter
  Fix README doc about running unit tests
  add values to parameters copied from symfony docs
  Use the constant to refer to session auth strategy
  Revert "Merge branch '1.2' into 1.3"
  updated deps as Silex 1.2 is not compatible with Symfony 2.7
  ...

Conflicts:
	.travis.yml
	README.rst
	composer.json
	doc/changelog.rst
	doc/providers/security.rst
	doc/usage.rst
	src/Silex/Api/BootableProviderInterface.php
	src/Silex/Application.php
	src/Silex/Provider/FormServiceProvider.php
	src/Silex/Provider/HttpCacheServiceProvider.php
	src/Silex/Provider/SecurityServiceProvider.php
	src/Silex/Provider/Translation/Translator.php
	src/Silex/Provider/TranslationServiceProvider.php
	src/Silex/Provider/ValidatorServiceProvider.php
	tests/Silex/Tests/Provider/MonologServiceProviderTest.php
	tests/Silex/Tests/Provider/TwigServiceProviderTest.php

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

Discussion
----------

Add a isGranted() function to Silex\Application\SecurityTrait + unit tests

Commits
-------

6d86c60d Add a isGranted() function to Silex\Application\SecurityTrait + unit tests