This PR was merged into the master branch.

Commits
-------

44ba6e72 Call parent constructor in app, to initialize pimple

Discussion
----------

Call parent constructor in app, to initialize pimple

This PR was merged into the master branch.

Commits
-------

6543379c Allow constructor arguments.

Discussion
----------

Allow constructor arguments.

Unfortunately my phpunit installation is horribly broken so I can't run the tests right now...

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

by igorw at 2012-11-27T00:21:38Z

👍

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

by igorw at 2012-11-27T00:21:49Z

Docs?

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

by igorw at 2012-11-27T00:24:24Z

The parent constructor should probably be called at the end, that allows parameters to override the default services. And you should add a test case for that too.

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

by GromNaN at 2012-11-27T07:54:31Z

@igorw The parent constructor replaces everything, so it cannot be called at the end.
https://github.com/fabpot/Pimple/blob/master/lib/Pimple.php#L46

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

by fabpot at 2013-01-03T08:10:28Z

What about just calling `array_replace($this->values, $values)` at the end of the constructor instead?

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

by igorw at 2013-01-03T08:35:02Z

Sounds good to me.

This PR was merged into the master branch.

Commits
-------

d272d710 [docs] Add cookbook recipe for the ErrorHandler

Discussion
----------

[docs] Add cookbook recipe for the ErrorHandler

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

by igorw at 2013-01-03T00:46:52Z

bump.

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

by davedevelopment at 2013-01-03T01:02:13Z

👍  looks good

This PR was merged into the master branch.

Commits
-------

6b248b0f Update src/Silex/Application.php

Discussion
----------

Update src/Silex/Application.php

EventDispatcher addListener function has no return value

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

by GromNaN at 2013-01-02T15:45:08Z

Exact.
https://github.com/symfony/symfony/blob/master/src/Symfony/Component/EventDispatcher/EventDispatcher.php#L88

EventDispatcher addListener function has no return value

This PR was merged into the master branch.

Commits
-------

d32857ac add charset documentation in doctrine provider

Discussion
----------

[docs] Add charset documentation in doctrine provider

This PR refers to https://github.com/fabpot/Silex/issues/549 and adds documentation on how to setup charset when connecting to mysql

I've also edited the mysql example so that it is even more clear

And last but not least, I've upgraded links to doctrine documentation so that it points to their latest version

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

by ricardclau at 2012-12-30T14:31:32Z

Tests have failed in travis due to a TransportException when downloading Pimple... weird!

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

Commits
-------

55dce6b5 Test session service provider with routes that does not use session

Discussion
----------

Test session service provider with routes that does not use session

Hello,

Since symfony/Symfony@098b593591, a bug occurs with `SessionServiceProvider` :

When using `HttpKernel\Client`, setting `$app['session.test'] = true;` and querying the application multiple routes in a single unit test, a `RuntimeException` is thrown by `Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage`.

For instance :

```php
use Silex\WebTestCase;
use Silex\Application;
use Silex\Provider\SessionServiceProvider;

class unitTest extends WebTestCase
{
    public function testUn()
    {
        $client = $this->createClient();
        $client->request('GET', '/');
        $client->request('GET', '/');
    }

    public function createApplication()
    {
        $app = new Application();

        $app->register(new SessionServiceProvider(), array(
            'session.test' => true
        ));

        $app['debug'] = true;
        $app['exception_handler']->disable();

        $app->get('/', function(Application $app) {
            return 'BOOM';
        });

        return $app;
    }
}
```
results in
```
1) unitTest::testUn
RuntimeException: Trying to save a session that was not started yet or was already closed

/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorage.php:101
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpFoundation/Session/Session.php:184
/Users/romain/Documents/workspace/testSess/vendor/silex/silex/src/Silex/Provider/SessionServiceProvider.php:107
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/EventDispatcher.php:164
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/EventDispatcher/EventDispatcher.php:53
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpKernel.php:169
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpKernel.php:151
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/HttpKernel.php:73
/Users/romain/Documents/workspace/testSess/vendor/silex/silex/src/Silex/Application.php:469
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/HttpKernel/Client.php:61
/Users/romain/Documents/workspace/testSess/vendor/symfony/symfony/src/Symfony/Component/BrowserKit/Client.php:264
/Users/romain/Documents/workspace/testSess/bingo.php:13
```

Of course, this test currently passes as the bug happens with latest `2.1.x-dev` source whereas `composer.json` settings ask to install latest stable tag.

This PR adds a test that fails with latest symfony 2.1.x.

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

by romainneutron at 2012-12-17T22:19:24Z

It seems the fix I've added is good enough, so, finally this PR brings a solution to the problem :)

This PR was merged into the master branch.

Commits
-------

490dd927 Replace double colons with valid PHP syntax

Discussion
----------

Replace double colons with valid PHP syntax

This PR was merged into the master branch.

Commits
-------

d2c42b32 Rename ErrorHandlerTest to ExceptionHandlerTest

Discussion
----------

Rename ErrorHandlerTest to ExceptionHandlerTest

This PR was merged into the master branch.

Commits
-------

332142f6 Document symfony/twig-bridge requirement for forms in twig templates

Discussion
----------

Document symfony/twig-bridge requirement for forms in twig templates

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

👍