This PR was merged into the 1.0 branch.

Discussion
----------

Change the order of routes.

The note below suggests adding more generic routes at the bottom
as the first matching route is used.

In my opinion the code block should also follow this suggestion
as it makes more clear how to use routes.

Commits
-------

a1a61fd1 Change the order of routes.

This PR was merged into the 1.0 branch.

Discussion
----------

Fix typos, remove trailing whitespace

Commits
-------

502d1049 Fix typos

The note below suggests adding more generic routes at the bottom
as the first matching route is used.

In my opinion the code block should also follow this suggestion
as it makes more clear how to use routes.

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

Discussion
----------

TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D

Commits
-------

72b1ad9 TranslationServiceProvider replaced translator.messages by translator.domains.

- changed in commit 7C496D

This PR was merged into the 1.0 branch.

Discussion
----------

Updated year in License

Commits
-------

1e543d2a Updated year in License

This PR was merged into the 1.0 branch.

Discussion
----------

Remove gendered pronouns

When referencing hypothetical users, it's more inclusive to use
gender-neutral prnouns. Instances of he/she/his/her/him have been
replaced with they/them/their and verb tenses changed to match.

Commits
-------

c48da4ca Remove gendered pronouns

When referencing hypothetical users, it's more inclusive to use
gender-neutral prnouns. Instances of he/she/his/her/him have been
replaced with they/them/their and verb tenses changed to match.

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

Discussion
----------

fix docblock

Commits
-------

fbf12a5 fix docblock

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

Discussion
----------

Update intro.rst - Included links to Symfony2, Pimple and Sinatra

Included links to Symfony2, Pimple and Sinatra

Commits
-------

f9c13a1 Update intro.rst - Included links to Symfony2, Pimple and Sinatra

Included links to Symfony2, Pimple and Sinatra

This PR was merged into the 1.0 branch.

Discussion
----------

Typo in doc/providers.rst

Commits
-------

81a0664a typo fixed in doc/providers.rst

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

Discussion
----------

[Docs] Add link for twig options

Commits
-------

3bdfa4a [Docs] Add link for twig options

This PR was merged into the 1.0 branch.

Discussion
----------

add '_route' key to RedirectableUrlMatcher::redirect

When there is a logger, the Symfony\Compoment\HttpKernel\EventListener\RouterListener::onKernelRequest method expects the '_route' key to exist in order to log the matched route and issues a PHP Notice

    <?php
    date_default_timezone_set('America/Los_Angeles');

    require_once __DIR__ . '/../vendor/autoload.php';
    Symfony\Component\HttpKernel\Debug\ErrorHandler::register();
    $app = new Silex\Application();
    $app['debug'] = true;
    $app['monolog.logfile'] = 'C:/TEMP/log.log';
    $app->register(new \Silex\Provider\MonologServiceProvider());
    $app->get('/a/', function() {
        return 'done';
    });

    $app->run();

*[url]/a* issues the notice before redirecting to */a/*

Commits
-------

3d1a868c add '_route' key to RedirectableUrlMatcher::redirect

This PR was merged into the 1.0 branch.

Discussion
----------

Add note on how to handle fatal errors

I'm not so happy with this solution from a usability perspective, but I don't want to have global error handlers in silex itself.

An option we could consider is making symfony's ErrorHandler fall back to an internal ``ExceptionHandler`` for fatal errors. But obviously that is not very elegant either. Ideas welcome.

Commits
-------

7a222ce5 Add note on how to handle fatal errors, as per mailing list

This PR was merged into the 1.0 branch.

Discussion
----------

Fixed typo in the ServiceProviderInterface interface PHPDoc block.

Commits
-------

8bf3f788 Fixed typo in the ServiceProviderInterface interface PHPDoc block.

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

Discussion
----------

Alter app references in middleware doc

I use ControllerProvider's and functions for my controllers, and I rely on the ````Application```` and ````Request```` being injected via the parameters of each function. Today I happened to need to build some middleware, but found that ````public function before(Application $app)```` resulted in a fatal as the middleware does not use type hinting to set parameters like controllers do. On digging a bit deeper I found in ````Silex\EventListener\MiddlewareListener.php::onKernelRequest```` the following line:
````
$ret = call_user_func($callback, $request, $this->app);
````
This injects application as the second parameter. I'm really happy that it does do this, but the parameter order seems a little strange to me. It's a bit at odds with the rest of the documentation on controllers - the general method prototype is ````method(Application $app, Request $request)````. Given this, I would have expected the app to come first in the parameter list. The same applies to the after callback, except it has ````Response```` between ````Request```` and ````Application````.

The global middleware defined in ````Application```` do not inject the app in any of the callbacks, confusing the matter further. My pattern doesn't actually require this, but some people's might. Is there a reason this hasn't been done? It would be very simple to add, given the three methods are inside the ````Application```` class itself.

The ideal fix to this would be that the middleware use type hinting to apply the parameters, but this is complicated by the callbacks occurring in two classes, neither of which are local to the existing type hinting code. At the very least I think this functionality should be documented, so this is what I have provided in the PR.

Commits
-------

ddc9b92 Alter app references in middleware doc

This PR was squashed before being merged into the 1.0 branch (closes #722).

Discussion
----------

Make DoctrineServiceProvider db connection lazy

Specifically, do not create all connections early, only create them as
needed.

Commits
-------

9cf31e47 Make DoctrineServiceProvider db connection lazy

This PR was squashed before being merged into the 1.0 branch (closes #723).

Discussion
----------

Workaround for OptionsResolver validating options

Couldn't think of anyway to determine which version of the form component was being used, so went with the the suck it and see.

Commits
-------

60338ac9 Workaround for OptionsResolver validating options

When there is a logger, the Symfony\Compoment\HttpKernel\EventListener\RouterListener class expects the '_route' key to exist in order to log the matched route and issues a PHP Notice

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

Discussion
----------

reflect change: Modularity chapter renamed to Organizing Controllers (#570)

Commits
-------

d051da3 reflect change: Modularity chapter renamed to Organizing Controllers (#570)

This PR was squashed before being merged into the 1.0 branch (closes #699).

Discussion
----------

Add target branch notes

Consolidate the information recently added to the wiki, once merged, we could edit the wiki page to point towards the docs.

Commits
-------

b99a10e5 Add target branch notes