* 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

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

Discussion
----------

Test against php7

Test against the upcomming change.

Commits
-------

14e1f613 Test against php7

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

Discussion
----------

Change closures to use $app as the first parameter.

Almost always the first parameter is $app therefor it makes little sense
to use `use` part of the closure and having PHP do context switching all
over the place.

This also makes it explicit in the service providers exactly what $app
instance is used.

Commits
-------

5efdf830 Change closures to use  as the first parameter.

* 1.3:
  fixed CS
  Update README.rst

This PR was merged into the 1.3 branch.

Discussion
----------

add changelog to readme

Commits
-------

b0211b2b Update README.rst

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

Discussion
----------

Update session_storage.rst: Add missing lifetime column

Commits
-------

e85ec346 Update session_storage.rst

Add missing lifetime column.

* 1.3:
  removed obsolete paragraph about the mailing-list

* 1.3:
  fixed CS
  Update usage.rst
  tweaks the testing docs

Conflicts:
	src/Silex/Application.php
	src/Silex/Application/SecurityTrait.php
	src/Silex/Provider/TwigServiceProvider.php

feature #1175 Added factory for RouteCollection, makes subclassing of RouteCollection possible. (lschricke)

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

Discussion
----------

Added factory for RouteCollection, makes subclassing of RouteCollection possible.

Note: replaces #1174, which was targeting a wrong branch (and where I messed a bit with the commits ;)).

--

The aim of this PR is to allow developpers to subclass `Symfony\Component\Routing\RouteCollection` to change some of its behavior.

In most of my Silex apps, I figured I don't want the Symfony's `RouteCollection` regular behavior where if you define two routes with the same name (bad copy-paste for instance), the first route added simply gets overriden by the second. Instead, I would like to be able to throw an Exception if that happens. So I've written [a tiny subclass of RouteCollection](https://github.com/lschricke/symfony-strict-route-collection), but to be able to use it (through [a service provider like this](https://github.com/lschricke/silex-strict-route-collection-service-provider) for instance (needs to be updated for Silex 2)), I need to be able to replace `RouteCollection` by my subclass. This PR makes it possible.

Thanks! :)

Commits
-------

18f253f2 Added factory for RouteCollection, makes subclassing of RouteCollection possible.

This PR was merged into the 1.3 branch.

Discussion
----------

Update usage.rst

* List all HTTP methods
* Update the error handling priority text
* Add link to error to exception cookbook entry
* Add link to the Twig provider documentation

Commits
-------

45da7908 Update usage.rst

* List all HTTP methods
* Update the error handling priority text
* Add link to error to exception cookbook entry
* Add link to the Twig provider documentation

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

Discussion
----------

added sender_address to switfmailer provider

fixes #1022

Commits
-------

cbe94829 added sender_address to switfmailer provider

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

Discussion
----------

Remove usage of the deprecated target-dir feature

Commits
-------

641c60cb Remove usage of the deprecated target-dir feature

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

Discussion
----------

cascade route configuration for embedded route collection

In 4e6031e2, I added a safeguard by mistake which makes configuration on nested collection not possible. This fixes this issue but only for the upcoming 2.0 branch as it might break BC.

fixes #1017, #1100, and #1081

Commits
-------

48727b4d cascade route configuration for embedded route collection

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

Discussion
----------

refactored the session provider

replaces #934 by making possible to override the default bags, but more importantly, it removes the storage definition from the inside of the session one to the outside.

Commits
-------

2cb76057 refactored the session provider

* 1.3:
  bumped version to 1.3.1-DEV
  prepared the 1.3.0 release
  prepared the 1.2.5 release
  updated CHANGELOG
  fixed changelog
  update fastcgi_pass socket location

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