* 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

* 1.2:
  prepared the 1.2.5 release
  updated CHANGELOG

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

* 1.2:
  update fastcgi_pass socket location

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

Discussion
----------

Update fastcgi_pass socket location

This makes it correspond with ubuntu 14.04 defaults

Commits
-------

42e9b8f2 update fastcgi_pass socket location

this makes it correspond with ubuntu 14.04 defaults

* 1.3: (27 commits)
  updated docs
  deprecated the user() trait
  made it easier to get the user from the app
  updated the changelog
  Remove incorrect examples and fix grammar
  updated changelog and docs
  Fixed whitespace issue
  Add options request capability to controller collection
  Update Application add options method for handling option routing
  Basic documentation
  Use PHPUnit annotation to skip test on <5.4
  Document as mixed, may be a string intended to be resolved from the CallbackResolver
  Revert the CS fix and make a valid docComment
  More CS fixes
  CS Fixes
  Allow view listeners to be "skipped" by returning null
  Restricted visibility
  Fix docblock type
  Remove callable hint for 5.3 tests
  Avoid mutating state
  ...

Conflicts:
	src/Silex/Application.php
	src/Silex/Provider/SecurityServiceProvider.php
	tests/Silex/Tests/ApplicationTest.php

This PR was merged into the 1.3 branch.

Discussion
----------

Easier user access

In Silex 1.3, it's "harder" to get the user from the security layer as the `security` service has been deprecated. The code is already available in the security trait, but if you are not using it, you need to use a somewhat "complex" expression in templates to access it (see #1152)

This PR moves the code from the trait to the security service to make it available to everyone.

One question though: can we deprecate the trait `user()` function? It is not useful anymore after this PR.

Commits
-------

87dc8570 made it easier to get the user from the app

* 1.2:
  Changed Doctrine page to use utf8mb4 as sample

This PR was merged into the 1.2 branch.

Discussion
----------

Changed Doctrine page to use utf8mb4 as sample

MySQL's `utf8` character set is a little broken, and does not cover 4-byte UTF-8 characters. In most cases it will quietly truncate the string whenever it sees one, saving incomplete text data.

In  5.5.3 they introduced `utf8mb4` to fix this inconsistency, and given that it's been 5 years, it's probably safe to encourage people to use it. If their MySQL installation is older, it should be easy for them to find the distinctive string and change it back to `utf8`, and for a new project.

Additional details can be found in the equivalent [pull-request for Symfony-2](https://github.com/symfony/symfony-docs/pull/5100).

Commits
-------

a20f8f6a Changed Doctrine page to use utf8mb4 as sample

This PR was merged into the 1.3 branch.

Discussion
----------

View Listener

Previously #1062 and #863

TODO

- [x] Documentation

Commits
-------

fa14af74 Remove incorrect examples and fix grammar
f0d7d7c2 Basic documentation
5407435c Use PHPUnit annotation to skip test on <5.4
b4446482 Document as mixed, may be a string intended to be resolved from the CallbackResolver
f2724fd2 Revert the CS fix and make a valid docComment
ca9fe47b More CS fixes
4e6591c3 CS Fixes
974b49d1 Allow view listeners to be "skipped" by returning null
50150276 Restricted visibility
c86b6f59 Fix docblock type
a7768253 Remove callable hint for 5.3 tests
65a97117 Avoid mutating state
f31bb299 Fix test
3a8e2dd5 Remove callable type hint from chain test for 5.3
a940fbe3 Clarify docblock
0bce9898 Add request to signature to test call
6bddf29e Add ViewListenerWrapper and tests
86c02016 Add view.

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

Discussion
----------

Add OPTIONS request routing directly to Application

I think it's important to add this HTTP Method directly to the application because it's often called automatically by browsers during AJAX requests. Meaning it's required that anyone sending AJAX requests to Silex will have to implement some kind of OPTIONS handling. I realize that you can use the match and method calls to do this same thing but those make routing OPTIONS requests less obvious.

Commits
-------

20be5c99 Fixed whitespace issue
45dc2bcc Add options request capability to controller collection
7ca60854 Update Application add options method for handling option routing