* 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

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

* 1.2:
  updated intro docs

Conflicts:
	doc/intro.rst

* 1.2:
  [Docs] [Providers] Fixed typo

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

Discussion
----------

[Docs] [Providers] Fixed typo

Commits
-------

cb279a24 [Docs] [Providers] Fixed typo