* 1.3:
  fixed translation override
  removed obsolete cookbook entry
  fixed CS
  updated the docs to show how to restrict a firewall by more than just the URL

This PR was merged into the 1.3 branch.

Discussion
----------

fixed translation override

fixes #1041

I've also removed a cookbook entry which is not relevant anymore.

Commits
-------

dd270386 fixed translation override
6d3cc41b removed obsolete cookbook entry

This PR was merged into the 1.3 branch.

Discussion
----------

updated the docs to show how to restrict a firewall by more than just the URL

closes #1171 and #1044

Commits
-------

721043c2 updated the docs to show how to restrict a firewall by more than just the URL

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

Discussion
----------

changed auto-generated route names when there is a conflict

Commits
-------

43aee48f changed auto-generated route names when there is a conflict

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

Discussion
----------

removed flush() argument

I propose to remove the `flush()` prefix argument as I don't see any use case. I think it was there because the method is recursive, but that's leaking an implementation detail. Passing a prefix was not documented.

Commits
-------

4005cf28 removed flush() argument

* 1.3:
  updated CHANGELOG
  moved logic to an internal method
  simplified previous merge
  Use shared RouteCollection among nested routes and apply prefix to route path before generating unique route name

bug #1205 Use shared RouteCollection among nested routes and apply prefix to route... (srsbiz, fabpot)

This PR was merged into the 1.3 branch.

Discussion
----------

Use shared RouteCollection among nested routes and apply prefix to route...

Replaces #1107, fixes #1106

Commits
-------

b510e5a0 moved logic to an internal method
401674e9 simplified previous merge
091240ea Use shared RouteCollection among nested routes and apply prefix to route path before generating unique route name

Use shared RouteCollection among nested routes and apply prefix to route path before generating unique route name

Fixes #1106

* 1.3:
  Changed the proposed nginx configuration to mimic Symfony's one
  fixed session logout handler when a firewall is stateless
  Support optional session invalidation on logout

This reverts commit 59575186, reversing
changes made to 19de0cd2.

This PR was submitted for the 1.3 branch but it was merged into the 2.0.x-dev branch instead (closes #1200).

Discussion
----------

Allowing the use of both objects and arrays for the register()

Sometimes we may like to use objects for lazy loading and whatsoever and since PHP has the Traversable interface, that should be perfectly fine.

Commits
-------

9ac0fd70 Allowing the use of both objects and arrays for the register()

This PR was submitted for the 1.3 branch but it was merged into the 2.0.x-dev branch instead (closes #1204).

Discussion
----------

Add form type support in FormTrait for flexibility

Set parameter to the end for backwards compatibility, ideally make it first in the future release.

Commits
-------

3ffe0c72 Add form type support in FormTrait for flexibility

This PR was squashed before being merged into the 1.3 branch (closes #1185).

Discussion
----------

Changed the proposed nginx configuration to mimic Symfony's one

The proposed configuration solves [this 404 error issue](https://github.com/silexphp/Silex-Skeleton/issues/24) when trying to load the web profiler under nginx.

Commits
-------

7e8157f9 Changed the proposed nginx configuration to mimic Symfony's one

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

Discussion
----------

Support optional session invalidation on logout

Avoid session destroying on logout by adding "invalidate_session: false" in your configuration e.g.

$app['security.firewalls'] = array(
[...]
        'logout' => array(
            'logout_path' => '/user/logout',
            'target_url' => '/logout',
            'invalidate_session' => false
        ),
[...]
);

Commits
-------

1a55ff82 Support optional session invalidation on logout

* 1.3:
  Allowed shared ContextListener for firewalls

* 1.3:
  tweaked docs
  added warning about route security trait
  PHPDocs Application -> HttpKernelInterface
  Very little typo fix.

This PR was merged into the 1.3 branch.

Discussion
----------

PHPDocs Application -> HttpKernelInterface

replacement of https://github.com/silexphp/Silex/pull/1193
(could not reopen that one because of a forced push)

Commits
-------

b960bad3 PHPDocs Application -> HttpKernelInterface

This PR was merged into the 1.3 branch.

Discussion
----------

Very little typo fix.

Commits
-------

83736136 Very little typo fix.

* 1.3:
  Test against php7