* 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.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 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

This reverts commit aaec9f86.

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

Conflicts:
	doc/changelog.rst

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

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

Discussion
----------

Improve Silex\Route\SecurityTrait coverage

Commits
-------

a1240023 Improve Silex\Route\SecurityTrait coverage