This PR was merged into the master branch.

Commits
-------

e04ec9f2 Rename BeforeAfterFilterTest to MiddlewareTest

Discussion
----------

Rename BeforeAfterFilterTest to MiddlewareTest

This PR was merged into the master branch.

Commits
-------

97d15149 getFormat() => getRequestFormat()

Discussion
----------

getFormat() => getRequestFormat()

The `getFormat()` method is not the one used to get the request format.

The `getFormat()` method is not the one used to get the request format.

This PR was merged into the master branch.

Commits
-------

84769fdd Make monolog documentation not condescending

Discussion
----------

Make monolog documentation not condescending

Docs regression from #551.

Docs regression from #551.

This PR was merged into the master branch.

Commits
-------

4772cbe7 Update doc/providers/serializer.rst

Discussion
----------

Update doc/providers/serializer.rst

fixed formatting for codeblocks

This PR was merged into the master branch.

Commits
-------

3c226283 Linked "How to make sub-requests" in usage doc

Discussion
----------

Linked "How to make sub-requests" in usage doc

Fixes #546.

---------------------------------------------------------------------------

by igorw at 2012-11-18T18:03:25Z

The example also needs to be fixed to pass the cookie and server bags.

This PR was merged into the master branch.

Commits
-------

a868919b Rename mount() argument from $app to $controllers

Discussion
----------

Rename mount() argument from $app to $controllers

App is a legacy name, the usage of the method has changed.

This PR was merged into the master branch.

Commits
-------

412c6d77 Removed unused use statement from the sample code

Discussion
----------

Removed unused use statement from the sample code

The sample code changed to not need the ControllerCollection anyone but the use statement was left in.

---------------------------------------------------------------------------

by igorw at 2012-11-26T02:35:33Z

👍

App is a legacy name, the usage of the method has changed

Fixes #546.

fixed formatting for codeblocks

This PR was squashed before being merged into the master branch (closes #539).

Commits
-------

7df7761c Example for DoctrineServiceProvider in session cookbook

Discussion
----------

Example for DoctrineServiceProvider in session cookbook

Adds an example for using the DoctrineServiceProvider with PdoSessionHandler.

---------------------------------------------------------------------------

by GromNaN at 2012-11-09T12:27:02Z

You should add section titles as the cookbook gives 2 ways to do the same thing.

---------------------------------------------------------------------------

by ChrisRiddell at 2012-11-09T12:35:50Z

@GromNaN Sorry still new to this what do you mean by section titles?

---------------------------------------------------------------------------

by GromNaN at 2012-11-09T12:43:52Z

The page contains 2 titles named "Example".
* 1st: name it "With a dedicated PDO service"
* 2nd: name it "Using the DoctrineServiceProvider" & move the text you added after the 2nd title.

---------------------------------------------------------------------------

by GromNaN at 2012-11-09T15:03:24Z

👍

This PR was merged into the master branch.

Commits
-------

4174a768 Define "magic" methods of \Silex\Controller

Discussion
----------

Define "magic" methods of \Silex\Controller

This makes IDEs (PHPStorm, in particular) a bit happier about route-definitions.
see http://manual.phpdoc.org/HTMLSmartyConverter/PHP/phpDocumentor/tutorial_tags.method.pkg.html

Controller forwards calls to Route using __call(), but, before this patch, IDEs do not know about this, and show warnings about non-existent methods: assert(), value(), etc.

This makes IDEs (PHPStorm, in particular) a bit happier about route-definitions.
see http://manual.phpdoc.org/HTMLSmartyConverter/PHP/phpDocumentor/tutorial_tags.method.pkg.html

This PR was merged into the master branch.

Commits
-------

969ae6d2 Link to web servers chapter from usage

Discussion
----------

Link to web servers chapter from usage

This PR was squashed before being merged into the master branch (closes #536).

Commits
-------

a9552481 Minor session documentation change.

Discussion
----------

Minor session documentation change.

Thanks to igorw in #silex-php, we were able to get our redis sessions
working in Silex. At his request, I'm updating the docs to indicate what
he came up with.

---------------------------------------------------------------------------

by igorw at 2012-11-08T18:26:20Z

Looks good, but please wrap the long line at 80 chars.

---------------------------------------------------------------------------

by igorw at 2012-11-08T19:04:07Z

👍

This PR was merged into the master branch.

Commits
-------

7d07da09 Update { => Native}FileSessionHandler in session doc

Discussion
----------

Update { => Native}FileSessionHandler in session doc

---------------------------------------------------------------------------

by indeyets at 2012-11-08T16:48:47Z

by the way, is non-native option still available somewhere?

---------------------------------------------------------------------------

by igorw at 2012-11-08T17:02:07Z

Yes. If you set the `session.test` parameter to true, it will use a `MockFileSessionStorage` instead. See also [the SessionServiceProvider docs](silex.sensiolabs.org/doc/providers/session.html).

This PR was merged into the master branch.

Commits
-------

d00ff5b1 Suggest removing the minimum-stability flag

Discussion
----------

Suggest removing the minimum-stability flag

Silex can be installed with stable versions of the Symfony2 components.
Users should not be encouraged to set the minimum-stability flag to dev.

https://groups.google.com/forum/?fromgroups=#!topic/silex-php/vPwMs7CMMT0

---------------------------------------------------------------------------

by igorw at 2012-11-07T23:50:52Z

I agree, it should also be adjusted in the usage doc (which is currently broken because it has neither `minimum-stability` nor `@dev`).

In fact this is already what is used in the skeletons.

This PR was merged into the master branch.

Commits
-------

4a0d746a Update doc/providers/security.rst

Discussion
----------

Update doc/providers/security.rst

typo is -> if

typo is -> if

Silex can be installed with stable versions of the components.

Revert "fixed a fatal error when the security provider is created without any firewalls (which of course does not make sense but anyways, refs #473)"

This reverts commit 2b28989b.

This PR was merged into the master branch.

Commits
-------

236ef89b Set SCRIPT_FILENAME after including params

Discussion
----------

Set SCRIPT_FILENAME after including params

I think that some versions or distributions of nginx set SCRIPT_FILENAME in the
fastcgi_params file (certainly ubuntu/debian), overriding anything previously set.

---------------------------------------------------------------------------

by igorw at 2012-11-06T14:21:18Z

Confirmed, ubuntu sets it:

    fastcgi_param   SCRIPT_FILENAME         $request_filename;

I think that some versions or distributions of nginx set SCRIPT_FILENAME in the
fastcgi_params file (certainly ubuntu/debian), overriding anything previously set.

This PR was squashed before being merged into the master branch (closes #528).

Commits
-------

454d49e5 Cookbook recipe on sub-requests, closes #506, #507

Discussion
----------

Cookbook recipe on sub-requests, closes #506, #507

---------------------------------------------------------------------------

by ChrisRiddell at 2012-11-04T23:28:09Z

This is very useful, maybe an example of the "Lack of container scopes" could be good as it got confusing.

---------------------------------------------------------------------------

by igorw at 2012-11-05T00:09:54Z

@ChrisRiddell Good point, I'll add an example to illustrate it. Cheers!

---------------------------------------------------------------------------

by igorw at 2012-11-06T13:06:49Z

I have made the requested changes.

This PR was merged into the master branch.

Commits
-------

c4975cc4 Create Application::on() method to add an event listener

Discussion
----------

Add method Application::on($eventName, $callback, $priority)

Simplify PR #435

This method is a shortcut to add a listener to the event dispatcher.

``` php
<?php
use Symfony\Component\Security\Http\SecurityEvents;

$app->on(SecurityEvents::SWITCH_USER, function ($event) {
    // ...
});
```

---------------------------------------------------------------------------

by fabpot at 2012-10-24T20:34:12Z

Can you add some useful examples in the documentation before I merge this PR? Thanks.

---------------------------------------------------------------------------

by GromNaN at 2012-10-24T21:57:48Z

Which part of the documentation would be the most relevant ?

I can write a cookbook on how to send an email when someone login to the application.

* mvrhov/nginx:
  improved nginx config. It's secure by default now.

Conflicts:
	doc/web_servers.rst